January 2010 - Wine-Commits

Nikolay Sivov : user32/tests: Forward test proc to default dialog procedure instead of window's one.
by Alexandre Julliard Jan. 8, 2010

Jan. 8, 2010

Module: wine Branch: master Commit: ba51a6c9bc9816c236596020d964aa99cbec1b8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba51a6c9bc9816c236596020d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jan 7 23:46:16 2010 +0300 user32/tests: Forward test proc to default dialog procedure instead of window's one. --- dlls/user32/tests/dialog.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 5879fbc..204d854 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -464,7 +464,6 @@ static BOOL OnTestDlgCreate (HWND hwnd, LPCREATESTRUCT lpcs) static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - LRESULT result; switch (uiMsg) { /* Add blank case statements for these to ensure we don't use them @@ -485,20 +484,19 @@ static LRESULT CALLBACK main_window_procA (HWND hwnd, UINT uiMsg, WPARAM wParam, break; } - result=DefWindowProcA (hwnd, uiMsg, wParam, lParam); - return result; + return DefWindowProcA (hwnd, uiMsg, wParam, lParam); } static LRESULT CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - LRESULT result; - DWORD dw; - HWND hwndOk; - switch (uiMsg) { case WM_INITDIALOG: + { + DWORD dw; + HWND hwndOk; + dw = SendMessage(hwnd, DM_GETDEFID, 0, 0); assert(DC_HASDEFID == HIWORD(dw)); hwndOk = GetDlgItem(hwnd, LOWORD(dw)); @@ -508,6 +506,7 @@ static LRESULT CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, PostMessage(hwnd, WM_KEYDOWN, VK_RETURN, 0); PostMessage(hwnd, WM_COMMAND, IDCANCEL, 0); break; + } case WM_COMMAND: if (wParam == IDOK) { @@ -523,14 +522,12 @@ static LRESULT CALLBACK disabled_test_proc (HWND hwnd, UINT uiMsg, break; } - result=DefWindowProcA (hwnd, uiMsg, wParam, lParam); - return result; + return DefWindowProcA (hwnd, uiMsg, wParam, lParam); } static LRESULT CALLBACK testDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - LRESULT result; switch (uiMsg) { /* Add blank case statements for these to ensure we don't use them @@ -544,8 +541,7 @@ static LRESULT CALLBACK testDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, (LPCREATESTRUCTA) lParam) ? 0 : (LRESULT) -1); } - result=DefWindowProcA (hwnd, uiMsg, wParam, lParam); - return result; + return DefDlgProcA (hwnd, uiMsg, wParam, lParam); } static BOOL RegisterWindowClasses (void)

1 0

Paul Vriens : ntdll: Fix length parameter for NtQueryValueKey (Coccinelle).
by Alexandre Julliard Jan. 8, 2010

Jan. 8, 2010

Module: wine Branch: master Commit: 2e03013fc0873524a7f8c0c78d455b7f3bac8966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e03013fc0873524a7f8c0c78… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 8 09:27:21 2010 +0100 ntdll: Fix length parameter for NtQueryValueKey (Coccinelle). --- dlls/ntdll/relay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 1981e51..7fd3c35 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -147,7 +147,7 @@ static const WCHAR **load_list( HKEY hkey, const WCHAR *value ) const WCHAR **list = NULL; RtlInitUnicodeString( &name, value ); - status = NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(buffer), &count ); + status = NtQueryValueKey( hkey, &name, KeyValuePartialInformation, buffer, sizeof(initial_buffer), &count ); if (status == STATUS_BUFFER_OVERFLOW) { buffer = RtlAllocateHeap( GetProcessHeap(), 0, count );

1 0

Alexandre Julliard : ntdll: Don' t require read access to the root directory for normal opens, similarly to the open by id case.
by Alexandre Julliard Jan. 8, 2010

Jan. 8, 2010

Module: wine Branch: master Commit: 25bee84030d63ca09a35e4a9a4fe2ecd9c3150d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bee84030d63ca09a35e4a9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 8 15:54:20 2010 +0100 ntdll: Don't require read access to the root directory for normal opens, similarly to the open by id case. --- dlls/ntdll/directory.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 7b124af..ecd9418 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2550,8 +2550,7 @@ NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_STRING * return STATUS_NO_MEMORY; unix_name[0] = '.'; - if (!(status = server_get_unix_fd( attr->RootDirectory, FILE_READ_DATA, &root_fd, - &needs_close, &type, NULL ))) + if (!(status = server_get_unix_fd( attr->RootDirectory, 0, &root_fd, &needs_close, &type, NULL ))) { if (type != FD_TYPE_DIR) {

1 0

Christian Costa : d3drm: Implement stubbed IDirect3DRM interface.
by Alexandre Julliard Jan. 8, 2010

Jan. 8, 2010

Module: wine Branch: master Commit: a59922ab55b08028a4dd1ea83510756199e2c99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59922ab55b08028a4dd1ea83… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Jan 7 22:43:25 2010 +0100 d3drm: Implement stubbed IDirect3DRM interface. --- dlls/d3drm/Makefile.in | 3 +- dlls/d3drm/d3drm.c | 431 ++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/d3drm_main.c | 6 +- dlls/d3drm/d3drm_private.h | 31 ++++ 4 files changed, 468 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a59922ab55b08028a4dd1…

1 0

Marcus Meissner : setupapi: Avoid NULL dereference in error path (Coverity) .
by Alexandre Julliard Jan. 8, 2010

Jan. 8, 2010

Module: wine Branch: master Commit: 1b27af164c3682419b636f5eb08647f3f6bb7e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b27af164c3682419b636f5eb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jan 8 09:20:34 2010 +0100 setupapi: Avoid NULL dereference in error path (Coverity). --- dlls/setupapi/parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index 7f581bd..744ee4c 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1024,7 +1024,7 @@ static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, DWORD sty UnmapViewOfFile( buffer ); if (err) { - free_inf_file( file ); + if (file) free_inf_file( file ); SetLastError( err ); file = NULL; }

1 0

Paul Vriens : wined3d: Fix use of memset (Coccinelle).
by Alexandre Julliard Jan. 8, 2010

Jan. 8, 2010

Module: wine Branch: master Commit: c8681f885d18e77ae227768e69a05e7369d45b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8681f885d18e77ae227768e6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 8 09:18:23 2010 +0100 wined3d: Fix use of memset (Coccinelle). --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index dbeb799..e8521bc 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1100,7 +1100,7 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, if(patch->has_texcoords) { vtxStride += 4 * sizeof(float); } - memset(&patch->strided, 0, sizeof(&patch->strided)); + memset(&patch->strided, 0, sizeof(patch->strided)); patch->strided.position.format = WINED3DFMT_R32G32B32_FLOAT; patch->strided.position.lpData = (BYTE *) patch->mem; patch->strided.position.dwStride = vtxStride;

1 0

Marcus Meissner : winex11: Remove more superflous NULL checks (Coverity).
by Alexandre Julliard Jan. 8, 2010

Jan. 8, 2010

Module: wine Branch: master Commit: 6fb5e61afbae235dcabd4552e32ffbcbc29ad8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb5e61afbae235dcabd4552e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jan 8 09:24:18 2010 +0100 winex11: Remove more superflous NULL checks (Coverity). --- dlls/winex11.drv/palette.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index a02501f..cbdf2d1 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -925,7 +925,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) /* fall through to RGB */ case 0: /* RGB */ - if (physDev && (physDev->depth == 1) ) + if (physDev->depth == 1) { int white = 1; RGBQUAD table[2]; @@ -981,7 +981,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) /* fall through to RGB */ case 0: /* RGB */ - if (physDev && (physDev->depth == 1) ) + if (physDev->depth == 1) { int white = 1; RGBQUAD table[2];

1 0

Alexandre Julliard : server: Don't dump more than 1024 bytes in a trace.
by Alexandre Julliard Jan. 8, 2010

Jan. 8, 2010

Module: wine Branch: master Commit: b824fe05f4348ed6a2af45c4320d6eaf85eb3975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b824fe05f4348ed6a2af45c43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 7 20:27:17 2010 +0100 server: Don't dump more than 1024 bytes in a trace. --- server/trace.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/trace.c b/server/trace.c index 6cb4cc9..df47e8f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -373,7 +373,7 @@ static void dump_varargs_user_handles( const char *prefix, data_size_t size ) static void dump_varargs_bytes( const char *prefix, data_size_t size ) { const unsigned char *data = cur_data; - data_size_t len = size; + data_size_t len = min( 1024, size ); fprintf( stderr,"%s{", prefix ); while (len > 0) @@ -381,6 +381,7 @@ static void dump_varargs_bytes( const char *prefix, data_size_t size ) fprintf( stderr, "%02x", *data++ ); if (--len) fputc( ',', stderr ); } + if (size > 1024) fprintf( stderr, "...(total %u)", size ); fputc( '}', stderr ); remove_data( size ); }

1 0

Marcus Meissner : winex11.drv: physDev cannot be NULL (Coverity).
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: 065fa22adc39f2cd594ee5c8d9234d3a054af0de URL: http://source.winehq.org/git/wine.git/?a=commit;h=065fa22adc39f2cd594ee5c8d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 6 18:58:55 2010 +0100 winex11.drv: physDev cannot be NULL (Coverity). --- dlls/winex11.drv/palette.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 81bb73b..a02501f 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -881,7 +881,7 @@ static inline BOOL colour_is_brighter(RGBQUAD c1, RGBQUAD c2) int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) { WORD index = 0; - HPALETTE hPal = physDev ? GetCurrentObject(physDev->hdc, OBJ_PAL ) : GetStockObject(DEFAULT_PALETTE); + HPALETTE hPal = GetCurrentObject(physDev->hdc, OBJ_PAL ); unsigned char spec_type = color >> 24; int *mapping = palette_get_mapping( hPal ); PALETTEENTRY entry;

1 0

James Hawkins : browseui: Fix two memory leaks in the autocomplete tests.
by Alexandre Julliard Jan. 7, 2010

Jan. 7, 2010

Module: wine Branch: master Commit: 5324cb6135cfb43a5fb227ed39837b3375e87171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5324cb6135cfb43a5fb227ed3… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 6 18:27:01 2010 -0800 browseui: Fix two memory leaks in the autocomplete tests. --- dlls/browseui/tests/autocomplete.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 84be84d..89f864d 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -321,6 +321,9 @@ static void test_ACLMulti(void) ok(mgr->lpVtbl->Release(mgr) == 0, "Unexpected references\n"); ok(acl1->ref == 1, "acl1 not released\n"); ok(acl2->ref == 1, "acl2 not released\n"); + + CoTaskMemFree(acl1); + CoTaskMemFree(acl2); } START_TEST(autocomplete)

1 0