April 2020 - Wine-devel - list.winehq.org

[PATCH] dwrite: Include config.h for HAVE___BUILTIN_POPCOUNT.
by Francois Gouget 21 Apr '20

21 Apr '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dwrite/opentype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 9813676ab0a..0307cd59810 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -21,6 +21,7 @@ #define COBJMACROS #define NONAMELESSUNION +#include "config.h" #include "dwrite_private.h" #include "winternl.h" -- 2.20.1

2 1

[PATCH 4/4] gdi32: Support LUID in D3DKMTOpenAdapterFromGdiDisplayName().
by Zhiyi Zhang 21 Apr '20

21 Apr '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/driver.c | 100 ++++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/driver.c | 2 + 3 files changed, 99 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index e1ac922ce52..32b2e6959c1 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -4,7 +4,7 @@ IMPORTLIB = gdi32 IMPORTS = advapi32 EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) -DELAYIMPORTS = usp10 +DELAYIMPORTS = usp10 setupapi C_SRCS = \ bidi.c \ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 90977383a58..8eedc821146 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -31,10 +31,14 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winreg.h" #include "ddrawgdi.h" #include "wine/winbase16.h" #include "winuser.h" #include "winternl.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "ddk/d3dkmthk.h" #include "gdi_private.h" @@ -45,6 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(driver); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + struct graphics_driver { struct list entry; @@ -84,6 +90,7 @@ static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static HWND (WINAPI *pGetDesktopWindow)(void); static INT (WINAPI *pGetSystemMetrics)(INT); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); +static BOOL (WINAPI *pEnumDisplayDevicesW)(LPCWSTR, DWORD, DISPLAY_DEVICEW *, DWORD); /********************************************************************** * create_driver @@ -159,6 +166,20 @@ static BOOL is_display_device( LPCWSTR name ) return TRUE; } +static HANDLE get_display_device_init_mutex( void ) +{ + static const WCHAR init_mutex[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW( NULL, FALSE, init_mutex ); + + WaitForSingleObject( mutex, INFINITE ); + return mutex; +} + +static void release_display_device_init_mutex( HANDLE mutex ) +{ + ReleaseMutex( mutex ); + CloseHandle( mutex ); +} /********************************************************************** * DRIVER_load_driver @@ -1351,16 +1372,89 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) { static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; + static const WCHAR pciW[] = {'P','C','I',0}; static D3DKMT_HANDLE handle_start = 0; + DWORD size, type, device_index = 0; + DISPLAY_DEVICEW display_device; struct d3dkmt_adapter *adapter; + SP_DEVINFO_DATA device_data; + WCHAR buffer[MAX_PATH]; + BOOL found = FALSE; + HDEVINFO devinfo; + HMODULE user32; + HANDLE mutex; + LSTATUS ls; WCHAR *end; + HKEY hkey; + LUID luid; int id; TRACE("(%p) semi-stub\n", desc); - if (!desc || strncmpiW( desc->DeviceName, displayW, ARRAY_SIZE(displayW) )) + if (!desc) return STATUS_UNSUCCESSFUL; + if (!pEnumDisplayDevicesW) + { + user32 = LoadLibraryA( "user32.dll" ); + pEnumDisplayDevicesW = (void *)GetProcAddress( user32, "EnumDisplayDevicesW" ); + } + + display_device.cb = sizeof( display_device ); + while (pEnumDisplayDevicesW( NULL, device_index++, &display_device, 0 )) + { + if (lstrcmpiW( display_device.DeviceName, desc->DeviceName )) + continue; + + if (display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + { + found = TRUE; + break; + } + } + + if (!found) + return STATUS_UNSUCCESSFUL; + + /* Get the GPU LUID from SetupAPI */ + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_DISPLAY, pciW, NULL, 0 ); + + found = FALSE; + device_index = 0; + device_data.cbSize = sizeof(device_data); + while (SetupDiEnumDeviceInfo( devinfo, device_index++, &device_data )) + { + hkey = SetupDiOpenDevRegKey( devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_READ ); + if (hkey == INVALID_HANDLE_VALUE) + continue; + + size = sizeof(buffer); + ls = RegQueryValueExW( hkey, video_idW, 0, NULL, (BYTE *)buffer, &size ); + RegCloseKey( hkey ); + if (ls) + continue; + + /* Compare GPU UUID. DeviceKey from EnumDisplayDevices is of form + * \Registry\Machine\System\CurrentControlSet\Control\Video\{GPU UUID}\0000 */ + if (strncmpiW( buffer, display_device.DeviceKey + 57, 38 )) + continue; + + if (SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, + &type, (BYTE *)&luid, sizeof(luid), NULL, 0) ) + { + found = TRUE; + break; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + + if (!found) + return STATUS_UNSUCCESSFUL; + + /* FIXME: Using display index as VidPnSourceId */ id = strtolW( desc->DeviceName + ARRAY_SIZE(displayW), &end, 10 ) - 1; if (*end) return STATUS_UNSUCCESSFUL; @@ -1376,9 +1470,7 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); desc->hAdapter = handle_start; - /* FIXME: Support AdapterLuid */ - desc->AdapterLuid.LowPart = 0; - desc->AdapterLuid.HighPart = 0; + desc->AdapterLuid = luid; desc->VidPnSourceId = id; return STATUS_SUCCESS; } diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 6172d4a7983..c656eb4245a 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -86,6 +86,8 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); + ok(open_adapter_gdi_desc.AdapterLuid.LowPart || open_adapter_gdi_desc.AdapterLuid.HighPart, + "Expect LUID not zero.\n"); close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; status = pD3DKMTCloseAdapter(&close_adapter_desc); -- 2.20.1

1 0

[PATCH 3/4] gdi32/tests: Remove tests for VidPnSourceId.
by Zhiyi Zhang 21 Apr '20

21 Apr '20

VidPnSourceId may be zero for non-primary adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index ed83a728131..6172d4a7983 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -86,11 +86,6 @@ static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) } ok(open_adapter_gdi_desc.hAdapter, "Expect not null.\n"); - if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - ok(open_adapter_gdi_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", - open_adapter_gdi_desc.VidPnSourceId); - else - ok(open_adapter_gdi_desc.VidPnSourceId, "Got unexpected value %#x.\n", open_adapter_gdi_desc.VidPnSourceId); close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; status = pD3DKMTCloseAdapter(&close_adapter_desc); @@ -135,12 +130,6 @@ static void test_D3DKMTOpenAdapterFromHdc(void) status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); todo_wine ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); todo_wine ok(open_adapter_hdc_desc.hAdapter, "Expect not null.\n"); - if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) - ok(open_adapter_hdc_desc.VidPnSourceId == 0, "Got unexpected value %#x.\n", - open_adapter_hdc_desc.VidPnSourceId); - else - todo_wine ok(open_adapter_hdc_desc.VidPnSourceId, "Got unexpected value %#x.\n", - open_adapter_hdc_desc.VidPnSourceId); DeleteDC(hdc); if (status == STATUS_SUCCESS) -- 2.20.1

1 0

[PATCH 1/4] winex11.drv: Allocate LUID for GPUs.
by Zhiyi Zhang 21 Apr '20

21 Apr '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7ad74c9b4e1..4429cb89224 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); @@ -278,9 +280,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; + DEVPROPTYPE property_type; WCHAR bufferW[1024]; HKEY hkey = NULL; GUID guid; + LUID luid; INT written; DWORD size; BOOL ret = FALSE; @@ -306,6 +310,20 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g (const BYTE *)&present, sizeof(present), 0)) goto done; + /* Write DEVPROPKEY_GPU_LUID property */ + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &property_type, + (BYTE *)&luid, sizeof(luid), NULL, 0)) + { + if (!AllocateLocallyUniqueId(&luid)) + goto done; + + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, + DEVPROP_TYPE_UINT64, (const BYTE *)&luid, sizeof(luid), 0)) + goto done; + } + 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); + /* Open driver key. * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); -- 2.20.1

1 0

[PATCH] user32: Added LoadKeyboardLayoutEx stub.
by Vijay Kiran Kamuju 21 Apr '20

21 Apr '20

Checked metasploit related documentation for function signature. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28170 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 5/5] vcruntime140_1: Add __CxxFrameHandler4 implementation.
by Piotr Caban 21 Apr '20

21 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/cppexcept.h | 65 ++++ dlls/vcruntime140_1/except_x86_64.c | 470 +++++++++++++++++++++++++++- 2 files changed, 533 insertions(+), 2 deletions(-)

1 0

[PATCH 4/5] vcruntime140_1: Implement function description version 4 structures reading.
by Piotr Caban 21 Apr '20

21 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/cppexcept.h | 54 ++++++ dlls/vcruntime140_1/except_x86_64.c | 289 ++++++++++++++++++++++++++++ 2 files changed, 343 insertions(+) create mode 100644 dlls/vcruntime140_1/cppexcept.h

1 0

[PATCH 3/5] vcruntime140_1: Add __CxxFrameHandler4 stub.
by Piotr Caban 21 Apr '20

21 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/Makefile.in | 5 ++++ dlls/vcruntime140_1/except_x86_64.c | 34 +++++++++++++++++++++++++ dlls/vcruntime140_1/vcruntime140_1.spec | 2 +- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 dlls/vcruntime140_1/except_x86_64.c

1 0

[PATCH 2/5] vcruntime140_1: Export functions only on x86_64.
by Piotr Caban 21 Apr '20

21 Apr '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/vcruntime140_1/vcruntime140_1.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 1/5] ucrtbase: Change ptd fields offsets to match with native.
by Piotr Caban 21 Apr '20

21 Apr '20

Makes it possible to use native vcruntime140_1.dll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 3 +-- dlls/msvcrt/msvcrt.h | 5 ++--- dlls/ucrtbase/tests/misc.c | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-)

1 0