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

[tools] testbot/TestAgent: Update and fix the usage message.
by Francois Gouget 01 Apr '22

01 Apr '22

The upgrade and restart commands were each only half documented. The getversion command was misspelled. Better identify optional arguments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/TestAgent | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 10bdc63d1..ea18b85b7 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -323,15 +323,17 @@ if (defined $Usage) error("try '$name0 --help' for more information\n"); exit $Usage; } - print "Usage: $name0 [options] <hostname> sendfile <localpath> <serverpath>\n"; - print "or $name0 [options] <hostname> getfile <serverpath> <localpath>\n"; - print "or $name0 [options] <hostname> run <command> <arguments>\n"; + print "Usage: $name0 [options] <hostname> sendfile <localpath> [<serverpath>]\n"; + print "or $name0 [options] <hostname> getfile <serverpath> [<localpath>]\n"; + print "or $name0 [options] <hostname> run <command> [<arguments>]\n"; print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> settime\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; - print "or $name0 [options] <hostname> getproperty <name>\n"; + print "or $name0 [options] <hostname> getproperty [<name>]\n"; print "or $name0 [options] <hostname> setproperty <name> <value>\n"; - print "or $name0 [options] <hostname> [getcwd|ping|version]\n"; + print "or $name0 [options] <hostname> (getcwd|ping|getversion)\n"; + print "or $name0 [options] <hostname> upgrade <localexe>\n"; + print "or $name0 [options] <hostname> restart <serverexe> [<arg1>...]\n"; print "\n"; print "This is a testagentd client. It can be used to send/receive files and to run commands on the server.\n"; print "\n"; @@ -353,18 +355,21 @@ if (defined $Usage) print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; print " wait Waits for the specified child process on the server.\n"; print " settime Set the system time of the remote host.\n"; + print " getcwd Returns the server's current working directory.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the protocol version.\n"; - print " getproperty <name> Retrieves and prints the specified server property, for\n"; + print " getproperty Retrieves and prints the <name> server property, for\n"; print " instance its architecture, 'server.arch'. One can print all the\n"; print " properties at once by omitting the name or setting it to '*'.\n"; - print " setproperty <name> <value> Sets the specified property.\n"; - print " getcwd Returns the server's current working directory.\n"; + print " setproperty Sets the <name> property to <value>.\n"; print " ping Makes sure the server is still alive.\n"; - print " upgrade Replaces the server executable with the specified file and\n"; - print " restarts it.\n"; - print " restart Replaces and restarts the server from the specified server file\n"; - print " and arguments or from the last command line if omitted.\n"; + print " upgrade Replaces the server executable with the <localexe> local file\n"; + print " and restarts it.\n"; + print " restart The first argument is mandatory and identifies the server file\n"; + print " the server executable should be replaced with. The arguments\n"; + print " that follow, if any, are passed to the server when it is\n"; + print " restarted. If omitted the current server's arguments are used\n"; + print " instead.\n"; print " <hostname> Is the hostname of the server.\n"; print " --port <port> Use the specified port number instead of the default one.\n"; print " --connect-one-timeout <time> Specifies the timeout for one connection\n"; -- 2.30.2

1 0

[tools] testbot/cgi: Remove a stray single quote from textarea fields.
by Francois Gouget 01 Apr '22

01 Apr '22

It would set the default value of textareas to a single quote. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This has been lurking from the start! The change from checking whether $Value is true to whether it is defined revealed this bug in the Register form which is the only one to both have a textarea field and to provide a default value, specifically an empty string (false). --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 9ce9fa93b..dfcd55e12 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -300,10 +300,7 @@ sub GenerateField($$$) print "50' rows='", int(($MaxLength + 49) / 50); } print "'>"; - if (defined $Value) - { - print $self->escapeHTML($Value), "'"; - } + print $self->escapeHTML($Value) if (defined $Value); print "</textarea>"; $self->GenerateRequired($PropertyDescriptor); } -- 2.30.2

1 0

[tools] testbot: Document SecureConnection() and MakeSecureURL().
by Francois Gouget 01 Apr '22

01 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 5315c75d4..d93a938d3 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -42,11 +42,38 @@ use WineTestBot::Config; # Web helpers # +=pod +=over 12 + +=item C<SecureConnection()> + +Returns true if the user accessed the website over a secure connection. + +This relies on the web server setting the $HTTPS environment variable. + +=back +=cut + sub SecureConnection() { return defined($ENV{"HTTPS"}) && $ENV{"HTTPS"} eq "on"; } +=pod +=over 12 + +=item C<MakeSecureURL()> + +Builds a URL that accesses this website using https if possible. +The parameter should be an absolute path that includes neither the protocol +nor the hostname. + +Note that this method uses $HTTP_HOST which may not match the official website +hostname. As such this should only be used for providing URLs back to the user +accessing the website, not for URLs sent to third-parties. + +=back +=cut sub MakeSecureURL($) { my ($URL) = @_; -- 2.30.2

1 0

[tools] testbot/TestAgent: Simplify the implementation for commands with no argument.
by Francois Gouget 01 Apr '22

01 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/TestAgent | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index ea18b85b7..a3d6e2625 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -210,15 +210,7 @@ while (@ARGV) @Rm = @ARGV; last; } - elsif ($arg eq "getcwd") - { - $Cmd = $arg; - } - elsif ($arg eq "getversion") - { - set_cmd($arg); - } - elsif ($arg eq "ping" or $arg eq "settime") + elsif ($arg =~ /^(?:getcwd|getversion|ping|settime)$/) { set_cmd($arg); } -- 2.30.2

1 0

[tools] testbot/TestAgent: Fix the spelling of a comment in the module.
by Francois Gouget 01 Apr '22

01 Apr '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 6457b4dd7..2d6002102 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1526,7 +1526,7 @@ sub Upgrade($$) my $rc = $self->_RecvList(''); # The server has quit and thus the connection is no longer usable. - # So disconnect now to force the next RPC to reconnect, instead or letting it + # So disconnect now to force the next RPC to reconnect instead of letting it # try to reuse the broken connection and fail. $self->Disconnect(); -- 2.30.2

1 0

[PATCH v2 6/6] win32u: Move NtUserSendInput implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

3 2

[PATCH 1/2] riched20/tests: Add tests for IRichEditOleCallback_QueryInsertObject.
by Jinoh Kang 01 Apr '22

01 Apr '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/tests/richole.c | 247 ++++++++++++++++++++++++++++++++-- 1 file changed, 236 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 24284a24484..bb99a9a7276 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -33,6 +33,169 @@ #include <tom.h> #include <wine/test.h> +#define EXPECT_TODO_WINE 0x80000000UL + +typedef struct IRichEditOleCallbackImpl { + IRichEditOleCallback IRichEditOleCallback_iface; + LONG ref; + int line; + + ULONG expect_queryinsertobject; + + const CLSID *lpclsid; + LPSTORAGE lpstg; + LONG cp; + HRESULT queryinsertobject_result; +}; + +static inline struct IRichEditOleCallbackImpl *impl_from_IRichEditOleCallback(IRichEditOleCallback *iface) +{ + return CONTAINING_RECORD(iface, struct IRichEditOleCallbackImpl, IRichEditOleCallback_iface); +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryInterface(IRichEditOleCallback *iface, REFIID riid, void **ppvObj) +{ + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IRichEditOleCallback)) { + IRichEditOleCallback_AddRef(iface); + *ppvObj = iface; + return S_OK; + } + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallbackImpl_AddRef(IRichEditOleCallback *iface) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedIncrement(&This->ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE RichEditOleCallbackImpl_Release(IRichEditOleCallback *iface) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG ref = InterlockedDecrement(&This->ref); + if (!ref) free(This); + return ref; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetNewStorage(IRichEditOleCallback *iface, LPSTORAGE *lplpstg) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetInPlaceContext(IRichEditOleCallback *iface, LPOLEINPLACEFRAME *lplpFrame, LPOLEINPLACEUIWINDOW *lplpDoc, LPOLEINPLACEFRAMEINFO lpFrameInfo) +{ + return E_INVALIDARG; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_ShowContainerUI(IRichEditOleCallback *iface, BOOL fShow) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryInsertObject(IRichEditOleCallback *iface, LPCLSID lpclsid, LPSTORAGE lpstg, LONG cp) +{ + struct IRichEditOleCallbackImpl *This = impl_from_IRichEditOleCallback(iface); + ULONG expect = This->expect_queryinsertobject; + + todo_wine_if(expect & EXPECT_TODO_WINE) + ok_(__FILE__,This->line)( expect & ~EXPECT_TODO_WINE, "unexpected call to IRichEditOleCallback_QueryInsertObject\n"); + if (!(expect & ~EXPECT_TODO_WINE)) return S_OK; + This->expect_queryinsertobject--; + + if (This->lpclsid && lpclsid) + ok_(__FILE__,This->line)( IsEqualGUID(This->lpclsid, lpclsid), "QueryInsertObject lpclsid expected %s, got %s\n", wine_dbgstr_guid( This->lpclsid ), wine_dbgstr_guid( lpclsid )); + else + ok_(__FILE__,This->line)( This->lpclsid == lpclsid, "QueryInsertObject lpclsid expected %p, got %p\n", This->lpclsid, lpclsid ); + ok_(__FILE__,This->line)( This->lpstg == lpstg, "QueryInsertObject lpstg expected %p, got %p\n", This->lpstg, lpstg ); + ok_(__FILE__,This->line)( This->cp == cp, "QueryInsertObject cp expected %ld, got %ld\n", This->cp, cp ); + return This->queryinsertobject_result; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_DeleteObject(IRichEditOleCallback *iface, LPOLEOBJECT lpoleobj) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_QueryAcceptData(IRichEditOleCallback *iface, LPDATAOBJECT lpdataobj, CLIPFORMAT *lpcfFormat, DWORD reco, BOOL fReally, HGLOBAL hMetaPict) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_ContextSensitiveHelp(IRichEditOleCallback *iface, BOOL fEnterMode) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetClipboardData(IRichEditOleCallback *iface, CHARRANGE *lpchrg, DWORD reco, LPDATAOBJECT *lplpdataobj) +{ + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetDragDropEffect(IRichEditOleCallback *iface, BOOL fDrag, DWORD grfKeyState, LPDWORD pdwEffect) +{ + if (pdwEffect) *pdwEffect = DROPEFFECT_COPY; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE RichEditOleCallbackImpl_GetContextMenu(IRichEditOleCallback *iface, WORD seltype, LPOLEOBJECT lpoleobj, CHARRANGE *lpchrg, HMENU *lphmenu) +{ + return E_NOTIMPL; +} + +static const struct IRichEditOleCallbackVtbl RichEditOleCallbackImpl_Vtbl = { + RichEditOleCallbackImpl_QueryInterface, + RichEditOleCallbackImpl_AddRef, + RichEditOleCallbackImpl_Release, + RichEditOleCallbackImpl_GetNewStorage, + RichEditOleCallbackImpl_GetInPlaceContext, + RichEditOleCallbackImpl_ShowContainerUI, + RichEditOleCallbackImpl_QueryInsertObject, + RichEditOleCallbackImpl_DeleteObject, + RichEditOleCallbackImpl_QueryAcceptData, + RichEditOleCallbackImpl_ContextSensitiveHelp, + RichEditOleCallbackImpl_GetClipboardData, + RichEditOleCallbackImpl_GetDragDropEffect, + RichEditOleCallbackImpl_GetContextMenu, +}; + +static HRESULT RichEditOleCallbackImpl_Create(struct IRichEditOleCallbackImpl **objptr) +{ + struct IRichEditOleCallbackImpl *obj; + + obj = calloc(sizeof(struct IRichEditOleCallbackImpl), 1); + if (!obj) return E_OUTOFMEMORY; + + obj->IRichEditOleCallback_iface.lpVtbl = &RichEditOleCallbackImpl_Vtbl; + obj->ref = 1; + + *objptr = obj; + return S_OK; +} + +static void olecb_expect_QueryInsertObject(struct IRichEditOleCallbackImpl *This, int line, ULONG expect, const CLSID *lpclsid, LPSTORAGE lpstg, LONG cp, HRESULT result) +{ + if (!This) return; + + This->line = line; + This->expect_queryinsertobject = expect; + This->lpclsid = lpclsid; + This->lpstg = lpstg; + This->cp = cp; + This->queryinsertobject_result = result; +} + +static void olecb_check_QueryInsertObject(struct IRichEditOleCallbackImpl *This, int line) +{ + if (!This) return; + + todo_wine_if(This->expect_queryinsertobject & EXPECT_TODO_WINE) + ok(!(This->expect_queryinsertobject & ~EXPECT_TODO_WINE), "expected IRichEditOleCallback_QueryInsertObject to be called\n"); + + olecb_expect_QueryInsertObject(This, 0, 0, NULL, NULL, 0, S_OK); +} + static HMODULE hmoduleRichEdit; DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); @@ -3233,21 +3396,24 @@ static void _check_reobject_struct(IRichEditOle *reole, LONG index, DWORD flags, ok_(__FILE__,line)(reobj.dwUser == user, "got wrong user-defined value.\n"); } -#define INSERT_REOBJECT(reole,reobj,cp,user) \ - _insert_reobject(reole, reobj, cp, user, __LINE__) -static void _insert_reobject(IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) +#define INSERT_REOBJECT(callback,reole,reobj,cp,user) \ + _insert_reobject(callback, reole, reobj, cp, user, __LINE__) +static void _insert_reobject(struct IRichEditOleCallbackImpl *callback, IRichEditOle *reole, REOBJECT *reobj, LONG cp, DWORD user, int line) { IOleClientSite *clientsite; HRESULT hr; + + olecb_expect_QueryInsertObject(callback, line, EXPECT_TODO_WINE | 1, &CLSID_NULL, NULL, REO_CP_SELECTION /* cp overriden */, S_OK); hr = IRichEditOle_GetClientSite(reole, &clientsite); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); fill_reobject_struct(reobj, cp, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, user); hr = IRichEditOle_InsertObject(reole, reobj); ok_(__FILE__,line)(hr == S_OK, "IRichEditOle_InsertObject got hr %#lx.\n", hr); IOleClientSite_Release(clientsite); + olecb_check_QueryInsertObject(callback, line); } -static void test_InsertObject(void) +static void subtest_InsertObject(struct IRichEditOleCallbackImpl *callback) { static CHAR test_text1[] = "abcdefg"; IRichEditOle *reole = NULL; @@ -3271,6 +3437,12 @@ static void test_InsertObject(void) BSTR bstr; create_interfaces(&hwnd, &reole, &doc, &selection); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, (LPARAM)&callback->IRichEditOleCallback_iface); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); hr = IRichEditOle_InsertObject(reole, NULL); @@ -3278,22 +3450,47 @@ static void test_InsertObject(void) /* insert object1 in (0, 1)*/ SendMessageA(hwnd, EM_SETSEL, 0, 1); - INSERT_REOBJECT(reole, &reo1, REO_CP_SELECTION, 1); + INSERT_REOBJECT(callback, reole, &reo1, REO_CP_SELECTION, 1); count = IRichEditOle_GetObjectCount(reole); ok(count == 1, "got wrong object count: %ld\n", count); /* insert object2 in (2, 3)*/ SendMessageA(hwnd, EM_SETSEL, 2, 3); - INSERT_REOBJECT(reole, &reo2, REO_CP_SELECTION, 2); + INSERT_REOBJECT(callback, reole, &reo2, REO_CP_SELECTION, 2); count = IRichEditOle_GetObjectCount(reole); ok(count == 2, "got wrong object count: %ld\n", count); /* insert object3 in (1, 2)*/ SendMessageA(hwnd, EM_SETSEL, 1, 2); - INSERT_REOBJECT(reole, &reo3, REO_CP_SELECTION, 3); + INSERT_REOBJECT(callback, reole, &reo3, REO_CP_SELECTION, 3); count = IRichEditOle_GetObjectCount(reole); ok(count == 3, "got wrong object count: %ld\n", count); + if (callback) + { + IOleClientSite *clientsite; + REOBJECT reobj; + + /* (fail to) insert object1 in (3, 4)*/ + SendMessageA(hwnd, EM_SETSEL, 3, 4); + + hr = IRichEditOle_GetClientSite(reole, &clientsite); + ok(hr == S_OK, "IRichEditOle_GetClientSite got hr %#lx.\n", hr); + + olecb_expect_QueryInsertObject(callback, __LINE__, EXPECT_TODO_WINE | 1, &CLSID_NULL, NULL, REO_CP_SELECTION, S_FALSE); + fill_reobject_struct(&reobj, REO_CP_SELECTION, NULL, NULL, clientsite, 10, 10, DVASPECT_CONTENT, 0, 0); + hr = IRichEditOle_InsertObject(reole, &reobj); + todo_wine + ok(hr == S_FALSE, "IRichEditOle_InsertObject got hr %#lx.\n", hr); + olecb_check_QueryInsertObject(callback, __LINE__); + + IOleClientSite_Release(clientsite); + + count = IRichEditOle_GetObjectCount(reole); + todo_wine + ok(count == 3, "got wrong object count: %ld\n", count); + } + /* tests below show that order of rebject (from 0 to 2) is: reo1,reo3,reo2 */ CHECK_REOBJECT_STRUCT(reole, 0, REO_GETOBJ_ALL_INTERFACES, 0, 0, NULL, NULL, reo1.polesite, 1); CHECK_REOBJECT_STRUCT(reole, 1, REO_GETOBJ_ALL_INTERFACES, 0, 1, NULL, NULL, reo3.polesite, 3); @@ -3371,8 +3568,8 @@ static void test_InsertObject(void) SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); /* "abc|d|efg" */ - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); SendMessageW(hwnd, EM_SETSEL, 2, 3); result = SendMessageW(hwnd, EM_SELECTIONTYPE, 0, 0); @@ -3473,8 +3670,8 @@ static void test_InsertObject(void) ok(!result, "Got result %lx.\n", result); /* "abc|d|efg" */ SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)test_text1); - INSERT_REOBJECT(reole, &reo1, 3, 1); - INSERT_REOBJECT(reole, &reo2, 5, 2); + INSERT_REOBJECT(callback, reole, &reo1, 3, 1); + INSERT_REOBJECT(callback, reole, &reo2, 5, 2); expected_string = L"abc d efg"; charrange.cpMin = 0; @@ -3551,9 +3748,37 @@ static void test_InsertObject(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); todo_wine ok(result == 0xfffc, "Got char: %lc\n", (WCHAR)result); + if (callback) + { + LRESULT sendres = SendMessageA(hwnd, EM_SETOLECALLBACK, 0, 0); + ok( !!sendres, "EM_SETOLECALLBACK should succeed\n" ); + } + release_interfaces(&hwnd, &reole, &doc, &selection); } +static void test_InsertObject(void) +{ + struct IRichEditOleCallbackImpl *callback; + HRESULT hr; + ULONG ref; + + subtest_InsertObject(NULL); + + hr = RichEditOleCallbackImpl_Create(&callback); + ok(SUCCEEDED(hr), "RichEditOleCallbackImpl_Create returned %#lx\n", hr); + if (SUCCEEDED(hr)) + { + subtest_InsertObject(callback); + ref = IRichEditOleCallback_Release(&callback->IRichEditOleCallback_iface); + ok(ref == 0, "expected IRichEditOleCallback recount to be 0, got %lu\n", ref); + } + else + { + skip("cannot test InsertObject with callback\n"); + } +} + static void test_GetStoryLength(void) { static const CHAR test_text1[] = "TestSomeText"; -- 2.34.1

2 2

[PATCH v2] setupapi: Add SetupQueryInfVersionInformationA/W stub.
by Gijs Vermeulen 01 Apr '22

01 Apr '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52616 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/query.c | 18 ++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index b25bd883cc64..e662b422a062 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -731,3 +731,21 @@ BOOL WINAPI SetupGetInfDriverStoreLocationW( SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetupQueryInfVersionInformationA(SP_INF_INFORMATION *info, UINT index, const char *key, char *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_a(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SetupQueryInfVersionInformationW(SP_INF_INFORMATION *info, UINT index, const WCHAR *key, WCHAR *buff, + DWORD size, DWORD *req_size) +{ + FIXME("info %p, index %d, key %s, buff %p, size %ld, req_size %p stub!\n", info, index, debugstr_w(key), buff, + size, req_size); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 06d423373b8e..7578fb25c9c7 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -492,8 +492,8 @@ @ stdcall SetupQueryInfFileInformationW(ptr long wstr long ptr) @ stdcall SetupQueryInfOriginalFileInformationA(ptr long ptr ptr) @ stdcall SetupQueryInfOriginalFileInformationW(ptr long ptr ptr) -@ stub SetupQueryInfVersionInformationA -@ stub SetupQueryInfVersionInformationW +@ stdcall SetupQueryInfVersionInformationA(ptr long str ptr long ptr) +@ stdcall SetupQueryInfVersionInformationW(ptr long wstr ptr long ptr) @ stub SetupQuerySourceListA @ stub SetupQuerySourceListW @ stdcall SetupQuerySpaceRequiredOnDriveA(long str ptr ptr long) -- 2.35.1

1 0

[PATCH v2 5/6] win32u: Move __wine_send_input implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

3 2

[PATCH v2 4/6] win32u: Move send_internal_message_timeout implementation from user32.
by Jacek Caban 01 Apr '22

01 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Don't use user32 functions in win32u. dlls/user32/message.c | 43 +- dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 5 +- dlls/win32u/hook.c | 14 +- dlls/win32u/message.c | 768 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 +- dlls/win32u/win32u_private.h | 3 + 7 files changed, 783 insertions(+), 55 deletions(-)

3 2