February 2008 - Wine-Commits

Paul Vriens : version/tests: Win98, NT4 and W2K return different errors.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: d6a8b5024a2bd04e8762b56e39675d3b2cfe7747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a8b5024a2bd04e8762b56e3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 25 17:07:52 2008 +0100 version/tests: Win98, NT4 and W2K return different errors. --- dlls/version/tests/info.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index d31797a..3bfc9fb 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -476,7 +476,8 @@ static void test_VerQueryValue(void) SetLastError(0xdeadbeef); ret = VerQueryValue(ver, "String", (LPVOID*)&p, &len); ok(!ret, "VerQueryValue should fail\n"); - ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, + ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || + GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); ok(len == 0, "expected 0 got %x\n", len); @@ -542,7 +543,8 @@ todo_wine ok(len == 0, "VerQueryValue returned %u, expected 0\n", len); SetLastError(0xdeadbeef); ret = VerQueryValue(ver, buf, (LPVOID*)&p, &len); ok(!ret, "VerQueryValue(%s) succeeded\n", buf); - ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, + ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND || + GetLastError() == 0xdeadbeef /* Win9x, NT4, W2K */, "VerQueryValue returned %u\n", GetLastError()); ok(p == (char *)0xdeadbeef, "expected 0xdeadbeef got %p\n", p); ok(len == 0, "expected 0 got %x\n", len);

1 0

Paul Vriens : advapi32/tests: Don't crash on NT4, W2K and XP-SP1.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 0c7ab1bd3079acd7901a381c5ecbea41f4336014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7ab1bd3079acd7901a381c5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 25 15:41:18 2008 +0100 advapi32/tests: Don't crash on NT4, W2K and XP-SP1. --- dlls/advapi32/tests/registry.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1180818..474879e 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -304,8 +304,12 @@ static void test_set_value(void) static const char string2A[] = "This\0Breaks\0\0A\0\0\0Lot\0\0\0\0"; static const char substring2A[] = "This"; - ret = RegSetValueA(hkey_main, NULL, REG_SZ, NULL, 0); - ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueA should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + if (0) + { + /* Crashes on NT4, Windows 2000 and XP SP1 */ + ret = RegSetValueA(hkey_main, NULL, REG_SZ, NULL, 0); + ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueA should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + } ret = RegSetValueA(hkey_main, NULL, REG_SZ, string1A, sizeof(string1A)); ok(ret == ERROR_SUCCESS, "RegSetValueA failed: %d, GLE=%d\n", ret, GetLastError()); @@ -367,9 +371,12 @@ static void test_set_value(void) /* 9x doesn't support W-calls, so don't test them then */ if(GLE == ERROR_CALL_NOT_IMPLEMENTED) return; - - ret = RegSetValueW(hkey_main, NULL, REG_SZ, NULL, 0); - ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + if (0) + { + /* Crashes on NT4, Windows 2000 and XP SP1 */ + ret = RegSetValueW(hkey_main, NULL, REG_SZ, NULL, 0); + ok(ret == ERROR_INVALID_PARAMETER, "RegSetValueW should have failed with ERROR_INVALID_PARAMETER instead of %d\n", ret); + } ret = RegSetValueW(hkey_main, NULL, REG_SZ, string1W, sizeof(string1W)); ok(ret == ERROR_SUCCESS, "RegSetValueW failed: %d, GLE=%d\n", ret, GetLastError());

1 0

Alexandre Julliard : winex11: Get rid of the visual id property, we are using the default now.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: a268725922390f96e030781a9739bfab95b945e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a268725922390f96e030781a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 25 16:06:08 2008 +0100 winex11: Get rid of the visual id property, we are using the default now. --- dlls/winex11.drv/window.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 9505103..6dd9e7d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -64,7 +64,6 @@ static const char fbconfig_id_prop[] = "__wine_x11_fbconfig_id"; static const char gl_drawable_prop[] = "__wine_x11_gl_drawable"; static const char pixmap_prop[] = "__wine_x11_pixmap"; static const char managed_prop[] = "__wine_x11_managed"; -static const char visual_id_prop[] = "__wine_x11_visual_id"; /* for XDG systray icons */ #define SYSTEM_TRAY_REQUEST_DOCK 0 @@ -1360,7 +1359,6 @@ static struct x11drv_win_data *create_desktop_win_data( Display *display, HWND h SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); SetPropA( data->hwnd, client_window_prop, (HANDLE)root_window ); - SetPropA( data->hwnd, visual_id_prop, (HANDLE)visualid ); set_initial_wm_hints( display, data ); return data; }

1 0

Alexandre Julliard : ntdll: Add an exception handler around check_actctx to catch bad handles.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 198a00bc9eeb2d2fcf5122fa8b7de38bb4fb526d URL: http://source.winehq.org/git/wine.git/?a=commit;h=198a00bc9eeb2d2fcf5122fa8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 25 19:49:27 2008 +0100 ntdll: Add an exception handler around check_actctx to catch bad handles. --- dlls/ntdll/actctx.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 60128bc..8f9a2c1 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -33,6 +33,7 @@ #define WIN32_NO_STATUS #include "winternl.h" #include "ntdll_misc.h" +#include "wine/exception.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -568,16 +569,18 @@ static WCHAR *build_assembly_id( const struct assembly_identity *ai ) static ACTIVATION_CONTEXT *check_actctx( HANDLE h ) { - ACTIVATION_CONTEXT *actctx = h; + ACTIVATION_CONTEXT *ret = NULL, *actctx = h; if (!h || h == INVALID_HANDLE_VALUE) return NULL; - switch (actctx->magic) + __TRY { - case ACTCTX_MAGIC: - return actctx; - default: - return NULL; + if (actctx->magic == ACTCTX_MAGIC) ret = actctx; } + __EXCEPT_PAGE_FAULT + { + } + __ENDTRY + return ret; } static inline void actctx_addref( ACTIVATION_CONTEXT *actctx )

1 0

Rob Shearman : ole32: Implement VT_VECTOR|VT_VARIANT in PropVariantCopy.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 9730b285ba30d30c5c1d5ccb142d5cd27d004a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9730b285ba30d30c5c1d5ccb1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 14:25:12 2008 +0000 ole32: Implement VT_VECTOR|VT_VARIANT in PropVariantCopy. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 91e35e2..e8efb47 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2888,8 +2888,8 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ case VT_BSTR: elemSize = sizeof(*pvarSrc->u.bstrVal); break; case VT_LPSTR: elemSize = sizeof(*pvarSrc->u.pszVal); break; case VT_LPWSTR: elemSize = sizeof(*pvarSrc->u.pwszVal); break; + case VT_VARIANT: elemSize = sizeof(*pvarSrc->u.pvarVal); break; - case VT_VARIANT: default: FIXME("Invalid element type: %ul\n", pvarSrc->vt & ~VT_VECTOR); return E_INVALIDARG;

1 0

Rob Shearman : imm32: Destroy the data of the context passed into ImmDestroyContext, not the data in the root context.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 076e3002ec6530718658c8c6321d3b551feaaf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=076e3002ec6530718658c8c63… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Feb 25 14:24:29 2008 +0000 imm32: Destroy the data of the context passed into ImmDestroyContext, not the data in the root context. --- dlls/imm32/imm.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 6b4e288..5872bc8 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -626,11 +626,11 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) if (hIMC) { - ImmDestroyIMCC(root_context->IMC.hCompStr); - ImmDestroyIMCC(root_context->IMC.hCandInfo); - ImmDestroyIMCC(root_context->IMC.hGuideLine); - ImmDestroyIMCC(root_context->IMC.hPrivate); - ImmDestroyIMCC(root_context->IMC.hMsgBuf); + ImmDestroyIMCC(data->IMC.hCompStr); + ImmDestroyIMCC(data->IMC.hCandInfo); + ImmDestroyIMCC(data->IMC.hGuideLine); + ImmDestroyIMCC(data->IMC.hPrivate); + ImmDestroyIMCC(data->IMC.hMsgBuf); if (data->textfont) {

1 0

Paul Vriens : msi/tests: Make tests run on win9x/NT4 again.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 89c8e795d8ef2af01fe793e31b26ba0b51ec8615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c8e795d8ef2af01fe793e31… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Feb 25 14:55:59 2008 +0100 msi/tests: Make tests run on win9x/NT4 again. --- dlls/msi/tests/install.c | 31 ++- dlls/msi/tests/source.c | 711 +++++++++++++++++++++++----------------------- 2 files changed, 377 insertions(+), 365 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89c8e795d8ef2af01fe79…

1 0

Alexandre Julliard : winex11: Use the same full screen test in is_window_managed and update_wm_states.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: dba8ad57518bb4c9d013f73108adaff55f10db7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba8ad57518bb4c9d013f7310… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 25 19:48:07 2008 +0100 winex11: Use the same full screen test in is_window_managed and update_wm_states. --- dlls/winex11.drv/window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6dd9e7d..cf84389 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -103,8 +103,8 @@ BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rect ) /* popup with sysmenu == caption are managed */ if (style & WS_SYSMENU) return TRUE; /* full-screen popup windows are managed */ - if ((window_rect->right - window_rect->left) == screen_width && - (window_rect->bottom - window_rect->top) == screen_height) + if (window_rect->left <= 0 && window_rect->right >= screen_width && + window_rect->top <= 0 && window_rect->bottom >= screen_height) return TRUE; } /* default: not managed */

1 0

Alexandre Julliard : user32: Moved the DCE support from winex11 back to user32.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 1642fbcbc2b4133cf0ce29c3539082cc1027180b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1642fbcbc2b4133cf0ce29c35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 25 15:59:19 2008 +0100 user32: Moved the DCE support from winex11 back to user32. Window and class DCEs are now allocated lazily. --- dlls/user32/class.c | 22 ++ dlls/user32/controls.h | 2 + dlls/user32/driver.c | 35 +-- dlls/user32/painting.c | 590 ++++++++++++++++++++++++++++++++- dlls/user32/tests/dce.c | 1 - dlls/user32/user32.spec | 1 + dlls/user32/user_private.h | 9 +- dlls/user32/win.c | 8 +- dlls/user32/winpos.c | 12 +- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/dce.c | 655 ------------------------------------- dlls/winex11.drv/opengl.c | 2 - dlls/winex11.drv/window.c | 95 ++++--- dlls/winex11.drv/winex11.drv.spec | 5 +- dlls/winex11.drv/winpos.c | 21 +- dlls/winex11.drv/x11drv.h | 14 - include/win.h | 1 + 17 files changed, 705 insertions(+), 769 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1642fbcbc2b4133cf0ce2…

1 0

Alexandre Julliard : user32: Simplify the window structure creation. Get rid of the unused clsStyle field.
by Alexandre Julliard Feb. 25, 2008

Feb. 25, 2008

Module: wine Branch: master Commit: 4273a8ab868f90b2af34db25884f8ceb8ad5b30d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4273a8ab868f90b2af34db258… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 25 15:55:17 2008 +0100 user32: Simplify the window structure creation. Get rid of the unused clsStyle field. --- dlls/user32/class.c | 12 +++--------- dlls/user32/controls.h | 2 +- dlls/user32/win.c | 11 +++++------ include/win.h | 1 - 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index eee9c1d..94bc639 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -433,17 +433,11 @@ void CLASS_RegisterBuiltinClasses(void) /*********************************************************************** - * CLASS_AddWindow - * - * Add a new window using this class, and set the necessary - * information inside the window structure. + * get_class_winproc */ -void CLASS_AddWindow( CLASS *class, WND *win, BOOL unicode ) +WNDPROC get_class_winproc( CLASS *class ) { - win->class = class; - win->clsStyle = class->style; - win->winproc = class->winproc; - if (WINPROC_IsUnicode( win->winproc, unicode )) win->flags |= WIN_ISUNICODE; + return class->winproc; } diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 812710c..ef56432 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -63,7 +63,7 @@ struct tagCLASS; /* opaque structure */ struct tagWND; extern ATOM get_int_atom_value( LPCWSTR name ) DECLSPEC_HIDDEN; extern void CLASS_RegisterBuiltinClasses(void) DECLSPEC_HIDDEN; -extern void CLASS_AddWindow( struct tagCLASS *class, struct tagWND *win, BOOL unicode ) DECLSPEC_HIDDEN; +extern WNDPROC get_class_winproc( struct tagCLASS *class ) DECLSPEC_HIDDEN; extern void CLASS_FreeModuleClasses( HMODULE16 hModule ) DECLSPEC_HIDDEN; /* defwnd proc */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8e02a5d..f5fee96 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -133,7 +133,8 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, return NULL; } - if (!(win = HeapAlloc( GetProcessHeap(), 0, sizeof(WND) + extra_bytes - sizeof(win->wExtra) ))) + if (!(win = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(WND) + extra_bytes - sizeof(win->wExtra) ))) { SERVER_START_REQ( destroy_window ) { @@ -163,13 +164,11 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, win->hwndSelf = handle; win->parent = full_parent; win->owner = full_owner; + win->class = class; + win->winproc = get_class_winproc( class ); win->dwMagic = WND_MAGIC; - win->flags = 0; win->cbWndExtra = extra_bytes; - SetRectEmpty( &win->rectWindow ); - SetRectEmpty( &win->rectClient ); - memset( win->wExtra, 0, extra_bytes ); - CLASS_AddWindow( class, win, unicode ); + if (WINPROC_IsUnicode( win->winproc, unicode )) win->flags |= WIN_ISUNICODE; return win; } diff --git a/include/win.h b/include/win.h index ac6b753..baa8c6d 100644 --- a/include/win.h +++ b/include/win.h @@ -49,7 +49,6 @@ typedef struct tagWND void *pHScroll; /* Horizontal scroll-bar info */ DWORD dwStyle; /* Window style (from CreateWindow) */ DWORD dwExStyle; /* Extended style (from CreateWindowEx) */ - DWORD clsStyle; /* Class style at window creation */ UINT_PTR wIDmenu; /* ID or hmenu (from CreateWindow) */ DWORD helpContext; /* Help context ID */ UINT flags; /* Misc. flags (see below) */

1 0