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

[PATCH] msado15: Add IConnectionPointContainer stub to _Connection.
by Aaro Altonen 28 May '20

28 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49272 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- dlls/msado15/connection.c | 67 +++++++++++++++++++++++++++++++--- dlls/msado15/tests/msado15.c | 5 +++ include/msado15_backcompat.idl | 2 +- 3 files changed, 67 insertions(+), 7 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 2f0aa0c8df..5d8d8cb72b 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -32,12 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct connection { - _Connection Connection_iface; - ISupportErrorInfo ISupportErrorInfo_iface; - LONG refs; - ObjectStateEnum state; - LONG timeout; - WCHAR *datasource; + _Connection Connection_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + IConnectionPointContainer IConnectionPointContainer_iface; + LONG refs; + ObjectStateEnum state; + LONG timeout; + WCHAR *datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -50,6 +51,11 @@ static inline struct connection *impl_from_ISupportErrorInfo( ISupportErrorInfo return CONTAINING_RECORD( iface, struct connection, ISupportErrorInfo_iface ); } +static inline struct connection *impl_from_IConnectionPointContainer( IConnectionPointContainer *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -83,6 +89,10 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_IConnectionPointContainer )) + { + *obj = &connection->IConnectionPointContainer_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -397,6 +407,50 @@ static const struct ISupportErrorInfoVtbl support_error_vtbl = supporterror_InterfaceSupportsErrorInfo }; +static HRESULT WINAPI connpointcontainer_QueryInterface( IConnectionPointContainer *iface, + REFIID riid, void **obj ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + return connection_QueryInterface( &connection->Connection_iface, riid, obj ); +} + +static ULONG WINAPI connpointcontainer_AddRef( IConnectionPointContainer *iface ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + return connection_AddRef( &connection->Connection_iface ); +} + +static ULONG WINAPI connpointcontainer_Release( IConnectionPointContainer *iface ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + return connection_Release( &connection->Connection_iface ); +} + +static HRESULT WINAPI connpointcontainer_EnumConnectionPoints( IConnectionPointContainer *iface, + IEnumConnectionPoints **points ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + FIXME( "%p, %p\n", connection, points ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpointcontainer_FindConnectionPoint( IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **point ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + FIXME( "%p, %s, %p\n", connection, debugstr_guid( riid ), point ); + return E_NOTIMPL; +} + +static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = +{ + connpointcontainer_QueryInterface, + connpointcontainer_AddRef, + connpointcontainer_Release, + connpointcontainer_EnumConnectionPoints, + connpointcontainer_FindConnectionPoint +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -404,6 +458,7 @@ HRESULT Connection_create( void **obj ) if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; connection->Connection_iface.lpVtbl = &connection_vtbl; connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; + connection->IConnectionPointContainer_iface.lpVtbl = &connpointcontainer_vtbl; connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 9834f55863..349363b7c5 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -666,6 +666,7 @@ static void test_Connection(void) _Connection *connection; IRunnableObject *runtime; ISupportErrorInfo *errorinfo; + IConnectionPointContainer *pointcontainer; LONG state, timeout; BSTR str, str2; @@ -679,6 +680,10 @@ static void test_Connection(void) ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); ISupportErrorInfo_Release(errorinfo); + hr = _Connection_QueryInterface(connection, &IID_IConnectionPointContainer, (void**)&pointcontainer); + ok(hr == S_OK, "Failed to get IConnectionPointContainer interface %08x\n", hr); + IConnectionPointContainer_Release(pointcontainer); + if (0) /* Crashes on windows */ { hr = _Connection_get_State(connection, NULL); diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index 68fda6ab21..33e76c2da3 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "oaidl.idl"; +import "ocidl.idl"; interface _ADO; interface _Collection; -- 2.26.2

2 1

[PATCH v2 1/2] wtsapi32: Implement WTSQuerySessionInformationA.
by Gijs Vermeulen 28 May '20

28 May '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49178 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wtsapi32/tests/wtsapi.c | 44 +++++++++++++++++++++++++++++------- dlls/wtsapi32/wtsapi32.c | 40 ++++++++++++++++++++++++-------- 2 files changed, 67 insertions(+), 17 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 67f56bbd7f..f45598f548 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -90,19 +90,47 @@ static void test_WTSEnumerateProcessesW(void) WTSFreeMemory(info); } -static void test_WTSQuerySessionInformationW(void) +static void test_WTSQuerySessionInformation(void) { BOOL ret; - WCHAR *buf; + WCHAR *buf1; + char *buf2; DWORD count; count = 0; - buf = NULL; - ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf, &count); + buf1 = NULL; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf1, &count); ok(ret, "got %u\n", GetLastError()); - ok(buf != NULL, "buf not set\n"); - ok(count == (lstrlenW(buf) + 1) * sizeof(WCHAR), "got %u\n", count); - WTSFreeMemory(buf); + ok(buf1 != NULL, "buf not set\n"); + ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + WTSFreeMemory(buf1); + + SetLastError(0xdeadbeef); + count = 0; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 0, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + count = 1; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); + ok(!ret, "got %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, NULL); + ok(!ret, "got %u\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "got %u\n", GetLastError()); + + count = 0; + buf2 = NULL; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, &buf2, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf2 != NULL, "buf not set\n"); + ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + WTSFreeMemory(buf2); } static void test_WTSQueryUserToken(void) @@ -118,6 +146,6 @@ static void test_WTSQueryUserToken(void) START_TEST (wtsapi) { test_WTSEnumerateProcessesW(); - test_WTSQuerySessionInformationW(); + test_WTSQuerySessionInformation(); test_WTSQueryUserToken(); } diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 026e7f4369..e7629dff5a 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -19,6 +19,7 @@ #include <stdlib.h> #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wtsapi32.h" #include "wine/debug.h" #include "wine/heap.h" @@ -287,17 +288,38 @@ HANDLE WINAPI WTSOpenServerW(LPWSTR pServerName) /************************************************************ * WTSQuerySessionInformationA (WTSAPI32.@) */ -BOOL WINAPI WTSQuerySessionInformationA( - HANDLE hServer, - DWORD SessionId, - WTS_INFO_CLASS WTSInfoClass, - LPSTR* Buffer, - DWORD* BytesReturned) +BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INFO_CLASS class, char **buffer, DWORD *count) { - /* FIXME: Forward request to winsta.dll::WinStationQueryInformationA */ - FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, - Buffer, BytesReturned); + WCHAR *bufferW = NULL; + + TRACE("%p 0x%08x %d %p %p\n", server, session_id, class, buffer, count); + if (!buffer || !count) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (WTSQuerySessionInformationW(server, session_id, class, &bufferW, count)) + { + *count = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL); + if (*count) + { + if (!(*buffer = heap_alloc(*count))) + { + heap_free(bufferW); + return FALSE; + } + + if ((*count = WideCharToMultiByte(CP_ACP, 0, bufferW, -1, *buffer, *count, NULL, NULL))) + { + heap_free(bufferW); + return TRUE; + } + heap_free(*buffer); + } + heap_free(bufferW); + } return FALSE; } -- 2.26.2

2 2

[PATCH 1/5] dwrite: Keep text properties zero initialized.
by Nikolay Sivov 28 May '20

28 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 6 +-- dlls/dwrite/dwrite_private.h | 10 ---- dlls/dwrite/shape.c | 99 ------------------------------------ 3 files changed, 2 insertions(+), 113 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 556191a13d7..56950a5baa3 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -34,11 +34,11 @@ extern const unsigned short wine_scripts_table[] DECLSPEC_HIDDEN; /* Number of characters needed for LOCALE_SNATIVEDIGITS */ #define NATIVE_DIGITS_LEN 11 -struct dwritescript_properties { +struct dwritescript_properties +{ DWRITE_SCRIPT_PROPERTIES props; UINT32 scripttags[3]; /* Maximum 2 script tags, 0-terminated. */ BOOL is_complex; - const struct scriptshaping_ops *ops; }; #define _OT(a,b,c,d) DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d) @@ -1194,8 +1194,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, *actual_glyph_count = context.glyph_count; memcpy(glyphs, context.u.subst.glyphs, context.glyph_count * sizeof(*glyphs)); memcpy(glyph_props, context.u.subst.glyph_props, context.glyph_count * sizeof(*glyph_props)); - hr = default_shaping_ops.set_text_glyphs_props(&context, clustermap, glyphs, *actual_glyph_count, - text_props, glyph_props); } heap_free(context.u.subst.glyph_props); diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index cf3e0f7c123..2ed53658cd2 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -571,15 +571,5 @@ extern void opentype_layout_apply_gsub_features(struct scriptshaping_context *co extern void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, unsigned int script_index, unsigned int language_index, const struct shaping_features *features) DECLSPEC_HIDDEN; -struct scriptshaping_ops -{ - HRESULT (*contextual_shaping)(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, UINT32* actual_glyph_count); - HRESULT (*set_text_glyphs_props)(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, - UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props); - const struct shaping_features *gpos_features; -}; - -extern const struct scriptshaping_ops default_shaping_ops DECLSPEC_HIDDEN; - extern HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; extern HRESULT shape_get_positions(struct scriptshaping_context *context, const unsigned int *scripts) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index b7b40d1211d..32aabac5f68 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -55,105 +55,6 @@ void release_scriptshaping_cache(struct scriptshaping_cache *cache) heap_free(cache); } -static void shape_update_clusters_from_glyphprop(UINT32 glyphcount, UINT32 text_len, UINT16 *clustermap, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) -{ - UINT32 i; - - for (i = 0; i < glyphcount; i++) { - if (!glyph_props[i].isClusterStart) { - UINT32 j; - - for (j = 0; j < text_len; j++) { - if (clustermap[j] == i) { - int k = j; - while (k >= 0 && k < text_len && !glyph_props[clustermap[k]].isClusterStart) - k--; - - if (k >= 0 && k < text_len && glyph_props[clustermap[k]].isClusterStart) - clustermap[j] = clustermap[k]; - } - } - } - } -} - -static int compare_clustersearch(const void *a, const void* b) -{ - UINT16 target = *(UINT16*)a; - UINT16 index = *(UINT16*)b; - int ret = 0; - - if (target > index) - ret = 1; - else if (target < index) - ret = -1; - - return ret; -} - -/* Maps given glyph position in glyph indices array to text index this glyph represents. - Lowest possible index is returned. - - clustermap [I] Text index to index in glyph indices array map - len [I] Clustermap size - target [I] Index in glyph indices array to map - */ -static INT32 map_glyph_to_text_pos(const UINT16 *clustermap, UINT32 len, UINT16 target) -{ - UINT16 *ptr; - INT32 k; - - ptr = bsearch(&target, clustermap, len, sizeof(UINT16), compare_clustersearch); - if (!ptr) - return -1; - - /* get to the beginning */ - for (k = (ptr - clustermap) - 1; k >= 0 && clustermap[k] == target; k--) - ; - k++; - - return k; -} - -static HRESULT default_set_text_glyphs_props(struct scriptshaping_context *context, UINT16 *clustermap, UINT16 *glyph_indices, - UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) -{ - UINT32 i; - - for (i = 0; i < glyphcount; i++) { - UINT32 char_index[20]; - UINT32 char_count = 0; - INT32 k; - - k = map_glyph_to_text_pos(clustermap, context->length, i); - if (k >= 0) { - for (; k < context->length && clustermap[k] == i; k++) - char_index[char_count++] = k; - } - - if (char_count == 0) - continue; - - if (char_count == 1 && isspaceW(context->text[char_index[0]])) { - glyph_props[i].justification = SCRIPT_JUSTIFY_BLANK; - text_props[char_index[0]].isShapedAlone = context->text[char_index[0]] == ' '; - } - else - glyph_props[i].justification = SCRIPT_JUSTIFY_CHARACTER; - } - - /* FIXME: update properties using GDEF table */ - shape_update_clusters_from_glyphprop(glyphcount, context->length, clustermap, glyph_props); - - return S_OK; -} - -const struct scriptshaping_ops default_shaping_ops = -{ - NULL, - default_set_text_glyphs_props -}; - static unsigned int shape_select_script(const struct scriptshaping_cache *cache, DWORD kind, const DWORD *scripts, unsigned int *script_index) { -- 2.26.2

1 4

[PATCH v2 2/4] winex11.drv: Set output id property for monitors.
by Zhiyi Zhang 28 May '20

28 May '20

From: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 55533255f36..cf661f9f06f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -41,6 +41,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); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -506,6 +507,11 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_INT64, (const BYTE *)gpu_luid, sizeof(*gpu_luid), 0)) goto done; + /* Write DEVPROPKEY_MONITOR_OUTPUT_ID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_OUTPUT_ID, + DEVPROP_TYPE_UINT32, (const BYTE *)&video_index, sizeof(video_index), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); -- 2.25.1

1 0

[PATCH v2 1/4] winex11.drv: Set GPU LUID property for monitors.
by Zhiyi Zhang 28 May '20

28 May '20

From: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 185960 and 185961. Update comments and split patches. And yes, the LUID property stored in GPUs is of type DEVPROP_TYPE_UINT64 but it's DEVPROP_TYPE_INT64 in monitors. 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 daea434dabf..55533255f36 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; } -- 2.25.1

1 0

[PATCH 1/7] ntoskrnl.exe: Partially implement KeInitializeDpc() function.
by Paul Gofman 28 May '20

28 May '20

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- 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 bfac3970117..d50eac6c821 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 8368f8c6e9f..9dce98516b6 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); -- 2.26.2

1 6

[PATCH 3/3] shlwapi: RegQueryValueExW() wants bytes, not chars.
by Serge Gautherie 28 May '20

28 May '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/shlwapi/ordinal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8c9e324..e73ba6e 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3372,7 +3372,7 @@ HRESULT WINAPI CLSIDFromStringWrap(LPCWSTR idstr, CLSID *id) */ HRESULT WINAPI SHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size) { - DWORD type, sz = size; + DWORD type, sz = size * sizeof(WCHAR); if(RegQueryValueExW(hkey, value, NULL, &type, (LPBYTE)buf, &sz) != ERROR_SUCCESS) return E_FAIL; -- 2.10.0.windows.1

1 0

[PATCH 1/3] advpack: RegQueryValueExW() wants bytes, not chars.
by Serge Gautherie 28 May '20

28 May '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/advpack/advpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index f2de8a6..e3d4d50 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -907,7 +907,7 @@ HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance, { HKEY setup, guid; WCHAR stub[MAX_PATH]; - DWORD size = MAX_PATH; + DWORD size = sizeof(stub); HRESULT hr = S_OK; BOOL res; -- 2.10.0.windows.1

1 0

[PATCH] winemac.drv: Set monitor's GPU LUID and output ID in SetupAPI.
by Brendan Shanks 28 May '20

28 May '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winemac.drv/display.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 7d9ff2d7c6..65c46f7dcc 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -52,6 +52,8 @@ struct display_mode_descriptor BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags); 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); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -1366,7 +1368,7 @@ void macdrv_displays_changed(const macdrv_event *event) * Return FALSE on failure and TRUE on success. */ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_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)}; @@ -1414,6 +1416,7 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int 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), gpu->name, luid.HighPart, luid.LowPart); @@ -1541,7 +1544,7 @@ done: * Return FALSE on failure and TRUE on success. */ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_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 nameW[MAX_PATH]; @@ -1562,6 +1565,16 @@ static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *m (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; + + /* Write DEVPROPKEY_MONITOR_OUTPUT_ID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_OUTPUT_ID, + DEVPROP_TYPE_UINT32, (const BYTE *)&video_index, sizeof(video_index), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -1670,6 +1683,7 @@ void macdrv_init_display_devices(BOOL force) DWORD disposition = 0; WCHAR guidW[40]; WCHAR driverW[1024]; + LUID gpu_luid; mutex = CreateMutexW(NULL, FALSE, init_mutexW); WaitForSingleObject(mutex, INFINITE); @@ -1699,7 +1713,7 @@ void macdrv_init_display_devices(BOOL force) for (gpu = 0; gpu < gpu_count; gpu++) { - if (!macdrv_init_gpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + if (!macdrv_init_gpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW, &gpu_luid)) goto done; /* Initialize adapters */ @@ -1721,7 +1735,7 @@ void macdrv_init_display_devices(BOOL force) for (monitor = 0; monitor < monitor_count; monitor++) { TRACE("monitor: %#x %s\n", monitor, monitors[monitor].name); - if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index, &gpu_luid)) goto done; } -- 2.26.2

1 0

[PATCH] winex11.drv: Set monitor's GPU LUID and output ID in SetupAPI.
by Brendan Shanks 28 May '20

28 May '20

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/winex11.drv/display.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index daea434dab..38d7b9bad5 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -40,6 +40,8 @@ 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); +DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); /* Wine specific monitor properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); @@ -319,7 +321,7 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) /* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ 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,16 @@ 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; + + /* Write DEVPROPKEY_MONITOR_OUTPUT_ID */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_MONITOR_OUTPUT_ID, + DEVPROP_TYPE_UINT32, (const BYTE *)&video_index, sizeof(video_index), 0)) + goto done; + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -599,6 +612,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 +641,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 +663,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; } -- 2.26.2

1 0