May 2018 - Wine-Commits - list.winehq.org

Daniel Lehman : msvcr100/tests: Add setlocale test.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: 0e882c6bf116e442c8c9fa9a29115197c58c2f9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e882c6bf116e442c8c9fa9a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue May 1 15:30:08 2018 -0700 msvcr100/tests: Add setlocale test. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index f02f5ea..bd95991 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -26,6 +26,8 @@ #include <winbase.h> #include "wine/test.h" +#include <locale.h> + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -232,6 +234,8 @@ static unsigned int (__cdecl *p_CurrentScheduler_Id)(void); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); +static char* (__cdecl *p_setlocale)(int, const char*); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -265,6 +269,7 @@ static BOOL init(void) SET(p_atoi, "atoi"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p_setlocale, "setlocale"); SET(p_Context_Id, "?Id(a)Context@Concurrency@@SAIXZ"); SET(p_CurrentScheduler_Detach, "?Detach(a)CurrentScheduler@Concurrency@@SAXXZ"); @@ -1052,6 +1057,14 @@ static void test__memicmp_l(void) "Cannot reset invalid parameter handler\n"); } +static void test_setlocale(void) +{ + char *ret; + + ret = p_setlocale(LC_ALL, "en-US"); + ok(!ret, "got %p\n", ret); +} + START_TEST(msvcr100) { if (!init()) @@ -1070,4 +1083,5 @@ START_TEST(msvcr100) test_event(); test__memicmp(); test__memicmp_l(); + test_setlocale(); }

1 0

Daniel Lehman : msvcrt/tests: Add setlocale test.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: 642e0917d56613d013d2ae889816ad65eb1f2f06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=642e0917d56613d013d2ae88… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue May 1 14:04:04 2018 -0700 msvcrt/tests: Add setlocale test. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/locale.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 5e6d172..024afc1 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -614,6 +614,9 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "English_United States.UTF8"); ok(ret == NULL, "ret != NULL\n"); + + ret = setlocale(LC_ALL, "en-US"); + ok(ret == NULL || broken (ret != NULL), "ret != NULL\n"); /* XP & 2003 */ } static void test_crtGetStringTypeW(void)

1 0

Alexandre Julliard : user32/tests: Reorganize the DPI tests.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: 487599e77f7be678c57b7fe03d0dc4aa781f45cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=487599e77f7be678c57b7fe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 2 17:32:29 2018 +0200 user32/tests: Reorganize the DPI tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 363 +++++++++++++++++++++--------------------- 1 file changed, 184 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=487599e77f7be678c57b…

1 0

Zebediah Figura : ntoskrnl.exe/tests: Also handle ERROR_INVALID_IMAGE_HASH.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: 0dc84eada28fde65f07ceb7372694de138153c6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dc84eada28fde65f07ceb73… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 1 18:38:02 2018 -0500 ntoskrnl.exe/tests: Also handle ERROR_INVALID_IMAGE_HASH. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 623e10d..bd0498a 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -104,7 +104,7 @@ static SC_HANDLE load_driver(char *filename) SetLastError(0xdeadbeef); ret = StartServiceA(service, 0, NULL); - if (!ret && GetLastError() == ERROR_DRIVER_BLOCKED) + if (!ret && (GetLastError() == ERROR_DRIVER_BLOCKED || GetLastError() == ERROR_INVALID_IMAGE_HASH)) { /* If Secure Boot is enabled or the machine is 64-bit, it will reject an unsigned driver. */ skip("Failed to start service; probably your machine doesn't accept unsigned drivers.\n");

1 0

Alistair Leslie-Hughes : combase/tests: Add RoGetActivationFactory tests.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: c5c37cf6b32fa57bb2427db4aa6f7896fe1951fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5c37cf6b32fa57bb2427db4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 2 03:42:50 2018 +0000 combase/tests: Add RoGetActivationFactory tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/Makefile.in | 1 + dlls/combase/tests/roapi.c | 112 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/dlls/combase/tests/Makefile.in b/dlls/combase/tests/Makefile.in index 3e7ecab..ca6c48f 100644 --- a/dlls/combase/tests/Makefile.in +++ b/dlls/combase/tests/Makefile.in @@ -1,4 +1,5 @@ TESTDLL = combase.dll C_SRCS = \ + roapi.c \ string.c diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c new file mode 100644 index 0000000..3d46772 --- /dev/null +++ b/dlls/combase/tests/roapi.c @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2018 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winstring.h" + +#include "initguid.h" +#include "roapi.h" + + +#include "wine/test.h" + +static HRESULT (WINAPI *pRoActivateInstance)(HSTRING, IInspectable **); +static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE); +static void (WINAPI *pRoUninitialize)(void); +static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **); + +static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *); +static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING); + +#define SET(x) p##x = (void*)GetProcAddress(hmod, #x) + +static BOOL init_functions(void) +{ + HMODULE hmod = LoadLibraryA("combase.dll"); + if (!hmod) + { + win_skip("Failed to load combase.dll, skipping tests\n"); + return FALSE; + } + SET(RoActivateInstance); + SET(RoInitialize); + SET(RoUninitialize); + SET(RoGetActivationFactory); + + SET(WindowsCreateString); + SET(WindowsDeleteString); + + return TRUE; +} + +static void test_ActivationFactories(void) +{ + static const WCHAR xmldocumentW[] = { 'W','i','n','d','o','w','s','.','D','a','t','a','.','X','m','l','.', + 'D','o','m','.','X','m','l','D','o','c','u','m','e','n','t',0 }; + static const WCHAR nonexistW[] = { 'D','o','e','s','.','N','o','t','.','E','x','i','s','t',0 }; + HRESULT hr; + HSTRING str, str2; + IActivationFactory *factory = NULL; + IInspectable *inspect = NULL; + + if(!pRoGetActivationFactory || !pRoActivateInstance) + { + win_skip("RoGetActivationFactory not available\n"); + return; + } + + hr = pWindowsCreateString(xmldocumentW, sizeof(xmldocumentW)/sizeof(WCHAR) - 1, &str); + ok(hr == S_OK, "got %08x\n", hr); + + hr = pWindowsCreateString(nonexistW, sizeof(nonexistW)/sizeof(WCHAR) - 1, &str2); + ok(hr == S_OK, "got %08x\n", hr); + + hr = pRoInitialize(RO_INIT_MULTITHREADED); + ok(hr == S_OK, "got %08x\n", hr); + + hr = pRoGetActivationFactory(str2, &IID_IActivationFactory, (void **)&factory); + todo_wine ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr); + + hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(factory) + IActivationFactory_Release(factory); + + hr = pRoActivateInstance(str2, &inspect); + todo_wine ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr); + + hr = pRoActivateInstance(str, &inspect); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(inspect) + IInspectable_Release(inspect); + + pWindowsDeleteString(str); + pRoUninitialize(); +} + +START_TEST(roapi) +{ + if (!init_functions()) + return; + + test_ActivationFactories(); +}

1 0

Daniel Lehman : msvcr110/tests: Add setlocale tests.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: d0e8c9a1ab7894bef53a1f62d81a85386c65fff7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0e8c9a1ab7894bef53a1f62… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue May 1 14:28:23 2018 -0700 msvcr110/tests: Add setlocale tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcr110/tests/Makefile.in | 5 +++ dlls/msvcr110/tests/msvcr110.c | 78 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+) diff --git a/configure b/configure index cf625c8..119391d 100755 --- a/configure +++ b/configure @@ -18837,6 +18837,7 @@ wine_fn_config_makefile dlls/msvcp90/tests enable_tests wine_fn_config_makefile dlls/msvcr100 enable_msvcr100 wine_fn_config_makefile dlls/msvcr100/tests enable_tests wine_fn_config_makefile dlls/msvcr110 enable_msvcr110 +wine_fn_config_makefile dlls/msvcr110/tests enable_tests wine_fn_config_makefile dlls/msvcr120 enable_msvcr120 wine_fn_config_makefile dlls/msvcr120/tests enable_tests wine_fn_config_makefile dlls/msvcr120_app enable_msvcr120_app diff --git a/configure.ac b/configure.ac index 7386d74..1bc3d13 100644 --- a/configure.ac +++ b/configure.ac @@ -3459,6 +3459,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp90/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr100) WINE_CONFIG_MAKEFILE(dlls/msvcr100/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr110) +WINE_CONFIG_MAKEFILE(dlls/msvcr110/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr120) WINE_CONFIG_MAKEFILE(dlls/msvcr120/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr120_app) diff --git a/dlls/msvcr110/tests/Makefile.in b/dlls/msvcr110/tests/Makefile.in new file mode 100644 index 0000000..e8fa818 --- /dev/null +++ b/dlls/msvcr110/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msvcr110.dll +APPMODE = -mno-cygwin + +C_SRCS = \ + msvcr110.c diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c new file mode 100644 index 0000000..0a18f73 --- /dev/null +++ b/dlls/msvcr110/tests/msvcr110.c @@ -0,0 +1,78 @@ +/* + * Copyright 2018 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <errno.h> +#include <stdarg.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> +#include <float.h> +#include <limits.h> + +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include "wine/test.h" + +#include <locale.h> + +static char* (CDECL *p_setlocale)(int category, const char* locale); + +static BOOL init(void) +{ + HMODULE module; + + module = LoadLibraryA("msvcr110.dll"); + if (!module) + { + win_skip("msvcr110.dll not installed\n"); + return FALSE; + } + + p_setlocale = (void*)GetProcAddress(module, "setlocale"); + return TRUE; +} + +static void test_setlocale(void) +{ + int i; + char *ret; + static const char *names[] = + { + "en-us", + "en-US", + "EN-US", + "syr-SY", + "uz-Latn-uz", + }; + + for(i=0; i<sizeof(names)/sizeof(*names); i++) { + ret = p_setlocale(LC_ALL, names[i]); + todo_wine ok(!!ret, "expected success, but got NULL\n"); + if(ret) ok(!strcmp(ret, names[i]), + "expected %s, got %s\n", names[i], ret); + } + + p_setlocale(LC_ALL, "C"); +} + +START_TEST(msvcr110) +{ + if (!init()) return; + test_setlocale(); +}

1 0

Hans Leidekker : server: Dump token details.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: 14191f2dd0b6daab7fc6d2d429a34759248b1902 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14191f2dd0b6daab7fc6d2d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 2 10:45:41 2018 +0200 server: Dump token details. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/token.c b/server/token.c index 7deddc4..cde9c5a 100644 --- a/server/token.c +++ b/server/token.c @@ -158,11 +158,12 @@ static const struct object_ops token_ops = token_destroy /* destroy */ }; - static void token_dump( struct object *obj, int verbose ) { - fprintf( stderr, "Security token\n" ); - /* FIXME: dump token members */ + struct token *token = (struct token *)obj; + assert( obj->ops == &token_ops ); + fprintf( stderr, "Token id=%d.%u primary=%u impersonation level=%d\n", token->token_id.high_part, + token->token_id.low_part, token->primary, token->impersonation_level ); } static unsigned int token_map_access( struct object *obj, unsigned int access )

1 0

Zebediah Figura : ntoskrnl.exe/tests: Add a simple test for MmMapLockedPagesSpecifyCache().
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: fb365b10e6434df1d270e0ee30e779aa3bc41ea0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb365b10e6434df1d270e0ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 1 18:38:04 2018 -0500 ntoskrnl.exe/tests: Add a simple test for MmMapLockedPagesSpecifyCache(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 21 +++++++++++++++++++++ include/ddk/wdm.h | 1 + 2 files changed, 22 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 1328045..84cfff7 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -152,6 +152,26 @@ todo_wine ok(current != NULL, "Expected current process to be non-NULL\n"); } +static void test_mdl_map(void) +{ + char buffer[20] = "test buffer"; + void *addr; + MDL *mdl; + + mdl = IoAllocateMdl(buffer, sizeof(buffer), FALSE, FALSE, NULL); + ok(mdl != NULL, "IoAllocateMdl failed\n"); + + MmProbeAndLockPages(mdl, KernelMode, IoReadAccess); + + addr = MmMapLockedPagesSpecifyCache(mdl, KernelMode, MmCached, NULL, FALSE, NormalPagePriority); +todo_wine + ok(addr != NULL, "MmMapLockedPagesSpecifyCache failed\n"); + + /* MmUnmapLockedPages(addr, mdl); */ + + IoFreeMdl(mdl); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -176,6 +196,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) ZwOpenFile(&okfile, FILE_APPEND_DATA, &attr, &io, 0, 0); test_currentprocess(); + test_mdl_map(); /* print process report */ if (test_input->winetest_debug) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 8634f36..cab9828 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1423,6 +1423,7 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICA void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); +void WINAPI MmProbeAndLockPages(PMDLX, KPROCESSOR_MODE, LOCK_OPERATION); static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) {

1 0

Daniel Lehman : advapi32/tests: Don't call function in assert().
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: 36a67edd1ef0b1eb45a9928ac9337244b935cee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36a67edd1ef0b1eb45a9928a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Sat Apr 28 13:02:08 2018 -0700 advapi32/tests: Don't call function in assert(). Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1df117b..2f7566c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -175,9 +175,12 @@ static DWORD delete_key( HKEY hkey ) static void setup_main_key(void) { + DWORD ret; + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main )) delete_key( hkey_main ); - assert (!RegCreateKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main )); + ret = RegCreateKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Test", &hkey_main ); + ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret); } static void check_user_privs(void)

1 0

Alexandre Julliard : user32: Set the thread DPI awareness to the window' s when calling a window procedure.
by Alexandre Julliard May 2, 2018

May 2, 2018

Module: wine Branch: master Commit: 39f0bbff4ea16e2ff674d849a38dd0c60f425f8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f0bbff4ea16e2ff674d849… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 2 17:33:19 2018 +0200 user32: Set the thread DPI awareness to the window's when calling a window procedure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/message.c | 3 +++ dlls/user32/tests/sysparams.c | 58 ++++++++++++++++++++++++------------------- dlls/user32/winproc.c | 6 +++++ 3 files changed, 42 insertions(+), 25 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 9e07be9..290f36b 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -228,6 +228,7 @@ WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode ) static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg ) { + DPI_AWARENESS_CONTEXT awareness; WNDPROC16 func = arg; int index = winproc_to_index( func ); CONTEXT context; @@ -281,6 +282,7 @@ static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPA } } + awareness = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( HWND_32(hwnd) )); args.params[4] = hwnd; args.params[3] = msg; args.params[2] = wParam; @@ -288,6 +290,7 @@ static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPA args.params[0] = LOWORD(lParam); WOWCallback16Ex( 0, WCB16_REGS, sizeof(args.params) + size, &args, (DWORD *)&context ); *result = MAKELONG( LOWORD(context.Eax), LOWORD(context.Edx) ); + SetThreadDpiAwarenessContext( awareness ); return *result; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 1836ca5..9620ffa 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3512,11 +3512,22 @@ static void test_dpi_context(void) ReleaseDC( 0, hdc ); } +static LRESULT CALLBACK dpi_winproc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + DPI_AWARENESS_CONTEXT ctx = pGetWindowDpiAwarenessContext( hwnd ); + DPI_AWARENESS_CONTEXT ctx2 = pGetThreadDpiAwarenessContext(); + ok( pGetAwarenessFromDpiAwarenessContext( ctx ) == pGetAwarenessFromDpiAwarenessContext( ctx2 ), + "msg %04x wrong awareness %p / %p\n", msg, ctx, ctx2 ); + return DefWindowProcA( hwnd, msg, wp, lp ); +} + static void test_dpi_window(void) { DPI_AWARENESS_CONTEXT context, orig; DPI_AWARENESS awareness; + ULONG_PTR i, j; HWND hwnd; + MSG msg = { 0, WM_USER + 1, 0, 0 }; if (!pGetWindowDpiAwarenessContext) { @@ -3524,31 +3535,25 @@ static void test_dpi_window(void) return; } orig = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); - hwnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", - WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); - ok( hwnd != 0, "failed to create window\n" ); - context = pGetWindowDpiAwarenessContext( hwnd ); - awareness = pGetAwarenessFromDpiAwarenessContext( context ); - ok( awareness == DPI_AWARENESS_UNAWARE, "wrong awareness %u\n", awareness ); - DestroyWindow( hwnd ); - - pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); - hwnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", - WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); - ok( hwnd != 0, "failed to create window\n" ); - context = pGetWindowDpiAwarenessContext( hwnd ); - awareness = pGetAwarenessFromDpiAwarenessContext( context ); - ok( awareness == DPI_AWARENESS_SYSTEM_AWARE, "wrong awareness %u\n", awareness ); - DestroyWindow( hwnd ); - - pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); - hwnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", - WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); - ok( hwnd != 0, "failed to create window\n" ); - context = pGetWindowDpiAwarenessContext( hwnd ); - awareness = pGetAwarenessFromDpiAwarenessContext( context ); - ok( awareness == DPI_AWARENESS_PER_MONITOR_AWARE, "wrong awareness %u\n", awareness ); - DestroyWindow( hwnd ); + for (i = DPI_AWARENESS_UNAWARE; i <= DPI_AWARENESS_PER_MONITOR_AWARE; i++) + { + pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~i ); + hwnd = CreateWindowA( "DpiTestClass", "Test", + WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), NULL ); + ok( hwnd != 0, "failed to create window\n" ); + context = pGetWindowDpiAwarenessContext( hwnd ); + awareness = pGetAwarenessFromDpiAwarenessContext( context ); + ok( awareness == i, "%lu: wrong awareness %u\n", i, awareness ); + msg.hwnd = hwnd; + for (j = DPI_AWARENESS_UNAWARE; j <= DPI_AWARENESS_PER_MONITOR_AWARE; j++) + { + pSetThreadDpiAwarenessContext( (DPI_AWARENESS_CONTEXT)~j ); + SendMessageA( hwnd, WM_USER, 0, 0 ); + DispatchMessageA( &msg ); + CallWindowProcA( dpi_winproc, hwnd, WM_USER + 2, 0, 0 ); + } + DestroyWindow( hwnd ); + } SetLastError( 0xdeadbeef ); context = pGetWindowDpiAwarenessContext( (HWND)0xdeadbeef ); @@ -3634,6 +3639,9 @@ START_TEST(sysparams) wc.cbClsExtra = 0; wc.cbWndExtra = 0; RegisterClassA( &wc ); + wc.lpszClassName = "DpiTestClass"; + wc.lpfnWndProc = dpi_winproc; + RegisterClassA( &wc ); ghTestWnd = CreateWindowA( "SysParamsTestClass", "Test System Parameters Application", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, hInstance, NULL ); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index e07971c..b2d4fd2 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -233,6 +233,7 @@ static WPARAM map_wparam_char_WtoA( WPARAM wParam, DWORD len ) /* call a 32-bit window procedure */ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { + DPI_AWARENESS_CONTEXT context; WNDPROC proc = arg; USER_CheckNotLock(); @@ -241,7 +242,9 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES TRACE_(relay)( "\1Call window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); *result = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); + SetThreadDpiAwarenessContext( context ); TRACE_(relay)( "\1Ret window proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, *result ); @@ -251,6 +254,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES /* call a 32-bit dialog procedure */ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRESULT *result, void *arg ) { + DPI_AWARENESS_CONTEXT context; WNDPROC proc = arg; LRESULT ret; @@ -260,8 +264,10 @@ static LRESULT call_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, LRES TRACE_(relay)( "\1Call dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx)\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp ); + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); ret = WINPROC_wrapper( proc, hwnd, msg, wp, lp ); *result = GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); + SetThreadDpiAwarenessContext( context ); TRACE_(relay)( "\1Ret dialog proc %p (hwnd=%p,msg=%s,wp=%08lx,lp=%08lx) retval=%08lx result=%08lx\n", proc, hwnd, SPY_GetMsgName(msg, hwnd), wp, lp, ret, *result );

1 0