May 2007 - Wine-commits - list.winehq.org

Francois Gouget : msvcrt: When operating on a closed pipe, read() should return 0, not -1.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: cf218621fd2d5f4c8750451ca57ef7672cdc109b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf218621fd2d5f4c8750451ca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 21 16:04:48 2007 +0200 msvcrt: When operating on a closed pipe, read() should return 0, not -1. Add tests to make sure read() and fread() work right on closed pipes. --- dlls/msvcrt/file.c | 12 ++++- dlls/msvcrt/tests/file.c | 105 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 109 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1d009ff..14b7311 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1692,8 +1692,16 @@ static int read_i(int fd, void *buf, unsigned int count) } else { - TRACE(":failed-last error (%d)\n",GetLastError()); - return -1; + if (GetLastError() == ERROR_BROKEN_PIPE) + { + TRACE(":end-of-pipe\n"); + return 0; + } + else + { + TRACE(":failed-last error (%d)\n",GetLastError()); + return -1; + } } if (count > 4) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9b5538f..9444b73 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -646,8 +646,9 @@ static void test_file_inherit( const char* selfname ) ok(fd != -1, "Couldn't create test file\n"); arg_v[0] = selfname; arg_v[1] = "tests/file.c"; - arg_v[2] = buffer; sprintf(buffer, "%d", fd); - arg_v[3] = 0; + arg_v[2] = "inherit"; + arg_v[3] = buffer; sprintf(buffer, "%d", fd); + arg_v[4] = 0; _spawnvp(_P_WAIT, selfname, arg_v); ok(tell(fd) == 8, "bad position %lu expecting 8\n", tell(fd)); lseek(fd, 0, SEEK_SET); @@ -659,8 +660,8 @@ static void test_file_inherit( const char* selfname ) ok(fd != -1, "Couldn't create test file\n"); arg_v[0] = selfname; arg_v[1] = "tests/file.c"; - arg_v[2] = buffer; sprintf(buffer, "%d", fd); - arg_v[3] = buffer; + arg_v[2] = "inherit_no"; + arg_v[3] = buffer; sprintf(buffer, "%d", fd); arg_v[4] = 0; _spawnvp(_P_WAIT, selfname, arg_v); ok(tell(fd) == 0, "bad position %lu expecting 0\n", tell(fd)); @@ -877,6 +878,91 @@ static void test_stat(void) skip("pipe failed with errno %d\n", errno); } +static const char* pipe_string="Hello world"; + +static void test_pipes_child(int argc, char** args) +{ + int fd; + + if (argc < 5) + { + ok(0, "not enough parameters: %d\n", argc); + return; + } + + fd=atoi(args[3]); + ok(close(fd) == 0, "unable to close %d: %d\n", fd, errno); + + fd=atoi(args[4]); + write(fd, pipe_string, strlen(pipe_string)); + ok(close(fd) == 0, "unable to close %d: %d\n", fd, errno); +} + +static void test_pipes(const char* selfname) +{ + int pipes[2]; + char str_fdr[12], str_fdw[12]; + FILE* file; + const char* arg_v[6]; + char buf[4096]; + int r; + + /* Test reading from a pipe with read() */ + if (_pipe(pipes, 1024, O_BINARY) < 0) + { + ok(0, "pipe failed with errno %d\n", errno); + return; + } + + arg_v[0] = selfname; + arg_v[1] = "tests/file.c"; + arg_v[2] = "pipes"; + arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); + arg_v[4] = str_fdw; sprintf(str_fdw, "%d", pipes[1]); + arg_v[5] = NULL; + _spawnvp(_P_NOWAIT, selfname, arg_v); + ok(close(pipes[1]) == 0, "unable to close %d: %d\n", pipes[1], errno); + + r=read(pipes[0], buf, sizeof(buf)-1); + ok(r == strlen(pipe_string), "expected to read %d bytes, got %d\n", strlen(pipe_string)+1, r); + if (r > 0) + buf[r]='\0'; + ok(strcmp(buf, pipe_string) == 0, "expected to read '%s', got '%s'\n", pipe_string, buf); + r=read(pipes[0], buf, sizeof(buf)-1); + ok(r == 0, "expected to read 0 bytes, got %d\n", r); + ok(close(pipes[0]) == 0, "unable to close %d: %d\n", pipes[0], errno); + + /* Test reading from a pipe with fread() */ + if (_pipe(pipes, 1024, O_BINARY) < 0) + { + ok(0, "pipe failed with errno %d\n", errno); + return; + } + + arg_v[0] = selfname; + arg_v[1] = "tests/file.c"; + arg_v[2] = "pipes"; + arg_v[3] = str_fdr; sprintf(str_fdr, "%d", pipes[0]); + arg_v[4] = str_fdw; sprintf(str_fdw, "%d", pipes[1]); + arg_v[5] = NULL; + _spawnvp(_P_NOWAIT, selfname, arg_v); + ok(close(pipes[1]) == 0, "unable to close %d: %d\n", pipes[1], errno); + file=fdopen(pipes[0], "r"); + + r=fread(buf, 1, sizeof(buf)-1, file); + ok(r == strlen(pipe_string), "fread() returned %d instead of %d: ferror=%d\n", r, strlen(pipe_string), ferror(file)); + if (r > 0) + buf[r]='\0'; + ok(strcmp(buf, pipe_string) == 0, "got '%s' expected '%s'\n", buf, pipe_string); + + r=fread(buf, 1, sizeof(buf)-1, file); + ok(r == 0, "fread() returned %d instead of 0\n", r); + ok(ferror(file) == 0, "got ferror() = %d\n", ferror(file)); + ok(feof(file), "feof() is false!\n"); + + ok(fclose(file) == 0, "unable to close the pipe: %d\n", errno); +} + START_TEST(file) { int arg_c; @@ -887,8 +973,14 @@ START_TEST(file) /* testing low-level I/O */ if (arg_c >= 3) { - if (arg_c == 3) test_file_inherit_child(arg_v[2]); - else test_file_inherit_child_no(arg_v[2]); + if (strcmp(arg_v[2], "inherit") == 0) + test_file_inherit_child(arg_v[3]); + else if (strcmp(arg_v[2], "inherit_no") == 0) + test_file_inherit_child_no(arg_v[3]); + else if (strcmp(arg_v[2], "pipes") == 0) + test_pipes_child(arg_c, arg_v); + else + ok(0, "invalid argument '%s'\n", arg_v[2]); return; } test_file_inherit(arg_v[0]); @@ -909,4 +1001,5 @@ START_TEST(file) test_tmpnam(); test_get_osfhandle(); test_setmaxstdio(); + test_pipes(arg_v[0]); }

1 0

Alexandre Julliard : Fix a couple of overflowing heap allocations revealed by the previous change .
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: be59e2bb5396ac40568e999c3ccd6a609db97e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be59e2bb5396ac40568e999c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 11:59:36 2007 +0200 Fix a couple of overflowing heap allocations revealed by the previous change. --- dlls/ntdll/file.c | 5 +++-- dlls/wininet/internet.c | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 4936bb2..3265ed5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1449,9 +1449,10 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, SERVER_END_REQ; if (!io->u.Status) { + char *tmpbuf; ULONG size = info->MaximumMessageSize ? info->MaximumMessageSize : 0x10000; - char *tmpbuf = RtlAllocateHeap( GetProcessHeap(), 0, size ); - if (tmpbuf) + if (size > 0x10000) size = 0x10000; + if ((tmpbuf = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { int fd, needs_close; if (!server_get_unix_fd( hFile, FILE_READ_DATA, &fd, &needs_close, NULL, NULL )) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3bfa62f..b507312 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1044,6 +1044,13 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, WCHAR* lpwszUrl; TRACE("(%s %u %x %p)\n", debugstr_a(lpszUrl), dwUrlLength, dwFlags, lpUrlComponents); + + if (!lpszUrl || !*lpszUrl) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if(dwUrlLength<=0) dwUrlLength=-1; nLength=MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,NULL,0);

1 0

Alexandre Julliard : server: Don' t allow a waitable timer to be set to expire in the past.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 1b15d45dd76eeaeb7779373b15ba2db2333ce3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b15d45dd76eeaeb7779373b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 11:59:45 2007 +0200 server: Don't allow a waitable timer to be set to expire in the past. --- server/timer.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/timer.c b/server/timer.c index 088a063..ffa4b03 100644 --- a/server/timer.c +++ b/server/timer.c @@ -164,7 +164,8 @@ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period period = 0; /* period doesn't make any sense for a manual timer */ timer->signaled = 0; } - + if (expire > 0 && expire < current_time) expire = current_time; + timer->when = expire; timer->period = period; timer->callback = callback; timer->arg = arg;

1 0

Francois Gouget : msvcrt/tests: When compiling with Visual C++ 2005, one must define _CRT_NON_CONFORMING_SWPRINTFS otherwise swprintf() takes an extra parameter.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: f793221f0fa3b46a3994903f15cb6292969feb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f793221f0fa3b46a3994903f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 21 16:03:37 2007 +0200 msvcrt/tests: When compiling with Visual C++ 2005, one must define _CRT_NON_CONFORMING_SWPRINTFS otherwise swprintf() takes an extra parameter. --- dlls/msvcrt/tests/printf.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 23cc5c8..61672f9 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -19,6 +19,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +/* With Visual Studio >= 2005, swprintf() takes an extra parameter unless + * the following macro is defined. + */ +#define _CRT_NON_CONFORMING_SWPRINTFS #include <stdio.h>

1 0

Stefan Dösinger : ddraw: Hold the lock in creation functions.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: bfe631dfb91334891d9ca6da43d162ff29200455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe631dfb91334891d9ca6da4… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon May 21 01:12:36 2007 +0200 ddraw: Hold the lock in creation functions. --- dlls/ddraw/ddraw.c | 4 +++- dlls/ddraw/ddraw_private.h | 3 --- dlls/ddraw/main.c | 42 +++++++++++++++++++++++++++--------------- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 2d8dc8a..734ac99 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -268,7 +268,9 @@ IDirectDrawImpl_Destroy(IDirectDrawImpl *This) /* Unregister the window class */ UnregisterClassA(This->classname, 0); - remove_ddraw_object(This); + EnterCriticalSection(&ddraw_cs); + list_remove(&This->ddraw_list_entry); + LeaveCriticalSection(&ddraw_cs); /* Release the attached WineD3D stuff */ IWineD3DDevice_Release(This->wineD3DDevice); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 5bd1164..ee194a1 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -203,9 +203,6 @@ IWineD3DVertexDeclaration * IDirectDrawImpl_FindDecl(IDirectDrawImpl *This, DWORD fvf); -void -remove_ddraw_object(IDirectDrawImpl *ddraw); - /* The default surface type */ extern WINED3DSURFTYPE DefaultSurfaceType; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 963661b..2d28626 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -317,10 +317,7 @@ DDRAW_Create(const GUID *guid, #undef FX_CAPS list_init(&This->surface_list); - - EnterCriticalSection(&ddraw_cs); list_add_head(&global_ddraw_list, &This->ddraw_list_entry); - LeaveCriticalSection(&ddraw_cs); This->decls = HeapAlloc(GetProcessHeap(), 0, 0); if(!This->decls) @@ -358,9 +355,13 @@ DirectDrawCreate(GUID *GUID, IDirectDraw **DD, IUnknown *UnkOuter) { + HRESULT hr; TRACE("(%s,%p,%p)\n", debugstr_guid(GUID), DD, UnkOuter); - return DDRAW_Create(GUID, (void **) DD, UnkOuter, &IID_IDirectDraw); + EnterCriticalSection(&ddraw_cs); + hr = DDRAW_Create(GUID, (void **) DD, UnkOuter, &IID_IDirectDraw); + LeaveCriticalSection(&ddraw_cs); + return hr; } /*********************************************************************** @@ -378,12 +379,16 @@ DirectDrawCreateEx(GUID *GUID, REFIID iid, IUnknown *UnkOuter) { + HRESULT hr; TRACE("(%s,%p,%s,%p)\n", debugstr_guid(GUID), DD, debugstr_guid(iid), UnkOuter); if (!IsEqualGUID(iid, &IID_IDirectDraw7)) return DDERR_INVALIDPARAMS; - return DDRAW_Create(GUID, DD, UnkOuter, iid); + EnterCriticalSection(&ddraw_cs); + hr = DDRAW_Create(GUID, DD, UnkOuter, iid); + LeaveCriticalSection(&ddraw_cs); + return hr; } /*********************************************************************** @@ -513,7 +518,9 @@ CF_CreateDirectDraw(IUnknown* UnkOuter, REFIID iid, TRACE("(%p,%s,%p)\n", UnkOuter, debugstr_guid(iid), obj); + EnterCriticalSection(&ddraw_cs); hr = DDRAW_Create(NULL, obj, UnkOuter, iid); + LeaveCriticalSection(&ddraw_cs); return hr; } @@ -538,11 +545,18 @@ CF_CreateDirectDrawClipper(IUnknown* UnkOuter, REFIID riid, HRESULT hr; IDirectDrawClipper *Clip; + EnterCriticalSection(&ddraw_cs); hr = DirectDrawCreateClipper(0, &Clip, UnkOuter); - if (hr != DD_OK) return hr; + if (hr != DD_OK) + { + LeaveCriticalSection(&ddraw_cs); + return hr; + } hr = IDirectDrawClipper_QueryInterface(Clip, riid, obj); IDirectDrawClipper_Release(Clip); + + LeaveCriticalSection(&ddraw_cs); return hr; } @@ -751,8 +765,14 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { + HRESULT hr; FIXME("(void): stub\n"); - return S_FALSE; + + EnterCriticalSection(&ddraw_cs); + hr = S_FALSE; + LeaveCriticalSection(&ddraw_cs); + + return hr; } /******************************************************************************* @@ -943,11 +963,3 @@ DllMain(HINSTANCE hInstDLL, return TRUE; } - -void -remove_ddraw_object(IDirectDrawImpl *ddraw) -{ - EnterCriticalSection(&ddraw_cs); - list_remove(&ddraw->ddraw_list_entry); - LeaveCriticalSection(&ddraw_cs); -}

1 0

Stefan Dösinger : ddraw: Make the ddraw list lock a global dll lock.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 5307dd20295fd59d448bc84c80da5389ea6a3aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5307dd20295fd59d448bc84c8… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri May 18 15:31:47 2007 +0200 ddraw: Make the ddraw list lock a global dll lock. --- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/main.c | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 9845102..5bd1164 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -80,6 +80,9 @@ extern ULONG WINAPI D3D7CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain); extern ULONG WINAPI D3D7CB_DestroyDepthStencilSurface(IWineD3DSurface *pSurface); +/* Global critical section */ +extern CRITICAL_SECTION ddraw_cs; + /***************************************************************************** * IDirectDraw implementation structure *****************************************************************************/ diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 46c383a..963661b 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -59,15 +59,14 @@ WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN; /* DDraw list and critical section */ static struct list global_ddraw_list = LIST_INIT(global_ddraw_list); -static CRITICAL_SECTION ddraw_list_cs; -static CRITICAL_SECTION_DEBUG ddraw_list_cs_debug = +static CRITICAL_SECTION_DEBUG ddraw_cs_debug = { - 0, 0, &ddraw_list_cs, - { &ddraw_list_cs_debug.ProcessLocksList, - &ddraw_list_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": ddraw_list_cs") } + 0, 0, &ddraw_cs, + { &ddraw_cs_debug.ProcessLocksList, + &ddraw_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": ddraw_cs") } }; -static CRITICAL_SECTION ddraw_list_cs = { &ddraw_list_cs_debug, -1, 0, 0, 0, 0 }; +CRITICAL_SECTION ddraw_cs = { &ddraw_cs_debug, -1, 0, 0, 0, 0 }; /*********************************************************************** * @@ -319,9 +318,9 @@ DDRAW_Create(const GUID *guid, list_init(&This->surface_list); - EnterCriticalSection(&ddraw_list_cs); + EnterCriticalSection(&ddraw_cs); list_add_head(&global_ddraw_list, &This->ddraw_list_entry); - LeaveCriticalSection(&ddraw_list_cs); + LeaveCriticalSection(&ddraw_cs); This->decls = HeapAlloc(GetProcessHeap(), 0, 0); if(!This->decls) @@ -948,7 +947,7 @@ DllMain(HINSTANCE hInstDLL, void remove_ddraw_object(IDirectDrawImpl *ddraw) { - EnterCriticalSection(&ddraw_list_cs); + EnterCriticalSection(&ddraw_cs); list_remove(&ddraw->ddraw_list_entry); - LeaveCriticalSection(&ddraw_list_cs); + LeaveCriticalSection(&ddraw_cs); }

1 0

Stefan Dösinger : ddraw: Hold the dll lock in IDirectDraw methods.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 83ba2c762d095dcfd3be6c7842a8ef689fa6f093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ba2c762d095dcfd3be6c784… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon May 21 01:13:52 2007 +0200 ddraw: Hold the dll lock in IDirectDraw methods. --- dlls/ddraw/ddraw.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 97 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83ba2c762d095dcfd3be6…

1 0

Alexandre Julliard : ntdll: Avoid overflows in heap allocations. Based on a patch by Rob Shearman.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: cc54b7d9bde31ce5e9d3e5a7240b74284103aacd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc54b7d9bde31ce5e9d3e5a72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 11:59:18 2007 +0200 ntdll: Avoid overflows in heap allocations. Based on a patch by Rob Shearman. --- dlls/kernel32/tests/heap.c | 11 +++++++++++ dlls/ntdll/heap.c | 22 ++++++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 8ddcbe8..a02a8d4 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -61,6 +61,17 @@ START_TEST(heap) HeapFree(GetProcessHeap(), 0, mem); } + /* test some border cases of HeapAlloc and HeapReAlloc */ + mem = HeapAlloc(GetProcessHeap(), 0, 0); + ok(mem != NULL, "memory not allocated for size 0\n"); + msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~0UL - 7); + ok(msecond == NULL, "HeapReAlloc(0xfffffff8) should have failed\n"); + msecond = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, ~0UL); + ok(msecond == NULL, "HeapReAlloc(0xffffffff) should have failed\n"); + HeapFree(GetProcessHeap(), 0, mem); + mem = HeapAlloc(GetProcessHeap(), 0, ~0UL); + ok(mem == NULL, "memory allocated for size ~0UL\n"); + /* Global*() functions */ gbl = GlobalAlloc(GMEM_MOVEABLE, 0); ok(gbl != NULL, "global memory not allocated for size 0\n"); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 571dd23..06bbbc0 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -735,6 +735,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, { SUBHEAP *subheap; struct list *ptr; + SIZE_T total_size; FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( size + sizeof(ARENA_INUSE) ); /* Find a suitable free list, and in it find a block large enough */ @@ -766,13 +767,15 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, * So just one heap struct, one first free arena which will eventually * get used, and a second free arena that might get assigned all remaining * free space in HEAP_ShrinkBlock() */ - size += ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); - if (!(subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, size, - max( HEAP_DEF_SIZE, size ) ))) + total_size = size + ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); + if (total_size < size) return NULL; /* overflow */ + + if (!(subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, + max( HEAP_DEF_SIZE, total_size ) ))) return NULL; TRACE("created new sub-heap %p of %08lx bytes for heap %p\n", - subheap, size, heap ); + subheap, total_size, heap ); *ppSubHeap = subheap; return (ARENA_FREE *)(subheap + 1); @@ -1178,6 +1181,11 @@ PVOID WINAPI RtlAllocateHeap( HANDLE heap, ULONG flags, SIZE_T size ) flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY; flags |= heapPtr->flags; rounded_size = ROUND_SIZE(size); + if (rounded_size < size) /* overflow */ + { + if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY ); + return NULL; + } if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection ); @@ -1320,6 +1328,12 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size HEAP_REALLOC_IN_PLACE_ONLY; flags |= heapPtr->flags; rounded_size = ROUND_SIZE(size); + if (rounded_size < size) /* overflow */ + { + if (flags & HEAP_GENERATE_EXCEPTIONS) RtlRaiseStatus( STATUS_NO_MEMORY ); + RtlSetLastWin32ErrorAndNtStatusFromNtStatus( STATUS_NO_MEMORY ); + return NULL; + } if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; if (!(flags & HEAP_NO_SERIALIZE)) RtlEnterCriticalSection( &heapPtr->critSection );

1 0

Dmitry Timoshkov : kernel32: Fix the size of ThreadAffinityMask to match PSDK.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 5f1a23473134e82ab3f3529361bc47433b6aa517 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f1a23473134e82ab3f352936… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon May 21 22:12:50 2007 +0900 kernel32: Fix the size of ThreadAffinityMask to match PSDK. --- dlls/kernel32/thread.c | 2 +- include/winbase.h | 2 +- include/winternl.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 59cbfdf..b91810f 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -392,7 +392,7 @@ BOOL WINAPI SetThreadPriorityBoost( /********************************************************************** * SetThreadAffinityMask (KERNEL32.@) */ -DWORD WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD dwThreadAffinityMask ) +DWORD_PTR WINAPI SetThreadAffinityMask( HANDLE hThread, DWORD_PTR dwThreadAffinityMask ) { NTSTATUS status; THREAD_BASIC_INFORMATION tbi; diff --git a/include/winbase.h b/include/winbase.h index 7d6a827..26691bb 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2004,7 +2004,7 @@ BOOL WINAPI SetSystemTime(const SYSTEMTIME*); BOOL WINAPI SetSystemTimeAdjustment(DWORD,BOOL); DWORD WINAPI SetTapeParameters(HANDLE,DWORD,LPVOID); DWORD WINAPI SetTapePosition(HANDLE,DWORD,DWORD,DWORD,DWORD,BOOL); -DWORD WINAPI SetThreadAffinityMask(HANDLE,DWORD); +DWORD_PTR WINAPI SetThreadAffinityMask(HANDLE,DWORD_PTR); BOOL WINAPI SetThreadContext(HANDLE,const CONTEXT *); DWORD WINAPI SetThreadExecutionState(EXECUTION_STATE); DWORD WINAPI SetThreadIdealProcessor(HANDLE,DWORD); diff --git a/include/winternl.h b/include/winternl.h index 1580535..06885b3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -729,7 +729,7 @@ typedef struct _THREAD_BASIC_INFORMATION NTSTATUS ExitStatus; PVOID TebBaseAddress; CLIENT_ID ClientId; - ULONG AffinityMask; + ULONG_PTR AffinityMask; LONG Priority; LONG BasePriority; } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION; @@ -960,7 +960,7 @@ typedef struct _PROCESS_BASIC_INFORMATION { #ifdef __WINESRC__ DWORD ExitStatus; DWORD PebBaseAddress; - DWORD AffinityMask; + DWORD_PTR AffinityMask; DWORD BasePriority; ULONG UniqueProcessId; ULONG InheritedFromUniqueProcessId;

1 0

Rolf Kalbermatter : advapi32: Return error on NULL service name to GetServiceDisplayNameA/W.
by Alexandre Julliard 22 May '07

22 May '07

Module: wine Branch: master Commit: 2e67fa32b11e58fdba8f87f24e62b8a72a076a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e67fa32b11e58fdba8f87f24… Author: Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> Date: Sun May 20 22:36:51 2007 +0200 advapi32: Return error on NULL service name to GetServiceDisplayNameA/W. --- dlls/advapi32/service.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 23fdd5c..08df41f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2069,6 +2069,12 @@ BOOL WINAPI GetServiceDisplayNameA( SC_HANDLE hSCManager, LPCSTR lpServiceName, TRACE("%p %s %p %p\n", hSCManager, debugstr_a(lpServiceName), lpDisplayName, lpcchBuffer); + if (!lpServiceName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER); if (!hscm) { @@ -2110,6 +2116,12 @@ BOOL WINAPI GetServiceDisplayNameW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, TRACE("%p %s %p %p\n", hSCManager, debugstr_w(lpServiceName), lpDisplayName, lpcchBuffer); + if (!lpServiceName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + hscm = sc_handle_get_handle_data(hSCManager, SC_HTYPE_MANAGER); if (!hscm) {

1 0