June 2020 - Wine-Devel - list.winehq.org

[PATCH] ntdll: Fix a typo in security descriptor flags.
by Nikolay Sivov June 11, 2020

June 11, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/unix/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 03b511881b7..5e327d0a667 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -214,7 +214,7 @@ NTSTATUS alloc_object_attributes( const OBJECT_ATTRIBUTES *attr, struct object_a owner = sd->Owner; group = sd->Group; if (sd->Control & SE_SACL_PRESENT) sacl = sd->Sacl; - if (sd->Control & SE_SACL_PRESENT) dacl = sd->Dacl; + if (sd->Control & SE_DACL_PRESENT) dacl = sd->Dacl; } if (owner) len += offsetof( SID, SubAuthority[owner->SubAuthorityCount] ); -- 2.26.2

1 0

[PATCH 2/2] oleaut32: Fix CompObj stream name in SLTG_Magic
by Vijay Kiran Kamuju June 11, 2020

June 11, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] ntdll: Use single field for misc flags in ComClass redirection section.
by Nikolay Sivov June 11, 2020

June 11, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- There is no evidence that remaining bytes are used for anything. dlls/kernel32/tests/actctx.c | 23 ++++++++++------------- dlls/mscoree/corruntimehost.c | 4 +--- dlls/ntdll/actctx.c | 22 +++++++++------------- dlls/ole32/compobj.c | 9 ++++----- dlls/sxs/sxs.c | 4 +--- 5 files changed, 25 insertions(+), 37 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 2d942cdc981..2093959d98d 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1422,9 +1422,7 @@ enum comclass_miscfields { struct comclassredirect_data { ULONG size; - BYTE res; - BYTE miscmask; - BYTE res1[2]; + ULONG flags; DWORD model; GUID clsid; GUID alias; @@ -1481,12 +1479,9 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(comclass->size == sizeof(*comclass), "got %d for header size\n", comclass->size); if (data.lpData && comclass->size == sizeof(*comclass)) { + ULONG len, miscmask; WCHAR *ptr; - ULONG len; - ok_(__FILE__, line)(comclass->res == 0, "got res as %d\n", comclass->res); - ok_(__FILE__, line)(comclass->res1[0] == 0, "got res1[0] as %02x\n", comclass->res1[0]); - ok_(__FILE__, line)(comclass->res1[1] == 0, "got res1[1] as %02x\n", comclass->res1[1]); ok_(__FILE__, line)(comclass->model == ThreadingModel_Neutral, "got model %d\n", comclass->model); ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid, clsid), "got wrong clsid %s\n", wine_dbgstr_guid(&comclass->clsid)); ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid2, clsid), "got wrong clsid2 %s\n", wine_dbgstr_guid(&comclass->clsid2)); @@ -1519,19 +1514,21 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(data.ulSectionTotalLength > comclass->name_offset, "got wrong offset %d\n", comclass->name_offset); /* check misc fields are set */ - if (comclass->miscmask) + miscmask = (comclass->flags >> 8) & 0xff; + if (miscmask) { - if (comclass->miscmask & MiscStatus) + if (miscmask & MiscStatus) ok_(__FILE__, line)(comclass->miscstatus != 0, "got miscstatus 0x%08x\n", comclass->miscstatus); - if (comclass->miscmask & MiscStatusIcon) + if (miscmask & MiscStatusIcon) ok_(__FILE__, line)(comclass->miscstatusicon != 0, "got miscstatusicon 0x%08x\n", comclass->miscstatusicon); - if (comclass->miscmask & MiscStatusContent) + if (miscmask & MiscStatusContent) ok_(__FILE__, line)(comclass->miscstatuscontent != 0, "got miscstatuscontent 0x%08x\n", comclass->miscstatuscontent); - if (comclass->miscmask & MiscStatusThumbnail) + if (miscmask & MiscStatusThumbnail) ok_(__FILE__, line)(comclass->miscstatusthumbnail != 0, "got miscstatusthumbnail 0x%08x\n", comclass->miscstatusthumbnail); - if (comclass->miscmask & MiscStatusDocPrint) + if (miscmask & MiscStatusDocPrint) ok_(__FILE__, line)(comclass->miscstatusdocprint != 0, "got miscstatusdocprint 0x%08x\n", comclass->miscstatusdocprint); } + ok_(__FILE__, line)(!(comclass->flags & 0xffff00ff), "Unexpected flags %#x.\n", comclass->flags); /* part used for clrClass only */ if (comclass->clrdata_len) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 9f53555ee94..a5b378b9251 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -74,9 +74,7 @@ struct dll_fixup struct comclassredirect_data { ULONG size; - BYTE res; - BYTE miscmask; - BYTE res1[2]; + ULONG flags; DWORD model; GUID clsid; GUID alias; diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index af9499c4044..1fb337ea333 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -242,9 +242,7 @@ enum comclass_miscfields struct comclassredirect_data { ULONG size; - BYTE res; - BYTE miscmask; - BYTE res1[2]; + ULONG flags; DWORD model; GUID clsid; GUID alias; @@ -4030,7 +4028,7 @@ static void add_comserver_record(const struct guidsection_header *section, const struct entity *entity = &entities->base[i]; if (entity->kind == ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION) { - ULONG module_len, progid_len, str_len = 0; + ULONG module_len, progid_len, str_len = 0, miscmask; struct comclassredirect_data *data; struct guid_index *alias_index; struct clrclass_data *clrdata; @@ -4064,9 +4062,6 @@ static void add_comserver_record(const struct guidsection_header *section, const /* setup data */ data = (struct comclassredirect_data*)((BYTE*)section + (*index)->data_offset); data->size = sizeof(*data); - data->res = 0; - data->res1[0] = 0; - data->res1[1] = 0; data->model = entity->u.comclass.model; data->clsid = (*index)->guid; data->alias = alias_index->guid; @@ -4091,17 +4086,18 @@ static void add_comserver_record(const struct guidsection_header *section, const data->miscstatusdocprint = entity->u.comclass.miscstatusdocprint; /* mask describes which misc* data is available */ - data->miscmask = 0; + miscmask = 0; if (data->miscstatus) - data->miscmask |= MiscStatus; + miscmask |= MiscStatus; if (data->miscstatuscontent) - data->miscmask |= MiscStatusContent; + miscmask |= MiscStatusContent; if (data->miscstatusthumbnail) - data->miscmask |= MiscStatusThumbnail; + miscmask |= MiscStatusThumbnail; if (data->miscstatusicon) - data->miscmask |= MiscStatusIcon; + miscmask |= MiscStatusIcon; if (data->miscstatusdocprint) - data->miscmask |= MiscStatusDocPrint; + miscmask |= MiscStatusDocPrint; + data->flags = miscmask << 8; if (data->clrdata_offset) { diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index bd28f42b33b..df234498e65 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -105,9 +105,7 @@ enum comclass_miscfields struct comclassredirect_data { ULONG size; - BYTE res; - BYTE miscmask; - BYTE res1[2]; + ULONG flags; DWORD model; GUID clsid; GUID alias; @@ -265,10 +263,11 @@ BOOL actctx_get_miscstatus(const CLSID *clsid, DWORD aspect, DWORD *status) { struct comclassredirect_data *comclass = (struct comclassredirect_data*)data.lpData; enum comclass_miscfields misc = dvaspect_to_miscfields(aspect); + ULONG miscmask = (comclass->flags >> 8) & 0xff; - if (!(comclass->miscmask & misc)) + if (!(miscmask & misc)) { - if (!(comclass->miscmask & MiscStatus)) + if (!(miscmask & MiscStatus)) { *status = 0; return TRUE; diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 5b2db1d997c..0b59eb5d2e9 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -64,9 +64,7 @@ typedef struct _SXS_GUID_INFORMATION_CLR struct comclassredirect_data { ULONG size; - BYTE res; - BYTE miscmask; - BYTE res1[2]; + ULONG flags; DWORD model; GUID clsid; GUID alias; -- 2.26.2

1 0

[PATCH 1/3] setupapi: Reset the source file pointer when comparing files.
by Zebediah Figura June 11, 2020

June 11, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/misc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 3b5d62b682c..3b0c9477747 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -933,6 +933,8 @@ static BOOL find_existing_inf(const WCHAR *source, WCHAR *target) if (dest_file == INVALID_HANDLE_VALUE) continue; + SetFilePointer( source_file, 0, NULL, FILE_BEGIN ); + if (GetFileSizeEx( dest_file, &dest_file_size ) && dest_file_size.QuadPart == source_file_size.QuadPart && !compare_files( source_file, dest_file )) -- 2.27.0

1 3

[PATCH v3] gdi32: Support LUID in D3DKMTOpenAdapterFromGdiDisplayName().
by Zhiyi Zhang June 11, 2020

June 11, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 185706. Don't use EnumDisplayDevicesW(). v3: Supersede 186810. Add comments and more trace. dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/driver.c | 92 ++++++++++++++++++++++++++++++++++----- dlls/gdi32/tests/driver.c | 2 + 3 files changed, 85 insertions(+), 11 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..39812b5ca0a 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; @@ -159,6 +165,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,17 +1371,35 @@ 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 state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; + static const WCHAR video_value_fmtW[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; + static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; + WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + NTSTATUS status = STATUS_UNSUCCESSFUL; static D3DKMT_HANDLE handle_start = 0; struct d3dkmt_adapter *adapter; - WCHAR *end; - int id; + SP_DEVINFO_DATA device_data; + DWORD size, state_flags; + DEVPROPTYPE type; + HANDLE mutex; + LUID luid; + int index; - TRACE("(%p) semi-stub\n", desc); + TRACE("(%p)\n", desc); - if (!desc || strncmpiW( desc->DeviceName, displayW, ARRAY_SIZE(displayW) )) + if (!desc) return STATUS_UNSUCCESSFUL; - id = strtolW( desc->DeviceName + ARRAY_SIZE(displayW), &end, 10 ) - 1; + TRACE("DeviceName: %s\n", wine_dbgstr_w( desc->DeviceName )); + if (strncmpiW( desc->DeviceName, displayW, ARRAY_SIZE(displayW) )) + return STATUS_UNSUCCESSFUL; + + index = strtolW( desc->DeviceName + ARRAY_SIZE(displayW), &end, 10 ) - 1; if (*end) return STATUS_UNSUCCESSFUL; @@ -1369,6 +1407,35 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI if (!adapter) return STATUS_NO_MEMORY; + /* Get adapter LUID from SetupAPI */ + mutex = get_display_device_init_mutex(); + + size = sizeof( bufferW ); + sprintfW( key_nameW, video_value_fmtW, index ); + if (RegGetValueW( HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) + goto done; + + /* Strip \Registry\Machine\ prefix and retrieve Wine specific data set by the display driver */ + lstrcpyW( key_nameW, bufferW + 18 ); + size = sizeof( state_flags ); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, state_flagsW, RRF_RT_REG_DWORD, NULL, + &state_flags, &size )) + goto done; + + if (!(state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + goto done; + + size = sizeof( bufferW ); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, gpu_idW, RRF_RT_REG_SZ, NULL, bufferW, &size )) + goto done; + + devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); + device_data.cbSize = sizeof( device_data ); + SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof( luid ), NULL, 0)) + goto done; + EnterCriticalSection( &driver_section ); /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ adapter->handle = ++handle_start; @@ -1376,11 +1443,16 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); desc->hAdapter = handle_start; - /* FIXME: Support AdapterLuid */ - desc->AdapterLuid.LowPart = 0; - desc->AdapterLuid.HighPart = 0; - desc->VidPnSourceId = id; - return STATUS_SUCCESS; + desc->AdapterLuid = luid; + desc->VidPnSourceId = index; + status = STATUS_SUCCESS; + +done: + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + if (status != STATUS_SUCCESS) + heap_free( adapter ); + return status; } /****************************************************************************** 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.25.1

2 1

[PATCH v2 1/6] ntoskrnl.exe/tests: Move test functions to the new utils.h header.
by Paul Gofman June 11, 2020

June 11, 2020

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/driver.c | 140 +-------------------------- dlls/ntoskrnl.exe/tests/utils.h | 160 +++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 138 deletions(-) create mode 100644 dlls/ntoskrnl.exe/tests/utils.h diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index beac9c2c25e..fa8d7b20e3e 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -35,6 +35,8 @@ #include "driver.h" +#include "utils.h" + static const WCHAR device_name[] = {'\\','D','e','v','i','c','e', '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; static const WCHAR upper_name[] = {'\\','D','e','v','i','c','e', @@ -45,17 +47,6 @@ static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s' static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *lower_device, *upper_device; -static HANDLE okfile; -static LONG successes; -static LONG failures; -static LONG skipped; -static LONG todo_successes; -static LONG todo_failures; -static int todo_level, todo_do_loop; -static int running_under_wine; -static int winetest_debug; -static int winetest_report_success; - static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType, *pIoDriverObjectType; static PEPROCESS *pPsInitialSystemProcess; static void *create_caller_thread; @@ -64,133 +55,6 @@ static PETHREAD create_irp_thread; NTSTATUS WINAPI ZwQueryInformationProcess(HANDLE,PROCESSINFOCLASS,void*,ULONG,ULONG*); -static void kvprintf(const char *format, __ms_va_list ap) -{ - static char buffer[512]; - IO_STATUS_BLOCK io; - int len = vsnprintf(buffer, sizeof(buffer), format, ap); - ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, len, NULL, NULL); -} - -static void WINAPIV kprintf(const char *format, ...) -{ - __ms_va_list valist; - - __ms_va_start(valist, format); - kvprintf(format, valist); - __ms_va_end(valist); -} - -static void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) -{ - const char *current_file; - - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; - - if (todo_level) - { - if (condition) - { - kprintf("%s:%d: Test succeeded inside todo block: ", current_file, line); - kvprintf(msg, args); - InterlockedIncrement(&todo_failures); - } - else - { - if (winetest_debug > 0) - { - kprintf("%s:%d: Test marked todo: ", current_file, line); - kvprintf(msg, args); - } - InterlockedIncrement(&todo_successes); - } - } - else - { - if (!condition) - { - kprintf("%s:%d: Test failed: ", current_file, line); - kvprintf(msg, args); - InterlockedIncrement(&failures); - } - else - { - if (winetest_report_success) - kprintf("%s:%d: Test succeeded\n", current_file, line); - InterlockedIncrement(&successes); - } - } -} - -static void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) -{ - __ms_va_list args; - __ms_va_start(args, msg); - vok_(file, line, condition, msg, args); - __ms_va_end(args); -} - -static void vskip_(const char *file, int line, const char *msg, __ms_va_list args) -{ - const char *current_file; - - if (!(current_file = drv_strrchr(file, '/')) && - !(current_file = drv_strrchr(file, '\\'))) - current_file = file; - else - current_file++; - - kprintf("%s:%d: Tests skipped: ", current_file, line); - kvprintf(msg, args); - skipped++; -} - -static void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) -{ - __ms_va_list args; - __ms_va_start(args, msg); - if (running_under_wine) - vok_(file, line, 0, msg, args); - else - vskip_(file, line, msg, args); - __ms_va_end(args); -} - -static void winetest_start_todo( int is_todo ) -{ - todo_level = (todo_level << 1) | (is_todo != 0); - todo_do_loop=1; -} - -static int winetest_loop_todo(void) -{ - int do_loop=todo_do_loop; - todo_do_loop=0; - return do_loop; -} - -static void winetest_end_todo(void) -{ - todo_level >>= 1; -} - -static int broken(int condition) -{ - return !running_under_wine && condition; -} - -#define ok(condition, ...) ok_(__FILE__, __LINE__, condition, __VA_ARGS__) -#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ - winetest_loop_todo(); \ - winetest_end_todo()) -#define todo_wine todo_if(running_under_wine) -#define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) -#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) - static void *get_proc_address(const char *name) { UNICODE_STRING name_u; diff --git a/dlls/ntoskrnl.exe/tests/utils.h b/dlls/ntoskrnl.exe/tests/utils.h new file mode 100644 index 00000000000..da0b02ac006 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/utils.h @@ -0,0 +1,160 @@ +/* + * ntoskrnl.exe testing framework + * + * Copyright 2015 Sebastian Lackner + * Copyright 2015 Michael Müller + * Copyright 2015 Christian Costa + * Copyright 2020 Paul Gofman for Codeweavers + * + * 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 + */ + +static HANDLE okfile; +static LONG successes; +static LONG failures; +static LONG skipped; +static LONG todo_successes; +static LONG todo_failures; +static int todo_level, todo_do_loop; +static int running_under_wine; +static int winetest_debug; +static int winetest_report_success; + +static inline void kvprintf(const char *format, __ms_va_list ap) +{ + static char buffer[512]; + IO_STATUS_BLOCK io; + int len = vsnprintf(buffer, sizeof(buffer), format, ap); + ZwWriteFile(okfile, NULL, NULL, NULL, &io, buffer, len, NULL, NULL); +} + +static inline void WINAPIV kprintf(const char *format, ...) +{ + __ms_va_list valist; + + __ms_va_start(valist, format); + kvprintf(format, valist); + __ms_va_end(valist); +} + +static inline void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) +{ + const char *current_file; + + if (!(current_file = drv_strrchr(file, '/')) && + !(current_file = drv_strrchr(file, '\\'))) + current_file = file; + else + current_file++; + + if (todo_level) + { + if (condition) + { + kprintf("%s:%d: Test succeeded inside todo block: ", current_file, line); + kvprintf(msg, args); + InterlockedIncrement(&todo_failures); + } + else + { + if (winetest_debug > 0) + { + kprintf("%s:%d: Test marked todo: ", current_file, line); + kvprintf(msg, args); + } + InterlockedIncrement(&todo_successes); + } + } + else + { + if (!condition) + { + kprintf("%s:%d: Test failed: ", current_file, line); + kvprintf(msg, args); + InterlockedIncrement(&failures); + } + else + { + if (winetest_report_success) + kprintf("%s:%d: Test succeeded\n", current_file, line); + InterlockedIncrement(&successes); + } + } +} + +static inline void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) +{ + __ms_va_list args; + __ms_va_start(args, msg); + vok_(file, line, condition, msg, args); + __ms_va_end(args); +} + +static inline void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +{ + const char *current_file; + + if (!(current_file = drv_strrchr(file, '/')) && + !(current_file = drv_strrchr(file, '\\'))) + current_file = file; + else + current_file++; + + kprintf("%s:%d: Tests skipped: ", current_file, line); + kvprintf(msg, args); + skipped++; +} + +static inline void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +{ + __ms_va_list args; + __ms_va_start(args, msg); + if (running_under_wine) + vok_(file, line, 0, msg, args); + else + vskip_(file, line, msg, args); + __ms_va_end(args); +} + +static inline void winetest_start_todo( int is_todo ) +{ + todo_level = (todo_level << 1) | (is_todo != 0); + todo_do_loop=1; +} + +static inline int winetest_loop_todo(void) +{ + int do_loop=todo_do_loop; + todo_do_loop=0; + return do_loop; +} + +static inline void winetest_end_todo(void) +{ + todo_level >>= 1; +} + +static inline int broken(int condition) +{ + return !running_under_wine && condition; +} + +#define ok(condition, ...) ok_(__FILE__, __LINE__, condition, __VA_ARGS__) +#define todo_if(is_todo) for (winetest_start_todo(is_todo); \ + winetest_loop_todo(); \ + winetest_end_todo()) +#define todo_wine todo_if(running_under_wine) +#define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) +#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) -- 2.26.2

1 5

[PATCH 1/4] oleaut32: Fix TypeLibCount for SLTG_OtherTypeInfo
by Vijay Kiran Kamuju June 11, 2020

June 11, 2020

Based on patch by Sebastian Lackner <sebastian(a)fds-team.de> From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 4

[PATCH 3/4] dwrite: Use BitScanReverse instead of dwrite_log2i.
by Jacek Caban June 11, 2020

June 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dwrite/opentype.c | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-)

2 1

[PATCH 2/4] dwrite: Use BitScanForward instead of dwrite_ctz.
by Jacek Caban June 11, 2020

June 11, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dwrite/opentype.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)

2 1

[PATCH v2] gdi32: Support LUID in D3DKMTOpenAdapterFromGdiDisplayName().
by Zhiyi Zhang June 11, 2020

June 11, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 185706. Don't use EnumDisplayDevicesW(). dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/driver.c | 84 +++++++++++++++++++++++++++++++++++---- dlls/gdi32/tests/driver.c | 2 + 3 files changed, 79 insertions(+), 9 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..4f1cef0b4f9 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; @@ -159,6 +165,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,17 +1371,31 @@ 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 state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; + static const WCHAR video_value_fmtW[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; + static const WCHAR video_keyW[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; + static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; + WCHAR *end, key_nameW[MAX_PATH], bufferW[MAX_PATH]; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + NTSTATUS status = STATUS_UNSUCCESSFUL; static D3DKMT_HANDLE handle_start = 0; struct d3dkmt_adapter *adapter; - WCHAR *end; - int id; + SP_DEVINFO_DATA device_data; + DWORD size, state_flags; + DEVPROPTYPE type; + HANDLE mutex; + LUID luid; + int index; TRACE("(%p) semi-stub\n", desc); if (!desc || strncmpiW( desc->DeviceName, displayW, ARRAY_SIZE(displayW) )) return STATUS_UNSUCCESSFUL; - id = strtolW( desc->DeviceName + ARRAY_SIZE(displayW), &end, 10 ) - 1; + index = strtolW( desc->DeviceName + ARRAY_SIZE(displayW), &end, 10 ) - 1; if (*end) return STATUS_UNSUCCESSFUL; @@ -1369,6 +1403,35 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI if (!adapter) return STATUS_NO_MEMORY; + /* Get adapter LUID from SetupAPI */ + mutex = get_display_device_init_mutex(); + + size = sizeof( bufferW ); + sprintfW( key_nameW, video_value_fmtW, index ); + if (RegGetValueW( HKEY_LOCAL_MACHINE, video_keyW, key_nameW, RRF_RT_REG_SZ, NULL, bufferW, &size )) + goto done; + + /* Strip \Registry\Machine\ prefix */ + lstrcpyW( key_nameW, bufferW + 18 ); + size = sizeof( state_flags ); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, state_flagsW, RRF_RT_REG_DWORD, NULL, + &state_flags, &size )) + goto done; + + if (!(state_flags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + goto done; + + size = sizeof( bufferW ); + if (RegGetValueW( HKEY_CURRENT_CONFIG, key_nameW, gpu_idW, RRF_RT_REG_SZ, NULL, bufferW, &size )) + goto done; + + devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); + device_data.cbSize = sizeof( device_data ); + SetupDiOpenDeviceInfoW( devinfo, bufferW, NULL, 0, &device_data ); + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof( luid ), NULL, 0)) + goto done; + EnterCriticalSection( &driver_section ); /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ adapter->handle = ++handle_start; @@ -1376,11 +1439,16 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI LeaveCriticalSection( &driver_section ); desc->hAdapter = handle_start; - /* FIXME: Support AdapterLuid */ - desc->AdapterLuid.LowPart = 0; - desc->AdapterLuid.HighPart = 0; - desc->VidPnSourceId = id; - return STATUS_SUCCESS; + desc->AdapterLuid = luid; + desc->VidPnSourceId = index; + status = STATUS_SUCCESS; + +done: + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + if (status != STATUS_SUCCESS) + heap_free( adapter ); + return status; } /****************************************************************************** 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.25.1

2 3