May 2020 - Wine-commits - list.winehq.org

Martin Storsjo : ntdll: Implement RtlRestoreContext.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 6c11d1d745af859cab682c3330bcf391f2521121 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c11d1d745af859cab682c33… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:44 2020 +0300 ntdll: Implement RtlRestoreContext. Call the consolidate frame callback before resuming. Before calling the callback, fill in ExceptionInformation[10] with the equivalent of dispatch.NonVolatileRegisters. This fixes unwinding of MSVC C++ exceptions in a lot of cases. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-rtlsupport-l1-1-0.spec | 2 +- .../api-ms-win-core-rtlsupport-l1-2-0.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm64.c | 134 ++++++++++++++++++++- 4 files changed, 136 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c11d1d745af859cab68…

1 0

Martin Storsjo : ntdll: Keep the previous iteration of NonVolatileRegisters in call_function_handlers.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: a8a944c22099194c6458698eadd58f343d69fd22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a944c22099194c6458698e… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:45 2020 +0300 ntdll: Keep the previous iteration of NonVolatileRegisters in call_function_handlers. Some language specific handlers, called by call_handler, can use the NonVolatileRegisters to restore the context before running code, and that assumes that NonVolatileRegisters contains the frame pointer as it was within the function (before unwinding). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 2af1e238ce..e544a1c2a4 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -849,14 +849,16 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; UNWIND_HISTORY_TABLE table; DISPATCHER_CONTEXT dispatch; - CONTEXT context; + CONTEXT context, prev_context; NTSTATUS status; context = *orig_context; dispatch.TargetPc = 0; dispatch.ContextRecord = &context; dispatch.HistoryTable = &table; - dispatch.NonVolatileRegisters = (BYTE *)&context.u.s.X19; + prev_context = context; + dispatch.NonVolatileRegisters = (BYTE *)&prev_context.u.s.X19; + for (;;) { status = virtual_unwind( UNW_FLAG_EHANDLER, &dispatch, &context ); @@ -933,6 +935,7 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con } if (context.Sp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; + prev_context = context; } return STATUS_UNHANDLED_EXCEPTION; }

1 0

Martin Storsjo : ntdll: Fix unwinding through raise_generic_exception.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 763f15ccde354a80826db4dbd7a700740b353447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=763f15ccde354a80826db4db… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:46 2020 +0300 ntdll: Fix unwinding through raise_generic_exception. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index e544a1c2a4..8e7296d207 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -135,6 +135,8 @@ static DWORD64 get_fault_esr( ucontext_t *sigcontext ) static const size_t teb_size = 0x2000; /* we reserve two pages for the TEB */ +typedef void (*raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); + /* stack layout when calling an exception raise function */ struct stack_layout { @@ -1046,6 +1048,24 @@ static void WINAPI raise_generic_exception( EXCEPTION_RECORD *rec, CONTEXT *cont raise_status( status, rec ); } +extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func, void *sp ); +__ASM_GLOBAL_FUNC( raise_func_trampoline, + __ASM_CFI(".cfi_signal_frame\n\t") + "stp x29, x30, [sp, #-0x20]!\n\t" + __ASM_CFI(".cfi_def_cfa_offset 32\n\t") + __ASM_CFI(".cfi_offset 29, -32\n\t") + __ASM_CFI(".cfi_offset 30, -24\n\t") + "mov x29, sp\n\t" + __ASM_CFI(".cfi_def_cfa_register 29\n\t") + "str x3, [sp, 0x10]\n\t" + __ASM_CFI(".cfi_remember_state\n\t") + __ASM_CFI(".cfi_escape 0x0f,0x03,0x8d,0x10,0x06\n\t") /* CFA */ + __ASM_CFI(".cfi_escape 0x10,0x1d,0x02,0x8d,0x00\n\t") /* x29 */ + __ASM_CFI(".cfi_escape 0x10,0x1e,0x02,0x8d,0x08\n\t") /* x30 */ + "blr x2\n\t" + __ASM_CFI(".cfi_restore_state\n\t") + "brk #1") + /*********************************************************************** * setup_raise_exception * @@ -1060,10 +1080,13 @@ static void setup_raise_exception( ucontext_t *sigcontext, struct stack_layout * restore_context( &stack->context, sigcontext ); return; } + REGn_sig(3, sigcontext) = SP_sig(sigcontext); /* original stack pointer, fourth arg for raise_func_trampoline */ SP_sig(sigcontext) = (ULONG_PTR)stack; - PC_sig(sigcontext) = (ULONG_PTR)raise_generic_exception; + LR_sig(sigcontext) = PC_sig(sigcontext); + PC_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline; /* raise_generic_exception; */ REGn_sig(0, sigcontext) = (ULONG_PTR)&stack->rec; /* first arg for raise_generic_exception */ REGn_sig(1, sigcontext) = (ULONG_PTR)&stack->context; /* second arg for raise_generic_exception */ + REGn_sig(2, sigcontext) = (ULONG_PTR)raise_generic_exception; /* third arg for raise_func_trampoline */ REGn_sig(18, sigcontext) = (ULONG_PTR)NtCurrentTeb(); }

1 0

Martin Storsjo : ntdll: Implement RtlRaiseException in assembly to fix continuing from exceptions.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: e0c8c4c3cd2fc5db5da7cd7b5889ac306db356c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0c8c4c3cd2fc5db5da7cd7b… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:47 2020 +0300 ntdll: Implement RtlRaiseException in assembly to fix continuing from exceptions. If the handlers returned ExceptionContinueExecution and we restore the stored context, make sure it's a context that ends up returning from the RtlRaiseException function. This matches how it's done on x86_64. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8e7296d207..7488b90d63 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -2097,14 +2097,29 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL /*********************************************************************** * RtlRaiseException (NTDLL.@) */ -void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) -{ - CONTEXT context; - - RtlCaptureContext( &context ); - rec->ExceptionAddress = (LPVOID)context.Pc; - RtlRaiseStatus( NtRaiseException( rec, &context, TRUE )); -} +__ASM_STDCALL_FUNC( RtlRaiseException, 4, + "sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */ + "stp x29, x30, [sp]\n\t" + __ASM_CFI(".cfi_def_cfa x29, 944\n\t") + __ASM_CFI(".cfi_offset x30, -936\n\t") + __ASM_CFI(".cfi_offset x29, -944\n\t") + "mov x29, sp\n\t" + "str x0, [sp, #0x10]\n\t" + "add x0, sp, #0x20\n\t" + "bl " __ASM_NAME("RtlCaptureContext") "\n\t" + "add x1, sp, #0x20\n\t" /* context pointer */ + "add x2, sp, #0x3b0\n\t" /* orig stack pointer */ + "str x2, [x1, #0x100]\n\t" /* context->Sp */ + "ldr x0, [sp, #0x10]\n\t" /* original first parameter */ + "str x0, [x1, #0x08]\n\t" /* context->X0 */ + "ldp x4, x5, [sp]\n\t" /* frame pointer, return address */ + "stp x4, x5, [x1, #0xf0]\n\t" /* context->Fp, Lr */ + "str x5, [x1, #0x108]\n\t" /* context->Pc */ + "str x5, [x1, #0x108]\n\t" /* context->Pc */ + "str x5, [x0, #0x10]\n\t" /* rec->ExceptionAddress */ + "mov x2, #1\n\t" + "bl " __ASM_NAME("NtRaiseException") "\n\t" + "bl " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); /************************************************************************* * RtlCaptureStackBackTrace (NTDLL.@)

1 0

Paul Gofman : ntoskrnl.exe: Partially implement KeInitializeDpc() function.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: e49be2db28bbcd7ac82326c9cceab221b8260787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e49be2db28bbcd7ac82326c9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:14 2020 +0300 ntoskrnl.exe: Partially implement KeInitializeDpc() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++-- include/ddk/wdm.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bfac397011..d50eac6c82 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3079,9 +3079,13 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void) /*********************************************************************** * KeInitializeDpc (NTOSKRNL.EXE.@) */ -VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOID DeferredContext) +void WINAPI KeInitializeDpc(KDPC *dpc, PKDEFERRED_ROUTINE deferred_routine, void *deferred_context) { - FIXME("stub\n"); + FIXME("dpc %p, deferred_routine %p, deferred_context %p semi-stub.\n", + dpc, deferred_routine, deferred_context); + + dpc->DeferredRoutine = deferred_routine; + dpc->DeferredContext = deferred_context; } /*********************************************************************** diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 8368f8c6e9..9dce98516b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1695,6 +1695,7 @@ void WINAPI KeEnterCriticalRegion(void); void WINAPI KeGenericCallDpc(PKDEFERRED_ROUTINE,PVOID); ULONG WINAPI KeGetCurrentProcessorNumber(void); PKTHREAD WINAPI KeGetCurrentThread(void); +void WINAPI KeInitializeDpc(KDPC*,PKDEFERRED_ROUTINE,void*); void WINAPI KeInitializeEvent(PRKEVENT,EVENT_TYPE,BOOLEAN); void WINAPI KeInitializeMutex(PRKMUTEX,ULONG); void WINAPI KeInitializeSemaphore(PRKSEMAPHORE,LONG,LONG);

1 0

Paul Gofman : ntoskrnl.exe: Add KeSetTimer() function.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: ba98574207b8f85839587a880b97eecbe34bdd3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba98574207b8f85839587a88… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:15 2020 +0300 ntoskrnl.exe: Add KeSetTimer() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 7 +++++++ include/ddk/wdm.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 331b03ba9f..dd7ff73bee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -642,7 +642,7 @@ @ stdcall KeSetSystemAffinityThreadEx(long) @ stdcall KeSetTargetProcessorDpc(ptr long) @ stub KeSetTimeIncrement -@ stub KeSetTimer +@ stdcall KeSetTimer(ptr int64 ptr) @ stdcall KeSetTimerEx(ptr int64 long ptr) @ stub KeStackAttachProcess @ stub KeSynchronizeExecution diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 647d427ee5..d5a635efad 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1258,3 +1258,10 @@ void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG else if (count > 0) KeWaitForSingleObject( &lock->Common.RemoveEvent, Executive, KernelMode, FALSE, NULL ); } + +BOOLEAN WINAPI KeSetTimer(KTIMER *timer, LARGE_INTEGER duetime, KDPC *dpc) +{ + TRACE("timer %p, duetime %I64x, dpc %p.\n", timer, duetime.QuadPart, dpc); + + return KeSetTimerEx(timer, duetime, 0, dpc); +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 9dce98516b..38a3098994 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1720,6 +1720,7 @@ LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); void WINAPI KeSetSystemAffinityThread(KAFFINITY); KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity); +BOOLEAN WINAPI KeSetTimer(KTIMER*,LARGE_INTEGER,KDPC*); BOOLEAN WINAPI KeSetTimerEx(KTIMER*,LARGE_INTEGER,LONG,KDPC*); void WINAPI KeSignalCallDpcDone(void*); BOOLEAN WINAPI KeSignalCallDpcSynchronize(void*);

1 0

Gijs Vermeulen : wuapi: Add UpdateInstaller coclass.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 45cb03f4878dc80df6624d246bfb1ad1f925af51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45cb03f4878dc80df6624d24… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat May 23 16:41:31 2020 +0200 wuapi: Add UpdateInstaller coclass. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wuapi/main.c | 5 +++++ include/wuapi.idl | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index c2ed95ed42..63392b3660 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -111,6 +111,7 @@ static const struct IClassFactoryVtbl wucf_vtbl = static wucf sessioncf = { { &wucf_vtbl }, UpdateSession_create }; static wucf updatescf = { { &wucf_vtbl }, AutomaticUpdates_create }; static wucf sysinfocf = { { &wucf_vtbl }, SystemInformation_create }; +static wucf installercf = { { &wucf_vtbl }, UpdateInstaller_create }; static HINSTANCE instance; @@ -146,6 +147,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &sysinfocf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_UpdateInstaller )) + { + cf = &installercf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); } diff --git a/include/wuapi.idl b/include/wuapi.idl index d1a3593084..a0a8e4359a 100644 --- a/include/wuapi.idl +++ b/include/wuapi.idl @@ -1329,6 +1329,15 @@ interface ISystemInformation : IDispatch ] coclass AutomaticUpdates { interface IAutomaticUpdates; } +[ + helpstring("UpdateInstaller Class"), + threading(both), + progid("Microsoft.Update.Installer.1"), + vi_progid("Microsoft.Update.Installer"), + uuid(d2e0fe7f-d23e-48e1-93c0-6fa8cc346474) +] +coclass UpdateInstaller { interface IUpdateInstaller; } + [ helpstring("UpdateSession Class"), threading(both),

1 0

Gijs Vermeulen : wuapi: Fake success in IUpdateInstaller::get_IsBusy.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: b9acfa96a9a91cf942f65debfaebe3b5cfdeccab URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9acfa96a9a91cf942f65deb… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sat May 23 16:41:32 2020 +0200 wuapi: Fake success in IUpdateInstaller::get_IsBusy. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wuapi/installer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wuapi/installer.c b/dlls/wuapi/installer.c index 376148244d..acfc101f8c 100644 --- a/dlls/wuapi/installer.c +++ b/dlls/wuapi/installer.c @@ -274,8 +274,9 @@ static HRESULT WINAPI update_installer_get_IsBusy( IUpdateInstaller *This, VARIANT_BOOL *retval ) { - FIXME("\n"); - return E_NOTIMPL; + FIXME("semi-stub, returning VARIANT_FALSE!\n"); + *retval = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI update_installer_Uninstall(

1 0

Alex Henrie : ntdll/tests: Make RtlIpv6AddressToString test data static and constant.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: fef9849aae6521382d0414eca00034913db73faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef9849aae6521382d0414ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 27 23:57:48 2020 -0600 ntdll/tests: Make RtlIpv6AddressToString test data static and constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 94c6b582f3..7a62670ea0 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1711,7 +1711,7 @@ static void test_RtlIpv6AddressToString(void) LPCSTR result; IN6_ADDR ip; DWORD_PTR len; - struct + static const struct { PCSTR address; int ip[8]; @@ -1835,7 +1835,7 @@ static void test_RtlIpv6AddressToStringEx(void) NTSTATUS res; IN6_ADDR ip; ULONG len; - struct + static const struct { PCSTR address; ULONG scopeid;

1 0

Brendan Shanks : winex11.drv: Set GPU LUID property for monitors.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 8cd6245b7633abccd68f73928544ae4de6f76d52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cd6245b7633abccd68f7392… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu May 28 18:09:16 2020 +0800 winex11.drv: Set GPU LUID property for monitors. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index daea434dab..55533255f3 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -40,6 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -317,9 +318,10 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) EnumWindows(update_windows_on_display_change, (LPARAM)mask); } -/* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ +/* Initialize a GPU instance. + * Return its GUID string in guid_string, driver value in driver parameter and LUID in gpu_luid */ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, - WCHAR *driver) + WCHAR *driver, LUID *gpu_luid) { static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; @@ -365,6 +367,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g DEVPROP_TYPE_UINT64, (const BYTE *)&luid, sizeof(luid), 0)) goto done; } + *gpu_luid = luid; TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), wine_dbgstr_w(gpu->name), luid.HighPart, luid.LowPart); @@ -480,7 +483,7 @@ done: } static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *monitor, int monitor_index, - int video_index) + int video_index, const LUID *gpu_luid) { SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; WCHAR bufferW[MAX_PATH]; @@ -498,6 +501,11 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) goto done; + /* Write DEVPROPKEY_MONITOR_GPU_LUID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_GPU_LUID, + DEVPROP_TYPE_INT64, (const BYTE *)gpu_luid, sizeof(*gpu_luid), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -599,6 +607,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) DWORD disposition = 0; WCHAR guidW[40]; WCHAR driverW[1024]; + LUID gpu_luid; mutex = get_display_device_init_mutex(); @@ -627,7 +636,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) for (gpu = 0; gpu < gpu_count; gpu++) { - if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW, &gpu_luid)) goto done; /* Initialize adapters */ @@ -649,7 +658,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) for (monitor = 0; monitor < monitor_count; monitor++) { TRACE("monitor: %#x %s\n", monitor, wine_dbgstr_w(monitors[monitor].name)); - if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid)) goto done; }

1 0