March 2022 - Wine-commits - list.winehq.org

Zebediah Figura : shell32: Use COM wrappers for IShellPropSheetExt and IShellExtInit.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: b6ad9e57a90a189f2806273feb8fffac6c9c8264 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6ad9e57a90a189f2806273f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 26 19:53:01 2022 -0500 shell32: Use COM wrappers for IShellPropSheetExt and IShellExtInit. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellord.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 55b02d4188f..66e5caf08da 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1674,7 +1674,7 @@ UINT WINAPI SHAddFromPropSheetExtArray(HPSXA hpsxa, LPFNADDPROPSHEETPAGE lpfnAdd /* Call the AddPage method of all registered IShellPropSheetExt interfaces */ for (i = 0; i != psxa->uiCount; i++) { - psxa->pspsx[i]->lpVtbl->AddPages(psxa->pspsx[i], PsxaCall, (LPARAM)&Call); + IShellPropSheetExt_AddPages(psxa->pspsx[i], PsxaCall, (LPARAM)&Call); } return Call.uiCount; @@ -1764,21 +1764,21 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ Then call IShellExtInit's Initialize method. */ if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) { - if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) + if (SUCCEEDED(IShellPropSheetExt_QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) { - if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) + if (SUCCEEDED(IShellExtInit_Initialize(psxi, NULL, pDataObj, hKey))) { /* Add the IShellPropSheetExt instance to the array */ psxa->pspsx[psxa->uiCount++] = pspsx; } else { - psxi->lpVtbl->Release(psxi); - pspsx->lpVtbl->Release(pspsx); + IShellExtInit_Release(psxi); + IShellPropSheetExt_Release(pspsx); } } else - pspsx->lpVtbl->Release(pspsx); + IShellPropSheetExt_Release(pspsx); } } @@ -1821,7 +1821,7 @@ UINT WINAPI SHReplaceFromPropSheetExtArray(HPSXA hpsxa, UINT uPageID, LPFNADDPRO for (i = 0; i != psxa->uiCount; i++) { Call.bCalled = FALSE; - psxa->pspsx[i]->lpVtbl->ReplacePage(psxa->pspsx[i], uPageID, PsxaCall, (LPARAM)&Call); + IShellPropSheetExt_ReplacePage(psxa->pspsx[i], uPageID, PsxaCall, (LPARAM)&Call); } return Call.uiCount; @@ -1844,7 +1844,7 @@ void WINAPI SHDestroyPropSheetExtArray(HPSXA hpsxa) { for (i = 0; i != psxa->uiCount; i++) { - psxa->pspsx[i]->lpVtbl->Release(psxa->pspsx[i]); + IShellPropSheetExt_Release(psxa->pspsx[i]); } LocalFree(psxa);

1 0

Zebediah Figura : user32: Remove redundant #ifdef around #undef.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: d5400817b4987c6d37dfbc1e34569c50d05c50a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5400817b4987c6d37dfbc1e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 26 19:54:02 2022 -0500 user32: Remove redundant #ifdef around #undef. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 11 ----------- dlls/user32/win.c | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index e2eb60d8bbf..cc342cf507b 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -765,21 +765,10 @@ BOOL16 WINAPI ClassNext16( CLASSENTRY *pClassEntry ) /* 64bit versions */ -#ifdef GetClassLongPtrA #undef GetClassLongPtrA -#endif - -#ifdef GetClassLongPtrW #undef GetClassLongPtrW -#endif - -#ifdef SetClassLongPtrA #undef SetClassLongPtrA -#endif - -#ifdef SetClassLongPtrW #undef SetClassLongPtrW -#endif /*********************************************************************** * GetClassLongPtrA (USER32.@) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b49afec9bd1..619bbba1dfe 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1831,21 +1831,10 @@ BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) /* 64bit versions */ -#ifdef GetWindowLongPtrW #undef GetWindowLongPtrW -#endif - -#ifdef GetWindowLongPtrA #undef GetWindowLongPtrA -#endif - -#ifdef SetWindowLongPtrW #undef SetWindowLongPtrW -#endif - -#ifdef SetWindowLongPtrA #undef SetWindowLongPtrA -#endif /***************************************************************************** * GetWindowLongPtrW (USER32.@)

1 0

Zebediah Figura : user32: Compile some functions only on 64-bit architectures.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: ed8cf75a5305d9bfa2c6b97ca27a7370794fba1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed8cf75a5305d9bfa2c6b97c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 26 19:54:03 2022 -0500 user32: Compile some functions only on 64-bit architectures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 4 ++++ dlls/user32/win.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index cc342cf507b..150226eb627 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -763,6 +763,8 @@ BOOL16 WINAPI ClassNext16( CLASSENTRY *pClassEntry ) } #endif +#ifdef _WIN64 + /* 64bit versions */ #undef GetClassLongPtrA @@ -803,3 +805,5 @@ ULONG_PTR WINAPI SetClassLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) if (offset == GCLP_MENUNAME) return set_menu_nameA( hwnd, offset, newval ); return NtUserSetClassLongPtr( hwnd, offset, newval, TRUE ); } + +#endif /* _WIN64 */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 619bbba1dfe..0a3f65e5aa4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1828,6 +1828,7 @@ BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) return TRUE; } +#ifdef _WIN64 /* 64bit versions */ @@ -1868,6 +1869,8 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) return NtUserSetWindowLongPtr( hwnd, offset, newval, TRUE ); } +#endif /* _WIN64 */ + /***************************************************************************** * RegisterTouchWindow (USER32.@) */

1 0

Zebediah Figura : amstream: Use CRT memory allocators.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: c71ac52389f5949864f10da06950373891f8078c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c71ac52389f5949864f10da0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 26 19:54:41 2022 -0500 amstream: Use CRT memory allocators. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream_private.h | 1 - dlls/amstream/audiodata.c | 22 +++++++++------------- dlls/amstream/audiostream.c | 24 +++++++++++------------- dlls/amstream/ddrawstream.c | 16 +++++++--------- dlls/amstream/filter.c | 24 ++++++++++++------------ dlls/amstream/main.c | 6 +++--- dlls/amstream/multimedia.c | 6 +++--- 7 files changed, 45 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c71ac52389f5949864f1…

1 0

Piotr Caban : oleacc/tests: Fix crash when current thread is not in foreground state.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 67b43b58bd7a142320464895ec19f30035e0d29e URL: https://source.winehq.org/git/wine.git/?a=commit;h=67b43b58bd7a142320464895… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Mar 27 14:16:31 2022 +0200 oleacc/tests: Fix crash when current thread is not in foreground state. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52079 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 85f9a085953..5522867b085 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -1035,7 +1035,13 @@ static void test_default_client_accessible_object(void) /* Set the focus to the parent window. */ ShowWindow(hwnd, SW_SHOW); - SetFocus(hwnd); + if (!SetForegroundWindow(hwnd)) + { + skip("SetForegroundWindow failed\n"); + IAccessible_Release(acc); + DestroyWindow(hwnd); + return; + } hr = IAccessible_get_accFocus(acc, &v); ok(GetFocus() == hwnd, "test window has no focus\n"); ok(hr == S_OK, "hr %#lx\n", hr); @@ -1763,6 +1769,12 @@ static void test_default_edit_accessible_object(void) check_acc_vals(acc, &edit_acc_vals[1]); IAccessible_Release(acc); + if (!SetForegroundWindow(hwnd)) + { + skip("SetForegroundWindow failed\n"); + DestroyWindow(hwnd); + return; + } SetFocus(edit[2]); hr = CreateStdAccessibleObject(edit[2], OBJID_CLIENT, &IID_IAccessible, (void**)&acc); str = SysAllocString(L"edit2-test\r\ntest-edit2\n");

1 0

Jacek Caban : win32u: Return client menu name from NtUserUnregisterClass.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: f1d1d88c9e3b199c1d706073a7c8afb9d4a2c2d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1d1d88c9e3b199c1d706073… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 27 17:34:40 2022 +0300 win32u: Return client menu name from NtUserUnregisterClass. Spotted by Esme Povirk. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/class.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index a030f5d6c0d..ba60794ccd7 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -481,6 +481,7 @@ BOOL WINAPI NtUserUnregisterClass( UNICODE_STRING *name, HINSTANCE instance, list_remove( &class->entry ); if (class->hbrBackground > (HBRUSH)(COLOR_GRADIENTINACTIVECAPTION + 1)) NtGdiDeleteObjectApp( class->hbrBackground ); + *client_menu_name = class->menu_name; NtUserDestroyCursor( class->hIconSmIntern, 0 ); free( class ); user_unlock();

1 0

Zhiyi Zhang : uxtheme: Check only the lower 16 bits of the return value of WM_ERASEBKGND.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 1c5e5ded0ffe414a49d2510f4ef65a737051ee43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5e5ded0ffe414a49d2510f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 24 17:05:52 2022 +0800 uxtheme: Check only the lower 16 bits of the return value of WM_ERASEBKGND. call_dialog_proc16() truncates the return values from 16-bit application window procedures to 16 bits. Since WINPROC_CallDlgProcA() is not available in uxtheme, CallWindowProcW() is used instead and the higher bits should be ignored as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52713 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index b91e20f0f33..706d170936e 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -129,7 +129,7 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO case WM_ERASEBKGND: { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); - lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); + lr = LOWORD(CallWindowProcW(dlgproc, hwnd, msg, wp, lp)); if (lr) return lr;

1 0

Zhiyi Zhang : uxtheme/tests: Test WM_ERASEBKGND return value from custom dialog procedures.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: wine Branch: master Commit: 538a90379245fbbddd3991187fa0488bef0dbc5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=538a90379245fbbddd399118… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 24 17:05:59 2022 +0800 uxtheme/tests: Test WM_ERASEBKGND return value from custom dialog procedures. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 93b6f1aa8f7..1308d54264b 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1614,6 +1614,7 @@ static const struct message empty_seq[] = static HWND dialog_child; static DWORD dialog_init_flag; +static BOOL handle_WM_ERASEBKGND; static BOOL handle_WM_CTLCOLORSTATIC; static INT_PTR CALLBACK test_EnableThemeDialogTexture_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) @@ -1639,6 +1640,15 @@ static INT_PTR CALLBACK test_EnableThemeDialogTexture_proc(HWND hwnd, UINT msg, EnableThemeDialogTexture(hwnd, dialog_init_flag); return TRUE; + case WM_ERASEBKGND: + { + if (!handle_WM_ERASEBKGND) + return FALSE; + + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 0); + return TRUE; + } + case WM_CTLCOLORSTATIC: return (INT_PTR)(handle_WM_CTLCOLORSTATIC ? GetSysColorBrush(COLOR_MENU) : 0); @@ -1876,6 +1886,13 @@ static void test_EnableThemeDialogTexture(void) GetSysColorBrush(COLOR_MENU), brush); handle_WM_CTLCOLORSTATIC = FALSE; + /* Test that the dialog procedure should take precedence over DefDlgProc() for WM_ERASEBKGND */ + handle_WM_ERASEBKGND = TRUE; + lr = SendMessageW(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); + todo_wine + ok(lr == 0, "Expected 0, got %#lx.\n", lr); + handle_WM_ERASEBKGND = FALSE; + /* Test that dialog doesn't have theme handle opened for itself */ ok(GetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n");

1 0

Francois Gouget : testbot/cgi: Remove the Page parameter from PageBase's Redirect().
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: tools Branch: master Commit: 4a2fb45b2c6ae9b6b9b9bce256112ea233a898f9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4a2fb45b2c6ae9b6b9b9bce… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 28 17:28:45 2022 +0200 testbot/cgi: Remove the Page parameter from PageBase's Redirect(). PageBase::Redirect() does not use the Page parameter and there is no reason for it to need that parameter since it has $self->{Request} and thus can already get any relevant HTTP request information. CheckSecurePage() only has a $Page parameter in order to pass it to Redirect() and the CheckSecurePage() callers never provide the $Page parameter anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index d598880..85e94b3 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -248,7 +248,7 @@ sub Redirect($$) { my ($self, $Location) = @_; - return $self->{PageBase}->Redirect($self, $Location); + return $self->{PageBase}->Redirect($Location); } diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 20e8a2c..cab14e1 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -92,7 +92,7 @@ sub new($$$$@) ! $Session->User->HasRole($RequiredRole)) { my $LoginURL = "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"}); - exit($self->Redirect($Page, MakeSecureURL($LoginURL))); + exit($self->Redirect(MakeSecureURL($LoginURL))); } } @@ -253,9 +253,9 @@ sub SessionActive($) return !1; } -sub Redirect($$$) +sub Redirect($$) { - my ($self, $Page, $Location) = @_; + my ($self, $Location) = @_; $self->SetCookies(); if (substr($Location, 0, 4) ne "http") @@ -278,13 +278,13 @@ sub Redirect($$$) return 0; # a suitable exit code } -sub CheckSecurePage($$) +sub CheckSecurePage($) { - my ($self, $Page) = @_; + my ($self) = @_; if ($UseSSL && ! SecureConnection()) { - exit($self->Redirect($Page, MakeSecureURL($ENV{"REQUEST_URI"}))); + exit($self->Redirect(MakeSecureURL($ENV{"REQUEST_URI"}))); } }

1 0

Francois Gouget : testbot/cgi: PageBase::*Cookies() do not take a $Page parameter.
by Alexandre Julliard 28 Mar '22

28 Mar '22

Module: tools Branch: master Commit: 34440654366951f7ed43863e25c55ab43ce73bde URL: https://source.winehq.org/git/tools.git/?a=commit;h=34440654366951f7ed43863… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 28 17:29:04 2022 +0200 testbot/cgi: PageBase::*Cookies() do not take a $Page parameter. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/Page.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 85e94b3..014324f 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -220,14 +220,14 @@ sub UnsetCookies($) { my ($self) = @_; - $self->{PageBase}->UnsetCookies($self); + $self->{PageBase}->UnsetCookies(); } sub SetCookies($) { my ($self) = @_; - $self->{PageBase}->SetCookies($self); + $self->{PageBase}->SetCookies(); } sub GetCurrentSession($)

1 0