February 2023 - Wine-Commits

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

Feb. 10, 2023

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

Mohamad Al-Jaf : windows.ui: Add IUISettings3 stub interface.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 8664fbe8cacbb330c3cd2b7914a5d3a99cd7bb72 URL: https://gitlab.winehq.org/wine/wine/-/commit/8664fbe8cacbb330c3cd2b7914a5d3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Fri Jan 27 03:27:27 2023 -0500 windows.ui: Add IUISettings3 stub interface. --- dlls/windows.ui/tests/uisettings.c | 22 ++++++- dlls/windows.ui/uisettings.c | 119 ++++++++++++++++++++++++++++++++++++- 2 files changed, 138 insertions(+), 3 deletions(-) diff --git a/dlls/windows.ui/tests/uisettings.c b/dlls/windows.ui/tests/uisettings.c index d9e10aee177..a54b581dfd0 100644 --- a/dlls/windows.ui/tests/uisettings.c +++ b/dlls/windows.ui/tests/uisettings.c @@ -53,6 +53,8 @@ static void test_UISettings(void) { static const WCHAR *uisettings_name = L"Windows.UI.ViewManagement.UISettings"; IActivationFactory *factory; + IUISettings3 *uisettings3; + IInspectable *inspectable; HSTRING str; HRESULT hr; LONG ref; @@ -61,7 +63,6 @@ static void test_UISettings(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = RoGetActivationFactory( str, &IID_IActivationFactory, (void **)&factory ); - WindowsDeleteString( str ); ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "got hr %#lx.\n", hr ); if (hr == REGDB_E_CLASSNOTREG) { @@ -72,7 +73,26 @@ static void test_UISettings(void) check_interface( factory, &IID_IUnknown, TRUE ); check_interface( factory, &IID_IInspectable, TRUE ); check_interface( factory, &IID_IAgileObject, FALSE ); + check_interface( factory, &IID_IUISettings3, FALSE ); + + hr = RoActivateInstance( str, &inspectable ); + ok( hr == S_OK, "Got unexpected hr %#lx.\n", hr ); + WindowsDeleteString( str ); + + hr = IInspectable_QueryInterface( inspectable, &IID_IUISettings3, (void **)&uisettings3 ); + ok( hr == S_OK || broken( hr == E_NOINTERFACE ), "Got unexpected hr %#lx.\n", hr ); + if (FAILED(hr)) + { + win_skip( "IUISettings3 not supported.\n" ); + goto skip_uisettings3; + } + + check_interface( inspectable, &IID_IAgileObject, TRUE ); + + IUISettings3_Release( uisettings3 ); +skip_uisettings3: + IInspectable_Release( inspectable ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); } diff --git a/dlls/windows.ui/uisettings.c b/dlls/windows.ui/uisettings.c index 1ce1096d708..983a9b9f0cf 100644 --- a/dlls/windows.ui/uisettings.c +++ b/dlls/windows.ui/uisettings.c @@ -23,6 +23,108 @@ WINE_DEFAULT_DEBUG_CHANNEL(ui); +struct uisettings +{ + IUISettings3 IUISettings3_iface; + LONG ref; +}; + +static inline struct uisettings *impl_from_IUISettings3( IUISettings3 *iface ) +{ + return CONTAINING_RECORD( iface, struct uisettings, IUISettings3_iface ); +} + +static HRESULT WINAPI uisettings3_QueryInterface( IUISettings3 *iface, REFIID iid, void **out ) +{ + struct uisettings *impl = impl_from_IUISettings3( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IUISettings3 )) + { + *out = &impl->IUISettings3_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI uisettings3_AddRef( IUISettings3 *iface ) +{ + struct uisettings *impl = impl_from_IUISettings3( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI uisettings3_Release( IUISettings3 *iface ) +{ + struct uisettings *impl = impl_from_IUISettings3( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p, ref %lu.\n", iface, ref ); + + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI uisettings3_GetIids( IUISettings3 *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings3_GetRuntimeClassName( IUISettings3 *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings3_GetTrustLevel( IUISettings3 *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings3_GetColorValue( IUISettings3 *iface, UIColorType type, Color *value ) +{ + FIXME( "iface %p, type %d, color %p stub!\n", iface, type, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings3_add_ColorValuesChanged( IUISettings3 *iface, ITypedEventHandler_UISettings_IInspectable *handler, EventRegistrationToken *cookie ) +{ + FIXME( "iface %p, handler %p, cookie %p stub!\n", iface, handler, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI uisettings3_remove_ColorValuesChanged( IUISettings3 *iface, EventRegistrationToken cookie ) +{ + FIXME( "iface %p, cookie %#I64x stub!\n", iface, cookie.value ); + return E_NOTIMPL; +} + +static const struct IUISettings3Vtbl uisettings3_vtbl = +{ + uisettings3_QueryInterface, + uisettings3_AddRef, + uisettings3_Release, + /* IInspectable methods */ + uisettings3_GetIids, + uisettings3_GetRuntimeClassName, + uisettings3_GetTrustLevel, + /* IUISettings3 methods */ + uisettings3_GetColorValue, + uisettings3_add_ColorValuesChanged, + uisettings3_remove_ColorValuesChanged, +}; + struct uisettings_statics { IActivationFactory IActivationFactory_iface; @@ -90,8 +192,21 @@ static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLev static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { - FIXME( "iface %p, instance %p stub!\n", iface, instance ); - return E_NOTIMPL; + struct uisettings *impl; + + TRACE( "iface %p, instance %p.\n", iface, instance ); + + if (!(impl = calloc( 1, sizeof(*impl) ))) + { + *instance = NULL; + return E_OUTOFMEMORY; + } + + impl->IUISettings3_iface.lpVtbl = &uisettings3_vtbl; + impl->ref = 1; + + *instance = (IInspectable *)&impl->IUISettings3_iface; + return S_OK; } static const struct IActivationFactoryVtbl factory_vtbl =

1 0

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

Feb. 10, 2023

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 Feb. 10, 2023

Feb. 10, 2023

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

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

Feb. 10, 2023

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: Mark the buffer as invalid in NdrProxyFreeBuffer().
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

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

Mohamad Al-Jaf : d3d12core: Add stub DLL.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 9acf1bd6a85a02da201a018e1b3e586ac74ec8d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9acf1bd6a85a02da201a018e1b3e58… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Jan 26 18:43:05 2023 -0500 d3d12core: Add stub DLL. Forspoken checks for the existence of this DLL. --- MAINTAINERS | 1 + configure | 2 ++ configure.ac | 1 + dlls/d3d12core/Makefile.in | 1 + dlls/d3d12core/d3d12core.spec | 2 ++ 5 files changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 8c30f8c6d1d..50f75e04e6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -72,6 +72,7 @@ P: Matteo Bruni <mbruni(a)codeweavers.com> F: dlls/d3d10core/ F: dlls/d3d11/ F: dlls/d3d12/ +F: dlls/d3d12core/ F: dlls/d3d8/ F: dlls/d3d9/ F: dlls/d3drm/ diff --git a/configure b/configure index 25bffe3c8eb..caa0f30a71c 100755 --- a/configure +++ b/configure @@ -1015,6 +1015,7 @@ enable_d3d10_1 enable_d3d10core enable_d3d11 enable_d3d12 +enable_d3d12core enable_d3d8 enable_d3d8thk enable_d3d9 @@ -21062,6 +21063,7 @@ wine_fn_config_makefile dlls/d3d11 enable_d3d11 wine_fn_config_makefile dlls/d3d11/tests enable_tests wine_fn_config_makefile dlls/d3d12 enable_d3d12 wine_fn_config_makefile dlls/d3d12/tests enable_tests +wine_fn_config_makefile dlls/d3d12core enable_d3d12core wine_fn_config_makefile dlls/d3d8 enable_d3d8 wine_fn_config_makefile dlls/d3d8/tests enable_tests wine_fn_config_makefile dlls/d3d8thk enable_d3d8thk diff --git a/configure.ac b/configure.ac index 8a6d21702cc..09cbf7533c3 100644 --- a/configure.ac +++ b/configure.ac @@ -2432,6 +2432,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3d11) WINE_CONFIG_MAKEFILE(dlls/d3d11/tests) WINE_CONFIG_MAKEFILE(dlls/d3d12) WINE_CONFIG_MAKEFILE(dlls/d3d12/tests) +WINE_CONFIG_MAKEFILE(dlls/d3d12core) WINE_CONFIG_MAKEFILE(dlls/d3d8) WINE_CONFIG_MAKEFILE(dlls/d3d8/tests) WINE_CONFIG_MAKEFILE(dlls/d3d8thk) diff --git a/dlls/d3d12core/Makefile.in b/dlls/d3d12core/Makefile.in new file mode 100644 index 00000000000..8778b66138b --- /dev/null +++ b/dlls/d3d12core/Makefile.in @@ -0,0 +1 @@ +MODULE = d3d12core.dll diff --git a/dlls/d3d12core/d3d12core.spec b/dlls/d3d12core/d3d12core.spec new file mode 100644 index 00000000000..c9c73bd4ee4 --- /dev/null +++ b/dlls/d3d12core/d3d12core.spec @@ -0,0 +1,2 @@ +@ stub D3D12GetInterface +@ stub D3D12SDKVersion

1 0

Mohamad Al-Jaf : include: Add DirectX 12 Agility SDK definitions.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 83625459c8227b0bd7b86c18946a35d3a806c80d URL: https://gitlab.winehq.org/wine/wine/-/commit/83625459c8227b0bd7b86c18946a35… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Jan 31 02:22:12 2023 -0500 include: Add DirectX 12 Agility SDK definitions. --- include/d3d12.idl | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 082a436c9ec..816ff283ee8 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -66,6 +66,7 @@ const UINT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT = 256; const UINT D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 4194304; const UINT D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT = 65536; const UINT D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT = 16; +const UINT D3D12_SDK_VERSION = 4; const UINT D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 65536; const UINT D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE = 4; @@ -2589,3 +2590,55 @@ typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **de [local] HRESULT __stdcall D3D12EnableExperimentalFeatures(UINT feature_count, const IID *iids, void *configurations, UINT *configurations_sizes); + +cpp_quote("DEFINE_GUID(CLSID_D3D12Debug, 0xf2352aeb, 0xdd84, 0x49fe, 0xb9, 0x7b, 0xa9, 0xdc, 0xfd, 0xcc, 0x1b, 0x4f);") +cpp_quote("DEFINE_GUID(CLSID_D3D12Tools, 0xe38216b1, 0x3c8c, 0x4833, 0xaa, 0x09, 0x0a, 0x06, 0xb6, 0x5d, 0x96, 0xc8);") +cpp_quote("DEFINE_GUID(CLSID_D3D12DeviceRemovedExtendedData, 0x4a75bbc4, 0x9ff4, 0x4ad8, 0x9f, 0x18, 0xab, 0xae, 0x84, 0xdc, 0x5f, 0xf2);") +cpp_quote("DEFINE_GUID(CLSID_D3D12SDKConfiguration, 0x7cda6aca, 0xa03e, 0x49c8, 0x94, 0x58, 0x03, 0x34, 0xd2, 0x0e, 0x07, 0xce);") + +typedef enum D3D12_DRED_ENABLEMENT +{ + D3D12_DRED_ENABLEMENT_SYSTEM_CONTROLLED = 0, + D3D12_DRED_ENABLEMENT_FORCED_OFF = 1, + D3D12_DRED_ENABLEMENT_FORCED_ON = 2, +} D3D12_DRED_ENABLEMENT; + +typedef HRESULT (__stdcall *PFN_D3D12_GET_INTERFACE)(REFCLSID clsid, REFIID iid, void **debug); + +[local] HRESULT __stdcall D3D12GetInterface(REFCLSID clsid, REFIID iid, void **debug); + +[ + uuid(7071e1f0-e84b-4b33-974f-12fa49de65c5), + object, + local, + pointer_default(unique) +] +interface ID3D12Tools : IUnknown +{ + void EnableShaderInstrumentation(BOOL enable); + BOOL ShaderInstrumentationEnabled(); +} + +[ + uuid(82bc481c-6b9b-4030-aedb-7ee3d1df1e63), + object, + local, + pointer_default(unique) +] +interface ID3D12DeviceRemovedExtendedDataSettings : IUnknown +{ + void SetAutoBreadcrumbsEnablement(D3D12_DRED_ENABLEMENT enablement); + void SetPageFaultEnablement(D3D12_DRED_ENABLEMENT enablement); + void SetWatsonDumpEnablement(D3D12_DRED_ENABLEMENT enablement); +}; + +[ + uuid(e9eb5314-33aa-42b2-a718-d77f58b1f1c7), + object, + local, + pointer_default(unique) +] +interface ID3D12SDKConfiguration : IUnknown +{ + HRESULT SetSDKVersion(UINT version, const char *path); +}

1 0

Zebediah Figura : user32/tests: Add a register_class() helper.
by Alexandre Julliard Feb. 10, 2023

Feb. 10, 2023

Module: wine Branch: master Commit: 77efd7ac5a87ff20719c0d011d5b800111ecea79 URL: https://gitlab.winehq.org/wine/wine/-/commit/77efd7ac5a87ff20719c0d011d5b80… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 20:07:04 2023 -0600 user32/tests: Add a register_class() helper. --- dlls/user32/tests/msg.c | 80 +++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 39 deletions(-)

1 0

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

Feb. 10, 2023

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