wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : kernel32/tests: Fully allocate SYSTEM_FIRMWARE_TABLE_INFORMATION.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: cb48c6dca4b207a7b4ea34a7e0a092777cce847d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb48c6dca4b207a7b4ea34a7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 11:16:29 2022 +0100 kernel32/tests: Fully allocate SYSTEM_FIRMWARE_TABLE_INFORMATION. This prevents a warning on mingw-gcc version 11 (-Warray-bounds). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index ad87bb38a16..ec74c920960 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -715,7 +715,7 @@ static void test_GetSystemFirmwareTable(void) return; } - sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + sfti = HeapAlloc(GetProcessHeap(), 0, sizeof(*sfti)); ok(!!sfti, "Failed to allocate memory\n"); sfti->ProviderSignature = RSMB; sfti->Action = SystemFirmwareTable_Get;

1 0

Eric Pouech : ntdll/tests: Fully allocate SYSTEM_FIRMWARE_TABLE_INFORMATION.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 0c85e59beac3a71ffa8df9d2a3bdc9e56299ff6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c85e59beac3a71ffa8df9d2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 11:16:23 2022 +0100 ntdll/tests: Fully allocate SYSTEM_FIRMWARE_TABLE_INFORMATION. This prevents a warning on mingw-gcc version 11 (-Warray-bounds). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index e9d42127c3e..d6b323dd9d7 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1461,7 +1461,7 @@ static void test_query_firmware(void) NTSTATUS status; SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti; - sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + sfti = HeapAlloc(GetProcessHeap(), 0, sizeof(*sfti)); ok(!!sfti, "Failed to allocate memory\n"); sfti->ProviderSignature = 0;

1 0

Eric Pouech : quartz: Always allocate the entire VIDEOINFO structure.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: e102068c0daab41f953d0594df1cdb92ae70de72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e102068c0daab41f953d0594… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 12:33:09 2022 -0600 quartz: Always allocate the entire VIDEOINFO structure. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index f8660890273..f473c829cba 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -342,9 +342,12 @@ static HRESULT avi_decompressor_source_get_media_type(struct strmbase_pin *iface if (index < ARRAY_SIZE(formats)) { - if (!(format = CoTaskMemAlloc(offsetof(VIDEOINFO, dwBitMasks[3])))) + /* In theory we could allocate less than this, but gcc generates + * -Warray-bounds warnings if we access the structure through a + * VIDEOINFO pointer, even if we only access valid fields. */ + if (!(format = CoTaskMemAlloc(sizeof(*format)))) return E_OUTOFMEMORY; - memset(format, 0, offsetof(VIDEOINFO, dwBitMasks[3])); + memset(format, 0, sizeof(*format)); format->rcSource = sink_format->rcSource; format->rcTarget = sink_format->rcTarget;

1 0

Francois Gouget : xinput1_3: Fix the spelling of a WARN() message and helper.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 30ab3557e9542cc4a1e29a980f6d2aa39aa77994 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30ab3557e9542cc4a1e29a98… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 17 20:53:59 2022 +0100 xinput1_3: Fix the spelling of a WARN() message and helper. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index c8ce6622dcb..909ef9e7dfd 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -470,7 +470,7 @@ static void get_registry_keys(HKEY *defkey, HKEY *appkey) } } -static BOOL device_is_overriden(HANDLE device) +static BOOL device_is_overridden(HANDLE device) { WCHAR name[MAX_PATH], buffer[MAX_PATH]; DWORD size = sizeof(buffer); @@ -519,8 +519,8 @@ static BOOL try_add_device(const WCHAR *device_path) else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (device_is_overriden(device)) - WARN("ignoring HID device, overriden for dinput\n"); + else if (device_is_overridden(device)) + WARN("ignoring HID device, overridden for dinput\n"); else if (!controller_init(&controllers[i], preparsed, &caps, device, device_path)) WARN("ignoring HID device, failed to initialize\n"); else

1 0

Alexandre Julliard : kernel32/tests: Add a few more tests for apisets.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 8796d34a803d6f4acc686c60a2fd132e250f04ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=8796d34a803d6f4acc686c60… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 17 21:12:54 2022 +0100 kernel32/tests: Add a few more tests for apisets. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/module.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 8ec3a5433ee..91e1aba31e0 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -692,21 +692,95 @@ static void test_LoadLibraryEx_search_flags(void) } else { + LoadLibraryA( "ole32.dll" ); /* FIXME: make sure the dependencies are loaded */ mod = LoadLibraryA( apiset_dll ); if (mod) { + HMODULE shcore; + char buffer[MAX_PATH]; + FreeLibrary(mod); mod = LoadLibraryExA( apiset_dll, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); + shcore = GetModuleHandleA( "shcore.dll" ); + todo_wine + ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); + ret = FreeLibrary( mod ); + ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); + shcore = GetModuleHandleA( "shcore.dll" ); + ok( !shcore, "shcore not unloaded\n" ); + + /* api set without .dll */ + strcpy( buffer, apiset_dll ); + buffer[strlen(buffer) - 4] = 0; + mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !!mod, "Got NULL module, error %u.\n", GetLastError() ); + ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); + shcore = GetModuleHandleA( "shcore.dll" ); + todo_wine + ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); ret = FreeLibrary( mod ); ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); + shcore = GetModuleHandleA( "shcore.dll" ); + ok( !shcore, "shcore not unloaded\n" ); + + /* api set with different version */ + strcpy( buffer, apiset_dll ); + buffer[strlen(buffer) - 5] = '9'; + mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + todo_wine + ok( !!mod || broken(!mod) /* win8 */, "Got NULL module, error %u.\n", GetLastError() ); + if (mod) + { + ok( !!GetModuleHandleA( apiset_dll ), "Got NULL handle.\n" ); + shcore = GetModuleHandleA( "shcore.dll" ); + ok( mod == shcore, "wrong module %p/%p\n", mod, shcore ); + ret = FreeLibrary( mod ); + ok( ret, "FreeLibrary failed, error %u.\n", GetLastError() ); + } + shcore = GetModuleHandleA( "shcore.dll" ); + ok( !shcore, "shcore not unloaded\n" ); + + /* api set with full path */ + GetWindowsDirectoryA( buffer, MAX_PATH ); + strcat( buffer, "\\" ); + strcat( buffer, apiset_dll ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( buffer, NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "Loaded %s\n", debugstr_a(buffer) ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryA( buffer ); + ok( !mod, "Loaded %s\n", debugstr_a(buffer) ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); } else { win_skip( "%s not found, skipping test.\n", apiset_dll ); } - } + + /* try a library with dependencies */ + mod = GetModuleHandleA( "rasapi32.dll" ); + ok( !mod, "rasapi32 already loaded\n" ); + mod = LoadLibraryA( "rasapi32.dll" ); + ok( !!mod, "rasapi32 not found %u\n", GetLastError() ); + FreeLibrary( mod ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "rasapi32.dll", NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "rasapi32 loaded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( "ext-ms-win-ras-rasapi32-l1-1-0.dll", NULL, LOAD_LIBRARY_SEARCH_APPLICATION_DIR ); + ok( !mod, "rasapi32 loaded\n" ); + ok( GetLastError() == ERROR_MOD_NOT_FOUND, "wrong error %u\n", GetLastError() ); + if (mod) FreeLibrary( mod ); + mod = LoadLibraryA( "ext-ms-win-ras-rasapi32-l1-1-0.dll" ); + ok( !!mod || broken(!mod) /* win7 */, "rasapi32 not found %u\n", GetLastError() ); + if (mod) FreeLibrary( mod ); + mod = GetModuleHandleA( "rasapi32.dll" ); + ok( !mod, "rasapi32 still loaded\n" ); + } done: for (i = 1; i <= 6; i++) {

1 0

Francois Gouget : ws2_32/tests: Remove the todo_wine on a test_recv() ok() call.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 98f2922d2e1ce640727c195ebbd2a7101264d092 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98f2922d2e1ce640727c195e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 17 16:29:58 2022 +0100 ws2_32/tests: Remove the todo_wine on a test_recv() ok() call. This test has been succeeding ever since the try_recv() call has been removed before the server call in sock_recv(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index d8a78947de4..befd9fc702e 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1460,7 +1460,7 @@ static void test_recv(void) memset(buffer, 0xcc, sizeof(buffer)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); - todo_wine ok(ret == STATUS_PIPE_DISCONNECTED, "got %#x\n", ret); + ok(ret == STATUS_PIPE_DISCONNECTED, "got %#x\n", ret); ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information);

1 0

Jacek Caban : win32u: Move primary palette handling from user32.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 4b0c0a6b23378d46f580591655c7e613a6808afc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b0c0a6b23378d46f5805916… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 17 15:43:40 2022 +0100 win32u: Move primary palette handling from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 72 +++----------------------------------------- dlls/win32u/ntuser_private.h | 1 + dlls/win32u/palette.c | 26 ++++++++++++++-- 3 files changed, 29 insertions(+), 70 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 8ca55b283f7..ea30772067d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -44,10 +44,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION user_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static HPALETTE (WINAPI *pfnGDISelectPalette)( HDC hdc, HPALETTE hpal, WORD bkgnd ); -static UINT (WINAPI *pfnGDIRealizePalette)( HDC hdc ); -static HPALETTE hPrimaryPalette; - static DWORD exiting_thread_id; extern void WDML_NotifyThreadDetach(void); @@ -86,69 +82,11 @@ void USER_CheckNotLock(void) /*********************************************************************** - * UserSelectPalette (Not a Windows API) + * UserRealizePalette (USER32.@) */ -static HPALETTE WINAPI UserSelectPalette( HDC hDC, HPALETTE hPal, BOOL bForceBackground ) +UINT WINAPI UserRealizePalette( HDC hdc ) { - WORD wBkgPalette = 1; - - if (!bForceBackground && (hPal != GetStockObject(DEFAULT_PALETTE))) - { - HWND hwnd = WindowFromDC( hDC ); - if (hwnd) - { - HWND hForeground = NtUserGetForegroundWindow(); - /* set primary palette if it's related to current active */ - if (hForeground == hwnd || IsChild(hForeground,hwnd)) - { - wBkgPalette = 0; - hPrimaryPalette = hPal; - } - } - } - return pfnGDISelectPalette( hDC, hPal, wBkgPalette); -} - - -/*********************************************************************** - * UserRealizePalette (USER32.@) - */ -UINT WINAPI UserRealizePalette( HDC hDC ) -{ - UINT realized = pfnGDIRealizePalette( hDC ); - - /* do not send anything if no colors were changed */ - if (realized && GetCurrentObject( hDC, OBJ_PAL ) == hPrimaryPalette) - { - /* send palette change notification */ - HWND hWnd = WindowFromDC( hDC ); - if (hWnd) SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)hWnd, 0, - SMTO_ABORTIFHUNG, 2000, NULL ); - } - return realized; -} - - -/*********************************************************************** - * palette_init - * - * Patch the function pointers in GDI for SelectPalette and RealizePalette - */ -static void palette_init(void) -{ - void **ptr; - HMODULE module = GetModuleHandleA( "gdi32" ); - if (!module) - { - ERR( "cannot get GDI32 handle\n" ); - return; - } - if ((ptr = (void**)GetProcAddress( module, "pfnSelectPalette" ))) - pfnGDISelectPalette = InterlockedExchangePointer( ptr, UserSelectPalette ); - else ERR( "cannot find pfnSelectPalette in GDI32\n" ); - if ((ptr = (void**)GetProcAddress( module, "pfnRealizePalette" ))) - pfnGDIRealizePalette = InterlockedExchangePointer( ptr, UserRealizePalette ); - else ERR( "cannot find pfnRealizePalette in GDI32\n" ); + return NtUserCallOneParam( HandleToUlong(hdc), NtUserRealizePalette ); } @@ -212,6 +150,7 @@ static const struct user_callbacks user_funcs = { GetDesktopWindow, GetWindowRect, + IsChild, RedrawWindow, SendMessageTimeoutW, WindowFromDC, @@ -240,9 +179,6 @@ static BOOL process_attach(void) /* Initialize system colors and metrics */ SYSPARAMS_Init(); - /* Setup palette function pointers */ - palette_init(); - return TRUE; } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index f0e0f8835bf..e9d19744976 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -28,6 +28,7 @@ struct user_callbacks { HWND (WINAPI *pGetDesktopWindow)(void); BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); + BOOL (WINAPI *pIsChild)( HWND, HWND ); BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); LRESULT (WINAPI *pSendMessageTimeoutW)( HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); HWND (WINAPI *pWindowFromDC)( HDC ); diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index 1c2f2c70434..d09fc9d4d73 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -508,12 +508,22 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) */ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) { + BOOL is_primary = FALSE; HPALETTE ret = 0; DC *dc; TRACE("%p %p\n", hdc, hpal ); - /* FIXME: move primary palette handling from user32 */ + if (!bkg && hpal != get_stock_object( DEFAULT_PALETTE )) + { + HWND hwnd = user_callbacks->pWindowFromDC( hdc ); + if (hwnd) + { + /* set primary palette if it's related to current active */ + HWND foreground = NtUserGetForegroundWindow(); + is_primary = foreground == hwnd || user_callbacks->pIsChild( foreground, hwnd ); + } + } if (get_gdi_object_type(hpal) != NTGDI_OBJ_PAL) { @@ -524,7 +534,7 @@ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) { ret = dc->hPalette; dc->hPalette = hpal; - if (!bkg) hPrimaryPalette = hpal; + if (is_primary) hPrimaryPalette = hpal; release_dc_ptr( dc ); } return ret; @@ -536,6 +546,7 @@ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) */ UINT realize_palette( HDC hdc ) { + BOOL is_primary = FALSE; UINT realized = 0; DC* dc = get_dc_ptr( hdc ); @@ -559,12 +570,23 @@ UINT realize_palette( HDC hdc ) (dc->hPalette == hPrimaryPalette) ); palPtr->unrealize = physdev->funcs->pUnrealizePalette; GDI_ReleaseObj( dc->hPalette ); + is_primary = dc->hPalette == hPrimaryPalette; } } else TRACE(" skipping (hLastRealizedPalette = %p)\n", hLastRealizedPalette); release_dc_ptr( dc ); TRACE(" realized %i colors.\n", realized ); + + /* do not send anything if no colors were changed */ + if (realized && is_primary) + { + /* send palette change notification */ + HWND hwnd = user_callbacks->pWindowFromDC( hdc ); + if (hwnd) user_callbacks->pSendMessageTimeoutW( HWND_BROADCAST, WM_PALETTECHANGED, + HandleToUlong(hwnd), 0, SMTO_ABORTIFHUNG, + 2000, NULL ); + } return realized; }

1 0

Jacek Caban : win32u: Move NtUserGetForegroundWindow implementation from user32.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: fa3bd8f417123848c343c45f93a152cd42b3e5ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa3bd8f417123848c343c45f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 17 15:43:07 2022 +0100 win32u: Move NtUserGetForegroundWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 19 +------------------ dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/win.c | 2 +- dlls/user32/winpos.c | 2 +- dlls/win32u/input.c | 16 ++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 5 +++++ include/ntuser.h | 1 + 12 files changed, 31 insertions(+), 24 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 4ba2bfef193..a5fc376bdc6 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -161,7 +161,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (IsWindow(hwnd)) { - SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); + SendMessageW( hwnd, WM_NCACTIVATE, hwnd == NtUserGetForegroundWindow(), (LPARAM)previous ); SendMessageW( hwnd, WM_ACTIVATE, MAKEWPARAM( mouse ? WA_CLICKACTIVE : WA_ACTIVE, IsIconic(hwnd) ), (LPARAM)previous ); @@ -371,23 +371,6 @@ HWND WINAPI GetFocus(void) } -/******************************************************************* - * GetForegroundWindow (USER32.@) - */ -HWND WINAPI GetForegroundWindow(void) -{ - HWND ret = 0; - - SERVER_START_REQ( get_thread_input ) - { - req->tid = 0; - if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->foreground ); - } - SERVER_END_REQ; - return ret; -} - - /*********************************************************************** * SetShellWindowEx (USER32.@) * hwndShell = Progman[Program Manager] diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a5fcc9068a7..b4850cc1937 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1876,7 +1876,7 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR if (is_desktop_window( hwnd )) return 0; return WIN_SetStyle(hwnd, wparam, lparam); case WM_WINE_SETACTIVEWINDOW: - if (!wparam && GetForegroundWindow() == hwnd) return 0; + if (!wparam && NtUserGetForegroundWindow() == hwnd) return 0; return (LRESULT)SetActiveWindow( (HWND)wparam ); case WM_WINE_KEYBOARD_LL_HOOK: case WM_WINE_MOUSE_LL_HOOK: diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index d60b424321b..3baa7594e84 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -302,7 +302,7 @@ @ stdcall GetDpiForSystem() @ stdcall GetDpiForWindow(long) @ stdcall GetFocus() -@ stdcall GetForegroundWindow() +@ stdcall GetForegroundWindow() NtUserGetForegroundWindow @ stdcall GetGestureConfig(long long long ptr ptr long) @ stdcall GetGestureInfo(long ptr) @ stdcall GetGUIThreadInfo(long ptr) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index a91db57cdb4..8ca55b283f7 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -97,7 +97,7 @@ static HPALETTE WINAPI UserSelectPalette( HDC hDC, HPALETTE hPal, BOOL bForceBac HWND hwnd = WindowFromDC( hDC ); if (hwnd) { - HWND hForeground = GetForegroundWindow(); + HWND hForeground = NtUserGetForegroundWindow(); /* set primary palette if it's related to current active */ if (hForeground == hwnd || IsChild(hForeground,hwnd)) { diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ee16144b179..1a037297ac1 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3843,7 +3843,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo ) hwnd = wndPtr->obj.handle; /* make it a full handle */ if (pfinfo->dwFlags) wparam = !(wndPtr->flags & WIN_NCACTIVATED); - else wparam = (hwnd == GetForegroundWindow()); + else wparam = (hwnd == NtUserGetForegroundWindow()); WIN_ReleasePtr( wndPtr ); SendMessageW( hwnd, WM_NCACTIVATE, wparam, 0 ); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index abf9c25e6c6..db3408c63ba 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1640,7 +1640,7 @@ void WINPOS_ActivateOtherWindow(HWND hwnd) } done: - fg = GetForegroundWindow(); + fg = NtUserGetForegroundWindow(); TRACE("win = %p fg = %p\n", hwndTo, fg); if (!fg || (hwnd == fg)) { diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index d73b03fe7fd..9c7a7e75253 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1004,3 +1004,19 @@ int WINAPI NtUserGetMouseMovePointsEx( UINT size, MOUSEMOVEPOINT *ptin, MOUSEMOV return copied; } + +/******************************************************************* + * NtUserGetForegroundWindow (win32u.@) + */ +HWND WINAPI NtUserGetForegroundWindow(void) +{ + HWND ret = 0; + + SERVER_START_REQ( get_thread_input ) + { + req->tid = 0; + if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->foreground ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index d97688d7c8c..2d37d605479 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -115,6 +115,7 @@ static void * const syscalls[] = NtUserGetCursor, NtUserGetDoubleClickTime, NtUserGetDpiForMonitor, + NtUserGetForegroundWindow, NtUserGetKeyState, NtUserGetKeyboardLayout, NtUserGetKeyboardLayoutName, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 20faca70c5e..03ab1ff885c 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -926,7 +926,7 @@ @ stub NtUserGetDpiForCurrentProcess @ stdcall -syscall NtUserGetDpiForMonitor(long long ptr ptr) @ stub NtUserGetExtendedPointerDeviceProperty -@ stub NtUserGetForegroundWindow +@ stdcall -syscall NtUserGetForegroundWindow() @ stub NtUserGetGUIThreadInfo @ stub NtUserGetGestureConfig @ stub NtUserGetGestureExtArgs diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 47e95a98a4b..22140c33f80 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -102,6 +102,7 @@ SYSCALL_ENTRY( NtUserGetCursor ) \ SYSCALL_ENTRY( NtUserGetDoubleClickTime ) \ SYSCALL_ENTRY( NtUserGetDpiForMonitor ) \ + SYSCALL_ENTRY( NtUserGetForegroundWindow ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayoutName ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index cd4dc32d407..a2be5fedb36 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -415,3 +415,8 @@ NTSTATUS WINAPI wow64_NtUserUnhookWindowsHookEx( UINT *args ) return NtUserUnhookWindowsHookEx( handle ); } + +NTSTATUS WINAPI wow64_NtUserGetForegroundWindow( UINT *args ) +{ + return HandleToUlong( NtUserGetForegroundWindow() ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 6e941c29c6d..51f1c624ba6 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -156,6 +156,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path UINT32 *num_mode_info ); UINT WINAPI NtUserGetDoubleClickTime(void); BOOL WINAPI NtUserGetDpiForMonitor( HMONITOR monitor, UINT type, UINT *x, UINT *y ); +HWND WINAPI NtUserGetForegroundWindow(void); INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ); SHORT WINAPI NtUserGetKeyState( INT vkey ); HKL WINAPI NtUserGetKeyboardLayout( DWORD thread_id );

1 0

Jacek Caban : win32u: Set user callbacks from user32 DllMain.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: e557f48cdf6ef1eafe468829ec9298a3eb6ac80b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e557f48cdf6ef1eafe468829… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 17 15:42:36 2022 +0100 win32u: Set user callbacks from user32 DllMain. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 11 +++++++ dlls/win32u/driver.c | 12 ++------ dlls/win32u/ntuser_private.h | 9 ++++++ dlls/win32u/palette.c | 11 +------ dlls/win32u/region.c | 7 +---- dlls/win32u/sysparams.c | 2 ++ dlls/win32u/win32u_private.h | 9 ------ dlls/win32u/wrappers.c | 73 +------------------------------------------- include/ntuser.h | 1 + 9 files changed, 28 insertions(+), 107 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index c2ec561a800..a91db57cdb4 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -208,6 +208,14 @@ static void dpiaware_init(void) } } +static const struct user_callbacks user_funcs = +{ + GetDesktopWindow, + GetWindowRect, + RedrawWindow, + SendMessageTimeoutW, + WindowFromDC, +}; static const void *kernel_callback_table[NtUserCallCount] = { @@ -223,6 +231,9 @@ static BOOL process_attach(void) { NtCurrentTeb()->Peb->KernelCallbackTable = kernel_callback_table; + /* FIXME: should not be needed */ + NtUserCallOneParam( (UINT_PTR)&user_funcs, NtUserSetCallbacks ); + dpiaware_init(); register_desktop_class(); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index b3a3e70f83f..5e6cee33bc6 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -24,21 +24,13 @@ #endif #include <assert.h> -#include <stdarg.h> -#include <string.h> -#include <stdio.h> #include <pthread.h> #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winreg.h" -#include "wine/winbase16.h" -#include "winuser.h" - #include "ntgdi_private.h" +#include "ntuser_private.h" +#include "wine/winbase16.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index fec04d94948..f0e0f8835bf 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -24,6 +24,15 @@ #include "ntuser.h" +struct user_callbacks +{ + HWND (WINAPI *pGetDesktopWindow)(void); + BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); + BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); + LRESULT (WINAPI *pSendMessageTimeoutW)( HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); + HWND (WINAPI *pWindowFromDC)( HDC ); +}; + /* this is the structure stored in TEB->Win32ClientInfo */ /* no attempt is made to keep the layout compatible with the Windows one */ struct user_thread_info diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index 3aeda89851f..1c2f2c70434 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -27,17 +27,8 @@ #pragma makedep unix #endif -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wingdi.h" -#include "winuser.h" - #include "ntgdi_private.h" +#include "ntuser_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(palette); diff --git a/dlls/win32u/region.c b/dlls/win32u/region.c index 86554f21e1c..17eae861cbf 100644 --- a/dlls/win32u/region.c +++ b/dlls/win32u/region.c @@ -99,13 +99,8 @@ SOFTWARE. #endif #include <assert.h> -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" #include "ntgdi_private.h" +#include "ntuser_private.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(region); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index c9885f89d87..7af1e20f008 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4544,6 +4544,8 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); case NtUserIncrementKeyStateCounter: return InterlockedAdd( &global_key_state_counter, arg ); + case NtUserSetCallbacks: + return (UINT_PTR)InterlockedExchangePointer( (void **)&user_callbacks, (void *)arg ); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c3419d83858..3017b7e6a72 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -30,15 +30,6 @@ #include "wine/unixlib.h" #include "wine/debug.h" -struct user_callbacks -{ - HWND (WINAPI *pGetDesktopWindow)(void); - BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); - BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); - LRESULT (WINAPI *pSendMessageTimeoutW)( HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); - HWND (WINAPI *pWindowFromDC)( HDC ); -}; - extern const struct user_callbacks *user_callbacks DECLSPEC_HIDDEN; struct unix_funcs diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 2823eae9fe1..922e5a26b00 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -947,79 +947,8 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *funcs, UINT vers return unix_funcs->set_display_driver( funcs, version ); } -static void *get_user_proc( const char *name, BOOL force_load ) -{ - ANSI_STRING name_str; - FARPROC proc = NULL; - static HMODULE user32; - - if (!user32) - { - UNICODE_STRING str; - NTSTATUS status; - RtlInitUnicodeString( &str, L"user32.dll" ); - status = force_load - ? LdrLoadDll( NULL, 0, &str, &user32 ) - : LdrGetDllHandle( NULL, 0, &str, &user32 ); - if (status < 0) return NULL; - } - RtlInitAnsiString( &name_str, name ); - LdrGetProcedureAddress( user32, &name_str, 0, (void**)&proc ); - return proc; -} - -static HWND WINAPI call_GetDesktopWindow(void) -{ - static HWND (WINAPI *pGetDesktopWindow)(void); - if (!pGetDesktopWindow) - pGetDesktopWindow = get_user_proc( "GetDesktopWindow", TRUE ); - return pGetDesktopWindow ? pGetDesktopWindow() : NULL; -} - -static BOOL WINAPI call_GetWindowRect( HWND hwnd, LPRECT rect ) -{ - static BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); - if (!pGetWindowRect) - pGetWindowRect = get_user_proc( "GetWindowRect", FALSE ); - return pGetWindowRect && pGetWindowRect( hwnd, rect ); -} - -static BOOL WINAPI call_RedrawWindow( HWND hwnd, const RECT *rect, HRGN rgn, UINT flags ) -{ - static BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); - if (!pRedrawWindow) - pRedrawWindow = get_user_proc( "RedrawWindow", FALSE ); - return pRedrawWindow && pRedrawWindow( hwnd, rect, rgn, flags ); -} - -static LRESULT WINAPI call_SendMessageTimeoutW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, - UINT flags, UINT timeout, PDWORD_PTR res_ptr ) -{ - static LRESULT (WINAPI *pSendMessageTimeoutW)( HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); - if (!pSendMessageTimeoutW) pSendMessageTimeoutW = get_user_proc( "SendMessageTimeoutW", FALSE ); - if (!pSendMessageTimeoutW) return 0; - return pSendMessageTimeoutW( hwnd, msg, wparam, lparam, flags, timeout, res_ptr ); -} - -static HWND WINAPI call_WindowFromDC( HDC hdc ) -{ - static HWND (WINAPI *pWindowFromDC)( HDC ); - if (!pWindowFromDC) - pWindowFromDC = get_user_proc( "WindowFromDC", FALSE ); - return pWindowFromDC ? pWindowFromDC( hdc ) : NULL; -} - -static const struct user_callbacks user_funcs = -{ - call_GetDesktopWindow, - call_GetWindowRect, - call_RedrawWindow, - call_SendMessageTimeoutW, - call_WindowFromDC, -}; - extern void wrappers_init( unixlib_handle_t handle ) { - const void *args = &user_funcs; + const void *args; if (!__wine_unix_call( handle, 1, &args )) unix_funcs = args; } diff --git a/include/ntuser.h b/include/ntuser.h index 6e4183b1e14..6e941c29c6d 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -85,6 +85,7 @@ enum NtUserFlushWindowSurfaces, NtUserGetDeskPattern, NtUserIncrementKeyStateCounter, + NtUserSetCallbacks, }; /* NtUserCallTwoParam codes, not compatible with Windows */

1 0

Jacek Caban : gdi32: Link directly to user32.
by Alexandre Julliard 17 Feb '22

17 Feb '22

Module: wine Branch: master Commit: 2353ef9bd5c509b3903a5c6d9cb9690907af9427 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2353ef9bd5c509b3903a5c6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 17 15:42:01 2022 +0100 gdi32: Link directly to user32. On Windows, loading gdi32.dll causes user32.dll to be loaded. It's important for win32u, which is not fully functional until user32 sets KernelCallbackTable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/objects.c | 25 ++++--------------------- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 3e0495f877b..ce877995ee2 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 -IMPORTS = advapi32 win32u +IMPORTS = user32 advapi32 win32u DELAYIMPORTS = setupapi C_SRCS = \ diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index f578543b937..0260027a484 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -415,23 +415,6 @@ HGDIOBJ WINAPI GetCurrentObject( HDC hdc, UINT type ) return NtGdiGetDCObject( hdc, obj_type ); } -/****************************************************************************** - * get_system_dpi - * - * Get the system DPI, based on the DPI awareness mode. - */ -static DWORD get_system_dpi(void) -{ - static UINT (WINAPI *pGetDpiForSystem)(void); - - if (!pGetDpiForSystem) - { - HMODULE user = GetModuleHandleW( L"user32.dll" ); - if (user) pGetDpiForSystem = (void *)GetProcAddress( user, "GetDpiForSystem" ); - } - return pGetDpiForSystem ? pGetDpiForSystem() : 96; -} - /*********************************************************************** * GetStockObject (GDI32.@) */ @@ -443,16 +426,16 @@ HGDIOBJ WINAPI GetStockObject( INT obj ) switch (obj) { case OEM_FIXED_FONT: - if (get_system_dpi() != 96) obj = 9; + if (GetDpiForSystem() != 96) obj = 9; break; case SYSTEM_FONT: - if (get_system_dpi() != 96) obj = STOCK_LAST + 2; + if (GetDpiForSystem() != 96) obj = STOCK_LAST + 2; break; case SYSTEM_FIXED_FONT: - if (get_system_dpi() != 96) obj = STOCK_LAST + 3; + if (GetDpiForSystem() != 96) obj = STOCK_LAST + 3; break; case DEFAULT_GUI_FONT: - if (get_system_dpi() != 96) obj = STOCK_LAST + 4; + if (GetDpiForSystem() != 96) obj = STOCK_LAST + 4; break; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022