wine-commits February 2023

wine-commits@winehq.org

1 participants
599 discussions

Mohamad Al-Jaf : windows.ui: Add stub DLL.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 9e440328e7eb01efc2fefbe1cf92f83cffd4ba88 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e440328e7eb01efc2fefbe1cf92f8… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Jan 27 03:05:40 2023 -0500 windows.ui: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.ui/Makefile.in | 9 +++ dlls/windows.ui/classes.idl | 23 ++++++++ dlls/windows.ui/main.c | 55 ++++++++++++++++++ dlls/windows.ui/private.h | 41 +++++++++++++ dlls/windows.ui/tests/Makefile.in | 5 ++ dlls/windows.ui/tests/uisettings.c | 90 ++++++++++++++++++++++++++++ dlls/windows.ui/uisettings.c | 116 +++++++++++++++++++++++++++++++++++++ dlls/windows.ui/windows.ui.spec | 7 +++ 10 files changed, 351 insertions(+)

1 0

Mohamad Al-Jaf : include: Add windows.ui.viewmanagement.idl file.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 5fc131ef816f764bd1879cde0c889f1f69b176f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fc131ef816f764bd1879cde0c889f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Jan 27 02:17:12 2023 -0500 include: Add windows.ui.viewmanagement.idl file. --- include/Makefile.in | 1 + include/windows.ui.viewmanagement.idl | 167 ++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index dba9ae86135..963fe1a2858 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -826,6 +826,7 @@ SOURCES = \ windows.system.threading.idl \ windows.system.userprofile.idl \ windows.ui.idl \ + windows.ui.viewmanagement.idl \ windowscontracts.idl \ windowsx.h \ wine/afd.h \ diff --git a/include/windows.ui.viewmanagement.idl b/include/windows.ui.viewmanagement.idl new file mode 100644 index 00000000000..e7a90646338 --- /dev/null +++ b/include/windows.ui.viewmanagement.idl @@ -0,0 +1,167 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * 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 + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.devices.enumeration.idl"; +/* import "windows.phone.idl"; */ +import "windows.ui.idl"; +/* import "windows.ui.core.idl"; */ +/* import "windows.ui.popups.idl"; */ +/* import "windows.ui.windowmanagement.idl"; */ + +namespace Windows.UI.ViewManagement +{ + typedef enum HandPreference HandPreference; + typedef enum UIColorType UIColorType; + typedef enum UIElementType UIElementType; + + interface IUISettings; + interface IUISettings3; + + runtimeclass UISettings; + + declare { + interface Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, IInspectable *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum HandPreference + { + LeftHanded = 0, + RightHanded = 1, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum UIColorType + { + Background = 0, + Foreground = 1, + AccentDark3 = 2, + AccentDark2 = 3, + AccentDark1 = 4, + Accent = 5, + AccentLight1 = 6, + AccentLight2 = 7, + AccentLight3 = 8, + Complement = 9, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum UIElementType + { + ActiveCaption = 0, + Background = 1, + ButtonFace = 2, + ButtonText = 3, + CaptionText = 4, + GrayText = 5, + Highlight = 6, + HighlightText = 7, + Hotlight = 8, + InactiveCaption = 9, + InactiveCaptionText = 10, + Window = 11, + WindowText = 12, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + AccentColor = 1000, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + TextHigh = 1001, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + TextMedium = 1002, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + TextLow = 1003, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + TextContrastWithHigh = 1004, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NonTextHigh = 1005, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NonTextMediumHigh = 1006, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NonTextMedium = 1007, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NonTextMediumLow = 1008, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + NonTextLow = 1009, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + PageBackground = 1010, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + PopupBackground = 1011, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + OverlayOutsidePopup = 1012, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ViewManagement.UISettings), + uuid(85361600-1c63-4627-bcb1-3a89e0bc9c55) + ] + interface IUISettings : IInspectable + { + [propget] HRESULT HandPreference([out, retval] Windows.UI.ViewManagement.HandPreference *value); + [propget] HRESULT CursorSize([out, retval] Windows.Foundation.Size *value); + [propget] HRESULT ScrollBarSize([out, retval] Windows.Foundation.Size *value); + [propget] HRESULT ScrollBarArrowSize([out, retval] Windows.Foundation.Size *value); + [propget] HRESULT ScrollBarThumbBoxSize([out, retval] Windows.Foundation.Size *value); + [propget] HRESULT MessageDuration([out, retval] UINT32 *value); + [propget] HRESULT AnimationsEnabled([out, retval] boolean *value); + [propget] HRESULT CaretBrowsingEnabled([out, retval] boolean *value); + [propget] HRESULT CaretBlinkRate([out, retval] UINT32 *value); + [propget] HRESULT CaretWidth([out, retval] UINT32 *value); + [propget] HRESULT DoubleClickTime([out, retval] UINT32 *value); + [propget] HRESULT MouseHoverTime([out, retval] UINT32 *value); + HRESULT UIElementColor([in] Windows.UI.ViewManagement.UIElementType element, [out, retval] Windows.UI.Color *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ViewManagement.UISettings), + uuid(03021be4-5254-4781-8194-5168f7d06d7b) + ] + interface IUISettings3 : IInspectable + { + HRESULT GetColorValue([in] Windows.UI.ViewManagement.UIColorType color, [out, retval] Windows.UI.Color *value); + [eventadd] HRESULT ColorValuesChanged([in] Windows.Foundation.TypedEventHandler<Windows.UI.ViewManagement.UISettings *, IInspectable *> *handler, + [out, retval] EventRegistrationToken *cookie); + [eventremove] HRESULT ColorValuesChanged([in] EventRegistrationToken cookie); + } + + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass UISettings + { + [default] interface Windows.UI.ViewManagement.IUISettings; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.UI.ViewManagement.IUISettings3; + } +}

1 0

Alex Henrie : winebus: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 4318b9dbd83a53bd2f83006bb1f7b89687df99b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/4318b9dbd83a53bd2f83006bb1f7b8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 10 09:02:29 2023 -0700 winebus: Avoid calling RtlInitUnicodeString on a static constant. --- dlls/winebus.sys/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index c02f786a11f..ae676f80565 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -645,17 +645,16 @@ static void sdl_bus_free_mappings(struct sdl_bus_options *options) static void sdl_bus_load_mappings(struct sdl_bus_options *options) { ULONG idx = 0, len, count = 0, capacity, info_size, info_max_size; + UNICODE_STRING path = RTL_CONSTANT_STRING(L"map"); KEY_VALUE_FULL_INFORMATION *info; OBJECT_ATTRIBUTES attr = {0}; char **mappings = NULL; - UNICODE_STRING path; NTSTATUS status; HANDLE key; options->mappings_count = 0; options->mappings = NULL; - RtlInitUnicodeString(&path, L"map"); InitializeObjectAttributes(&attr, &path, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, driver_key, NULL); status = NtOpenKey(&key, KEY_ALL_ACCESS, &attr); if (status) return;

1 0

Eric Pouech : dbghelp: Fix failing test on Windows 7.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 452041927f73a9496157c5e973b40269a51d383d URL: https://gitlab.winehq.org/wine/wine/-/commit/452041927f73a9496157c5e973b402… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Feb 10 09:31:19 2023 +0100 dbghelp: Fix failing test on Windows 7. Using old versions of the module information structure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54465 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 95 ++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 39 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 713c93b0a02..bcae5c1f875 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -193,35 +193,58 @@ static void test_search_path(void) static USHORT get_module_machine(const char* path) { - BOOL ret; HANDLE hFile, hMap; void* mapping; IMAGE_NT_HEADERS *nthdr; - USHORT machine; + USHORT machine = IMAGE_FILE_MACHINE_UNKNOWN; hFile = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - ok(hFile != INVALID_HANDLE_VALUE, "Couldn't open file %s (%lu)\n", path, GetLastError()); - hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); - ok(hMap != NULL, "Couldn't create map (%lu)\n", GetLastError()); - mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0); - ok(mapping != NULL, "Couldn't map (%lu)\n", GetLastError()); - nthdr = RtlImageNtHeader(mapping); - ok(nthdr != NULL, "Cannot get NT headers out of %s\n", path); - machine = nthdr ? nthdr->FileHeader.Machine : IMAGE_FILE_MACHINE_UNKNOWN; - ret = UnmapViewOfFile(mapping); - ok(ret, "Couldn't unmap (%lu)\n", GetLastError()); - CloseHandle(hMap); - CloseHandle(hFile); + if (hFile != INVALID_HANDLE_VALUE) + { + hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); + if (hMap != NULL) + { + mapping = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0); + if (mapping != NULL) + { + nthdr = RtlImageNtHeader(mapping); + if (nthdr != NULL) machine = nthdr->FileHeader.Machine; + UnmapViewOfFile(mapping); + } + CloseHandle(hMap); + } + CloseHandle(hFile); + } return machine; } +static BOOL skip_too_old_dbghelp(HANDLE proc, DWORD64 base) +{ + IMAGEHLP_MODULE im0 = {sizeof(im0)}; + BOOL ret; + + /* test if get module info succeeds with oldest structure format */ + ret = SymGetModuleInfo(proc, base, &im0); + if (ret) + { + skip("Too old dbghelp. Skipping module tests.\n"); + ret = SymCleanup(proc); + ok(ret, "SymCleanup failed: %lu\n", GetLastError()); + return TRUE; + } + ok(ret, "SymGetModuleInfo failed: %lu\n", GetLastError()); + return FALSE; +} + static void test_modules(void) { BOOL ret; - DWORD attr; + char file_system[MAX_PATH]; + char file_wow64[MAX_PATH]; const DWORD64 base1 = 0x00010000; const DWORD64 base2 = 0x08010000; IMAGEHLP_MODULEW64 im; + USHORT machine_wow, machine2; im.SizeOfStruct = sizeof(im); @@ -231,48 +254,42 @@ static void test_modules(void) ret = SymInitialize(GetCurrentProcess(), 0, FALSE); ok(ret, "SymInitialize failed: %lu\n", GetLastError()); + GetSystemWow64DirectoryA(file_wow64, MAX_PATH); + strcat(file_wow64, "\\notepad.exe"); + /* not always present */ - attr = GetFileAttributesA("C:\\windows\\syswow64\\notepad.exe"); - if (attr != INVALID_FILE_ATTRIBUTES) + machine_wow = get_module_machine(file_wow64); + if (machine_wow != IMAGE_FILE_MACHINE_UNKNOWN) { - ret = SymLoadModule(GetCurrentProcess(), NULL, "C:\\windows\\syswow64\\notepad.exe", NULL, base2, 0); + ret = SymLoadModule(GetCurrentProcess(), NULL, file_wow64, NULL, base2, 0); ok(ret, "SymLoadModule failed: %lu\n", GetLastError()); ret = SymGetModuleInfoW64(GetCurrentProcess(), base2, &im); + if (!ret && skip_too_old_dbghelp(GetCurrentProcess(), base2)) return; ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); ok(im.BaseOfImage == base2, "Wrong base address\n"); - ok(im.MachineType == get_module_machine("C:\\windows\\syswow64\\notepad.exe"), - "Wrong machine %lx\n", im.MachineType); + ok(im.MachineType == machine_wow, "Wrong machine %lx (expecting %u)\n", im.MachineType, machine_wow); } - ret = SymLoadModule(GetCurrentProcess(), NULL, "C:\\windows\\system32\\notepad.exe", NULL, base1, 0); + GetSystemDirectoryA(file_system, MAX_PATH); + strcat(file_system, "\\notepad.exe"); + + ret = SymLoadModule(GetCurrentProcess(), NULL, file_system, NULL, base1, 0); ok(ret, "SymLoadModule failed: %lu\n", GetLastError()); ret = SymGetModuleInfoW64(GetCurrentProcess(), base1, &im); - /* we want to access IMAGEHLP_MODULE.MachineType, so ensure that error stems from a too old - * dbghelp (on Windows), not supporting new enlarged IMAGEHLP_MODULE structures. - */ - if (broken(!ret && GetLastError() == ERROR_INVALID_PARAMETER)) - { - IMAGEHLP_MODULE im0 = {sizeof(im0)}; - ret = SymGetModuleInfo(GetCurrentProcess(), base1, &im0); - ok(ret, "Unexpected error: %lu\n", GetLastError()); - skip("Too old dbghelp. Skipping module tests\n"); - ret = SymCleanup(GetCurrentProcess()); - ok(ret, "SymCleanup failed: %lu\n", GetLastError()); - return; - } + if (!ret && skip_too_old_dbghelp(GetCurrentProcess(), base1)) return; ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); ok(im.BaseOfImage == base1, "Wrong base address\n"); - ok(im.MachineType == get_module_machine("C:\\windows\\system32\\notepad.exe"), - "Wrong machine %lx\n", im.MachineType); + machine2 = get_module_machine(file_system); + ok(machine2 != IMAGE_FILE_MACHINE_UNKNOWN, "Unexpected machine %u\n", machine2); + ok(im.MachineType == machine2, "Wrong machine %lx (expecting %u)\n", im.MachineType, machine2); /* still can access first module after loading second */ - if (attr != INVALID_FILE_ATTRIBUTES) + if (machine_wow != IMAGE_FILE_MACHINE_UNKNOWN) { ret = SymGetModuleInfoW64(GetCurrentProcess(), base2, &im); ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); ok(im.BaseOfImage == base2, "Wrong base address\n"); - ok(im.MachineType == get_module_machine("C:\\windows\\syswow64\\notepad.exe"), - "Wrong machine %lx\n", im.MachineType); + ok(im.MachineType == machine_wow, "Wrong machine %lx (expecting %u)\n", im.MachineType, machine_wow); } ret = SymCleanup(GetCurrentProcess());

1 0

Dmitry Timoshkov : rpcrt4: Avoid casting an object to IUnknown.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 70a847248feb7008b994588574a4aff320af93c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/70a847248feb7008b994588574a4af… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 13 20:59:19 2022 -0600 rpcrt4: Avoid casting an object to IUnknown. Cast its interface member to IUnknown instead. --- dlls/rpcrt4/cproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index b51ba41a45f..80400422e41 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -332,7 +332,7 @@ HRESULT StdProxy_Construct(REFIID riid, This = calloc(1, sizeof(StdProxyImpl)); if (!This) return E_OUTOFMEMORY; - if (!pUnkOuter) pUnkOuter = (IUnknown *)This; + if (!pUnkOuter) pUnkOuter = (IUnknown *)&This->IRpcProxyBuffer_iface; This->IRpcProxyBuffer_iface.lpVtbl = &StdProxy_Vtbl; This->PVtbl = vtbl->Vtbl; /* one reference for the proxy */

1 0

Dmitry Timoshkov : rpcrt4: Mark the buffer as invalid in NdrProxyFreeBuffer().
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 4ec4bdff7365193f71806f7fc0c31c0cbf724a57 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ec4bdff7365193f71806f7fc0c31c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 13 20:57:18 2022 -0600 rpcrt4: Mark the buffer as invalid in NdrProxyFreeBuffer(). --- dlls/rpcrt4/cproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index b2c86d54422..b51ba41a45f 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -586,7 +586,7 @@ void WINAPI NdrProxyFreeBuffer(void *This, { IRpcChannelBuffer_FreeBuffer(pStubMsg->pRpcChannelBuffer, (RPCOLEMESSAGE*)pStubMsg->RpcMsg); - pStubMsg->fBufferValid = TRUE; + pStubMsg->fBufferValid = FALSE; } IRpcChannelBuffer_Release(pStubMsg->pRpcChannelBuffer); pStubMsg->pRpcChannelBuffer = NULL;

1 0

Alex Henrie : services: Avoid calling RtlInitUnicodeString on a static constant.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: dccc6a60b67db35c3cdc6333aa0146a5ab4bae2c URL: https://gitlab.winehq.org/wine/wine/-/commit/dccc6a60b67db35c3cdc6333aa0146… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Feb 9 23:04:17 2023 -0700 services: Avoid calling RtlInitUnicodeString on a static constant. --- programs/services/services.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 6bda0a4008b..8a3ff754329 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -1074,9 +1074,9 @@ found: CreateEnvironmentBlock(&environment, token, FALSE); if (GetEnvironmentVariableW( L"WINEBOOTSTRAPMODE", val, ARRAY_SIZE(val) )) { - UNICODE_STRING name, value; + UNICODE_STRING name = RTL_CONSTANT_STRING(L"WINEBOOTSTRAPMODE"); + UNICODE_STRING value; - RtlInitUnicodeString( &name, L"WINEBOOTSTRAPMODE" ); RtlInitUnicodeString( &value, val ); RtlSetEnvironmentVariable( (WCHAR **)&environment, &name, &value ); }

1 0

Zebediah Figura : user32/tests: Test WM_DEVICECHANGE Unicode conversion.
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 8675cad31c66b6620150a897545f705c1d17a59f URL: https://gitlab.winehq.org/wine/wine/-/commit/8675cad31c66b6620150a897545f70… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:23:08 2023 -0600 user32/tests: Test WM_DEVICECHANGE Unicode conversion. --- dlls/user32/tests/msg.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 268ed9d8b8f..cca211cc22a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -22,6 +22,7 @@ #include <limits.h> #include <stdarg.h> +#include <stdbool.h> #include <stdio.h> #include "windef.h" @@ -11038,8 +11039,14 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent, static const WCHAR wszUnicode[] = {'U','n','i','c','o','d','e',0}; static const WCHAR wszAnsi[] = {'U',0}; +static const GUID iface_guid = {0x66666666}; +static bool got_device_broadcast; + static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + const DEV_BROADCAST_DEVICEINTERFACE_A *ifaceA = (const void *)lParam; + const DEV_BROADCAST_DEVICEINTERFACE_W *ifaceW = (const void *)lParam; + switch (uMsg) { case CB_FINDSTRINGEXACT: @@ -11048,6 +11055,30 @@ static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, if (!lstrcmpW((LPCWSTR)lParam, wszAnsi)) return 0; return -1; + + case WM_DEVICECHANGE: + if (wParam == DBT_DEVICEARRIVAL && IsEqualGUID(&ifaceA->dbcc_classguid, &iface_guid)) + { + DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, dbcc_name[strlen(ifaceA->dbcc_name)]); + + ok(ifaceA->dbcc_size == expect_size, "Expected %lu, got %lu.\n", expect_size, ifaceA->dbcc_size); + ok(ifaceA->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, + "Got notification type %#lx.\n", ifaceA->dbcc_devicetype); + ok(!ifaceA->dbcc_reserved, "Got reserved %#lx.\n", ifaceA->dbcc_reserved); + ok(!strcmp(ifaceA->dbcc_name, "test name"), "Got name %s.\n", debugstr_a(ifaceA->dbcc_name)); + return 2; + } + else if (wParam == DBT_CUSTOMEVENT && IsEqualGUID(&ifaceA->dbcc_classguid, &iface_guid)) + { + DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[wcslen(ifaceW->dbcc_name) + 1]); + + ok(ifaceW->dbcc_size == expect_size, "Expected %lu, got %lu.\n", expect_size, ifaceW->dbcc_size); + ok(ifaceW->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, + "Got notification type %#lx.\n", ifaceW->dbcc_devicetype); + ok(!ifaceW->dbcc_reserved, "Got reserved %#lx.\n", ifaceW->dbcc_reserved); + ok(!wcscmp(ifaceW->dbcc_name, L"test name"), "Got name %s.\n", debugstr_w(ifaceW->dbcc_name)); + got_device_broadcast = true; + } } return DefWindowProcW(hwnd, uMsg, wParam, lParam); } @@ -11079,6 +11110,8 @@ static void test_message_conversion(void) { static const WCHAR wszMsgConversionClass[] = {'M','s','g','C','o','n','v','e','r','s','i','o','n','C','l','a','s','s',0}; + char buffer[200]; + DEV_BROADCAST_DEVICEINTERFACE_A *dev_interface = (void *)buffer; WNDCLASSW cls; LRESULT lRes; HWND hwnd; @@ -11161,6 +11194,20 @@ static void test_message_conversion(void) ok(lRes == 0 && (GetLastError() == ERROR_MESSAGE_SYNC_ONLY || GetLastError() == ERROR_INVALID_PARAMETER), "SendMessageCallback on sync only message returned %Id, last error %ld\n", lRes, GetLastError()); + /* Test WM_DEVICECHANGE. */ + + dev_interface->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; + dev_interface->dbcc_reserved = 0; + dev_interface->dbcc_classguid = iface_guid; + strcpy(dev_interface->dbcc_name, "test name"); + dev_interface->dbcc_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, + dbcc_name[strlen(dev_interface->dbcc_name)]); + lRes = SendMessageA(hwnd, WM_DEVICECHANGE, DBT_DEVICEARRIVAL, (LPARAM)dev_interface); + ok(lRes == 2, "Got %Id, error %lu.\n", lRes, GetLastError()); + lRes = BroadcastSystemMessageA(0, NULL, WM_DEVICECHANGE, DBT_CUSTOMEVENT, (LPARAM)dev_interface); + todo_wine ok(!lRes, "Got %Id, error %lu.\n", lRes, GetLastError()); + todo_wine ok(got_device_broadcast, "Device broadcast was not received.\n"); + DestroyWindow(hwnd); /* Check WM_GETTEXTLENGTH A->W behaviour, whether WM_GETTEXT is also sent or not */

1 0

Zebediah Figura : user32/tests: Avoid leaking a window in test_message_conversion().
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: ea2935add7936472ba091a9f39889ab42d3ae1d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/ea2935add7936472ba091a9f39889a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:22:33 2023 -0600 user32/tests: Avoid leaking a window in test_message_conversion(). --- dlls/user32/tests/msg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e4174ebff2b..268ed9d8b8f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11161,6 +11161,8 @@ static void test_message_conversion(void) ok(lRes == 0 && (GetLastError() == ERROR_MESSAGE_SYNC_ONLY || GetLastError() == ERROR_INVALID_PARAMETER), "SendMessageCallback on sync only message returned %Id, last error %ld\n", lRes, GetLastError()); + DestroyWindow(hwnd); + /* Check WM_GETTEXTLENGTH A->W behaviour, whether WM_GETTEXT is also sent or not */ hwnd = CreateWindowW (testWindowClassW, wszUnicode,

1 0

Zebediah Figura : user32/tests: Use ok() instead of assert().
by Alexandre Julliard 10 Feb '23

10 Feb '23

Module: wine Branch: master Commit: 366b84295d27b363a698f4a8e6779c0f09606b7e URL: https://gitlab.winehq.org/wine/wine/-/commit/366b84295d27b363a698f4a8e6779c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:14:34 2023 -0600 user32/tests: Use ok() instead of assert(). --- dlls/user32/tests/msg.c | 108 ++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 49 deletions(-)

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
60
Older →

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 2023