- Wine-Commits - list.winehq.org

Zebediah Figura : shell32: Stub IObjectWithSite on the New menu.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: 777a9d0f51f2a2b4939d2c19c8d76b0b7b4cb0ce URL: https://gitlab.winehq.org/wine/wine/-/commit/777a9d0f51f2a2b4939d2c19c8d76b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 25 18:09:43 2024 -0600 shell32: Stub IObjectWithSite on the New menu. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24812 --- dlls/shell32/new_menu.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlview.c | 5 ++--- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/new_menu.c b/dlls/shell32/new_menu.c index 83e07b70988..87ea93f9964 100644 --- a/dlls/shell32/new_menu.c +++ b/dlls/shell32/new_menu.c @@ -28,6 +28,7 @@ struct new_menu { IShellExtInit IShellExtInit_iface; IContextMenu3 IContextMenu3_iface; + IObjectWithSite IObjectWithSite_iface; LONG refcount; }; @@ -48,6 +49,8 @@ static HRESULT WINAPI ext_init_QueryInterface(IShellExtInit *iface, REFIID iid, || IsEqualGUID(iid, &IID_IContextMenu2) || IsEqualGUID(iid, &IID_IContextMenu3)) *out = &menu->IContextMenu3_iface; + else if (IsEqualGUID(iid, &IID_IObjectWithSite)) + *out = &menu->IObjectWithSite_iface; else { *out = NULL; @@ -178,6 +181,55 @@ static const IContextMenu3Vtbl context_menu_vtbl = context_menu_HandleMenuMsg2, }; +static struct new_menu *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return CONTAINING_RECORD(iface, struct new_menu, IObjectWithSite_iface); +} + +static HRESULT WINAPI object_with_site_QueryInterface(IObjectWithSite *iface, REFIID iid, void **out) +{ + struct new_menu *menu = impl_from_IObjectWithSite(iface); + + return IShellExtInit_QueryInterface(&menu->IShellExtInit_iface, iid, out); +} + +static ULONG WINAPI object_with_site_AddRef(IObjectWithSite *iface) +{ + struct new_menu *menu = impl_from_IObjectWithSite(iface); + + return IShellExtInit_AddRef(&menu->IShellExtInit_iface); +} + +static ULONG WINAPI object_with_site_Release(IObjectWithSite *iface) +{ + struct new_menu *menu = impl_from_IObjectWithSite(iface); + + return IShellExtInit_Release(&menu->IShellExtInit_iface); +} + +static HRESULT WINAPI object_with_site_SetSite(IObjectWithSite *iface, IUnknown *site) +{ + FIXME("iface %p, site %p, stub!\n", iface, site); + + return E_NOTIMPL; +} + +static HRESULT WINAPI object_with_site_GetSite(IObjectWithSite *iface, REFIID iid, void **out) +{ + FIXME("iface %p, iid %s, out %p, stub!\n", iface, debugstr_guid(iid), out); + + return E_NOTIMPL; +} + +static const IObjectWithSiteVtbl object_with_site_vtbl = +{ + object_with_site_QueryInterface, + object_with_site_AddRef, + object_with_site_Release, + object_with_site_SetSite, + object_with_site_GetSite, +}; + HRESULT WINAPI new_menu_create(IUnknown *outer, REFIID iid, void **out) { struct new_menu *menu; @@ -191,6 +243,7 @@ HRESULT WINAPI new_menu_create(IUnknown *outer, REFIID iid, void **out) menu->IShellExtInit_iface.lpVtbl = &ext_init_vtbl; menu->IContextMenu3_iface.lpVtbl = &context_menu_vtbl; + menu->IObjectWithSite_iface.lpVtbl = &object_with_site_vtbl; menu->refcount = 1; TRACE("Created New menu %p.\n", menu); diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index d2eeafd3323..0de7f2768c1 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1493,9 +1493,8 @@ static void test_newmenu(void) IUnknown_Release(unk2); hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&unk2); - todo_wine ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#lx.\n", hr); - if (hr == S_OK) - IUnknown_Release(unk2); + ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#lx.\n", hr); + IUnknown_Release(unk2); IUnknown_Release(unk); }

1 0

Brendan Shanks : ntdll: Add native thread renaming for FreeBSD.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: fe4f138292a81935e5653e94683e3961b7ede4fa URL: https://gitlab.winehq.org/wine/wine/-/commit/fe4f138292a81935e5653e94683e39… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Feb 26 15:19:39 2024 -0800 ntdll: Add native thread renaming for FreeBSD. --- dlls/ntdll/unix/thread.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 52cb0f26e97..578399f43f3 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -62,6 +62,9 @@ #ifdef __APPLE__ #include <mach/mach.h> #endif +#ifdef __FreeBSD__ +#include <sys/thr.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -1935,6 +1938,36 @@ static void set_native_thread_name( HANDLE handle, const UNICODE_STRING *name ) len = ntdll_wcstoumbs( name->Buffer, name->Length / sizeof(WCHAR), nameA, sizeof(nameA) - 1, FALSE ); nameA[len] = '\0'; pthread_setname_np( nameA ); +#elif defined(__FreeBSD__) + unsigned int status; + char nameA[64]; + int unix_pid, unix_tid, len; + + SERVER_START_REQ( get_thread_times ) + { + req->handle = wine_server_obj_handle( handle ); + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + { + unix_pid = reply->unix_pid; + unix_tid = reply->unix_tid; + } + } + SERVER_END_REQ; + + if (status != STATUS_SUCCESS || unix_pid == -1 || unix_tid == -1) + return; + + if (unix_pid != getpid()) + { + static int once; + if (!once++) FIXME("cross-process native thread naming not supported\n"); + return; + } + + len = ntdll_wcstoumbs( name->Buffer, name->Length / sizeof(WCHAR), nameA, sizeof(nameA), FALSE ); + nameA[len] = '\0'; + thr_set_name( unix_tid, nameA ); #else static int once; if (!once++) FIXME("not implemented on this platform\n");

1 0

Zebediah Figura : shell32: Stub CLSID_NewMenu.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: 1662fa9ab1243dc001425fc37902096a382a0b6b URL: https://gitlab.winehq.org/wine/wine/-/commit/1662fa9ab1243dc001425fc3790209… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 25 16:15:17 2024 -0600 shell32: Stub CLSID_NewMenu. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24812 --- dlls/shell32/Makefile.in | 1 + dlls/shell32/new_menu.c | 116 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32_classes.idl | 6 ++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellole.c | 1 + dlls/shell32/tests/shlview.c | 16 ++---- 6 files changed, 132 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 743df597ee4..4a906ac59db 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -23,6 +23,7 @@ SOURCES = \ enumidlist.c \ folders.c \ iconcache.c \ + new_menu.c \ pidl.c \ recyclebin.c \ resources/audio.svg \ diff --git a/dlls/shell32/new_menu.c b/dlls/shell32/new_menu.c new file mode 100644 index 00000000000..8fc29e7138b --- /dev/null +++ b/dlls/shell32/new_menu.c @@ -0,0 +1,116 @@ +/* + * Copyright 2015 Michael Müller + * + * 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 "shobjidl.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +struct new_menu +{ + IShellExtInit IShellExtInit_iface; + LONG refcount; +}; + +static struct new_menu *impl_from_IShellExtInit(IShellExtInit *iface) +{ + return CONTAINING_RECORD(iface, struct new_menu, IShellExtInit_iface); +} + +static HRESULT WINAPI ext_init_QueryInterface(IShellExtInit *iface, REFIID iid, void **out) +{ + struct new_menu *menu = impl_from_IShellExtInit(iface); + + TRACE("menu %p, iid %s, out %p.\n", menu, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IShellExtInit)) + *out = &menu->IShellExtInit_iface; + else + { + *out = NULL; + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static ULONG WINAPI ext_init_AddRef(IShellExtInit *iface) +{ + struct new_menu *menu = impl_from_IShellExtInit(iface); + ULONG refcount = InterlockedIncrement(&menu->refcount); + + TRACE("%p increasing refcount to %lu.\n", menu, refcount); + + return refcount; +} + +static ULONG WINAPI ext_init_Release(IShellExtInit *iface) +{ + struct new_menu *menu = impl_from_IShellExtInit(iface); + ULONG refcount = InterlockedDecrement(&menu->refcount); + + TRACE("%p decreasing refcount to %lu.\n", menu, refcount); + + if (!refcount) + free(menu); + + return refcount; +} + +static HRESULT WINAPI ext_init_Initialize(IShellExtInit *iface, LPCITEMIDLIST pidl, IDataObject *obj, HKEY key) +{ + struct new_menu *menu = impl_from_IShellExtInit(iface); + + TRACE("menu %p, pidl %p, obj %p, key %p.\n", menu, pidl, obj, key); + + return S_OK; +} + +static const IShellExtInitVtbl ext_init_vtbl = +{ + ext_init_QueryInterface, + ext_init_AddRef, + ext_init_Release, + ext_init_Initialize, +}; + +HRESULT WINAPI new_menu_create(IUnknown *outer, REFIID iid, void **out) +{ + struct new_menu *menu; + HRESULT hr; + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(menu = malloc(sizeof(*menu)))) + return E_OUTOFMEMORY; + + menu->IShellExtInit_iface.lpVtbl = &ext_init_vtbl; + menu->refcount = 1; + + TRACE("Created New menu %p.\n", menu); + + hr = IShellExtInit_QueryInterface(&menu->IShellExtInit_iface, iid, out); + IShellExtInit_Release(&menu->IShellExtInit_iface); + return hr; +} diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index dc65ed3728d..135ef52f7b0 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -183,3 +183,9 @@ coclass KnownFolderManager { interface IKnownFolderManager; } threading(apartment), uuid(75048700-ef1f-11d0-9888-006097deacf9) ] coclass ActiveDesktop { interface IActiveDesktop; } + +[ + threading(apartment), + uuid(d969a300-e7ff-11d0-a93b-00a0c90f2719) +] +coclass NewMenu {} diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 3f94385a60f..52c7d44f39f 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -114,6 +114,8 @@ HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, R HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv); HRESULT WINAPI ApplicationDocumentLists_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv); +HRESULT WINAPI new_menu_create(IUnknown *outer, REFIID iid, void **out); + HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv); LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST); diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 52123ac0004..aa9bd3e0f3e 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -70,6 +70,7 @@ static const struct { {&CLSID_MyComputer, ISF_MyComputer_Constructor}, {&CLSID_MyDocuments, MyDocuments_Constructor}, {&CLSID_NetworkPlaces, ISF_NetworkPlaces_Constructor}, + {&CLSID_NewMenu, new_menu_create}, {&CLSID_Printers, Printers_Constructor}, {&CLSID_QueryAssociations, QueryAssociations_Constructor}, {&CLSID_RecycleBin, RecycleBin_Constructor}, diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 89ff2e71eb0..316eb228bae 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1482,25 +1482,21 @@ static void test_newmenu(void) HRESULT hr; hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - todo_wine ok(hr == S_OK, "Failed to create NewMenu object, hr %#lx.\n", hr); - if (hr != S_OK) - { - skip("NewMenu is not supported.\n"); - return; - } hr = IUnknown_QueryInterface(unk, &IID_IShellExtInit, (void **)&unk2); ok(hr == S_OK, "Failed to get IShellExtInit, hr %#lx.\n", hr); IUnknown_Release(unk2); hr = IUnknown_QueryInterface(unk, &IID_IContextMenu3, (void **)&unk2); - ok(hr == S_OK, "Failed to get IContextMenu3, hr %#lx.\n", hr); - IUnknown_Release(unk2); + todo_wine ok(hr == S_OK, "Failed to get IContextMenu3, hr %#lx.\n", hr); + if (hr == S_OK) + IUnknown_Release(unk2); hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&unk2); - ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#lx.\n", hr); - IUnknown_Release(unk2); + todo_wine ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#lx.\n", hr); + if (hr == S_OK) + IUnknown_Release(unk2); IUnknown_Release(unk); }

1 0

Zebediah Figura : shell32: Stub IContextMenu3 on the New menu.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: 667eca5c0cbabedd3c55ffd65cbc9025ba72c943 URL: https://gitlab.winehq.org/wine/wine/-/commit/667eca5c0cbabedd3c55ffd65cbc90… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 25 18:04:50 2024 -0600 shell32: Stub IContextMenu3 on the New menu. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24812 --- dlls/shell32/new_menu.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlview.c | 5 ++- 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/new_menu.c b/dlls/shell32/new_menu.c index 8fc29e7138b..83e07b70988 100644 --- a/dlls/shell32/new_menu.c +++ b/dlls/shell32/new_menu.c @@ -27,6 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); struct new_menu { IShellExtInit IShellExtInit_iface; + IContextMenu3 IContextMenu3_iface; LONG refcount; }; @@ -43,6 +44,10 @@ static HRESULT WINAPI ext_init_QueryInterface(IShellExtInit *iface, REFIID iid, if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IShellExtInit)) *out = &menu->IShellExtInit_iface; + else if (IsEqualGUID(iid, &IID_IContextMenu) + || IsEqualGUID(iid, &IID_IContextMenu2) + || IsEqualGUID(iid, &IID_IContextMenu3)) + *out = &menu->IContextMenu3_iface; else { *out = NULL; @@ -94,6 +99,85 @@ static const IShellExtInitVtbl ext_init_vtbl = ext_init_Initialize, }; +static struct new_menu *impl_from_IContextMenu3(IContextMenu3 *iface) +{ + return CONTAINING_RECORD(iface, struct new_menu, IContextMenu3_iface); +} + +static HRESULT WINAPI context_menu_QueryInterface(IContextMenu3 *iface, REFIID iid, void **out) +{ + struct new_menu *menu = impl_from_IContextMenu3(iface); + + return IShellExtInit_QueryInterface(&menu->IShellExtInit_iface, iid, out); +} + +static ULONG WINAPI context_menu_AddRef(IContextMenu3 *iface) +{ + struct new_menu *menu = impl_from_IContextMenu3(iface); + + return IShellExtInit_AddRef(&menu->IShellExtInit_iface); +} + +static ULONG WINAPI context_menu_Release(IContextMenu3 *iface) +{ + struct new_menu *menu = impl_from_IContextMenu3(iface); + + return IShellExtInit_Release(&menu->IShellExtInit_iface); +} + +static HRESULT WINAPI context_menu_QueryContextMenu(IContextMenu3 *iface, + HMENU hmenu, UINT index, UINT min_id, UINT max_id, UINT flags) +{ + FIXME("iface %p, hmenu %p, index %u, min_id %u, max_id %u, flags %#x, stub!\n", + iface, hmenu, index, min_id, max_id, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI context_menu_InvokeCommand(IContextMenu3 *iface, CMINVOKECOMMANDINFO *info) +{ + FIXME("iface %p, info %p, stub!\n", iface, info); + + return E_NOTIMPL; +} + +static HRESULT WINAPI context_menu_GetCommandString(IContextMenu3 *iface, + UINT_PTR id, UINT type, UINT *reserved, char *string, UINT size) +{ + FIXME("iface %p, id %Iu, type %#x, reserved %p, string %p, size %u, stub!\n", + iface, id, type, reserved, string, size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI context_menu_HandleMenuMsg(IContextMenu3 *iface, UINT msg, WPARAM wparam, LPARAM lparam) +{ + FIXME("iface %p, msg %#x, wparam %#Ix, lparam %#Ix, stub!\n", iface, msg, wparam, lparam); + + return E_NOTIMPL; +} + +static HRESULT WINAPI context_menu_HandleMenuMsg2(IContextMenu3 *iface, + UINT msg, WPARAM wparam, LPARAM lparam, LRESULT *result) +{ + FIXME("iface %p, msg %#x, wparam %#Ix, lparam %#Ix, result %p, stub!\n", + iface, msg, wparam, lparam, result); + + return E_NOTIMPL; +} + +static const IContextMenu3Vtbl context_menu_vtbl = +{ + context_menu_QueryInterface, + context_menu_AddRef, + context_menu_Release, + context_menu_QueryContextMenu, + context_menu_InvokeCommand, + context_menu_GetCommandString, + context_menu_HandleMenuMsg, + context_menu_HandleMenuMsg2, +}; + HRESULT WINAPI new_menu_create(IUnknown *outer, REFIID iid, void **out) { struct new_menu *menu; @@ -106,6 +190,7 @@ HRESULT WINAPI new_menu_create(IUnknown *outer, REFIID iid, void **out) return E_OUTOFMEMORY; menu->IShellExtInit_iface.lpVtbl = &ext_init_vtbl; + menu->IContextMenu3_iface.lpVtbl = &context_menu_vtbl; menu->refcount = 1; TRACE("Created New menu %p.\n", menu); diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 316eb228bae..d2eeafd3323 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1489,9 +1489,8 @@ static void test_newmenu(void) IUnknown_Release(unk2); hr = IUnknown_QueryInterface(unk, &IID_IContextMenu3, (void **)&unk2); - todo_wine ok(hr == S_OK, "Failed to get IContextMenu3, hr %#lx.\n", hr); - if (hr == S_OK) - IUnknown_Release(unk2); + ok(hr == S_OK, "Failed to get IContextMenu3, hr %#lx.\n", hr); + IUnknown_Release(unk2); hr = IUnknown_QueryInterface(unk, &IID_IObjectWithSite, (void **)&unk2); todo_wine ok(hr == S_OK, "Failed to get IObjectWithSite, hr %#lx.\n", hr);

1 0

Fabian Maurer : win32u: Move get_awareness_from_dpi_awareness_context.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: d96754213c4a722ffc5cf483e12c984fb20e7c21 URL: https://gitlab.winehq.org/wine/wine/-/commit/d96754213c4a722ffc5cf483e12c98… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 24 17:50:59 2024 +0100 win32u: Move get_awareness_from_dpi_awareness_context. --- dlls/win32u/sysparams.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 5dcf42ff7f5..5e48a09522c 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2187,6 +2187,27 @@ UINT get_win_monitor_dpi( HWND hwnd ) return system_dpi; } +/* see GetAwarenessFromDpiAwarenessContext */ +static DPI_AWARENESS get_awareness_from_dpi_awareness_context( DPI_AWARENESS_CONTEXT context ) +{ + switch ((ULONG_PTR)context) + { + case 0x10: + case 0x11: + case 0x12: + case 0x80000010: + case 0x80000011: + case 0x80000012: + return (ULONG_PTR)context & 3; + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: + case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: + return ~(ULONG_PTR)context; + default: + return DPI_AWARENESS_INVALID; + } +} + /********************************************************************** * get_thread_dpi_awareness */ @@ -2240,27 +2261,6 @@ UINT get_system_dpi(void) return system_dpi; } -/* see GetAwarenessFromDpiAwarenessContext */ -static DPI_AWARENESS get_awareness_from_dpi_awareness_context( DPI_AWARENESS_CONTEXT context ) -{ - switch ((ULONG_PTR)context) - { - case 0x10: - case 0x11: - case 0x12: - case 0x80000010: - case 0x80000011: - case 0x80000012: - return (ULONG_PTR)context & 3; - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: - return ~(ULONG_PTR)context; - default: - return DPI_AWARENESS_INVALID; - } -} - /********************************************************************** * SetThreadDpiAwarenessContext (win32u.so) */

1 0

Fabian Maurer : win32u: Refactor get_thread_dpi_awareness to use get_awareness_from_dpi_awareness_context.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: cbcf609108b1e6de53e83c7f066ff4a04c6c48b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbcf609108b1e6de53e83c7f066ff4… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Feb 24 17:53:29 2024 +0100 win32u: Refactor get_thread_dpi_awareness to use get_awareness_from_dpi_awareness_context. --- dlls/win32u/sysparams.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 5e48a09522c..7dc807bb909 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2216,24 +2216,10 @@ DPI_AWARENESS get_thread_dpi_awareness(void) struct ntuser_thread_info *info = NtUserGetThreadInfo(); ULONG_PTR context = info->dpi_awareness; - switch (context) - { - case 0: /* process default */ + if (context == 0) /* process default */ return NtUserGetProcessDpiAwarenessContext( NULL ) & 3; - case 0x10: - case 0x11: - case 0x12: - case 0x80000010: - case 0x80000011: - case 0x80000012: - return context & 3; - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_UNAWARE: - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_SYSTEM_AWARE: - case (ULONG_PTR)DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE: - return ~context; - default: - return DPI_AWARENESS_INVALID; - } + + return get_awareness_from_dpi_awareness_context((DPI_AWARENESS_CONTEXT)context); } DWORD get_process_layout(void)

1 0

Jacek Caban : configure: Disable -Wmisleading-indentation warnings on GCC.
by Alexandre Julliard Feb. 27, 2024

Feb. 27, 2024

Module: wine Branch: master Commit: 2a5acd3dda4cd5130a65be1718fd01a76e5f7fb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a5acd3dda4cd5130a65be1718fd01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 26 22:12:41 2024 +0100 configure: Disable -Wmisleading-indentation warnings on GCC. --- configure | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 ++++++ 2 files changed, 70 insertions(+) diff --git a/configure b/configure index 5e1b3765413..83a641ff542 100755 --- a/configure +++ b/configure @@ -11526,6 +11526,41 @@ then : as_fn_append ${wine_arch}_EXTRACFLAGS " -Wenum-conversion" fi } + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-flarge-source-files -Wmisleading-indentation" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -flarge-source-files -Wmisleading-indentation" >&5 +printf %s "checking whether $CC supports -flarge-source-files -Wmisleading-indentation... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -flarge-source-files -Wmisleading-indentation" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void *__os_arm64x_dispatch_ret = 0; +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + as_fn_append ${wine_arch}_EXTRACFLAGS " -Wno-misleading-indentation" +fi } + case $wine_arch in i386) { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-fno-omit-frame-pointer" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fno-omit-frame-pointer" >&5 @@ -19473,6 +19508,35 @@ then : EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -flarge-source-files -Wmisleading-indentation" >&5 +printf %s "checking whether the compiler supports -flarge-source-files -Wmisleading-indentation... " >&6; } +if test ${ac_cv_cflags__flarge_source_files__Wmisleading_indentation+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -flarge-source-files -Wmisleading-indentation" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__flarge_source_files__Wmisleading_indentation=yes +else $as_nop + ac_cv_cflags__flarge_source_files__Wmisleading_indentation=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__flarge_source_files__Wmisleading_indentation" >&5 +printf "%s\n" "$ac_cv_cflags__flarge_source_files__Wmisleading_indentation" >&6; } +if test "x$ac_cv_cflags__flarge_source_files__Wmisleading_indentation" = xyes +then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-misleading-indentation" +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wpointer-arith" >&5 printf %s "checking whether the compiler supports -Wpointer-arith... " >&6; } if test ${ac_cv_cflags__Wpointer_arith+y} diff --git a/configure.ac b/configure.ac index 1c59651ba1e..64083de89c4 100644 --- a/configure.ac +++ b/configure.ac @@ -968,6 +968,9 @@ This is an error since --enable-archs=$wine_arch was requested.])]) WINE_TRY_PE_CFLAGS([-Wabsolute-value]) WINE_TRY_PE_CFLAGS([-Wenum-conversion]) + dnl GCC can't handle large files when -Wmisleading-indentation is enabled (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89549) + WINE_TRY_PE_CFLAGS([-flarge-source-files -Wmisleading-indentation],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-misleading-indentation"])]) + case $wine_arch in i386) WINE_TRY_PE_CFLAGS([-fno-omit-frame-pointer]) WINE_TRY_PE_CFLAGS([-mpreferred-stack-boundary=2]) @@ -1863,6 +1866,9 @@ then WINE_TRY_CFLAGS([-Wvla]) WINE_TRY_CFLAGS([-Wwrite-strings]) + dnl GCC can't handle large files when -Wmisleading-indentation is enabled (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89549) + WINE_TRY_CFLAGS([-flarge-source-files -Wmisleading-indentation],[EXTRACFLAGS="$EXTRACFLAGS -Wno-misleading-indentation"]) + dnl Check for noisy string.h WINE_TRY_CFLAGS([-Wpointer-arith], [saved_string_h_CFLAGS=$CFLAGS

1 0

Henri Verbeet : vkd3d: Store a D3D12_RESOURCE_DESC structure in struct vkd3d_image_resource_create_info.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: vkd3d Branch: master Commit: 0914561f8504211ccd2f24c1fa6f7cb80c19ed22 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0914561f8504211ccd2f24c1fa6f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 18:19:36 2024 +0100 vkd3d: Store a D3D12_RESOURCE_DESC structure in struct vkd3d_image_resource_create_info. Like we did before commit 6d4782ed7f7e06cff31313c3170ea5e6bc281254. That commit somehow managed to change the "desc" field from D3D12_RESOURCE_DESC to D3D12_RESOURCE_DESC1, but that breaks the ABI. --- include/vkd3d.h | 2 +- libs/vkd3d/device.c | 8 -------- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 8 ++++++++ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 79c04230..a3bb8e0d 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -182,7 +182,7 @@ struct vkd3d_image_resource_create_info const void *next; VkImage vk_image; - D3D12_RESOURCE_DESC1 desc; + D3D12_RESOURCE_DESC desc; unsigned int flags; D3D12_RESOURCE_STATES present_state; }; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0f45b68f..17c7ccb3 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3733,14 +3733,6 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device7 * 1, &src_descriptor_range_offset, &descriptor_count, descriptor_heap_type); } -static void d3d12_resource_desc1_from_desc(D3D12_RESOURCE_DESC1 *desc1, const D3D12_RESOURCE_DESC *desc) -{ - memcpy(desc1, desc, sizeof(*desc)); - desc1->SamplerFeedbackMipRegion.Width = 0; - desc1->SamplerFeedbackMipRegion.Height = 0; - desc1->SamplerFeedbackMipRegion.Depth = 0; -} - static void d3d12_resource_allocation_info1_from_vkd3d(D3D12_RESOURCE_ALLOCATION_INFO1 *result, const struct vkd3d_resource_allocation_info *info) { diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index fc05fce1..89764d09 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2277,8 +2277,8 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->ID3D12Resource2_iface.lpVtbl = &d3d12_resource_vtbl; object->refcount = 1; object->internal_refcount = 1; - object->desc = create_info->desc; - object->format = vkd3d_format_from_d3d12_resource_desc(d3d12_device, &create_info->desc, 0); + d3d12_resource_desc1_from_desc(&object->desc, &create_info->desc); + object->format = vkd3d_format_from_d3d12_resource_desc(d3d12_device, &object->desc, 0); object->u.vk_image = create_info->vk_image; object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6101c3fe..20317ace 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -769,6 +769,14 @@ HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, const D3D12_CLEAR_VALUE *optimized_clear_value, struct d3d12_resource **resource); struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface); +static inline void d3d12_resource_desc1_from_desc(D3D12_RESOURCE_DESC1 *desc1, const D3D12_RESOURCE_DESC *desc) +{ + memcpy(desc1, desc, sizeof(*desc)); + desc1->SamplerFeedbackMipRegion.Width = 0; + desc1->SamplerFeedbackMipRegion.Height = 0; + desc1->SamplerFeedbackMipRegion.Depth = 0; +} + HRESULT vkd3d_allocate_buffer_memory(struct d3d12_device *device, VkBuffer vk_buffer, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, VkDeviceMemory *vk_memory, uint32_t *vk_memory_type, VkDeviceSize *vk_memory_size);

1 0

Victor Chiletto : vkd3d-shader/hlsl: Fix hlsl_ir_resource_store::resource cleanup.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: vkd3d Branch: master Commit: 7e27ae73af61997ad98da2e8afd74e112e7ef998 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e27ae73af61997ad98da2e8afd74… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Thu Feb 22 17:05:15 2024 -0300 vkd3d-shader/hlsl: Fix hlsl_ir_resource_store::resource cleanup. --- libs/vkd3d-shader/hlsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0e75edd4..538f083d 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3017,7 +3017,7 @@ static void free_ir_resource_load(struct hlsl_ir_resource_load *load) static void free_ir_resource_store(struct hlsl_ir_resource_store *store) { - hlsl_src_remove(&store->resource.rel_offset); + hlsl_cleanup_deref(&store->resource); hlsl_src_remove(&store->coords); hlsl_src_remove(&store->value); vkd3d_free(store);

1 0

Giovanni Mascellani : tests: Test how constant folding works on SM1.
by Alexandre Julliard Feb. 26, 2024

Feb. 26, 2024

Module: vkd3d Branch: master Commit: 500b61c3837455ea0dd2195bd793b428cc45a285 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/500b61c3837455ea0dd2195bd793b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Feb 23 10:53:49 2024 +0100 tests: Test how constant folding works on SM1. --- Makefile.am | 1 + tests/hlsl/sm1-const-folding.shader_test | 146 +++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+) diff --git a/Makefile.am b/Makefile.am index cfb225f9..9e761ef3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -170,6 +170,7 @@ vkd3d_shader_tests = \ tests/hlsl/side-effects.shader_test \ tests/hlsl/sign.shader_test \ tests/hlsl/single-numeric-initializer.shader_test \ + tests/hlsl/sm1-const-folding.shader_test \ tests/hlsl/sm6-ternary.shader_test \ tests/hlsl/sm6-uav-rwtexture.shader_test \ tests/hlsl/smoothstep.shader_test \ diff --git a/tests/hlsl/sm1-const-folding.shader_test b/tests/hlsl/sm1-const-folding.shader_test new file mode 100644 index 00000000..1766de38 --- /dev/null +++ b/tests/hlsl/sm1-const-folding.shader_test @@ -0,0 +1,146 @@ +% Test the interaction between integer constant folding and the fact +% that integers are secretly considered floats in SM1-3 + +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 3000000000u; + return float4(x, 0.0, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (3.0e+009, 0.0, 0.0, 0.0) + +% The uint value is never casted to int on SM1-3, just casted to float and treated as such +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 3000000000u; + return float4(x, 0.0, 0.0, 0.0); +} + +[test] +draw quad +if(sm<4) todo probe all rgba (3.0e+009, 0.0, 0.0, 0.0) +if(sm>=4) probe all rgba (-1.29496730e+009, 0.0, 0.0, 0.0) + +% On SM1-5 (FXC) the literal is considered signed independently of its value and casted to uint; +% on SM1-3 compilation fails because the uint would be negative +[pixel shader fail(sm<4) todo(sm<4)] +float4 main() : SV_TARGET +{ + uint x = 3000000000; + return float4(x, 0.0, 0.0, 0.0); +} + +[test] +draw quad +if(sm>=4) probe all rgba (3.0e+009, 0.0, 0.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 3000000000; + return float4(x, 0.0, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (-1.29496730e+009, 0.0, 0.0, 0.0) + +[pixel shader] +float4 main() : SV_TARGET +{ + return float4(3000000000u, 0.0, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (3.0e+009, 0.0, 0.0, 0.0) + +% Unsuffixed literals can instead be considered unsigned on SM6 +[pixel shader] +float4 main() : SV_TARGET +{ + return float4(3000000000, 0.0, 0.0, 0.0); +} + +[test] +draw quad +if(sm<6) probe all rgba (-1.29496730e+009, 0.0, 0.0, 0.0) +if(sm>=6) probe all rgba (3.0e+009, 0.0, 0.0, 0.0) + +% Constant folding is done with uint semantics before converting to float; +% so constant folding seems to happen before converting integer operations to floats +[pixel shader] +float4 main() : SV_TARGET +{ + uint x = 3000000000u + 3000000000u; + return float4(x, 0.0, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (1.70503270e+009, 0.0, 0.0, 0.0) + +% SM1-3 complains that uint values must be positive, but it's not clear why this is a problem here: +% the sum should be done before casting to uint, and the result of the int sum should be positive, +% so it seems that the declared type of x means something on how constant folding is done. +% I'm not sure what's happening for SM4 anyway +[pixel shader fail(sm<4) todo(sm<4)] +float4 main() : SV_TARGET +{ + uint x = 3000000000 + 3000000000; + return float4(x, 0.0, 0.0, 0.0); +} + +[test] +draw quad +todo probe all rgba (2.14748365e+009, 0.0, 0.0, 0.0) + +% Again, no idea of what's happening here +[pixel shader] +float4 main() : SV_TARGET +{ + int x = 3000000000 + 3000000000; + return float4(x, 0.0, 0.0, 0.0); +} + +[test] +draw quad +todo probe all rgba (-2.14748365e+009, 0.0, 0.0, 0.0) + +% This makes sense +[pixel shader] +float4 main() : SV_TARGET +{ + return float4(3000000000u + 3000000000u, 0.0, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (1.70503270e+009, 0.0, 0.0, 0.0) + +% This does not again +[pixel shader] +float4 main() : SV_TARGET +{ + return float4(3000000000 + 3000000000, 0.0, 0.0, 0.0); +} + +[test] +draw quad +todo probe all rgba (-2.14748365e+009, 0.0, 0.0, 0.0) + +% Explicit float literals use float semantics, at least +[pixel shader] +float4 main() : SV_TARGET +{ + float x = 3000000000.0 + 3000000000.0; + return float4(x, 0.0, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (6.0e+009, 0.0, 0.0, 0.0)

1 0