July 2022 - Wine-commits - list.winehq.org

Jeremy White : gitlab: Include the content-type header.
by Alexandre Julliard 19 Jul '22

19 Jul '22

Module: tools Branch: master Commit: 44e8afd5a74ed722bbd0782c647ec1a9e9d60760 URL: https://gitlab.winehq.org/winehq/tools/-/commit/44e8afd5a74ed722bbd0782c647… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jul 18 16:52:56 2022 -0500 gitlab: Include the content-type header. Hopefully this will prevent winetestbot from being confused. --- gitlab/gitlab-to-mail/gitlabtomail.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 67909567..fca8466c 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -47,6 +47,7 @@ def send_email(message): message['Reply-To'] = settings.BRIDGE_FROM_EMAIL message['To'] = settings.BRIDGE_TO_EMAIL + message['Content-Type'] = 'text/plain; charset=utf-8' encoded_message = message.as_string().encode('utf-8') if settings.DEBUG:

1 0

Francois Gouget : ntdll: Fix the spelling of a comment.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 15831e0dcc76ced1adfda503da7fdc3237ceb595 URL: https://gitlab.winehq.org/wine/wine/-/commit/15831e0dcc76ced1adfda503da7fdc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 15:58:51 2022 +0200 ntdll: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 40c317417ce..91a231e01b7 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -755,7 +755,7 @@ static void free_used_block( struct heap *heap, SUBHEAP *subheap, struct block * } else if (!heap->shared) { - /* keep room for a full commited block as hysteresis */ + /* keep room for a full committed block as hysteresis */ subheap_decommit( heap, subheap, (char *)(entry + 1) + (COMMIT_MASK + 1) ); } }

1 0

Francois Gouget : win32u: Fix the spelling of a variable name.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 7040cf17ff7ca3731d012adaa63ab4de22858425 URL: https://gitlab.winehq.org/wine/wine/-/commit/7040cf17ff7ca3731d012adaa63ab4… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 15:59:25 2022 +0200 win32u: Fix the spelling of a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/win32u/menu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index c67d0e00615..2530c04241c 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -159,7 +159,7 @@ static HMENU top_popup_hmenu; static BOOL exit_menu = FALSE; static SIZE menucharsize; -static UINT od_item_hight; /* default owner drawn item height */ +static UINT od_item_height; /* default owner drawn item height */ /********************************************************************** * NtUserCopyAcceleratorTable (win32u.@) @@ -1986,7 +1986,7 @@ static void calc_menu_item_size( HDC hdc, struct menu_item *item, HWND owner, IN menucharsize.cx = get_char_dimensions( hdc, NULL, &menucharsize.cy ); /* Win95/98/ME will use menucharsize.cy here. Testing is possible * but it is unlikely an application will depend on that */ - od_item_hight = HIWORD( get_dialog_base_units() ); + od_item_height = HIWORD( get_dialog_base_units() ); } SetRect( &item->rect, org_x, org_y, org_x, org_y ); @@ -1998,7 +1998,7 @@ static void calc_menu_item_size( HDC hdc, struct menu_item *item, HWND owner, IN mis.CtlID = 0; mis.itemID = item->wID; mis.itemData = item->dwItemData; - mis.itemHeight = od_item_hight; + mis.itemHeight = od_item_height; mis.itemWidth = 0; send_message( owner, WM_MEASUREITEM, 0, (LPARAM)&mis ); /* Tests reveal that Windows ( Win95 through WinXP) adds twice the average

1 0

Francois Gouget : urlmon/tests: Fix the spelling of a trace() message.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: d01b13f49519479b461740fb6c5318aa8434a04e URL: https://gitlab.winehq.org/wine/wine/-/commit/d01b13f49519479b461740fb6c5318… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 15:59:56 2022 +0200 urlmon/tests: Fix the spelling of a trace() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 1521f8af99b..5e6792742ac 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -4181,7 +4181,7 @@ START_TEST(url) trace("emulated about test (to object)...\n"); test_BindToObject(ABOUT_TEST, BINDTEST_EMULATE, S_OK); - trace("emulalated test reporting result in read...\n"); + trace("emulated test reporting result in read...\n"); test_BindToStorage(WINETEST_SYNC_TEST, BINDTEST_EMULATE, TYMED_ISTREAM); trace("file test...\n");

1 0

Francois Gouget : include: Fix the spelling of some comments.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 3ff91992d4ebe9edab9e2384620c026eeca9c580 URL: https://gitlab.winehq.org/wine/wine/-/commit/3ff91992d4ebe9edab9e2384620c02… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 9 16:02:31 2022 +0200 include: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/wine/iaccessible2.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wine/iaccessible2.idl b/include/wine/iaccessible2.idl index 0091c529f0d..34c1f169939 100644 --- a/include/wine/iaccessible2.idl +++ b/include/wine/iaccessible2.idl @@ -1350,7 +1350,7 @@ IA2_STATE_PINNED = 0x80000 @ref _indexes\n @ref _enumBase\n @ref _specialOffsets\n - @ref _dicoveringInterfaces\n + @ref _discoveringInterfaces\n @ref _changingInterfaces\n @ref _applicationInfo\n @ref _childIDs\n @@ -1440,7 +1440,7 @@ IA2_STATE_PINNED = 0x80000 Since the same offset is associated with two different lines a special means is needed to fetch text from the line where the caret is physically located. - @section _dicoveringInterfaces Discovery of Interfaces + @section _discoveringInterfaces Discovery of Interfaces In general AT (Assistive Technology) should try IAccessible2 interfaces, followed by using the MSAA (Microsoft® Active Accessibility®) interfaces. (In cases where the an application is known to have custom interfaces which provide information not supplied by IAccessible2 @@ -2381,7 +2381,7 @@ enum IA2TextBoundaryType { that present textual information on the display like buttons, text entry fields, or text portions of the document window. The interface provides access to the text's content, attributes, and spatial location. - However, text can not be modified with this interface. That is the task + However, text cannot be modified with this interface. That is the task of the IAccessibleEditableText interface. The text length, i.e. the number of characters in the text, is @@ -3686,7 +3686,7 @@ interface IAccessibleHypertext : IAccessibleText /** @brief This interface exposes information about hypertext in a document. The %IAccessibleHypertext2 interface extends the functinality of the - %IAccessibleHypertext inteface. + %IAccessibleHypertext interface. */ [object, uuid(CF64D89F-8287-4B44-8501-A827453A6077)] interface IAccessibleHypertext2 : IAccessibleHypertext @@ -4326,7 +4326,7 @@ interface IAccessibleTable : IUnknown Please also refer to the IAccessibleTableCell interface. If you want to support older applications you should also support the - IAccessibleTable inteface. + IAccessibleTable interface. */ [object, uuid(6167f295-06f0-4cdd-a1fa-02e25153d869)] interface IAccessibleTable2 : IUnknown @@ -4821,7 +4821,7 @@ interface IAccessibleTableCell : IUnknown [out, retval] boolean *isSelected ); - /** @brief Returns a reference to the accessbile of the containing table. + /** @brief Returns a reference to the accessible of the containing table. @param [out] table Returns a reference to the IUnknown of the containing table.

1 0

Brendan McGrath : qedit/tests: Test adding a reference to the sample from ISampleGrabberCB::SampleCB().
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 2f280d0dda2b85533fedc15e092185c4e648fcf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f280d0dda2b85533fedc15e092185… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Sun Jul 17 12:38:08 2022 +1000 qedit/tests: Test adding a reference to the sample from ISampleGrabberCB::SampleCB(). Unravel Two adds a reference to the IMediaSample during its callback. This patch adds a test that checks if an application does do this, that it can free it later and the reference count will finish at zero. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51616 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/mediadet.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 3202baca924..6e7017f865c 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -866,6 +866,17 @@ static void test_put_filter(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); } +struct test_sample +{ + IMediaSample sample; + LONG refcount; +}; + +static struct test_sample *impl_from_IMediaSample(IMediaSample *iface) +{ + return CONTAINING_RECORD(iface, struct test_sample, sample); +} + static HRESULT WINAPI ms_QueryInterface(IMediaSample *iface, REFIID riid, void **ppvObject) { @@ -874,12 +885,14 @@ static HRESULT WINAPI ms_QueryInterface(IMediaSample *iface, REFIID riid, static ULONG WINAPI ms_AddRef(IMediaSample *iface) { - return 2; + struct test_sample *sample = impl_from_IMediaSample(iface); + return InterlockedIncrement(&sample->refcount); } static ULONG WINAPI ms_Release(IMediaSample *iface) { - return 1; + struct test_sample *sample = impl_from_IMediaSample(iface); + return InterlockedDecrement(&sample->refcount); } static HRESULT WINAPI ms_GetPointer(IMediaSample *iface, BYTE **ppBuffer) @@ -989,7 +1002,7 @@ static const IMediaSampleVtbl my_sample_vt = { ms_SetMediaTime }; -static IMediaSample my_sample = { &my_sample_vt }; +static struct test_sample my_sample = { {&my_sample_vt}, 0 }; static BOOL samplecb_called = FALSE; @@ -1012,8 +1025,9 @@ static ULONG WINAPI sgcb_Release(ISampleGrabberCB *iface) static HRESULT WINAPI sgcb_SampleCB(ISampleGrabberCB *iface, double SampleTime, IMediaSample *pSample) { - ok(pSample == &my_sample, "Got wrong IMediaSample: %p, expected %p\n", pSample, &my_sample); + ok(pSample == &my_sample.sample, "Got wrong IMediaSample: %p, expected %p\n", pSample, &my_sample); samplecb_called = TRUE; + IMediaSample_AddRef(pSample); return E_NOTIMPL; } @@ -1043,6 +1057,7 @@ static void test_samplegrabber(void) IEnumPins *pins; HRESULT hr; FILTER_STATE fstate; + ULONG refcount; /* Invalid RIID */ hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, @@ -1074,10 +1089,13 @@ static void test_samplegrabber(void) hr = IPin_QueryInterface(pin, &IID_IMemInputPin, (void**)&inpin); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IMemInputPin_Receive(inpin, &my_sample); + hr = IMemInputPin_Receive(inpin, &my_sample.sample); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(samplecb_called == TRUE, "SampleCB should have been called\n"); + refcount = IUnknown_Release(&my_sample.sample); + todo_wine ok(!refcount, "Got unexpected refcount %ld.\n", refcount); + IMemInputPin_Release(inpin); IPin_Release(pin);

1 0

Brendan McGrath : qedit: Do not force the sample to be freed in SampleGrabber_callback().
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 1113f42aa748d9e0a27c4663b9d8de1237f95e73 URL: https://gitlab.winehq.org/wine/wine/-/commit/1113f42aa748d9e0a27c4663b9d8de… Author: Brendan McGrath <brendan(a)redmandi.com> Date: Sun Jul 17 12:38:09 2022 +1000 qedit: Do not force the sample to be freed in SampleGrabber_callback(). Remove a work around that causes a crash in Unravel Two. There is a callback in Unravel Two that appears to add a reference to a IMediaSample, which this workaround treats as a leak and releases. However, the application also later releases the reference itself, causing a use-after-free. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51616 Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 3 --- dlls/qedit/tests/mediadet.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 9b9780e564a..cefb2f37078 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -164,9 +164,6 @@ static void SampleGrabber_callback(struct sample_grabber *This, IMediaSample *sa if (ref) { ERR("(%p) Callback referenced sample %p by %lu\n", This, sample, ref); - /* ugly as hell but some apps are sooo buggy */ - while (ref--) - IMediaSample_Release(sample); } } break; diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 6e7017f865c..05805c56eb5 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -1094,7 +1094,7 @@ static void test_samplegrabber(void) ok(samplecb_called == TRUE, "SampleCB should have been called\n"); refcount = IUnknown_Release(&my_sample.sample); - todo_wine ok(!refcount, "Got unexpected refcount %ld.\n", refcount); + ok(!refcount, "Got unexpected refcount %ld.\n", refcount); IMemInputPin_Release(inpin); IPin_Release(pin);

1 0

Zhiyi Zhang : rpcrt4/tests: Add I_RpcBindingInqLocalClientPID() tests.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 056dbb04dea4d0b990e0177f63475165f56ba8da URL: https://gitlab.winehq.org/wine/wine/-/commit/056dbb04dea4d0b990e0177f634751… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 23 17:46:03 2022 +0800 rpcrt4/tests: Add I_RpcBindingInqLocalClientPID() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/rpcrt4/tests/server.c | 106 ++++++++++++++++++++++++++++++++++++++++--- dlls/rpcrt4/tests/server.idl | 2 + 2 files changed, 101 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 253fd817a48..7fdb076bc73 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -40,10 +40,11 @@ #define INT_CODE 4198 -static const char *progname; +static const char *progname, *client_test_name; static BOOL old_windows_version; static HANDLE stop_event, stop_wait_event; +static PROCESS_INFORMATION client_info; static void (WINAPI *pNDRSContextMarshall2)(RPC_BINDING_HANDLE, NDR_SCONTEXT, void*, NDR_RUNDOWN, void*, ULONG); static NDR_SCONTEXT (WINAPI *pNDRSContextUnmarshall2)(RPC_BINDING_HANDLE, void*, ULONG, void*, ULONG); @@ -147,6 +148,7 @@ static int (__cdecl *sum_array_ptr)(int (*a)[2]); static ctx_handle_t (__cdecl *get_handle)(void); static void (__cdecl *get_handle_by_ptr)(ctx_handle_t *r); static void (__cdecl *test_handle)(ctx_handle_t ctx_handle); +static void (__cdecl *test_I_RpcBindingInqLocalClientPID)(unsigned int protseq, RPC_BINDING_HANDLE binding); #define SERVER_FUNCTIONS \ X(int_return) \ @@ -240,7 +242,8 @@ static void (__cdecl *test_handle)(ctx_handle_t ctx_handle); X(sum_array_ptr) \ X(get_handle) \ X(get_handle_by_ptr) \ - X(test_handle) + X(test_handle) \ + X(test_I_RpcBindingInqLocalClientPID) /* type check statements generated in header file */ fnprintf *p_printf = printf; @@ -1122,6 +1125,88 @@ void __cdecl s_test_handle(ctx_handle_t ctx_handle) ok(ctx_handle == (ctx_handle_t)0xdeadbeef, "Unexpected ctx_handle %p\n", ctx_handle); } +struct test_thread_params +{ + unsigned int protseq; + RPC_BINDING_HANDLE binding; +}; + +static DWORD CALLBACK test_I_RpcBindingInqLocalClientPID_thread_func(void *args) +{ + struct test_thread_params *params = (struct test_thread_params *)args; + RPC_STATUS status; + ULONG pid; + + winetest_push_context("%s", client_test_name); + + status = I_RpcBindingInqLocalClientPID(NULL, &pid); + todo_wine + ok(status == RPC_S_NO_CALL_ACTIVE, "Got unexpected %ld.\n", status); + + /* Other protocol sequences throw exceptions */ + if (params->protseq == RPC_PROTSEQ_LRPC) + { + status = I_RpcBindingInqLocalClientPID(params->binding, &pid); + todo_wine + ok(status == RPC_S_OK, "Got unexpected %ld.\n", status); + todo_wine + ok(pid == client_info.dwProcessId, "Got unexpected pid.\n"); + } + + winetest_pop_context(); + return 0; +} + +void __cdecl s_test_I_RpcBindingInqLocalClientPID(unsigned int protseq, RPC_BINDING_HANDLE binding) +{ + struct test_thread_params params; + RPC_STATUS status; + HANDLE thread; + ULONG pid; + + winetest_push_context("%s", client_test_name); + + /* Crash on Windows */ + if (0) + { + status = I_RpcBindingInqLocalClientPID(NULL, NULL); + ok(status == RPC_S_INVALID_ARG, "Got unexpected %ld.\n", status); + + status = I_RpcBindingInqLocalClientPID(binding, NULL); + ok(status == RPC_S_INVALID_ARG, "Got unexpected %ld.\n", status); + } + + status = I_RpcBindingInqLocalClientPID(NULL, &pid); + if (protseq == RPC_PROTSEQ_LRPC) + { + todo_wine + ok(status == RPC_S_OK, "Got unexpected %ld.\n", status); + todo_wine + ok(pid == client_info.dwProcessId, "Got unexpected pid.\n"); + } + else + { + ok(status == RPC_S_INVALID_BINDING, "Got unexpected %ld.\n", status); + } + + if (protseq == RPC_PROTSEQ_LRPC) /* Other protocol sequences throw exceptions */ + { + status = I_RpcBindingInqLocalClientPID(binding, &pid); + todo_wine + ok(status == RPC_S_OK, "Got unexpected %ld.\n", status); + todo_wine + ok(pid == client_info.dwProcessId, "Got unexpected pid.\n"); + } + + params.protseq = protseq; + params.binding = binding; + thread = CreateThread(NULL, 0, test_I_RpcBindingInqLocalClientPID_thread_func, &params, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + winetest_pop_context(); +} + void __RPC_USER ctx_handle_t_rundown(ctx_handle_t ctx_handle) { ok(ctx_handle == (ctx_handle_t)0xdeadbeef, "Unexpected ctx_handle %p\n", ctx_handle); @@ -1137,17 +1222,17 @@ static void run_client(const char *test) { char cmdline[MAX_PATH]; - PROCESS_INFORMATION info; STARTUPINFOA startup; memset(&startup, 0, sizeof startup); startup.cb = sizeof startup; + client_test_name = test; make_cmdline(cmdline, test); - ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); - wait_child_process( info.hProcess ); - ok(CloseHandle(info.hProcess), "CloseHandle\n"); - ok(CloseHandle(info.hThread), "CloseHandle\n"); + ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &client_info), "CreateProcess\n"); + wait_child_process(client_info.hProcess); + ok(CloseHandle(client_info.hProcess), "CloseHandle\n"); + ok(CloseHandle(client_info.hThread), "CloseHandle\n"); } static void @@ -1964,6 +2049,7 @@ client(const char *test) run_tests(); authinfo_test(RPC_PROTSEQ_TCP, 0); + test_I_RpcBindingInqLocalClientPID(RPC_PROTSEQ_TCP, IMixedServer_IfHandle); test_is_server_listening2(IMixedServer_IfHandle, RPC_S_OK, RPC_S_ACCESS_DENIED); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); @@ -1976,6 +2062,7 @@ client(const char *test) set_auth_info(IMixedServer_IfHandle); authinfo_test(RPC_PROTSEQ_TCP, 1); + test_I_RpcBindingInqLocalClientPID(RPC_PROTSEQ_TCP, IMixedServer_IfHandle); test_is_server_listening(IMixedServer_IfHandle, RPC_S_ACCESS_DENIED); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); @@ -1988,6 +2075,7 @@ client(const char *test) run_tests(); /* can cause RPC_X_BAD_STUB_DATA exception */ authinfo_test(RPC_PROTSEQ_LRPC, 0); + test_I_RpcBindingInqLocalClientPID(RPC_PROTSEQ_LRPC, IMixedServer_IfHandle); test_is_server_listening(IMixedServer_IfHandle, RPC_S_OK); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); @@ -2000,6 +2088,7 @@ client(const char *test) run_tests(); authinfo_test(RPC_PROTSEQ_LRPC, 0); + test_I_RpcBindingInqLocalClientPID(RPC_PROTSEQ_LRPC, IMixedServer_IfHandle); todo_wine test_is_server_listening(IMixedServer_IfHandle, RPC_S_NOT_LISTENING); @@ -2016,6 +2105,7 @@ client(const char *test) set_auth_info(IMixedServer_IfHandle); authinfo_test(RPC_PROTSEQ_LRPC, 1); + test_I_RpcBindingInqLocalClientPID(RPC_PROTSEQ_LRPC, IMixedServer_IfHandle); test_is_server_listening(IMixedServer_IfHandle, RPC_S_OK); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); @@ -2029,6 +2119,7 @@ client(const char *test) test_is_server_listening(IMixedServer_IfHandle, RPC_S_OK); run_tests(); authinfo_test(RPC_PROTSEQ_NMP, 0); + test_I_RpcBindingInqLocalClientPID(RPC_PROTSEQ_NMP, IMixedServer_IfHandle); test_is_server_listening(IMixedServer_IfHandle, RPC_S_OK); stop(); test_is_server_listening(IMixedServer_IfHandle, RPC_S_NOT_LISTENING); @@ -2046,6 +2137,7 @@ client(const char *test) test_is_server_listening(IInterpServer_IfHandle, RPC_S_OK); run_tests(); authinfo_test(RPC_PROTSEQ_NMP, 0); + test_I_RpcBindingInqLocalClientPID(RPC_PROTSEQ_NMP, IInterpServer_IfHandle); test_is_server_listening(IInterpServer_IfHandle, RPC_S_OK); ok(RPC_S_OK == RpcStringFreeA(&binding), "RpcStringFree\n"); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index 4d945dcca3e..8de5dce5d4e 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -485,4 +485,6 @@ cpp_quote("#endif") ctx_handle_t get_handle(); void get_handle_by_ptr([out] ctx_handle_t *r); void test_handle(ctx_handle_t ctx_handle); + + void test_I_RpcBindingInqLocalClientPID([in] unsigned int protseq, [in] handle_t binding); }

1 0

Zhiyi Zhang : rpcrt4: Implement I_RpcBindingInqLocalClientPID().
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: a0301f7db6b58cb8aedd2bd0e862f89cbdb984c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0301f7db6b58cb8aedd2bd0e862f8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 23 23:09:59 2022 +0800 rpcrt4: Implement I_RpcBindingInqLocalClientPID(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/rpcrt4/rpc_binding.c | 16 ++++++++++++++-- dlls/rpcrt4/rpc_binding.h | 1 + dlls/rpcrt4/rpc_transport.c | 11 +++++++++++ dlls/rpcrt4/tests/server.c | 7 ------- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index ba7ef418419..8c2d34f8a21 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1981,6 +1981,18 @@ RPC_STATUS WINAPI RpcBindingSetOption(RPC_BINDING_HANDLE BindingHandle, ULONG Op RPC_STATUS WINAPI I_RpcBindingInqLocalClientPID(RPC_BINDING_HANDLE ClientBinding, ULONG *ClientPID) { - FIXME("%p %p: stub\n", ClientBinding, ClientPID); - return RPC_S_INVALID_BINDING; + RpcConnection *connection = NULL; + RpcBinding *binding; + + TRACE("%p %p\n", ClientBinding, ClientPID); + + binding = ClientBinding ? ClientBinding : RPCRT4_GetThreadCurrentCallHandle(); + if (!binding) + return RPC_S_NO_CALL_ACTIVE; + + connection = binding->FromConn; + if (!connection->ops->inquire_client_pid) + return RPC_S_INVALID_BINDING; + + return connection->ops->inquire_client_pid(connection, ClientPID); } diff --git a/dlls/rpcrt4/rpc_binding.h b/dlls/rpcrt4/rpc_binding.h index 8faacbd66e2..c79451f4894 100644 --- a/dlls/rpcrt4/rpc_binding.h +++ b/dlls/rpcrt4/rpc_binding.h @@ -118,6 +118,7 @@ struct connection_ops { RPC_STATUS (*impersonate_client)(RpcConnection *conn); RPC_STATUS (*revert_to_self)(RpcConnection *conn); RPC_STATUS (*inquire_auth_client)(RpcConnection *, RPC_AUTHZ_HANDLE *, RPC_WSTR *, ULONG *, ULONG *, ULONG *, ULONG); + RPC_STATUS (*inquire_client_pid)(RpcConnection *conn, ULONG *pid); }; /* don't know what MS's structure looks like */ diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 82798a5a80d..8c615b71dd9 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -893,6 +893,13 @@ static RPC_STATUS rpcrt4_ncalrpc_inquire_auth_client( return RPC_S_OK; } +static RPC_STATUS rpcrt4_ncalrpc_inquire_client_pid(RpcConnection *conn, ULONG *pid) +{ + RpcConnection_np *connection = (RpcConnection_np *)conn; + + return GetNamedPipeClientProcessId(connection->pipe, pid) ? RPC_S_OK : RPC_S_INVALID_BINDING; +} + /**** ncacn_ip_tcp support ****/ static size_t rpcrt4_ip_tcp_get_top_of_tower(unsigned char *tower_data, @@ -3134,6 +3141,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_impersonate_client, rpcrt4_conn_np_revert_to_self, RPCRT4_default_inquire_auth_client, + NULL }, { "ncalrpc", { EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_PIPE }, @@ -3156,6 +3164,7 @@ static const struct connection_ops conn_protseq_list[] = { rpcrt4_conn_np_impersonate_client, rpcrt4_conn_np_revert_to_self, rpcrt4_ncalrpc_inquire_auth_client, + rpcrt4_ncalrpc_inquire_client_pid }, { "ncacn_ip_tcp", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_TCP }, @@ -3178,6 +3187,7 @@ static const struct connection_ops conn_protseq_list[] = { RPCRT4_default_impersonate_client, RPCRT4_default_revert_to_self, RPCRT4_default_inquire_auth_client, + NULL }, { "ncacn_http", { EPM_PROTOCOL_NCACN, EPM_PROTOCOL_HTTP }, @@ -3200,6 +3210,7 @@ static const struct connection_ops conn_protseq_list[] = { RPCRT4_default_impersonate_client, RPCRT4_default_revert_to_self, RPCRT4_default_inquire_auth_client, + NULL }, }; diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 7fdb076bc73..5fe803e5a1d 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1140,16 +1140,13 @@ static DWORD CALLBACK test_I_RpcBindingInqLocalClientPID_thread_func(void *args) winetest_push_context("%s", client_test_name); status = I_RpcBindingInqLocalClientPID(NULL, &pid); - todo_wine ok(status == RPC_S_NO_CALL_ACTIVE, "Got unexpected %ld.\n", status); /* Other protocol sequences throw exceptions */ if (params->protseq == RPC_PROTSEQ_LRPC) { status = I_RpcBindingInqLocalClientPID(params->binding, &pid); - todo_wine ok(status == RPC_S_OK, "Got unexpected %ld.\n", status); - todo_wine ok(pid == client_info.dwProcessId, "Got unexpected pid.\n"); } @@ -1179,9 +1176,7 @@ void __cdecl s_test_I_RpcBindingInqLocalClientPID(unsigned int protseq, RPC_BIND status = I_RpcBindingInqLocalClientPID(NULL, &pid); if (protseq == RPC_PROTSEQ_LRPC) { - todo_wine ok(status == RPC_S_OK, "Got unexpected %ld.\n", status); - todo_wine ok(pid == client_info.dwProcessId, "Got unexpected pid.\n"); } else @@ -1192,9 +1187,7 @@ void __cdecl s_test_I_RpcBindingInqLocalClientPID(unsigned int protseq, RPC_BIND if (protseq == RPC_PROTSEQ_LRPC) /* Other protocol sequences throw exceptions */ { status = I_RpcBindingInqLocalClientPID(binding, &pid); - todo_wine ok(status == RPC_S_OK, "Got unexpected %ld.\n", status); - todo_wine ok(pid == client_info.dwProcessId, "Got unexpected pid.\n"); }

1 0

Giovanni Mascellani : xactengine3_7/tests: Test notifications when loading a wave bank.
by Alexandre Julliard 18 Jul '22

18 Jul '22

Module: wine Branch: master Commit: 1ac80a99dd8ffa92e1822a71168030d2cd0bf802 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ac80a99dd8ffa92e1822a71168030… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Jul 7 15:15:05 2022 +0200 xactengine3_7/tests: Test notifications when loading a wave bank. "The King of Fighters '98 Ultimate Match Final Edition" depends on this behavior. At least, the build I have is; it seems other builds are not. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/xactengine3_7/tests/xact3.c | 171 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c index 623a1c97db8..1b27eb9aa19 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "xact3.h" +#include "xact3wb.h" DEFINE_GUID(IID_IXACT3Engine30, 0x9e33f661, 0x2d07, 0x43ec, 0x97, 0x04, 0xbb, 0xcb, 0x71, 0xa5, 0x49, 0x72); DEFINE_GUID(IID_IXACT3Engine31, 0xe72c1b9a, 0xd717, 0x41c0, 0x81, 0xa6, 0x50, 0xeb, 0x56, 0xe8, 0x06, 0x49); @@ -90,11 +91,181 @@ static void test_interfaces(void) } } +static WCHAR *gen_xwb_file(void) +{ + static const WAVEBANKENTRY entry = + { + .Format = + { + .wFormatTag = WAVEBANKMINIFORMAT_TAG_ADPCM, + .nChannels = 2, + .nSamplesPerSec = 22051, + .wBlockAlign = 48, + }, + }; + static const WAVEBANKDATA bank_data = + { + .dwFlags = WAVEBANK_TYPE_STREAMING, + .dwEntryCount = 1, + .szBankName = "test", + .dwEntryMetaDataElementSize = sizeof(entry), + .dwEntryNameElementSize = WAVEBANK_ENTRYNAME_LENGTH, + .dwAlignment = 0x800, + }; + static const WAVEBANKHEADER header = + { + .dwSignature = WAVEBANK_HEADER_SIGNATURE, + .dwVersion = XACT_CONTENT_VERSION, + .dwHeaderVersion = WAVEBANK_HEADER_VERSION, + .Segments = + { + [WAVEBANK_SEGIDX_BANKDATA] = + { + .dwOffset = sizeof(header), + .dwLength = sizeof(bank_data), + }, + [WAVEBANK_SEGIDX_ENTRYMETADATA] = + { + .dwOffset = sizeof(header) + sizeof(bank_data), + .dwLength = sizeof(entry), + }, + }, + }; + static WCHAR path[MAX_PATH]; + DWORD written; + HANDLE file; + + GetTempPathW(ARRAY_SIZE(path), path); + lstrcatW(path, L"test.xwb"); + + file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Cannot create file %s, error %ld\n", + wine_dbgstr_w(path), GetLastError()); + + WriteFile(file, &header, sizeof(header), &written, NULL); + ok(written == sizeof(header), "Cannot write header\n"); + + WriteFile(file, &bank_data, sizeof(bank_data), &written, NULL); + ok(written == sizeof(bank_data), "Cannot write bank data\n"); + + WriteFile(file, &entry, sizeof(entry), &written, NULL); + ok(written == sizeof(entry), "Cannot write entry\n"); + + CloseHandle(file); + + return path; +} + +struct notification_cb_data +{ + XACTNOTIFICATIONTYPE type; + IXACT3WaveBank *wave_bank; + BOOL received; + DWORD thread_id; +}; + +static void WINAPI notification_cb(const XACT_NOTIFICATION *notification) +{ + struct notification_cb_data *data = notification->pvContext; + DWORD thread_id = GetCurrentThreadId(); + + data->received = TRUE; + ok(notification->type == data->type, + "Unexpected notification type %u\n", notification->type); + ok(notification->waveBank.pWaveBank == data->wave_bank, "Unexpected wave bank %p instead of %p\n", + notification->waveBank.pWaveBank, data->wave_bank); + ok(thread_id == data->thread_id, "Unexpected thread id %#lx instead of %#lx\n", thread_id, data->thread_id); +} + +static void test_notifications(void) +{ + struct notification_cb_data prepared_data = { 0 }, destroyed_data = { 0 }; + XACT_NOTIFICATION_DESCRIPTION notification_desc = { 0 }; + XACT_STREAMING_PARAMETERS streaming_params = { 0 }; + XACT_RUNTIME_PARAMETERS params = { 0 }; + IXACT3Engine *engine; + WCHAR *filename; + unsigned int i; + HANDLE file; + DWORD state; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XACTEngine, NULL, CLSCTX_INPROC_SERVER, &IID_IXACT3Engine, (void **)&engine); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* Win 10 v1507 */, "Cannot create engine, hr %#lx\n", hr); + + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("XACT not supported\n"); + return; + } + + params.lookAheadTime = XACT_ENGINE_LOOKAHEAD_DEFAULT; + params.fnNotificationCallback = notification_cb; + + hr = IXACT3Engine_Initialize(engine, &params); + ok(hr == S_OK, "Cannot initialize engine, hr %#lx\n", hr); + + prepared_data.type = XACTNOTIFICATIONTYPE_WAVEBANKPREPARED; + prepared_data.thread_id = GetCurrentThreadId(); + notification_desc.type = XACTNOTIFICATIONTYPE_WAVEBANKPREPARED; + notification_desc.flags = XACT_FLAG_NOTIFICATION_PERSIST; + notification_desc.pvContext = &prepared_data; + hr = IXACT3Engine_RegisterNotification(engine, &notification_desc); + ok(hr == S_OK, "Cannot register notification, hr %#lx\n", hr); + + destroyed_data.type = XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED; + destroyed_data.thread_id = GetCurrentThreadId(); + notification_desc.type = XACTNOTIFICATIONTYPE_WAVEBANKDESTROYED; + notification_desc.flags = XACT_FLAG_NOTIFICATION_PERSIST; + notification_desc.pvContext = NULL; + hr = IXACT3Engine_RegisterNotification(engine, &notification_desc); + ok(hr == S_OK, "Cannot register notification, hr %#lx\n", hr); + + /* Registering again overrides pvContext, but each notification + * class has its own pvContext. */ + notification_desc.pvContext = &destroyed_data; + hr = IXACT3Engine_RegisterNotification(engine, &notification_desc); + ok(hr == S_OK, "Cannot register notification, hr %#lx\n", hr); + + filename = gen_xwb_file(); + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + ok(file != INVALID_HANDLE_VALUE, "Cannot open file\n"); + + streaming_params.file = file; + streaming_params.packetSize = 0x800; + hr = IXACT3Engine_CreateStreamingWaveBank(engine, &streaming_params, &prepared_data.wave_bank); + ok(hr == S_OK, "Cannot create a streaming wave bank, hr %#lx\n", hr); + destroyed_data.wave_bank = prepared_data.wave_bank; + + for (i = 0; i < 10 && !prepared_data.received; i++) + { + IXACT3Engine_DoWork(engine); + Sleep(1); + } + + hr = IXACT3WaveBank_GetState(prepared_data.wave_bank, &state); + ok(hr == S_OK, "Cannot query wave bank state, hr %#lx\n", hr); + ok(state == XACT_WAVEBANKSTATE_PREPARED, "Wave bank is not in prepared state, but in %#lx\n", state); + + todo_wine ok(prepared_data.received, "The 'wave bank prepared' notification was never received\n"); + ok(!destroyed_data.received, "The 'wave bank destroyed' notification was received too early\n"); + + IXACT3WaveBank_Destroy(prepared_data.wave_bank); + todo_wine ok(destroyed_data.received, "The 'wave bank destroyed' notification was never received\n"); + + CloseHandle(file); + IXACT3Engine_Release(engine); + + DeleteFileW(filename); +} + START_TEST(xact3) { CoInitialize(NULL); test_interfaces(); + test_notifications(); CoUninitialize(); }

1 0