- Wine-Devel - list.winehq.org

[PATCH 2/4] oleaut32: Implement decoding of SLTG help strings.
by Vijay Kiran Kamuju June 11, 2020

June 11, 2020

Tested using builtin oleview and ole1 typelib from older DDks. oleview now shows the helpstrings for SLTG interfaces and coclasses. From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v3 2/2] winhttp: Add WinHttpWebSocket* function stubs.
by Hans Leidekker June 11, 2020

June 11, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v3: Move stubs to request.c and add WinHttpWebSocketShutdown. Alistair, there was no sign-off on v2. Can you reply with your sign-off if you agree with my changes? Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winhttp/winhttp.spec | 6 ++++++ include/winhttp.h | 6 ++++++ 3 files changed, 50 insertions(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index fbccf0228b9..79d66fd5e80 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3013,6 +3013,44 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write return !ret; } +HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade( HINTERNET hrequest, DWORD_PTR context ) +{ + FIXME("%p, %08lx\n", hrequest, context); + return NULL; +} + +DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, void *buf, DWORD len ) +{ + FIXME("%p, %u, %p, %u\n", hsocket, type, buf, len); + return ERROR_INVALID_PARAMETER; +} + +DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *read, + WINHTTP_WEB_SOCKET_BUFFER_TYPE *type ) +{ + FIXME("%p, %p, %u, %p, %p\n", hsocket, buf, len, read, type); + return ERROR_INVALID_PARAMETER; +} + +DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) +{ + FIXME("%p, %u, %p, %u\n", hsocket, status, reason, len); + return ERROR_INVALID_PARAMETER; +} + +DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reason, DWORD len ) +{ + FIXME("%p, %u, %p, %u\n", hsocket, status, reason, len); + return ERROR_INVALID_PARAMETER; +} + +DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status, void *reason, DWORD len, + DWORD *consumed ) +{ + FIXME("%p, %p, %p, %u, %p\n", hsocket, status, reason, len, consumed); + return ERROR_INVALID_PARAMETER; +} + enum request_state { REQUEST_STATE_INITIALIZED, diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec index 28dcb1598b7..beace245a8c 100644 --- a/dlls/winhttp/winhttp.spec +++ b/dlls/winhttp/winhttp.spec @@ -28,4 +28,10 @@ @ stdcall WinHttpSetTimeouts(ptr long long long long) @ stdcall WinHttpTimeFromSystemTime(ptr ptr) @ stdcall WinHttpTimeToSystemTime(wstr ptr) +@ stdcall WinHttpWebSocketClose(ptr long ptr long) +@ stdcall WinHttpWebSocketCompleteUpgrade(ptr ptr) +@ stdcall WinHttpWebSocketQueryCloseStatus(ptr ptr ptr long ptr) +@ stdcall WinHttpWebSocketReceive(ptr ptr long ptr ptr) +@ stdcall WinHttpWebSocketSend(ptr long ptr long) +@ stdcall WinHttpWebSocketShutdown(ptr long ptr long) @ stdcall WinHttpWriteData(ptr ptr long ptr) diff --git a/include/winhttp.h b/include/winhttp.h index ddfda480880..930c5891f5e 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -853,6 +853,12 @@ WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); BOOL WINAPI WinHttpTimeFromSystemTime(const SYSTEMTIME *,LPWSTR); BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); +DWORD WINAPI WinHttpWebSocketClose(HINTERNET,USHORT,void *,DWORD); +HINTERNET WINAPI WinHttpWebSocketCompleteUpgrade(HINTERNET,DWORD_PTR); +DWORD WINAPI WinHttpWebSocketQueryCloseStatus(HINTERNET,USHORT*,void*,DWORD,DWORD*); +DWORD WINAPI WinHttpWebSocketReceive(HINTERNET,void*,DWORD,DWORD*,WINHTTP_WEB_SOCKET_BUFFER_TYPE*); +DWORD WINAPI WinHttpWebSocketSend(HINTERNET,WINHTTP_WEB_SOCKET_BUFFER_TYPE,void*,DWORD); +DWORD WINAPI WinHttpWebSocketShutdown(HINTERNET,USHORT,void*,DWORD); BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); DWORD WINAPI WinHttpWriteProxySettings(HINTERNET,BOOL,WINHTTP_PROXY_SETTINGS*); -- 2.20.1

2 1

[PATCH v4 1/2] oleaut32/tests: Add tests for ITypeInfo::GetDllEntry()
by Porot Mo June 11, 2020

June 11, 2020

Signed-off-by: Porot Mo <porotmjp(a)gmail.com> --- v3: check returned dllname, split tests and fix v4: add todo_wine to pass tests dlls/oleaut32/tests/test_reg.idl | 13 ++++++++++ dlls/oleaut32/tests/typelib.c | 53 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 2 deletions(-)

2 2

[PATCH v2 2/4] winex11.drv: Support multiple adapter display settings in registry.
by Zhiyi Zhang June 11, 2020

June 11, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 4 +- dlls/winex11.drv/settings.c | 103 +++++++++++++++++++++++------------- dlls/winex11.drv/x11drv.h | 2 + 3 files changed, 71 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 4acd7299624..1dedf32a52f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -124,7 +124,7 @@ static CRITICAL_SECTION_DEBUG screen_critsect_debug = }; static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; -static HANDLE get_display_device_init_mutex(void) +HANDLE get_display_device_init_mutex(void) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); @@ -133,7 +133,7 @@ static HANDLE get_display_device_init_mutex(void) return mutex; } -static void release_display_device_init_mutex(HANDLE mutex) +void release_display_device_init_mutex(HANDLE mutex) { ReleaseMutex(mutex); CloseHandle(mutex); diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index bc9f7aa1dca..c3f31d0430d 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -19,9 +19,6 @@ */ #include "config.h" -#include <string.h> -#include <stdio.h> -#include <assert.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -32,6 +29,7 @@ #include "winreg.h" #include "wingdi.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11settings); @@ -154,43 +152,63 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_AddOneMode( primary.right - primary.left, primary.bottom - primary.top, 0, 60); } -static BOOL get_display_device_reg_key(char *key, unsigned len) +static BOOL get_display_device_reg_key(const WCHAR *device_name, WCHAR *key, unsigned len) { - static const char display_device_guid_prop[] = "__wine_display_device_guid"; - static const char video_path[] = "System\\CurrentControlSet\\Control\\Video\\{"; - static const char display0[] = "}\\0000"; - ATOM guid_atom; + static const WCHAR display[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; + static const WCHAR video_value_fmt[] = {'\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; + static const WCHAR video_key[] = {'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O','\\',0}; + WCHAR value_name[MAX_PATH], buffer[MAX_PATH], *end_ptr; + DWORD adapter_index, size; - assert(len >= sizeof(video_path) + sizeof(display0) + 40); - - guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), display_device_guid_prop)); - if (!guid_atom) return FALSE; - - memcpy(key, video_path, sizeof(video_path)); - - if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) + /* Device name has to be \\.\DISPLAY%d */ + if (strncmpiW(device_name, display, ARRAY_SIZE(display))) return FALSE; - strcat(key, display0); + /* Parse \\.\DISPLAY* */ + adapter_index = strtolW(device_name + ARRAY_SIZE(display), &end_ptr, 10) - 1; + if (*end_ptr) + return FALSE; - TRACE("display device key %s\n", wine_dbgstr_a(key)); + /* Open \Device\Video* in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + sprintfW(value_name, video_value_fmt, adapter_index); + size = sizeof(buffer); + if (RegGetValueW(HKEY_LOCAL_MACHINE, video_key, value_name, RRF_RT_REG_SZ, NULL, buffer, &size)) + return FALSE; + + if (len < lstrlenW(buffer + 18) + 1) + return FALSE; + + /* Skip \Registry\Machine\ prefix */ + lstrcpyW(key, buffer + 18); + TRACE("display device %s registry settings key %s.\n", wine_dbgstr_w(device_name), wine_dbgstr_w(key)); return TRUE; } -static BOOL read_registry_settings(DEVMODEW *dm) +static BOOL read_registry_settings(const WCHAR *device_name, DEVMODEW *dm) { - char wine_x11_reg_key[128]; + WCHAR wine_x11_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; DWORD type, size; BOOL ret = TRUE; dm->dmFields = 0; - if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_x11_reg_key, ARRAY_SIZE(wine_x11_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegOpenKeyExA(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, KEY_READ, &hkey)) + if (RegOpenKeyExW(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, KEY_READ, &hkey)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define query_value(name, data) \ size = sizeof(DWORD); \ @@ -218,21 +236,30 @@ static BOOL read_registry_settings(DEVMODEW *dm) #undef query_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } -static BOOL write_registry_settings(const DEVMODEW *dm) +static BOOL write_registry_settings(const WCHAR *device_name, const DEVMODEW *dm) { - char wine_x11_reg_key[128]; + WCHAR wine_x11_reg_key[MAX_PATH]; + HANDLE mutex; HKEY hkey; BOOL ret = TRUE; - if (!get_display_device_reg_key(wine_x11_reg_key, sizeof(wine_x11_reg_key))) + mutex = get_display_device_init_mutex(); + if (!get_display_device_reg_key(device_name, wine_x11_reg_key, ARRAY_SIZE(wine_x11_reg_key))) + { + release_display_device_init_mutex(mutex); return FALSE; + } - if (RegCreateKeyExA(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, NULL, + if (RegCreateKeyExW(HKEY_CURRENT_CONFIG, wine_x11_reg_key, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL)) + { + release_display_device_init_mutex(mutex); return FALSE; + } #define set_value(name, data) \ if (RegSetValueExA(hkey, name, 0, REG_DWORD, (const BYTE*)(data), sizeof(DWORD))) \ @@ -251,6 +278,7 @@ static BOOL write_registry_settings(const DEVMODEW *dm) #undef set_value RegCloseKey(hkey); + release_display_device_init_mutex(mutex); return ret; } @@ -301,7 +329,7 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo if (n == ENUM_REGISTRY_SETTINGS) { TRACE("mode %d (registry) -- getting default mode (%s)\n", n, handler_name); - return read_registry_settings(devmode); + return read_registry_settings(name, devmode); } if (n < dd_mode_count) { @@ -368,13 +396,6 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, devmode = &default_mode; } - if (lstrcmpiW(primary_adapter, devname)) - { - FIXME("Changing non-primary adapter %s settings is currently unsupported.\n", - wine_dbgstr_w(devname)); - return DISP_CHANGE_SUCCESSFUL; - } - if (is_detached_mode(devmode)) { FIXME("Detaching adapters is currently unsupported.\n"); @@ -407,8 +428,18 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, /* we have a valid mode */ TRACE("Requested display settings match mode %d (%s)\n", i, handler_name); - if (flags & CDS_UPDATEREGISTRY) - write_registry_settings(devmode); + if (flags & CDS_UPDATEREGISTRY && !write_registry_settings(devname, devmode)) + { + ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); + return DISP_CHANGE_NOTUPDATED; + } + + if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter %s settings is currently unsupported.\n", + wine_dbgstr_w(devname)); + return DISP_CHANGE_SUCCESSFUL; + } if (!(flags & (CDS_TEST | CDS_NORESET))) return pSetCurrentMode(i); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5021c71a415..a9eaed20cab 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -754,6 +754,8 @@ struct x11drv_display_device_handler void (*register_event_handlers)(void); }; +extern HANDLE get_display_device_init_mutex(void) DECLSPEC_HIDDEN; +extern void release_display_device_init_mutex(HANDLE) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_RegisterEventHandlers(void) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH v2 1/4] explorer: Initialize registry display settings for all adapters.
by Zhiyi Zhang June 11, 2020

June 11, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 186364~186367. Rebase and duplicate string constants. programs/explorer/desktop.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 8a8e5bc0712..e7acb2db772 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -22,6 +22,8 @@ #include <stdio.h> #define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #define OEMRESOURCE #include <windows.h> #include <rpc.h> @@ -881,16 +883,31 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) static void initialize_display_settings(void) { + DISPLAY_DEVICEW ddW; DEVMODEW dmW; + DWORD i = 0; /* Store current display mode in the registry */ - if (EnumDisplaySettingsExW( NULL, ENUM_CURRENT_SETTINGS, &dmW, 0 )) + ddW.cb = sizeof(ddW); + dmW.dmSize = sizeof(dmW); + while (EnumDisplayDevicesW( NULL, i++, &ddW, 0 )) { - WINE_TRACE( "Current display mode %ux%u %u bpp %u Hz\n", dmW.dmPelsWidth, - dmW.dmPelsHeight, dmW.dmBitsPerPel, dmW.dmDisplayFrequency ); - ChangeDisplaySettingsExW( NULL, &dmW, 0, - CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, - NULL ); + if (!EnumDisplaySettingsExW( ddW.DeviceName, ENUM_CURRENT_SETTINGS, &dmW, 0)) + { + WINE_ERR( "Failed to query current display settings for %s.\n", + wine_dbgstr_w( ddW.DeviceName ) ); + continue; + } + + WINE_TRACE( "Device %s current display mode %ux%u %uBits %uHz at %d,%d.\n", + wine_dbgstr_w( ddW.DeviceName ), dmW.dmPelsWidth, dmW.dmPelsHeight, + dmW.dmBitsPerPel, dmW.dmDisplayFrequency, dmW.u1.s2.dmPosition.x, + dmW.u1.s2.dmPosition.y ); + + if (ChangeDisplaySettingsExW( ddW.DeviceName, &dmW, 0, + CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, 0 )) + WINE_ERR( "Failed to initialize registry display settings for %s.\n", + wine_dbgstr_w( ddW.DeviceName ) ); } } -- 2.25.1

1 0

[PATCH v3 1/2] include: Add winhttp web socket defines
by Hans Leidekker June 11, 2020

June 11, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- include/winhttp.h | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/include/winhttp.h b/include/winhttp.h index 33fc1f915dd..ddfda480880 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -762,6 +762,54 @@ typedef struct _WINHTTP_REQUEST_STATS ULONGLONG rgullStats[WinHttpRequestStatMax]; } WINHTTP_REQUEST_STATS, *PWINHTTP_REQUEST_STATS; +typedef enum _WINHTTP_WEB_SOCKET_OPERATION +{ + WINHTTP_WEB_SOCKET_SEND_OPERATION = 0, + WINHTTP_WEB_SOCKET_RECEIVE_OPERATION = 1, + WINHTTP_WEB_SOCKET_CLOSE_OPERATION = 2, + WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION = 3 +} WINHTTP_WEB_SOCKET_OPERATION; + +typedef enum _WINHTTP_WEB_SOCKET_BUFFER_TYPE +{ + WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE = 0, + WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE = 1, + WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE = 2, + WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE = 3, + WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE = 4 +} WINHTTP_WEB_SOCKET_BUFFER_TYPE; + +typedef enum _WINHTTP_WEB_SOCKET_CLOSE_STATUS +{ + WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS = 1000, + WINHTTP_WEB_SOCKET_ENDPOINT_TERMINATED_CLOSE_STATUS = 1001, + WINHTTP_WEB_SOCKET_PROTOCOL_ERROR_CLOSE_STATUS = 1002, + WINHTTP_WEB_SOCKET_INVALID_DATA_TYPE_CLOSE_STATUS = 1003, + WINHTTP_WEB_SOCKET_EMPTY_CLOSE_STATUS = 1005, + WINHTTP_WEB_SOCKET_ABORTED_CLOSE_STATUS = 1006, + WINHTTP_WEB_SOCKET_INVALID_PAYLOAD_CLOSE_STATUS = 1007, + WINHTTP_WEB_SOCKET_POLICY_VIOLATION_CLOSE_STATUS = 1008, + WINHTTP_WEB_SOCKET_MESSAGE_TOO_BIG_CLOSE_STATUS = 1009, + WINHTTP_WEB_SOCKET_UNSUPPORTED_EXTENSIONS_CLOSE_STATUS = 1010, + WINHTTP_WEB_SOCKET_SERVER_ERROR_CLOSE_STATUS = 1011, + WINHTTP_WEB_SOCKET_SECURE_HANDSHAKE_ERROR_CLOSE_STATUS = 1015 +} WINHTTP_WEB_SOCKET_CLOSE_STATUS; + +typedef struct _WINHTTP_WEB_SOCKET_ASYNC_RESULT +{ + WINHTTP_ASYNC_RESULT AsyncResult; + WINHTTP_WEB_SOCKET_OPERATION Operation; +} WINHTTP_WEB_SOCKET_ASYNC_RESULT; + +typedef struct _WINHTTP_WEB_SOCKET_STATUS +{ + DWORD dwBytesTransferred; + WINHTTP_WEB_SOCKET_BUFFER_TYPE eBufferType; +} WINHTTP_WEB_SOCKET_STATUS; + +#define WINHTTP_WEB_SOCKET_MAX_CLOSE_REASON_LENGTH 123 +#define WINHTTP_WEB_SOCKET_MIN_KEEPALIVE_VALUE 15000 + #ifdef __cplusplus extern "C" { #endif -- 2.20.1

1 0

[PATCH v6 3/3] oleaut32: Match funcdesc using both memberid and invkind.
by Huw Davies June 11, 2020

June 11, 2020

From: Porot Mo <porotmjp(a)gmail.com> Property access functions can share the same memberid. Signed-off-by: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 3 --- dlls/oleaut32/typelib.c | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index c095d8ea0fb..a8cb966f33e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1050,11 +1050,9 @@ static void test_TypeInfo(void) /* correct memberid -- wrong invkind */ hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_FUNC, &bstrDllName, &bstrName, &ordinal); -todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYPUTREF, &bstrDllName, &bstrName, &ordinal); -todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); /* correct memberid -- correct invkind */ @@ -1069,7 +1067,6 @@ todo_wine ok_ole_success(hr, ITypeInfo_GetDllEntry); ok(!lstrcmpW(bstrDllName, wszTestDll), "got %s\n", wine_dbgstr_w(bstrDllName)); ok(bstrName == NULL, "got %s\n", wine_dbgstr_w(bstrName)); -todo_wine ok(ordinal == 2, "got ordinal: %04x\n", ordinal); SysFreeString(bstrDllName); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ab421fec90d..01bb16efbc4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1701,6 +1701,19 @@ static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid(ITypeInfoImpl *typeinfo, return NULL; } +static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid_invkind(ITypeInfoImpl *typeinfo, MEMBERID memid, INVOKEKIND invkind) +{ + int i; + + for (i = 0; i < typeinfo->typeattr.cFuncs; ++i) + { + if (typeinfo->funcdescs[i].funcdesc.memid == memid && typeinfo->funcdescs[i].funcdesc.invkind == invkind) + return &typeinfo->funcdescs[i]; + } + + return NULL; +} + static inline TLBVarDesc *TLB_get_vardesc_by_memberid(ITypeInfoImpl *typeinfo, MEMBERID memid) { int i; @@ -7804,7 +7817,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid if (This->typeattr.typekind != TKIND_MODULE) return TYPE_E_BADMODULEKIND; - pFDesc = TLB_get_funcdesc_by_memberid(This, memid); + pFDesc = TLB_get_funcdesc_by_memberid_invkind(This, memid, invKind); if (!pFDesc) return TYPE_E_ELEMENTNOTFOUND; dump_TypeInfo(This); -- 2.23.0

1 0

[PATCH v6 2/3] oleaut32/tests: Add tests for ITypeInfo::GetDllEntry()
by Huw Davies June 11, 2020

June 11, 2020

From: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/test_reg.idl | 13 ++++++++ dlls/oleaut32/tests/typelib.c | 55 ++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index c9be76b0273..d41f4bec52b 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -163,4 +163,17 @@ library register_test UINT32 field; HRESULT hr; }; + + [ + uuid(f073cd92-a199-11ea-bb37-0242ac130002), + dllname("test.dll") + ] + module TestGetDllEntry + { + [propget, entry(1)] + int test1([out] int *i); + + [propput, entry(2)] + int test1([in] int i); + }; } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 5e5b44a0345..c095d8ea0fb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -831,18 +831,22 @@ static void test_TypeInfo(void) static WCHAR wszBogus[] = { 'b','o','g','u','s',0 }; static WCHAR wszGetTypeInfo[] = { 'G','e','t','T','y','p','e','I','n','f','o',0 }; static WCHAR wszClone[] = {'C','l','o','n','e',0}; + static WCHAR wszTestDll[] = {'t','e','s','t','.','d','l','l',0}; OLECHAR* bogus = wszBogus; OLECHAR* pwszGetTypeInfo = wszGetTypeInfo; OLECHAR* pwszClone = wszClone; DISPID dispidMember; DISPPARAMS dispparams; GUID bogusguid = {0x806afb4f,0x13f7,0x42d2,{0x89,0x2c,0x6c,0x97,0xc3,0x6a,0x36,0xc1}}; + static const GUID moduleTestGetDllEntryGuid = {0xf073cd92,0xa199,0x11ea,{0xbb,0x37,0x02,0x42,0xac,0x13,0x00,0x02}}; VARIANT var, res, args[2]; UINT count, i; TYPEKIND kind; const WCHAR *filename; TYPEATTR *attr; LONG l; + WORD ordinal; + BSTR bstrDllName, bstrName; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -1025,6 +1029,52 @@ static void test_TypeInfo(void) hr = LoadTypeLib(filename, &pTypeLib); ok(hr == S_OK, "got 0x%08x\n", hr); + /* test GetDllEntry */ + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &moduleTestGetDllEntryGuid, &pTypeInfo); + ok_ole_success(hr, ITypeLib_GetTypeInfoOfGuid); + ok(pTypeInfo != NULL, "got NULL typeinfo\n"); + + /* wrong memberid -- wrong invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_FUNC, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_PROPERTYPUTREF, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + /* wrong memberid -- correct invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_PROPERTYGET, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x6000000d, INVOKE_PROPERTYPUT, &bstrDllName, &bstrName, &ordinal); + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + /* correct memberid -- wrong invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_FUNC, &bstrDllName, &bstrName, &ordinal); +todo_wine + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYPUTREF, &bstrDllName, &bstrName, &ordinal); +todo_wine + ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); + + /* correct memberid -- correct invkind */ + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYGET, &bstrDllName, &bstrName, &ordinal); + ok_ole_success(hr, ITypeInfo_GetDllEntry); + ok(!lstrcmpW(bstrDllName, wszTestDll), "got %s\n", wine_dbgstr_w(bstrDllName)); + ok(bstrName == NULL, "got %s\n", wine_dbgstr_w(bstrName)); + ok(ordinal == 1, "got ordinal: %04x\n", ordinal); + SysFreeString(bstrDllName); + + hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYPUT, &bstrDllName, &bstrName, &ordinal); + ok_ole_success(hr, ITypeInfo_GetDllEntry); + ok(!lstrcmpW(bstrDllName, wszTestDll), "got %s\n", wine_dbgstr_w(bstrDllName)); + ok(bstrName == NULL, "got %s\n", wine_dbgstr_w(bstrName)); +todo_wine + ok(ordinal == 2, "got ordinal: %04x\n", ordinal); + SysFreeString(bstrDllName); + + ITypeInfo_Release(pTypeInfo); + hr = ITypeLib_GetTypeInfoOfGuid(pTypeLib, &IID_IInvokeTest, &pTypeInfo); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -5092,7 +5142,8 @@ static void test_register_typelib(BOOL system_registration) { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, - { TKIND_RECORD, 0 } + { TKIND_RECORD, 0 }, + { TKIND_MODULE, 0 }, }; trace("Starting %s typelib registration tests\n", @@ -5126,7 +5177,7 @@ static void test_register_typelib(BOOL system_registration) ok(hr == S_OK, "got %08x\n", hr); count = ITypeLib_GetTypeInfoCount(typelib); - ok(count == 14, "got %d\n", count); + ok(count == 15, "got %d\n", count); for(i = 0; i < count; i++) { -- 2.23.0

1 0

[PATCH v6 1/3] oleaut32: Return early if there is no matching funcdesc.
by Huw Davies June 11, 2020

June 11, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/typelib.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f8d71368345..ab421fec90d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7805,28 +7805,24 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid return TYPE_E_BADMODULEKIND; pFDesc = TLB_get_funcdesc_by_memberid(This, memid); - if(pFDesc){ - dump_TypeInfo(This); - if (TRACE_ON(ole)) - dump_TLBFuncDescOne(pFDesc); - - if (pBstrDllName) - *pBstrDllName = SysAllocString(TLB_get_bstr(This->DllName)); - - if (!IS_INTRESOURCE(pFDesc->Entry) && (pFDesc->Entry != (void*)-1)) { - if (pBstrName) - *pBstrName = SysAllocString(TLB_get_bstr(pFDesc->Entry)); - if (pwOrdinal) - *pwOrdinal = -1; - return S_OK; - } - if (pBstrName) - *pBstrName = NULL; - if (pwOrdinal) - *pwOrdinal = LOWORD(pFDesc->Entry); - return S_OK; - } - return TYPE_E_ELEMENTNOTFOUND; + if (!pFDesc) return TYPE_E_ELEMENTNOTFOUND; + + dump_TypeInfo(This); + if (TRACE_ON(ole)) dump_TLBFuncDescOne(pFDesc); + + if (pBstrDllName) *pBstrDllName = SysAllocString(TLB_get_bstr(This->DllName)); + + if (!IS_INTRESOURCE(pFDesc->Entry) && (pFDesc->Entry != (void*)-1)) + { + if (pBstrName) *pBstrName = SysAllocString(TLB_get_bstr(pFDesc->Entry)); + if (pwOrdinal) *pwOrdinal = -1; + } + else + { + if (pBstrName) *pBstrName = NULL; + if (pwOrdinal) *pwOrdinal = LOWORD(pFDesc->Entry); + } + return S_OK; } /* internal function to make the inherited interfaces' methods appear -- 2.23.0

1 0

[PATCH v5 3/3] oleaut32: Match funcdesc using both memberid and invkind.
by Huw Davies June 11, 2020

June 11, 2020

From: Porot Mo <porotmjp(a)gmail.com> Property access functions can share the same memberid. Signed-off-by: Porot Mo <porotmjp(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 3 --- dlls/oleaut32/typelib.c | 15 ++++++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 9f55cc41400..0e59db6ee7f 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1050,11 +1050,9 @@ static void test_TypeInfo(void) /* correct memberid -- wrong invkind */ hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_FUNC, &bstrDllName, &bstrName, &ordinal); -todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); hr = ITypeInfo_GetDllEntry(pTypeInfo, 0x60000000, INVOKE_PROPERTYPUTREF, &bstrDllName, &bstrName, &ordinal); -todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "ITypeInfo_GetDllEntry should have returned TYPE_E_ELEMENTNOTFOUND instead of 0x%08x\n", hr); /* correct memberid -- correct invkind */ @@ -1069,7 +1067,6 @@ todo_wine ok_ole_success(hr, ITypeInfo_GetDllEntry); ok(!lstrcmpW(bstrDllName, wszTestDll), "got %s\n", wine_dbgstr_w(bstrDllName)); ok(bstrName == NULL, "got %s\n", wine_dbgstr_w(bstrName)); -todo_wine ok(ordinal == 2, "got ordinal: %04x\n", ordinal); SysFreeString(bstrName); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ab421fec90d..01bb16efbc4 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1701,6 +1701,19 @@ static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid(ITypeInfoImpl *typeinfo, return NULL; } +static inline TLBFuncDesc *TLB_get_funcdesc_by_memberid_invkind(ITypeInfoImpl *typeinfo, MEMBERID memid, INVOKEKIND invkind) +{ + int i; + + for (i = 0; i < typeinfo->typeattr.cFuncs; ++i) + { + if (typeinfo->funcdescs[i].funcdesc.memid == memid && typeinfo->funcdescs[i].funcdesc.invkind == invkind) + return &typeinfo->funcdescs[i]; + } + + return NULL; +} + static inline TLBVarDesc *TLB_get_vardesc_by_memberid(ITypeInfoImpl *typeinfo, MEMBERID memid) { int i; @@ -7804,7 +7817,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid if (This->typeattr.typekind != TKIND_MODULE) return TYPE_E_BADMODULEKIND; - pFDesc = TLB_get_funcdesc_by_memberid(This, memid); + pFDesc = TLB_get_funcdesc_by_memberid_invkind(This, memid, invKind); if (!pFDesc) return TYPE_E_ELEMENTNOTFOUND; dump_TypeInfo(This); -- 2.23.0

1 0