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

Rémi Bernon : win32u: Get rid of the UpdateDisplayDevices force parameter.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 04470e1edad54ce77f47107b731ae00f1a1e0789 URL: https://gitlab.winehq.org/wine/wine/-/commit/04470e1edad54ce77f47107b731ae0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 16 12:56:05 2024 +0200 win32u: Get rid of the UpdateDisplayDevices force parameter. --- dlls/win32u/driver.c | 6 ++--- dlls/win32u/sysparams.c | 24 +++++++++----------- dlls/wineandroid.drv/init.c | 47 +++++++++++++++++---------------------- dlls/winemac.drv/display.c | 4 +--- dlls/winemac.drv/macdrv.h | 3 +-- dlls/winewayland.drv/display.c | 7 ++---- dlls/winewayland.drv/waylanddrv.h | 3 +-- dlls/winex11.drv/display.c | 4 +--- dlls/winex11.drv/x11drv.h | 3 +-- include/wine/gdi_driver.h | 2 +- 10 files changed, 43 insertions(+), 60 deletions(-)

1 0

Piotr Caban : ntdll: Fix UNC path handling in alloc_module.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 9ff41324ae33164a4bee90772a2ba5dfd5545c4a URL: https://gitlab.winehq.org/wine/wine/-/commit/9ff41324ae33164a4bee90772a2ba5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 24 13:11:56 2024 +0200 ntdll: Fix UNC path handling in alloc_module. --- dlls/ntdll/loader.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 31bfe60d121..5c59d102dd9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1518,8 +1518,17 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name InitializeListHead(&wm->ldr.DdagNode->Modules); InsertTailList(&wm->ldr.DdagNode->Modules, &wm->ldr.NodeModuleLink); - memcpy( buffer, nt_name->Buffer + 4 /* \??\ prefix */, nt_name->Length - 4 * sizeof(WCHAR) ); - buffer[nt_name->Length/sizeof(WCHAR) - 4] = 0; + if (nt_name->Length >= 8 * sizeof(WCHAR) && !wcsncmp(nt_name->Buffer + 4, L"UNC\\", 4)) + { + buffer[0] = '\\'; + memcpy( buffer + 1, nt_name->Buffer + 7 /* \??\UNC prefix */, nt_name->Length - 7 * sizeof(WCHAR) ); + buffer[nt_name->Length/sizeof(WCHAR) - 6] = 0; + } + else + { + memcpy( buffer, nt_name->Buffer + 4 /* \??\ prefix */, nt_name->Length - 4 * sizeof(WCHAR) ); + buffer[nt_name->Length/sizeof(WCHAR) - 4] = 0; + } if ((p = wcsrchr( buffer, '\\' ))) p++; else p = buffer; RtlInitUnicodeString( &wm->ldr.FullDllName, buffer );

1 0

Aida Jonikienė : dxdiagn: Add bIsD3DDebugRuntime property.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 952a2c5b7bfb3cee1b08aa76fc734278ed9942f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/952a2c5b7bfb3cee1b08aa76fc7342… Author: Aida Jonikienė <aidas957(a)gmail.com> Date: Sat May 25 22:37:36 2024 +0300 dxdiagn: Add bIsD3DDebugRuntime property. Ground Control II complains about D3D debug runtime being present if this property doesn't exist. --- dlls/dxdiagn/provider.c | 4 ++++ dlls/dxdiagn/tests/container.c | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 0a6111fff25..e64adbbd25f 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -636,6 +636,10 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; + hr = add_bool_property(node, L"bIsD3DDebugRuntime", FALSE); + if (FAILED(hr)) + return hr; + hr = add_bool_property(node, L"bNECPC98", FALSE); if (FAILED(hr)) return hr; diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 31047337148..353a830082f 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -792,6 +792,7 @@ static void test_DxDiag_SystemInfo(void) {L"dwDirectXVersionMinor", VT_UI4}, {L"szDirectXVersionLetter", VT_BSTR}, {L"bDebug", VT_BOOL}, + {L"bIsD3DDebugRuntime", VT_BOOL}, {L"bNECPC98", VT_BOOL}, {L"ullPhysicalMemory", VT_BSTR}, {L"ullUsedPageFile", VT_BSTR},

1 0

Rémi Bernon : user32: Test and fix IsValidDpiAwarenessContext.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 1172c4a94e5d72790659cc68b66e4ed00c6a04e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1172c4a94e5d72790659cc68b66e4e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 20 13:20:57 2024 +0200 user32: Test and fix IsValidDpiAwarenessContext. --- dlls/user32/sysparams.c | 32 +++++++++++++- dlls/user32/tests/sysparams.c | 100 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 123 insertions(+), 9 deletions(-)

1 0

Fabian Maurer : userenv: Add CreateAppContainerProfile stub.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 4537dbdcd503406fb0238e08f2c8e8fc8ee0097c URL: https://gitlab.winehq.org/wine/wine/-/commit/4537dbdcd503406fb0238e08f2c8e8… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun May 26 06:41:10 2024 +0200 userenv: Add CreateAppContainerProfile stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56724 --- dlls/userenv/userenv.spec | 1 + dlls/userenv/userenv_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 4d8bc4ec407..6395bba1949 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -1,5 +1,6 @@ 138 stdcall @(long str str str str long str long long str str long) USERENV_138 +@ stdcall CreateAppContainerProfile(wstr wstr wstr ptr long ptr) @ stdcall CreateEnvironmentBlock(ptr ptr long) @ stdcall DestroyEnvironmentBlock(ptr) @ stdcall EnterCriticalPolicySection(long) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index cadb45c1a74..dd04c40446e 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -688,3 +688,13 @@ BOOL WINAPI USERENV_138( int csidl, LPCSTR lnk_dir, LPCSTR lnk_filename, return FALSE; } + +HRESULT WINAPI CreateAppContainerProfile(PCWSTR container_name, PCWSTR display_name, PCWSTR description, + SID_AND_ATTRIBUTES *capabilities, DWORD capability_count, + SID **container_sid) +{ + FIXME("(%s, %s, %s, %p, %ld, %p): stub\n", debugstr_w(container_name), debugstr_w(display_name), + debugstr_w(description), capabilities, capability_count, container_sid); + + return E_NOTIMPL; +}

1 0

Rémi Bernon : win32u: Get rid of the drivers force_display_devices_refresh flag.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: f7f213bdf84a161008b5729f3034782b4f6f9bdf URL: https://gitlab.winehq.org/wine/wine/-/commit/f7f213bdf84a161008b5729f303478… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 11:37:46 2024 +0200 win32u: Get rid of the drivers force_display_devices_refresh flag. --- dlls/win32u/sysparams.c | 3 +++ dlls/wineandroid.drv/init.c | 13 +++---------- dlls/winemac.drv/display.c | 10 +++------- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 +- dlls/winewayland.drv/display.c | 13 ++++--------- dlls/winewayland.drv/wayland.c | 2 +- dlls/winewayland.drv/waylanddrv.h | 2 +- dlls/winewayland.drv/window.c | 2 +- dlls/winex11.drv/display.c | 8 ++------ dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- dlls/winex11.drv/xrandr.c | 2 +- include/ntuser.h | 1 + 14 files changed, 24 insertions(+), 40 deletions(-)

1 0

Alistair Leslie-Hughes : odbc32: Correct SQLSetConnectOptionW length parameter type.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 55842cee31c6ccc6b86c6d4b753c0a7be4bd5159 URL: https://gitlab.winehq.org/wine/wine/-/commit/55842cee31c6ccc6b86c6d4b753c0a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 27 17:27:00 2024 +1000 odbc32: Correct SQLSetConnectOptionW length parameter type. --- dlls/odbc32/proxyodbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index d5c271bdfa2..a3732c001be 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -2488,7 +2488,7 @@ SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType) /************************************************************************* * SQLSetConnectOptionW [ODBC32.150] */ -SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLLEN Value) +SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value) { struct SQLSetConnectOptionW_params params = { 0, Option, Value }; struct handle *handle = ConnectionHandle;

1 0

Alistair Leslie-Hughes : include: Correct ListView_GetItemIndexRect macro.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: ccc803a06c98a0ead3cd877ac7b452e168c29751 URL: https://gitlab.winehq.org/wine/wine/-/commit/ccc803a06c98a0ead3cd877ac7b452… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 27 17:26:29 2024 +1000 include: Correct ListView_GetItemIndexRect macro. --- include/commctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index a54de13d8b2..7c5b09f6e72 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4211,7 +4211,7 @@ typedef struct tagLVITEMINDEX SNDMSG((hwnd), LVM_GETGROUPCOUNT, (WPARAM)0, (LPARAM)0) #define ListView_GetItemIndexRect(hwnd, index, subitem, code, prc) \ (BOOL)SNDMSG((hwnd), LVM_GETITEMINDEXRECT, (WPARAM)(LVITEMINDEX*)(index), \ - (prc ? ((((LPRECT)prc)->top = subitem), (((LPRECT)prc)->left = code), (LPARAM)prc) : (LPARAM)NULL) + (prc ? ((((LPRECT)prc)->top = subitem), (((LPRECT)prc)->left = code), (LPARAM)prc) : (LPARAM)NULL)) #define ListView_SetItemIndexState(hwndLV, index, data, mask) \ { LV_ITEM macro; macro.stateMask = (mask); macro.state = data; \ SNDMSG((hwndLV), LVM_SETITEMINDEXSTATE, (WPARAM)(LVITEMINDEX*)(index), (LPARAM)(LV_ITEM *)&macro); }

1 0

Rémi Bernon : win32u: Update the display device cache after loading the driver.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 4e1a049c9399e8a35b5fda7d317804fa2fcd4b7c URL: https://gitlab.winehq.org/wine/wine/-/commit/4e1a049c9399e8a35b5fda7d317804… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 11:43:32 2024 +0200 win32u: Update the display device cache after loading the driver. --- dlls/win32u/driver.c | 1 + dlls/winemac.drv/display.c | 13 ------------- dlls/winemac.drv/macdrv.h | 1 - dlls/winemac.drv/macdrv_main.c | 1 - dlls/winewayland.drv/display.c | 10 ---------- dlls/winewayland.drv/wayland.c | 2 -- dlls/winewayland.drv/waylanddrv.h | 1 - dlls/winex11.drv/display.c | 8 -------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_main.c | 1 - 10 files changed, 1 insertion(+), 38 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 7c694d20a3c..3d4f01643c8 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1012,6 +1012,7 @@ static const struct user_driver_funcs *load_driver(void) __wine_set_user_driver( &null_user_driver, WINE_GDI_DRIVER_VERSION ); } + update_display_cache( FALSE ); return user_driver; } diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index c933a770a79..4caae9c8444 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1206,16 +1206,3 @@ UINT macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage macdrv_free_displays(displays); return STATUS_SUCCESS; } - -/*********************************************************************** - * macdrv_init_display_devices - * - * Initialize display device registry data. - */ -void macdrv_init_display_devices(void) -{ - UINT32 num_path, num_mode; - - /* trigger refresh in win32u */ - NtUserGetDisplayConfigBufferSizes( QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode ); -} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 3899fbb1d30..774d3505b5f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -271,7 +271,6 @@ extern void macdrv_status_item_mouse_button(const macdrv_event *event); extern void macdrv_status_item_mouse_move(const macdrv_event *event); extern void check_retina_status(void); -extern void macdrv_init_display_devices(void); extern void macdrv_resize_desktop(void); extern void init_user_driver(void); diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index d42a85f257a..84e5818b8ce 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -451,7 +451,6 @@ static NTSTATUS macdrv_init(void *arg) } init_user_driver(); - macdrv_init_display_devices(); return STATUS_SUCCESS; } diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index aed1f65904a..51fae6aac8b 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -36,16 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); -void wayland_init_display_devices(void) -{ - UINT32 num_path, num_mode; - - TRACE("\n"); - - /* Trigger refresh in win32u */ - NtUserGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode); -} - struct output_info { int x, y; diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index 2e82a1deee2..c94b35e173c 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -280,8 +280,6 @@ BOOL wayland_process_init(void) return FALSE; } - wayland_init_display_devices(); - process_wayland.initialized = TRUE; return TRUE; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index bdc205a92d9..bc4d456ef50 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -223,7 +223,6 @@ struct wayland_shm_buffer */ BOOL wayland_process_init(void); -void wayland_init_display_devices(void); /********************************************************************** * Wayland output diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7238ba87ce2..f2780ccbf83 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -559,11 +559,3 @@ UINT X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage host_handler.free_gpus( gpus, gpu_count ); return STATUS_SUCCESS; } - -void X11DRV_DisplayDevices_Init(void) -{ - UINT32 num_path, num_mode; - - /* trigger refresh in win32u */ - NtUserGetDisplayConfigBufferSizes( QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode ); -} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1aa71449af6..9f522778436 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -819,7 +819,6 @@ struct x11drv_display_device_handler }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler); -extern void X11DRV_DisplayDevices_Init(void); extern void X11DRV_DisplayDevices_RegisterEventHandlers(void); extern BOOL X11DRV_DisplayDevices_SupportEventHandlers(void); /* Display device handler used in virtual desktop mode */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 420c254b7ca..9c00b16386e 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -682,7 +682,6 @@ static NTSTATUS x11drv_init( void *arg ) if (use_xim) use_xim = xim_init( input_style ); init_user_driver(); - X11DRV_DisplayDevices_Init(); X11DRV_DisplayDevices_RegisterEventHandlers(); return STATUS_SUCCESS; }

1 0

Alistair Leslie-Hughes : include: Add IFACEMETHOD macros.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: ae6aa1c8a4787c26110eeb863d2eac52ded57553 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae6aa1c8a4787c26110eeb863d2eac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 27 17:26:29 2024 +1000 include: Add IFACEMETHOD macros. --- include/objbase.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/objbase.h b/include/objbase.h index bae8de54bab..024d96ca7da 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -210,6 +210,11 @@ #define DECLARE_INTERFACE_(iface,ibase) interface DECLSPEC_NOVTABLE iface : public ibase #define DECLARE_INTERFACE_IID_(iface, ibase, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface : public ibase +#define IFACEMETHOD(method) STDMETHOD(method) +#define IFACEMETHOD_(type,method) STDMETHOD_(type,method) +#define IFACEMETHODV(method) STDMETHODV(method) +#define IFACEMETHODV_(type,method) STDMETHODV_(type,method) + #define BEGIN_INTERFACE #define END_INTERFACE @@ -253,6 +258,11 @@ #define BEGIN_INTERFACE #define END_INTERFACE +#define IFACEMETHOD(method) STDMETHOD(method) +#define IFACEMETHOD_(type,method) STDMETHOD_(type,method) +#define IFACEMETHODV(method) STDMETHODV(method) +#define IFACEMETHODV_(type,method) STDMETHODV_(type,method) + #endif /* __cplusplus && !CINTERFACE */ #ifndef __IRpcStubBuffer_FWD_DEFINED__

1 0