November 2022 - Wine-commits

Gabriel Ivăncescu : mshtml: Forward IDispatchEx to the document node.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 7001705c86cdf80e1175e9421006f4fa9be1858d URL: https://gitlab.winehq.org/wine/wine/-/commit/7001705c86cdf80e1175e9421006f4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 14 19:53:27 2022 +0200 mshtml: Forward IDispatchEx to the document node. And get rid of the dispex since it's useless now. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/oleobj.c | 161 +++++++------------------------------------ dlls/mshtml/tests/dom.c | 27 ++++++++ dlls/mshtml/tests/events.c | 86 ++++++++++++++++++++++- 4 files changed, 137 insertions(+), 138 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Handle cNames > 1 in GetIDsOfNames properly.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: cc0f443088863760e3a879e960d19a835f8ffa95 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc0f443088863760e3a879e960d19a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Nov 14 19:53:27 2022 +0200 mshtml: Handle cNames > 1 in GetIDsOfNames properly. Native ignores any cNames > 1 and doesn't even fill the dispids for them. Note that it was already wrong; the multiple dispids are supposed to correspond to the member's argument names, not extra dispids. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 13 ++--- dlls/mshtml/htmlwindow.c | 12 ++--- dlls/mshtml/tests/dom.c | 101 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/xmlhttprequest.c | 31 ++++++++++++ 4 files changed, 142 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d8aaf819f58..c70deb67209 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1636,19 +1636,16 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, LCID lcid, DISPID *rgDispId) { DispatchEx *This = impl_from_IDispatchEx(iface); - UINT i; - HRESULT hres; + HRESULT hres = S_OK; TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - for(i=0; i < cNames; i++) { - hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); - if(FAILED(hres)) - return hres; - } + /* Native ignores all cNames > 1, and doesn't even fill them */ + if(cNames) + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[0], 0, rgDispId); - return S_OK; + return hres; } static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 7014a4cd4b4..c2475afd1f6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3476,19 +3476,17 @@ static HRESULT WINAPI WindowDispEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid LCID lcid, DISPID *rgDispId) { HTMLWindow *This = impl_from_IDispatchEx(iface); - UINT i; - HRESULT hres; + HRESULT hres = S_OK; WARN("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - for(i=0; i < cNames; i++) { + /* Native ignores all cNames > 1, and doesn't even fill them */ + if(cNames) { /* We shouldn't use script's IDispatchEx here, so we shouldn't use GetDispID */ - hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); - if(FAILED(hres)) - return hres; + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[0], 0, rgDispId); } - return S_OK; + return hres; } static HRESULT WINAPI WindowDispEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c31de136cd8..4e6ad469b28 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "mshtml.h" #include "mshtmcid.h" +#include "mshtmdid.h" #include "mshtmhst.h" #include "docobj.h" #include "hlink.h" @@ -5288,6 +5289,98 @@ static void _test_doc_set_title(unsigned line, IHTMLDocument2 *doc, const WCHAR SysFreeString(tmp); } +static void test_doc_GetIDsOfNames(IHTMLDocument2 *doc) +{ + DISPID dispids[3]; + HRESULT hres; + BSTR bstr[3]; + + bstr[0] = SysAllocString(L"createStyleSheet"); + bstr[1] = SysAllocString(L"bstrHref"); + bstr[2] = SysAllocString(L"lIndex"); + dispids[0] = 0; + dispids[1] = 0xdead; + dispids[2] = 0xbeef; + hres = IHTMLDocument2_GetIDsOfNames(doc, &IID_NULL, bstr, 3, 0, dispids); + ok(hres == S_OK, "GetIDsOfNames failed: %08lx\n", hres); + ok(dispids[0] == DISPID_IHTMLDOCUMENT2_CREATESTYLESHEET, "createStyleSheet dispid = %ld\n", dispids[0]); + ok(dispids[1] == 0xdead, "bstrHref dispid = %ld\n", dispids[1]); + ok(dispids[2] == 0xbeef, "lIndex dispid = %ld\n", dispids[2]); + SysFreeString(bstr[2]); + SysFreeString(bstr[1]); + SysFreeString(bstr[0]); +} + +static void test_window_GetIDsOfNames(IHTMLWindow2 *window) +{ + DISPID dispids[3]; + HRESULT hres; + BSTR bstr[3]; + + bstr[0] = SysAllocString(L"showHelp"); + bstr[1] = SysAllocString(L"helpURL"); + bstr[2] = SysAllocString(L"helpArg"); + dispids[0] = 0; + dispids[1] = 0xdead; + dispids[2] = 0xbeef; + hres = IHTMLWindow2_GetIDsOfNames(window, &IID_NULL, bstr, 3, 0, dispids); + ok(hres == S_OK, "GetIDsOfNames failed: %08lx\n", hres); + ok(dispids[0] == DISPID_IHTMLWINDOW2_SHOWHELP, "showHelp dispid = %ld\n", dispids[0]); + ok(dispids[1] == 0xdead, "helpURL dispid = %ld\n", dispids[1]); + ok(dispids[2] == 0xbeef, "helpArg dispid = %ld\n", dispids[2]); + SysFreeString(bstr[2]); + SysFreeString(bstr[1]); + SysFreeString(bstr[0]); +} + +static void test_elem_GetIDsOfNames(IHTMLElement *elem) +{ + DISPID dispids[3]; + HRESULT hres; + BSTR bstr[3]; + + /* IE9+ use something like js proxies even on native and have different dispids */ + if(compat_mode >= COMPAT_IE9) + return; + + bstr[0] = SysAllocString(L"insertAdjacentText"); + bstr[1] = SysAllocString(L"where"); + bstr[2] = SysAllocString(L"text"); + dispids[0] = 0; + dispids[1] = 0xdead; + dispids[2] = 0xbeef; + hres = IHTMLElement_GetIDsOfNames(elem, &IID_NULL, bstr, 3, 0, dispids); + ok(hres == S_OK, "GetIDsOfNames failed: %08lx\n", hres); + ok(dispids[0] == DISPID_IHTMLELEMENT_INSERTADJACENTTEXT, "insertAdjacentText dispid = %ld\n", dispids[0]); + ok(dispids[1] == 0xdead, "where dispid = %ld\n", dispids[1]); + ok(dispids[2] == 0xbeef, "text dispid = %ld\n", dispids[2]); + SysFreeString(bstr[2]); + SysFreeString(bstr[1]); + SysFreeString(bstr[0]); +} + +static void test_attr_GetIDsOfNames(IHTMLDOMAttribute *attr) +{ + DISPID dispids[3]; + HRESULT hres; + BSTR bstr[3]; + + bstr[0] = SysAllocString(L"insertBefore"); + bstr[1] = SysAllocString(L"newChild"); + bstr[2] = SysAllocString(L"refChild"); + dispids[0] = 0; + dispids[1] = 0xdead; + dispids[2] = 0xbeef; + hres = IHTMLDOMAttribute_GetIDsOfNames(attr, &IID_NULL, bstr, 3, 0, dispids); + ok(hres == S_OK, "GetIDsOfNames failed: %08lx\n", hres); + ok(dispids[0] == DISPID_IHTMLDOMATTRIBUTE2_INSERTBEFORE, "insertBefore dispid = %ld\n", dispids[0]); + ok(dispids[1] == 0xdead, "newChild dispid = %ld\n", dispids[1]); + ok(dispids[2] == 0xbeef, "refChild dispid = %ld\n", dispids[2]); + SysFreeString(bstr[2]); + SysFreeString(bstr[1]); + SysFreeString(bstr[0]); +} + static void test_elem_bounding_client_rect(IUnknown *unk) { IHTMLRectCollection *rects; @@ -5462,6 +5555,7 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const WCHAR *id, BOOL e elem = get_elem_iface((IUnknown*)disp); IDispatch_Release(disp); + test_elem_GetIDsOfNames(elem); return elem; } @@ -5482,6 +5576,8 @@ static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, const WCHAR *id) IHTMLDocument3_Release(doc3); + if(elem) + test_elem_GetIDsOfNames(elem); return elem; } @@ -6854,6 +6950,8 @@ static void test_doc_elem(IHTMLDocument2 *doc) HRESULT hres; BSTR bstr; + test_doc_GetIDsOfNames(doc); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument3) failed: %08lx\n", hres); @@ -6875,6 +6973,7 @@ static void test_doc_elem(IHTMLDocument2 *doc) owner_doc = get_owner_doc((IUnknown*)elem); ok(iface_cmp((IUnknown *)doc_node, (IUnknown *)owner_doc), "doc_node != owner_doc\n"); IHTMLDocument2_Release(owner_doc); + test_doc_GetIDsOfNames(doc_node); owner_doc = get_owner_doc((IUnknown*)doc_node); ok(!owner_doc, "owner_doc = %p\n", owner_doc); @@ -7158,6 +7257,7 @@ static void test_window(IHTMLDocument2 *doc) win_skip("IID_ITravelLogClient not supported\n"); test_disp((IUnknown*)window, &DIID_DispHTMLWindow2, &CLSID_HTMLWindow2, L"[object]"); + test_window_GetIDsOfNames(window); hres = IHTMLWindow2_get_document(window, &doc2); ok(hres == S_OK, "get_document failed: %08lx\n", hres); @@ -9796,6 +9896,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); test_attr_specified(attr, VARIANT_TRUE); test_attr_parent(attr); + test_attr_GetIDsOfNames(attr); attr2 = get_elem_attr_node((IUnknown*)elem, L"id", TRUE); ok(iface_cmp((IUnknown*)attr, (IUnknown*)attr2), "attr != attr2\n"); diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index 6aef9f5a35d..a3ec54ffef6 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "ole2.h" #include "mshtml.h" +#include "mshtmdid.h" #include "objsafe.h" #include "wine/test.h" @@ -402,6 +403,35 @@ static void create_xmlhttprequest(IHTMLDocument2 *doc) ok(xhr != NULL, "xhr == NULL\n"); } +static void test_GetIDsOfNames(IHTMLDocument2 *doc) +{ + DISPID dispids[3]; + HRESULT hres; + BSTR bstr[3]; + + create_xmlhttprequest(doc); + if(!xhr) + return; + + bstr[0] = SysAllocString(L"open"); + bstr[1] = SysAllocString(L"bstrMethod"); + bstr[2] = SysAllocString(L"varAsync"); + dispids[0] = 0; + dispids[1] = 0xdead; + dispids[2] = 0xbeef; + hres = IHTMLXMLHttpRequest_GetIDsOfNames(xhr, &IID_NULL, bstr, 3, 0, dispids); + ok(hres == S_OK, "GetIDsOfNames failed: %08lx\n", hres); + ok(dispids[0] == DISPID_IHTMLXMLHTTPREQUEST_OPEN, "open dispid = %ld\n", dispids[0]); + ok(dispids[1] == 0xdead, "bstrMethod dispid = %ld\n", dispids[1]); + ok(dispids[2] == 0xbeef, "varAsync dispid = %ld\n", dispids[2]); + SysFreeString(bstr[2]); + SysFreeString(bstr[1]); + SysFreeString(bstr[0]); + + IHTMLXMLHttpRequest_Release(xhr); + xhr = NULL; +} + static void test_header(const struct HEADER_TYPE expect[], int num) { int i; @@ -1100,6 +1130,7 @@ START_TEST(xmlhttprequest) content_type = SysAllocString(L"Content-Type"); doc = create_doc_from_url(start_url); if(doc) { + test_GetIDsOfNames(doc); test_sync_xhr(doc, xml_url, expect_response_text); test_sync_xhr(doc, large_page_url, NULL); test_async_xhr(doc, xml_url, expect_response_text);

1 0

Paul Gofman : winhttp: Always send Content-length with PUT.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: a8c1d5c108fc57e4d78e9db126f395c89083a83d URL: https://gitlab.winehq.org/wine/wine/-/commit/a8c1d5c108fc57e4d78e9db126f395… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 14 10:57:50 2022 -0600 winhttp: Always send Content-length with PUT. --- dlls/winhttp/request.c | 2 +- dlls/winhttp/tests/winhttp.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 64f70b61a96..e046b05581c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2185,7 +2185,7 @@ static DWORD send_request( struct request *request, const WCHAR *headers, DWORD if (request->creds[TARGET_SERVER][SCHEME_BASIC].username) do_authorization( request, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC ); - if (total_len || (request->verb && !wcscmp( request->verb, L"POST" ))) + if (total_len || (request->verb && (!wcscmp( request->verb, L"POST" ) || !wcscmp( request->verb, L"PUT" )))) { WCHAR length[21]; /* decimal long int + null */ swprintf( length, ARRAY_SIZE(length), L"%ld", total_len ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 45eaf1a673a..b7deaea324a 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2541,6 +2541,11 @@ static DWORD CALLBACK server_thread(LPVOID param) ok(!!strstr(buffer, "Cookie: 111\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); send(c, okmsg, sizeof(okmsg) - 1, 0); } + if (strstr(buffer, "PUT /test")) + { + ok(!!strstr(buffer, "Content-Length: 0\r\n"), "Header missing from request %s.\n", debugstr_a(buffer)); + send(c, okmsg, sizeof(okmsg) - 1, 0); + } shutdown(c, 2); closesocket(c); c = -1; @@ -2633,8 +2638,15 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) memset(buffer, 0, sizeof(buffer)); ret = WinHttpReadData(req, buffer, sizeof buffer, &count); ok(ret, "failed to read data %lu\n", GetLastError()); - ok(count == sizeof page1 - 1, "count was wrong\n"); - ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + if (verb && !wcscmp(verb, L"PUT")) + { + ok(!count, "got count %ld\n", count); + } + else + { + ok(count == sizeof page1 - 1, "got count %ld\n", count); + ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); + } WinHttpCloseHandle(req); WinHttpCloseHandle(con); @@ -5795,7 +5807,6 @@ START_TEST (winhttp) test_WinHttpGetProxyForUrl(); test_chunked_read(); test_max_http_automatic_redirects(); - si.event = CreateEventW(NULL, 0, 0, NULL); si.port = 7532; @@ -5809,10 +5820,10 @@ START_TEST (winhttp) CloseHandle(thread); return; } - test_IWinHttpRequest(si.port); test_connection_info(si.port); test_basic_request(si.port, NULL, L"/basic"); + test_basic_request(si.port, L"PUT", L"/test"); test_no_headers(si.port); test_no_content(si.port); test_head_request(si.port);

1 0

Rémi Bernon : ntdll: Delay loading unixlibs until the functions are requested.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 34099bba6cbb65de37403819fb65635338bb41a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/34099bba6cbb65de37403819fb6563… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 11:55:51 2022 +0100 ntdll: Delay loading unixlibs until the functions are requested. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53909 --- dlls/ntdll/unix/virtual.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3367913d4e2..5dd482c0dbb 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -98,6 +98,7 @@ struct builtin_module unsigned int refcount; void *handle; void *module; + char *unix_path; void *unix_handle; }; @@ -583,6 +584,7 @@ static void add_builtin_module( void *module, void *handle ) builtin->handle = handle; builtin->module = module; builtin->refcount = 1; + builtin->unix_path = NULL; builtin->unix_handle = NULL; list_add_tail( &builtin_modules, &builtin->entry ); } @@ -603,6 +605,7 @@ void release_builtin_module( void *module ) list_remove( &builtin->entry ); if (builtin->handle) dlclose( builtin->handle ); if (builtin->unix_handle) dlclose( builtin->unix_handle ); + free( builtin->unix_path ); free( builtin ); } break; @@ -652,6 +655,8 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; + if (builtin->unix_path && !builtin->unix_handle) + builtin->unix_handle = dlopen( builtin->unix_path, RTLD_NOW ); if (builtin->unix_handle) { *funcs = dlsym( builtin->unix_handle, ptr_name ); @@ -669,26 +674,19 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun */ NTSTATUS load_builtin_unixlib( void *module, const char *name ) { - void *handle; sigset_t sigset; - NTSTATUS status = STATUS_DLL_NOT_FOUND; + NTSTATUS status = STATUS_SUCCESS; struct builtin_module *builtin; - if (!(handle = dlopen( name, RTLD_NOW ))) return status; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; - if (!builtin->unix_handle) - { - builtin->unix_handle = handle; - status = STATUS_SUCCESS; - } + if (!builtin->unix_path) builtin->unix_path = strdup( name ); else status = STATUS_IMAGE_ALREADY_LOADED; break; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); - if (status) dlclose( handle ); return status; }

1 0

Rémi Bernon : user32: Move touch related functions to input.c.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 8da21e083b9feb6618c8073c64da15e9545910cf URL: https://gitlab.winehq.org/wine/wine/-/commit/8da21e083b9feb6618c8073c64da15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Oct 4 16:47:16 2021 +0200 user32: Move touch related functions to input.c. --- dlls/user32/input.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/misc.c | 29 -------------- dlls/user32/user32.spec | 2 + dlls/user32/win.c | 50 ----------------------- 4 files changed, 105 insertions(+), 79 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index bb7477ed482..4bd5785ff9b 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -653,3 +653,106 @@ LRESULT WINAPI DefRawInputProc( RAWINPUT **data, INT data_count, UINT header_siz return header_size == sizeof(RAWINPUTHEADER) ? 0 : -1; } + +/***************************************************************************** + * CloseTouchInputHandle (USER32.@) + */ +BOOL WINAPI CloseTouchInputHandle( HTOUCHINPUT handle ) +{ + FIXME( "handle %p stub!\n", handle ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetTouchInputInfo (USER32.@) + */ +BOOL WINAPI GetTouchInputInfo( HTOUCHINPUT handle, UINT count, TOUCHINPUT *ptr, int size ) +{ + FIXME( "handle %p, count %u, ptr %p, size %u stub!\n", handle, count, ptr, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/********************************************************************** + * IsTouchWindow (USER32.@) + */ +BOOL WINAPI IsTouchWindow( HWND hwnd, ULONG *flags ) +{ + FIXME( "hwnd %p, flags %p stub!\n", hwnd, flags ); + return FALSE; +} + +/***************************************************************************** + * RegisterTouchWindow (USER32.@) + */ +BOOL WINAPI RegisterTouchWindow( HWND hwnd, ULONG flags ) +{ + FIXME( "hwnd %p, flags %#lx stub!\n", hwnd, flags ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * UnregisterTouchWindow (USER32.@) + */ +BOOL WINAPI UnregisterTouchWindow( HWND hwnd ) +{ + FIXME( "hwnd %p stub!\n", hwnd ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureInfo (USER32.@) + */ +BOOL WINAPI CloseGestureInfoHandle( HGESTUREINFO handle ) +{ + FIXME( "handle %p stub!\n", handle ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureInfo (USER32.@) + */ +BOOL WINAPI GetGestureExtraArgs( HGESTUREINFO handle, UINT count, BYTE *args ) +{ + FIXME( "handle %p, count %u, args %p stub!\n", handle, count, args ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureInfo (USER32.@) + */ +BOOL WINAPI GetGestureInfo( HGESTUREINFO handle, GESTUREINFO *ptr ) +{ + FIXME( "handle %p, ptr %p stub!\n", handle, ptr ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/***************************************************************************** + * GetGestureConfig (USER32.@) + */ +BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count, + GESTURECONFIG *config, UINT size ) +{ + FIXME( "handle %p, reserved %#lx, flags %#lx, count %p, config %p, size %u stub!\n", + hwnd, reserved, flags, count, config, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/********************************************************************** + * SetGestureConfig (USER32.@) + */ +BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT count, + GESTURECONFIG *config, UINT size ) +{ + FIXME( "handle %p, reserved %#lx, count %u, config %p, size %u stub!\n", + hwnd, reserved, count, config, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 24adcc62b9c..879e8b32a0f 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -440,35 +440,6 @@ BOOL WINAPI UnregisterSuspendResumeNotification(HPOWERNOTIFY handle) return TRUE; } -/***************************************************************************** - * GetGestureConfig (USER32.@) - */ -BOOL WINAPI GetGestureConfig( HWND hwnd, DWORD reserved, DWORD flags, UINT *count, GESTURECONFIG *config, UINT size ) -{ - FIXME("(%p %08lx %08lx %p %p %u): stub\n", hwnd, reserved, flags, count, config, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/********************************************************************** - * SetGestureConfig [USER32.@] - */ -BOOL WINAPI SetGestureConfig( HWND hwnd, DWORD reserved, UINT id, PGESTURECONFIG config, UINT size ) -{ - FIXME("(%p %08lx %u %p %u): stub\n", hwnd, reserved, id, config, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/********************************************************************** - * IsTouchWindow [USER32.@] - */ -BOOL WINAPI IsTouchWindow( HWND hwnd, PULONG flags ) -{ - FIXME("(%p %p): stub\n", hwnd, flags); - return FALSE; -} - /********************************************************************** * IsWindowRedirectedForPrint [USER32.@] */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4f15b4c06e5..256e4c33e1c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -76,6 +76,7 @@ @ stdcall CloseClipboard() NtUserCloseClipboard @ stdcall CloseDesktop(long) NtUserCloseDesktop @ stdcall CloseTouchInputHandle(long) +@ stdcall CloseGestureInfoHandle(long) @ stdcall CloseWindow(long) @ stdcall CloseWindowStation(long) NtUserCloseWindowStation @ stdcall CopyAcceleratorTableA(long ptr long) @@ -304,6 +305,7 @@ @ stdcall GetFocus() @ stdcall GetForegroundWindow() NtUserGetForegroundWindow @ stdcall GetGestureConfig(long long long ptr ptr long) +@ stdcall GetGestureExtraArgs(long long ptr) @ stdcall GetGestureInfo(long ptr) @ stdcall GetGUIThreadInfo(long ptr) NtUserGetGUIThreadInfo @ stdcall GetGuiResources(long long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3750d4b9643..383de818172 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1479,56 +1479,6 @@ LONG_PTR WINAPI SetWindowLongPtrA( HWND hwnd, INT offset, LONG_PTR newval ) #endif /* _WIN64 */ -/***************************************************************************** - * RegisterTouchWindow (USER32.@) - */ -BOOL WINAPI RegisterTouchWindow(HWND hwnd, ULONG flags) -{ - FIXME("(%p %08lx): stub\n", hwnd, flags); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/***************************************************************************** - * UnregisterTouchWindow (USER32.@) - */ -BOOL WINAPI UnregisterTouchWindow(HWND hwnd) -{ - FIXME("(%p): stub\n", hwnd); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/***************************************************************************** - * CloseTouchInputHandle (USER32.@) - */ -BOOL WINAPI CloseTouchInputHandle(HTOUCHINPUT handle) -{ - FIXME("(%p): stub\n", handle); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/***************************************************************************** - * GetTouchInputInfo (USER32.@) - */ -BOOL WINAPI GetTouchInputInfo(HTOUCHINPUT handle, UINT count, TOUCHINPUT *ptr, int size) -{ - FIXME("(%p %u %p %u): stub\n", handle, count, ptr, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/***************************************************************************** - * GetGestureInfo (USER32.@) - */ -BOOL WINAPI GetGestureInfo(HGESTUREINFO handle, PGESTUREINFO ptr) -{ - FIXME("(%p %p): stub\n", handle, ptr); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - /***************************************************************************** * GetWindowDisplayAffinity (USER32.@) */

1 0

Hans Leidekker : crypt32/tests: Remove OCSP revoked cert test.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: c1aee64eb2cac4d3832af2fbad473791a4021055 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1aee64eb2cac4d3832af2fbad4737… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Nov 14 15:51:14 2022 +0100 crypt32/tests: Remove OCSP revoked cert test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53919 --- dlls/crypt32/tests/cert.c | 276 ---------------------------------------------- 1 file changed, 276 deletions(-)

1 0

Jason Millard : vbscript: Add support for VT_DISPATCH in Global_TypeName.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 0eff79ec7814763e93e4b9d62aadb96d99e84fad URL: https://gitlab.winehq.org/wine/wine/-/commit/0eff79ec7814763e93e4b9d62aadb9… Author: Jason Millard <jsm174(a)gmail.com> Date: Mon Nov 14 07:48:16 2022 -0500 vbscript: Add support for VT_DISPATCH in Global_TypeName. --- dlls/vbscript/global.c | 16 ++++++++++++++++ dlls/vbscript/tests/api.vbs | 4 ++++ dlls/vbscript/vbregexp.c | 8 ++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1abfff9b4fe..51c92f6a8a0 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2450,6 +2450,10 @@ static HRESULT Global_DatePart(BuiltinDisp *This, VARIANT *arg, unsigned args_cn static HRESULT Global_TypeName(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { + ITypeInfo *typeinfo; + BSTR name = NULL; + HRESULT hres; + TRACE("(%s)\n", debugstr_variant(arg)); assert(args_cnt == 1); @@ -2482,6 +2486,18 @@ static HRESULT Global_TypeName(BuiltinDisp *This, VARIANT *arg, unsigned args_cn return return_string(res, L"Empty"); case VT_NULL: return return_string(res, L"Null"); + case VT_DISPATCH: + if (SUCCEEDED(IDispatch_GetTypeInfo(V_DISPATCH(arg), 0, GetUserDefaultLCID(), &typeinfo))) + { + hres = ITypeInfo_GetDocumentation(typeinfo, MEMBERID_NIL, &name, NULL, NULL, NULL); + ITypeInfo_Release(typeinfo); + + if (SUCCEEDED(hres) && name && *name) + return return_bstr(res, name); + + SysFreeString(name); + } + return return_string(res, L"Object"); default: FIXME("arg %s not supported\n", debugstr_variant(arg)); return E_NOTIMPL; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 5f7f2aac3bf..0e47f428d09 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1555,6 +1555,10 @@ Call ok(TypeName(True) = "Boolean", "TypeName(True) = " & TypeName(True)) Call ok(getVT(TypeName(True)) = "VT_BSTR", "getVT(TypeName(True)) = " & getVT(TypeName(True))) Call ok(TypeName(arr) = "Variant()", "TypeName(arr) = " & TypeName(arr)) Call ok(getVT(TypeName(arr)) = "VT_BSTR", "getVT(TypeName(arr)) = " & getVT(TypeName(arr))) +Call ok(TypeName(collectionObj) = "Object", "TypeName(collectionObj) = " & TypeName(collectionObj)) +Dim regex +set regex = new RegExp +Call ok(TypeName(regex) = "IRegExp2", "TypeName(regex) = " & TypeName(regex)) Call ok(VarType(Empty) = vbEmpty, "VarType(Empty) = " & VarType(Empty)) Call ok(getVT(VarType(Empty)) = "VT_I2", "getVT(VarType(Empty)) = " & getVT(VarType(Empty))) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 24ce243c645..7232773a3c3 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1140,8 +1140,12 @@ static HRESULT WINAPI RegExp2_GetTypeInfo(IRegExp2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { RegExp2 *This = impl_from_IRegExp2(iface); - FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + + TRACE("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); + + *ppTInfo = typeinfos[RegExp2_tid]; + ITypeInfo_AddRef(*ppTInfo); + return S_OK; } static HRESULT WINAPI RegExp2_GetIDsOfNames(IRegExp2 *iface, REFIID riid,

1 0

Piotr Caban : winspool.drv: Use CRT allocation functions.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 788f6b1b6a16f5203e472aa89b306f019ac07d1c URL: https://gitlab.winehq.org/wine/wine/-/commit/788f6b1b6a16f5203e472aa89b306f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 10 19:48:03 2022 +0100 winspool.drv: Use CRT allocation functions. --- dlls/winspool.drv/info.c | 612 +++++++++++++++++++++-------------------------- 1 file changed, 275 insertions(+), 337 deletions(-)

1 0

Piotr Caban : localspl: Use wcslen instead of lstrlenW.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 685e2fda08bd217b6f85d512c5642dddd4daa9a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/685e2fda08bd217b6f85d512c5642d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 10 13:53:29 2022 +0100 localspl: Use wcslen instead of lstrlenW. --- dlls/localspl/localmon.c | 6 ++--- dlls/localspl/provider.c | 70 ++++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 38 deletions(-)

1 0

Piotr Caban : localspl: Use CRT allocation functions.
by Alexandre Julliard 14 Nov '22

14 Nov '22

Module: wine Branch: master Commit: 897ab8c6ec8986f5b8c54bd108951ecfc53eab60 URL: https://gitlab.winehq.org/wine/wine/-/commit/897ab8c6ec8986f5b8c54bd108951e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 10 13:59:06 2022 +0100 localspl: Use CRT allocation functions. --- dlls/localspl/localmon.c | 19 ++++++++-------- dlls/localspl/provider.c | 56 ++++++++++++++++++++++++------------------------ 2 files changed, 37 insertions(+), 38 deletions(-)

1 0