October 2022 - Wine-Commits

Rémi Bernon : mf: Avoid clearing media session command list while it is running.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 16d975fc128bdd754b6ce912a45927cf113efd28 URL: https://gitlab.winehq.org/wine/wine/-/commit/16d975fc128bdd754b6ce912a45927… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 16 13:30:31 2022 +0200 mf: Avoid clearing media session command list while it is running. This fixes a random crash with mfmediaengine tests, which quickly starts then shuts down a media session. --- dlls/mf/session.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 8be3ffcd7f3..b410a5fe861 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -47,6 +47,7 @@ enum session_command SESSION_CMD_PAUSE, SESSION_CMD_STOP, SESSION_CMD_SET_RATE, + SESSION_CMD_SHUTDOWN, }; struct session_op @@ -460,7 +461,10 @@ static HRESULT session_submit_command(struct media_session *session, struct sess { if (list_empty(&session->commands) && !(session->presentation.flags & SESSION_FLAG_PENDING_COMMAND)) hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, &op->IUnknown_iface); - list_add_tail(&session->commands, &op->entry); + if (op->command == SESSION_CMD_SHUTDOWN) + list_add_head(&session->commands, &op->entry); + else + list_add_tail(&session->commands, &op->entry); IUnknown_AddRef(&op->IUnknown_iface); } LeaveCriticalSection(&session->cs); @@ -2041,7 +2045,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) IMFPresentationClock_Release(session->clock); session->clock = NULL; session_clear_presentation(session); - session_clear_command_list(session); + session_submit_simple_command(session, SESSION_CMD_SHUTDOWN); } LeaveCriticalSection(&session->cs); @@ -2383,6 +2387,10 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, case SESSION_CMD_SET_RATE: session_set_rate(session, op->set_rate.thin, op->set_rate.rate); break; + case SESSION_CMD_SHUTDOWN: + session_clear_command_list(session); + session_command_complete(session); + break; default: ; }

1 0

Zebediah Figura : d3d8: Add reference counting helpers for textures.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 520daf86302fef35fed1c6336c58a819984f422b URL: https://gitlab.winehq.org/wine/wine/-/commit/520daf86302fef35fed1c6336c58a8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 16:06:55 2022 -0500 d3d8: Add reference counting helpers for textures. --- dlls/d3d8/texture.c | 159 ++++++++++++++++++---------------------------------- 1 file changed, 54 insertions(+), 105 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index bb0c4e5bd24..fea5d9a4ce1 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -20,6 +20,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static ULONG d3d8_texture_incref(struct d3d8_texture *texture) +{ + ULONG ref = InterlockedIncrement(&texture->resource.refcount); + + TRACE("%p increasing refcount to %u.\n", texture, ref); + + if (ref == 1) + { + struct d3d8_surface *surface; + + IDirect3DDevice8_AddRef(texture->parent_device); + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) + { + wined3d_rendertarget_view_incref(surface->wined3d_rtv); + } + wined3d_texture_incref(texture->wined3d_texture); + wined3d_mutex_unlock(); + } + + return ref; +} + +static ULONG d3d8_texture_decref(struct d3d8_texture *texture) +{ + ULONG ref = InterlockedDecrement(&texture->resource.refcount); + + TRACE("%p decreasing refcount to %u.\n", texture, ref); + + if (!ref) + { + IDirect3DDevice8 *parent_device = texture->parent_device; + struct d3d8_surface *surface; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) + { + wined3d_rendertarget_view_decref(surface->wined3d_rtv); + } + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parent_device); + } + return ref; +} + static void d3d8_texture_preload(struct d3d8_texture *texture) { wined3d_mutex_lock(); @@ -65,51 +113,15 @@ static HRESULT WINAPI d3d8_texture_2d_QueryInterface(IDirect3DTexture8 *iface, R static ULONG WINAPI d3d8_texture_2d_AddRef(IDirect3DTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - ULONG ref = InterlockedIncrement(&texture->resource.refcount); - TRACE("%p increasing refcount to %u.\n", iface, ref); - - if (ref == 1) - { - struct d3d8_surface *surface; - - IDirect3DDevice8_AddRef(texture->parent_device); - wined3d_mutex_lock(); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) - { - wined3d_rendertarget_view_incref(surface->wined3d_rtv); - } - wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); - } - - return ref; + return d3d8_texture_incref(texture); } static ULONG WINAPI d3d8_texture_2d_Release(IDirect3DTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - ULONG ref = InterlockedDecrement(&texture->resource.refcount); - - TRACE("%p decreasing refcount to %u.\n", iface, ref); - - if (!ref) - { - IDirect3DDevice8 *parent_device = texture->parent_device; - struct d3d8_surface *surface; - - wined3d_mutex_lock(); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) - { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - } - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice8_Release(parent_device); - } - return ref; + return d3d8_texture_decref(texture); } static HRESULT WINAPI d3d8_texture_2d_GetDevice(IDirect3DTexture8 *iface, IDirect3DDevice8 **device) @@ -402,53 +414,15 @@ static HRESULT WINAPI d3d8_texture_cube_QueryInterface(IDirect3DCubeTexture8 *if static ULONG WINAPI d3d8_texture_cube_AddRef(IDirect3DCubeTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - ULONG ref = InterlockedIncrement(&texture->resource.refcount); - - TRACE("%p increasing refcount to %u.\n", iface, ref); - - if (ref == 1) - { - struct d3d8_surface *surface; - - IDirect3DDevice8_AddRef(texture->parent_device); - wined3d_mutex_lock(); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) - { - wined3d_rendertarget_view_incref(surface->wined3d_rtv); - } - wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); - } - return ref; + return d3d8_texture_incref(texture); } static ULONG WINAPI d3d8_texture_cube_Release(IDirect3DCubeTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - ULONG ref = InterlockedDecrement(&texture->resource.refcount); - TRACE("%p decreasing refcount to %u.\n", iface, ref); - - if (!ref) - { - IDirect3DDevice8 *parent_device = texture->parent_device; - struct d3d8_surface *surface; - - TRACE("Releasing child %p.\n", texture->wined3d_texture); - - wined3d_mutex_lock(); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) - { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - } - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice8_Release(parent_device); - } - return ref; + return d3d8_texture_decref(texture); } static HRESULT WINAPI d3d8_texture_cube_GetDevice(IDirect3DCubeTexture8 *iface, IDirect3DDevice8 **device) @@ -764,40 +738,15 @@ static HRESULT WINAPI d3d8_texture_3d_QueryInterface(IDirect3DVolumeTexture8 *if static ULONG WINAPI d3d8_texture_3d_AddRef(IDirect3DVolumeTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - ULONG ref = InterlockedIncrement(&texture->resource.refcount); - - TRACE("%p increasing refcount to %u.\n", iface, ref); - if (ref == 1) - { - IDirect3DDevice8_AddRef(texture->parent_device); - wined3d_mutex_lock(); - wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); - } - - return ref; + return d3d8_texture_incref(texture); } static ULONG WINAPI d3d8_texture_3d_Release(IDirect3DVolumeTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - ULONG ref = InterlockedDecrement(&texture->resource.refcount); - - TRACE("%p decreasing refcount to %u.\n", iface, ref); - - if (!ref) - { - IDirect3DDevice8 *parent_device = texture->parent_device; - wined3d_mutex_lock(); - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice8_Release(parent_device); - } - return ref; + return d3d8_texture_decref(texture); } static HRESULT WINAPI d3d8_texture_3d_GetDevice(IDirect3DVolumeTexture8 *iface, IDirect3DDevice8 **device)

1 0

Zebediah Figura : d3d8: Factor out d3d8_texture_init().
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: a72e2613aeea4c24fbb21feedd3fdc00fe6ba7e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a72e2613aeea4c24fbb21feedd3fdc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 29 18:06:00 2022 -0500 d3d8: Factor out d3d8_texture_init(). --- dlls/d3d8/d3d8_private.h | 13 +++--- dlls/d3d8/device.c | 6 +-- dlls/d3d8/texture.c | 119 ++++++++++++++++------------------------------- 3 files changed, 49 insertions(+), 89 deletions(-)

1 0

John Chadwick : wintab32: Fix match_token to match XWayland devices.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 953b93737a6cf2c2c45b01a982961b21ea4cd1ef URL: https://gitlab.winehq.org/wine/wine/-/commit/953b93737a6cf2c2c45b01a982961b… Author: John Chadwick <john(a)jchw.io> Date: Mon Oct 3 02:21:34 2022 -0400 wintab32: Fix match_token to match XWayland devices. XWayland tablet devices have the Wayland seat ID appended to the end of them, preceded by a colon. This prevents match_token from properly detecting XWayland devices and causes Wintab32 to fail to initialize. This change allows a matched token to end in a colon, and thus allows XWayland tablet devices to be detected correctly. Signed-off-by: John Chadwick <john(a)jchw.io> --- dlls/winex11.drv/wintab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index b906a589e08..6f1437f14c6 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -374,7 +374,7 @@ static BOOL match_token(const char *haystack, const char *needle) for (q = needle; *q && *p && tolower(*p) == tolower(*q); q++) p++; - if (! *q && (isspace(*p) || !*p)) + if (! *q && (isspace(*p) || *p == ':' || !*p)) return TRUE; while (*p && ! isspace(*p))

1 0

Alistair Leslie-Hughes : msdasql: Implement IRowsetInfo GetProperties.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 475824e7097479127067fd83a4ffbbca502e398e URL: https://gitlab.winehq.org/wine/wine/-/commit/475824e7097479127067fd83a4ffbb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 11 14:52:24 2021 +1100 msdasql: Implement IRowsetInfo GetProperties. The only way to actually set these properties is via the ICommandProperties interface found on ICommandText(eg rowset->caller). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 15 +++++++++++++-- dlls/msdasql/tests/provider.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 2c1f193107b..27d952276e5 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -905,8 +905,19 @@ static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets) { struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); - FIXME("%p, %lu, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); - return E_NOTIMPL; + HRESULT hr; + ICommandProperties *props; + + TRACE("%p, %lu, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); + + hr = IUnknown_QueryInterface(rowset->caller, &IID_ICommandProperties, (void**)&props); + if (FAILED(hr)) + return hr; + + hr = ICommandProperties_GetProperties(props, count, propertyidsets, out_count, propertysets); + ICommandProperties_Release(props); + + return hr; } static HRESULT WINAPI rowset_info_GetReferencedRowset(IRowsetInfo *iface, DBORDINAL ordinal, diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index ec883a80943..72e13154846 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -496,6 +496,43 @@ static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) ok(hr == E_NOINTERFACE, "got 0x%08lx\n", hr); } +static void test_rowset_info(IRowset *rowset) +{ + IRowsetInfo *info; + HRESULT hr; + ULONG propcnt; + DBPROPIDSET propidset; + DBPROPSET *propset; + int i; + DWORD row_props[] = { + DBPROP_CANSCROLLBACKWARDS, DBPROP_IRowsetUpdate, DBPROP_IRowsetResynch, + DBPROP_IConnectionPointContainer, DBPROP_BOOKMARKSKIPPED, DBPROP_REMOVEDELETED, + DBPROP_IConvertType, DBPROP_NOTIFICATIONGRANULARITY, DBPROP_IMultipleResults, DBPROP_ACCESSORDER, + DBPROP_BOOKMARKINFO, DBPROP_UNIQUEROWS + }; + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); + ok(hr == S_OK, "got 0x%08lx\n", hr); + + propidset.rgPropertyIDs = row_props; + propidset.cPropertyIDs = ARRAY_SIZE(row_props); + propidset.guidPropertySet = DBPROPSET_ROWSET; + + hr = IRowsetInfo_GetProperties(info, 1, &propidset, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(propset->cProperties == ARRAY_SIZE(row_props), "got %lu\n", propset->cProperties); + + for(i=0; i < ARRAY_SIZE(row_props); i++) + { + ok(propset->rgProperties[i].dwPropertyID == row_props[i], "expected 0x%08lx got 0x%08lx\n", + propset->rgProperties[i].dwPropertyID, row_props[i]); + } + + CoTaskMemFree(propset); + + IRowsetInfo_Release(info); +} + static void test_command_rowset(IUnknown *cmd) { ICommandText *command_text; @@ -587,6 +624,8 @@ static void test_command_rowset(IUnknown *cmd) CoTaskMemFree(stringsbuffer); IColumnsInfo_Release(colinfo); + test_rowset_info(rowset); + IRowset_Release(rowset); IUnknown_Release(unk); }

1 0

Martin Storsjö : wow64: Use the right SEH opcode in raise_exception on arm64.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 4934c1276232a9ac9cad1bdf750c5ac099944180 URL: https://gitlab.winehq.org/wine/wine/-/commit/4934c1276232a9ac9cad1bdf750c5a… Author: Martin Storsjö <martin(a)martin.st> Date: Sat Oct 1 23:49:29 2022 +0300 wow64: Use the right SEH opcode in raise_exception on arm64. On ARM and ARM64, each SEH opcode is supposed to map to exactly one instruction; the operation of writing x29+x30 with a stack offset with writeback is called ".seh_save_fplr_x". Using the right opcode would fix inconsistent unwinding if we would unwind from near the end of the prologue (which is implausible here). However, clang/LLVM might also get checking for mismatches between SEH opcodes and the prolog/epilog ranges (https://reviews.llvm.org/D131394) mainly to guard against inconsistencies in the unwind info generated by the compiler, but that would trigger on this handwritten function too. --- dlls/wow64/process.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 1d35702bf01..a810d5e5543 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -421,8 +421,7 @@ __ASM_GLOBAL_FUNC( raise_exception, #elif defined(__aarch64__) __ASM_GLOBAL_FUNC( raise_exception, "stp x29, x30, [sp, #-32]!\n\t" - __ASM_SEH(".seh_stackalloc 32\n\t") - __ASM_SEH(".seh_save_fplr 0\n\t") + __ASM_SEH(".seh_save_fplr_x 32\n\t") __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa x29, 32\n\t") __ASM_CFI(".cfi_offset x30, -24\n\t")

1 0

Francois Gouget : dpnet/tests: Mark the test_enum_hosts*() tests failing randomly on Windows as flaky.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: fd64cbc02e20d104847b384c5bad55e38659f31a URL: https://gitlab.winehq.org/wine/wine/-/commit/fd64cbc02e20d104847b384c5bad55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 11:04:23 2022 +0200 dpnet/tests: Mark the test_enum_hosts*() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53239 --- dlls/dpnet/tests/client.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 04d7b18581c..2f7d6335a97 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -320,6 +320,7 @@ static void test_enum_hosts(void) lastAsyncHandle = 0xdeadbeef; hr = IDirectPlay8Client_CancelAsyncOperation(client, async2, 0); ok(hr == S_OK, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08lx\n", hr); + flaky todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08lx\n", lastAsyncCode); todo_wine ok(lastAsyncHandle == async2, "got 0x%08lx\n", async2); @@ -750,7 +751,9 @@ static void test_enum_hosts_peer(void) lastAsyncHandle = 0xdeadbeef; hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async2, 0); todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08lx\n", hr); + flaky todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08lx\n", lastAsyncCode); + flaky todo_wine ok(lastAsyncHandle == async2, "got 0x%08lx\n", async2); IDirectPlay8Peer_Release(peer2);

1 0

Piotr Caban : comctl32/tests: Test passing PropertySheetPage as HPROPSHEETPAGE.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 89729df986b7142245b34c94b509dd40d35154f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/89729df986b7142245b34c94b509dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 23 12:07:14 2022 +0200 comctl32/tests: Test passing PropertySheetPage as HPROPSHEETPAGE. --- dlls/comctl32/tests/propsheet.c | 89 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index ca99e11df36..7e0e7087f67 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -42,6 +42,7 @@ static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageA)(const PROPSHEETPAGEA * static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageW)(const PROPSHEETPAGEW *desc); static BOOL (WINAPI *pDestroyPropertySheetPage)(HPROPSHEETPAGE proppage); static INT_PTR (WINAPI *pPropertySheetA)(const PROPSHEETHEADERA *header); +static INT_PTR (WINAPI *pPropertySheetW)(const PROPSHEETHEADERW *header); static BOOL (WINAPI *pIsThemeActive)(void); static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); @@ -1301,6 +1302,92 @@ static void test_page_dialog_texture(void) DestroyWindow(hdlg); } +static void test_invalid_hpropsheetpage(void) +{ + BYTE buf_pspW[sizeof(ULONG_PTR) + sizeof(PROPSHEETPAGEW)]; + BYTE buf_psp[sizeof(ULONG_PTR) + sizeof(PROPSHEETPAGEA)]; + HPROPSHEETPAGE hpsp[1]; + PROPSHEETHEADERW pshW; + PROPSHEETHEADERA psh; + PROPSHEETPAGEW *pspW; + PROPSHEETPAGEA *psp; + LRESULT ret; + HWND hdlg; + + /* LocalSize throws exception on misaligned pointers (x86_64). */ + psp = (PROPSHEETPAGEA *)((ULONG_PTR)buf_psp & 0xf ? buf_psp : buf_psp + sizeof(ULONG_PTR)); + pspW = (PROPSHEETPAGEW *)((ULONG_PTR)buf_pspW & 0xf ? buf_pspW : buf_pspW + sizeof(ULONG_PTR)); + + memset(psp, 0, sizeof(*psp)); + psp->dwSize = sizeof(*psp); + psp->hInstance = GetModuleHandleA(NULL); + U(psp)->pszTemplate = "prop_page1"; + U2(psp)->pszIcon = NULL; + psp->pfnDlgProc = page_dlg_proc; + psp->lParam = 0; + + /* Pass PROPSHEETPAGEA* instead of HPROPSHEETPAGE */ + hpsp[0] = (HPROPSHEETPAGE)psp; + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; + psh.pszCaption = "test caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = hpsp; + psh.pfnCallback = sheet_callback; + + hdlg = (HWND)pPropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + + ret = SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0); + ok(ret, "page was not created\n"); + todo_wine ok((HPROPSHEETPAGE)ret != hpsp[0], "invalid HPROPSHEETPAGE was preserved\n"); + DestroyWindow(hdlg); + + memset(pspW, 0, sizeof(*pspW)); + pspW->dwSize = sizeof(*pspW); + pspW->hInstance = GetModuleHandleA(NULL); + U(pspW)->pszTemplate = L"prop_page1"; + U2(pspW)->pszIcon = NULL; + pspW->pfnDlgProc = page_dlg_proc; + pspW->lParam = 0; + + /* Pass PROPSHEETPAGEW* instead of HPROPSHEETPAGE */ + hpsp[0] = (HPROPSHEETPAGE)pspW; + + hdlg = (HWND)pPropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + + ok(!SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0), "there should be no pages\n"); + /* Pass PROPSHEETPAGE[AW]* instead of HPROPSHEETPAGE */ + ok(!SendMessageW(hdlg, PSM_ADDPAGE, 0, (LPARAM)pspW), "PSM_ADDPAGE succeeded\n"); + ok(SendMessageW(hdlg, PSM_ADDPAGE, 0, (LPARAM)psp), "PSM_ADDPAGE failed\n"); + ok(SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0), "no pages after PSM_ADDPAGE\n"); + DestroyWindow(hdlg); + + /* Pass PROPSHEETPAGEW* instead of HPROPSHEETPAGE */ + hpsp[0] = (HPROPSHEETPAGE)pspW; + + memset(&pshW, 0, sizeof(pshW)); + pshW.dwSize = sizeof(pshW); + pshW.dwFlags = PSH_MODELESS | PSH_USECALLBACK; + pshW.pszCaption = L"test caption"; + pshW.nPages = 1; + pshW.hwndParent = GetDesktopWindow(); + U3(pshW).phpage = hpsp; + pshW.pfnCallback = sheet_callback; + + hdlg = (HWND)pPropertySheetW(&pshW); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + + ret = SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0); + todo_wine ok(ret, "page was not created\n"); + ok((HPROPSHEETPAGE)ret != hpsp[0], "invalid HPROPSHEETPAGE was preserved\n"); + DestroyWindow(hdlg); +} + static void init_comctl32_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1310,6 +1397,7 @@ static void init_comctl32_functions(void) X(CreatePropertySheetPageW); X(DestroyPropertySheetPage); X(PropertySheetA); + X(PropertySheetW); #undef X } @@ -1353,6 +1441,7 @@ START_TEST(propsheet) test_PSM_INSERTPAGE(); test_CreatePropertySheetPage(); test_page_dialog_texture(); + test_invalid_hpropsheetpage(); if (!load_v6_module(&ctx_cookie, &ctx)) return;

1 0

Piotr Caban : comctl32: Don't pass PROPSHEETPAGE to SetWindowSubclass in PROPSHEET_CreatePage.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: b536d57825e2e2b55fce58753989da3ec5638b13 URL: https://gitlab.winehq.org/wine/wine/-/commit/b536d57825e2e2b55fce58753989da… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 23 17:30:40 2022 +0200 comctl32: Don't pass PROPSHEETPAGE to SetWindowSubclass in PROPSHEET_CreatePage. --- dlls/comctl32/propsheet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a512ca9f361..884a0638abb 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1461,8 +1461,7 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && (ppshpage->dwFlags & PSP_HIDEHEADER)) { - SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, - (DWORD_PTR)ppshpage); + SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, 0); } if (!(psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)) EnableThemeDialogTexture (hwndPage, ETDT_ENABLETAB);

1 0

Piotr Caban : comctl32/tests: Add more PROPSHEETPAGE tests inside callback.
by Alexandre Julliard Oct. 10, 2022

Oct. 10, 2022

Module: wine Branch: master Commit: 2a2878551500079a0664977066e036156fedf5f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a2878551500079a0664977066e036… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 16:05:04 2022 +0200 comctl32/tests: Add more PROPSHEETPAGE tests inside callback. --- dlls/comctl32/tests/propsheet.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index eee525a19d3..ca99e11df36 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1049,7 +1049,10 @@ static UINT CALLBACK proppage_callback_a(HWND hwnd, UINT msg, PROPSHEETPAGEA *ps ok(psp->lParam && psp->lParam != (LPARAM)psp, "Expected newly allocated page description, got %Ix, %p\n", psp->lParam, psp); - ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); + if (psp->dwFlags & PSP_USETITLE) + todo_wine ok(psp_orig->pszTitle != psp->pszTitle, "Expected different page title pointer\n"); + else + ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); ok(!lstrcmpA(psp_orig->pszTitle, psp->pszTitle), "Expected same page title string\n"); if (psp->dwSize >= FIELD_OFFSET(struct custom_proppage, addref_called)) { @@ -1148,6 +1151,17 @@ static void test_CreatePropertySheetPage(void) } } + page.u.pageA.dwSize = sizeof(PROPSHEETPAGEA); + page.u.pageA.dwFlags |= PSP_USETITLE; + page.addref_called = 0; + hpsp = pCreatePropertySheetPageA(&page.u.pageA); + ok(hpsp != NULL, "Failed to create a page, size %lu\n", page.u.pageA.dwSize); + ok(page.addref_called == 1, "Expected ADDREF callback message\n"); + page.release_called = 0; + ret = pDestroyPropertySheetPage(hpsp); + ok(ret, "Failed to destroy a page\n"); + ok(page.release_called == 1, "Expected RELEASE callback message\n"); + memset(&page.u.pageW, 0, sizeof(page.u.pageW)); page.u.pageW.dwFlags = PSP_USECALLBACK; page.u.pageW.pfnDlgProc = page_dlg_proc_messages;

1 0