JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* shared.cc (open_shared): Don't attempt VirtualAlloc magic if first attempt to 

map memory fails.
This commit is contained in:
Christopher Faylor 2005-01-02 00:34:55 +00:00
parent f8316b46dd
commit d8c83adc04
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2005-01-01 Christopher Faylor <cgf@timesys.com>
* shared.cc (open_shared): Don't attempt VirtualAlloc magic if first
attempt to map memory fails.
2004-12-30 Christopher Faylor <cgf@timesys.com> 2004-12-30 Christopher Faylor <cgf@timesys.com>
* devices.cc (device::isfs): Return true for the logical case of * devices.cc (device::isfs): Return true for the logical case of

5
winsup/cygwin/shared.cc
View File

@ -79,7 +79,7 @@ open_shared (const char *name, int n, HANDLE &shared_h, DWORD size,
void *shared; void *shared;
void *addr; void *addr;
if (!wincap.needs_memory_protection ()) if (!wincap.needs_memory_protection () && offsets[0])
addr = NULL; addr = NULL;
else else
{ {
@ -116,12 +116,13 @@ open_shared (const char *name, int n, HANDLE &shared_h, DWORD size,
if (wincap.is_winnt ()) if (wincap.is_winnt ())
system_printf ("relocating shared object %s(%d) from %p to %p on Windows NT", name, n, addr, shared); system_printf ("relocating shared object %s(%d) from %p to %p on Windows NT", name, n, addr, shared);
#endif #endif
offsets[0] = NULL;
} }
if (!shared) if (!shared)
api_fatal ("MapViewOfFileEx '%s'(%p), %E. Terminating.", name, shared_h); api_fatal ("MapViewOfFileEx '%s'(%p), %E. Terminating.", name, shared_h);
if (m == SH_CYGWIN_SHARED && wincap.needs_memory_protection ()) if (m == SH_CYGWIN_SHARED && offsets[0] && wincap.needs_memory_protection ())
{ {
unsigned delta = (char *) shared - offsets[0]; unsigned delta = (char *) shared - offsets[0];
offsets[0] = (char *) shared; offsets[0] = (char *) shared;