September 2019 - Wine-devel

Testbox failing at apply patches.
by Alistair Leslie-Hughes 13 Sep '19

13 Sep '19

I've just sent a patch to the list and it's failing to apply to the current code on the testbox. Which is expected if it was updated after today's commits. Looking that the tests run on the testbox, the normal daily tests haven't been performed for a couple of days. Maybe the Upgrade the other day has upset it? Regard Alistair

3 2

[PATCH] ole32: Turn FIXME into a TRACE for clipboard backend of QueryGetData.
by Dmitry Timoshkov 13 Sep '19

13 Sep '19

This one seems to be implemented. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 3464e2ca6a..0c02d02a65 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1602,7 +1602,7 @@ end: */ static HRESULT WINAPI snapshot_QueryGetData(IDataObject *iface, FORMATETC *fmt) { - FIXME("(%p, %p {%s})\n", iface, fmt, dump_fmtetc(fmt)); + TRACE("(%p, %p {%s})\n", iface, fmt, dump_fmtetc(fmt)); if (!fmt) return E_INVALIDARG; -- 2.20.1

2 1

[PATCH] winex11.drv: Protect XOpenIM with a critical section.
by Bernhard Übelacker 13 Sep '19

13 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47366 I could reproduce for "Far Manager v2.0 build 1807 x86" that "double free or corruption (!prev)" bug. After some debugging and additional logging I guess this is a race between two threads living in Far.exe. Both run through XOpenIM at the same time, the main process by calling ToUnicodeEx, the other thread by CreateWindowExW. Therefore sometimes freeing the same memory. Sometimes just freezing. Because of this being timing related, I cannot say if this is really a regression. A comment above open_xim reads: "Should always be called with the x11 lock held" Got this "x11 lock" removed in 2012? This patch adds a critical section for all the contents of open_xim, because I am unsure if just protecting XOpenIM would be sufficient. I got the backtraces below, in Debian 10, current wine git with some logging. Library libx11-6 got also some logging. Therefore the line information might be off a few lines: Thread 1 hit Breakpoint 1, destroy (lcd=0x7c5a4d20) at ../../../src/xlibi18n/lcPublic.c:275 warning: Source file is more recent than executable. 275 fprintf(stderr, "%d: destroy pub=%p lcd=%p\n", mygettid(), pub, lcd); fflush(stderr); Wine-gdb> bt #0 destroy (lcd=0x7c5a4d20) at ../../../src/xlibi18n/lcPublic.c:275 #1 0xf79b5269 in _XCloseLC (lcd=0x7c5a4d20) at ../../../src/xlibi18n/lcWrap.c:338 #2 0xf79b52bf in _XlcCurrentLC () at ../../../src/xlibi18n/lcWrap.c:365 #3 0xf79ae2d5 in _Xlcmbstowcs (lcd=0x0, wstr=0x32cd48 L"À", str=0x7c60a7a2 "À", len=127) at ../../../src/xlibi18n/lcStd.c:132 #4 0xf79ae3a2 in _Xmbstowcs (wstr=0x32cd48 L"À", str=0x7c60a7a2 "À", len=127) at ../../../src/xlibi18n/lcStd.c:232 #5 0xf79c2e74 in parseline (depth=<optimized out>, tokenbuf=<optimized out>, im=<optimized out>, fp=<optimized out>) at ../../../../modules/im/ximcp/imLcPrs.c:626 #6 parsestringfile (fp=fp(a)entry=0x7c594240, im=im(a)entry=0x7c5fbe40, depth=depth(a)entry=0) at ../../../../modules/im/ximcp/imLcPrs.c:737 #7 0xf79c360f in _XimParseStringFile (fp=0x7c594240, im=0x7c5fbe40) at ../../../../modules/im/ximcp/imLcPrs.c:716 #8 0xf79c0f1e in _XimCreateDefaultTree (im=0x7c5fbe40) at ../../../../modules/im/ximcp/imLcIm.c:610 #9 _XimLocalOpenIM (im=0x7c5fbe40) at ../../../../modules/im/ximcp/imLcIm.c:700 #10 0xf79bf482 in _XimOpenIM (lcd=0x7c5a4d20, dpy=0x7c5facc0, rdb=0x0, res_name=0x0, res_class=0x0) at ../../../../modules/im/ximcp/imInt.c:229 #11 0xf79a5ba6 in XOpenIM (display=0x7c5facc0, rdb=0x0, res_name=0x0, res_class=0x0) at ../../../src/xlibi18n/IMWrap.c:121 #12 0xf7b42495 in open_xim (display=0x7c5facc0) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/xim.c:354 #13 0xf7b42deb in X11DRV_SetupXIM () at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/xim.c:474 #14 0xf7b3ee99 in x11drv_init_thread_data () at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/x11drv_main.c:682 #15 0xf7b15bb5 in thread_init_display () at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/x11drv.h:369 #16 0xf7b199a4 in X11DRV_ToUnicodeEx (virtKey=0, scanCode=0, lpKeyState=0x32f4e4 "", bufW=0x32f65c, bufW_size=1, flags=0, hkl=0x4070407) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/keyboard.c:2447 #17 0x7e89cc85 in ToUnicodeEx (virtKey=0, scanCode=0, lpKeyState=0x32f4e4 "", lpwStr=0x32f65c, size=1, flags=0, hkl=0x4070407) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/user32/input.c:868 #18 0x00486311 in ?? () #19 0x0049b690 in ?? () #20 0x004fd424 in ?? () #21 0x7b4744ba in call_process_entry () at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/kernel32/process.c:1226 #22 0x7b474600 in start_process (entry=0x4fd47a, peb=0x7ffdf000) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/kernel32/process.c:1293 #23 0x7b4744c6 in start_process_wrapper () at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/kernel32/process.c:1226 #24 0x00000000 in ?? () Thread 2 received signal SIGTRAP, Trace/breakpoint trap. [Switching to Thread 63] 0xf79adc3a in destroy (lcd=0x7c5a4d20) at ../../../src/xlibi18n/lcPublic.c:275 275 fprintf(stderr, "%d: destroy pub=%p lcd=%p\n", mygettid(), pub, lcd); fflush(stderr); Wine-gdb> bt #0 0xf79adc3a in destroy (lcd=0x7c5a4d20) at ../../../src/xlibi18n/lcPublic.c:275 #1 0xf79b5269 in _XCloseLC (lcd=0x7c5a4d20) at ../../../src/xlibi18n/lcWrap.c:338 #2 0xf79b52bf in _XlcCurrentLC () at ../../../src/xlibi18n/lcWrap.c:365 #3 0xf79ae715 in _Xlcmbstoutf8 (lcd=0x0, ustr=0x8bd69c "Ǫ", str=0xf7711964 "ǫ", len=255) at ../../../src/xlibi18n/lcStd.c:324 #4 0xf79ae752 in _Xmbstoutf8 (ustr=0x8bd69c "Ǫ", str=0xf7711964 "ǫ", len=255) at ../../../src/xlibi18n/lcStd.c:357 #5 0xf79c3159 in parseline (depth=<optimized out>, tokenbuf=<optimized out>, im=<optimized out>, fp=<optimized out>) at ../../../../modules/im/ximcp/imLcPrs.c:642 #6 parsestringfile (fp=fp(a)entry=0xf7701030, im=im(a)entry=0xf77019d0, depth=depth(a)entry=0) at ../../../../modules/im/ximcp/imLcPrs.c:737 #7 0xf79c360f in _XimParseStringFile (fp=0xf7701030, im=0xf77019d0) at ../../../../modules/im/ximcp/imLcPrs.c:716 #8 0xf79c0f1e in _XimCreateDefaultTree (im=0xf77019d0) at ../../../../modules/im/ximcp/imLcIm.c:610 #9 _XimLocalOpenIM (im=0xf77019d0) at ../../../../modules/im/ximcp/imLcIm.c:700 #10 0xf79bf482 in _XimOpenIM (lcd=0x7c5a4d20, dpy=0xf77005d0, rdb=0x0, res_name=0x0, res_class=0x0) at ../../../../modules/im/ximcp/imInt.c:229 #11 0xf79a5ba6 in XOpenIM (display=0xf77005d0, rdb=0x0, res_name=0x0, res_class=0x0) at ../../../src/xlibi18n/IMWrap.c:121 #12 0xf7b42495 in open_xim (display=0xf77005d0) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/xim.c:354 #13 0xf7b42deb in X11DRV_SetupXIM () at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/xim.c:474 #14 0xf7b3ee99 in x11drv_init_thread_data () at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/x11drv_main.c:682 #15 0xf7b32a77 in thread_init_display () at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/x11drv.h:369 #16 0xf7b37350 in X11DRV_create_win_data (hwnd=0x3006e, window_rect=0x8bfd88, client_rect=0x8bfd88) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/window.c:1883 #17 0xf7b380d3 in X11DRV_WindowPosChanging (hwnd=0x3006e, insert_after=0x0, swp_flags=20, window_rect=0x8bfd88, client_rect=0x8bfd88, visible_rect=0x8bfbf0, surface=0x8bfb8c) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/winex11.drv/window.c:2252 #18 0x7e8fbf85 in set_window_pos (hwnd=0x3006e, insert_after=0x0, swp_flags=20, window_rect=0x8bfd88, client_rect=0x8bfd88, valid_rects=0x0) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/user32/winpos.c:2080 #19 0x7e8f0c38 in WIN_CreateWindowEx (cs=0x8bfe70, className=0x51b598, module=0x0, unicode=1) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/user32/win.c:1614 #20 0x7e8f13b8 in CreateWindowExW (exStyle=0, className=0x51b598, windowName=0x0, style=0, x=-2147483648, y=-2147483648, width=-2147483648, height=-2147483648, parent=0x0, menu=0x0, instance=0x0, data=0x0) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/user32/win.c:1798 #21 0x004f6387 in ?? () #22 0x7bca9dd4 in call_thread_func_wrapper () at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/ntdll/signal_i386.c:2628 #23 0x7bca9e37 in call_thread_func (entry=0x4f6310, arg=0x5776b8) at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/ntdll/signal_i386.c:2723 #24 0x7bca9dc6 in call_thread_entry () at /home/bernhard/data/entwicklung/2019/wine/wine-git/wine-git/dlls/ntdll/signal_i386.c:2628 #25 0x00000000 in ?? () --- dlls/winex11.drv/xim.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 44fe62e900..fdbb29151d 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -59,6 +59,15 @@ static XIMStyle ximStyle = 0; static XIMStyle ximStyleRoot = 0; static XIMStyle ximStyleRequest = STYLE_CALLBACK; +static CRITICAL_SECTION xim_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &xim_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": xim_section") } +}; +static CRITICAL_SECTION xim_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + static void X11DRV_ImmSetInternalString(DWORD dwOffset, DWORD selLength, LPWSTR lpComp, DWORD dwCompLen) { @@ -334,17 +343,25 @@ static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data) */ static BOOL open_xim( Display *display ) { - struct x11drv_thread_data *thread_data = x11drv_thread_data(); + struct x11drv_thread_data *thread_data; XIMStyle ximStyleNone; XIMStyles *ximStyles = NULL; INT i; XIM xim; XIMCallback destroy; + TRACE("(%p)\n", display); + + EnterCriticalSection( &xim_section ); + TRACE("EnterCriticalSection( &xim_section ) after\n"); + + thread_data = x11drv_thread_data(); xim = XOpenIM(display, NULL, NULL, NULL); if (xim == NULL) { WARN("Could not open input method.\n"); + TRACE("LeaveCriticalSection( &xim_section ) before\n"); + LeaveCriticalSection( &xim_section ); return FALSE; } @@ -364,6 +381,8 @@ static BOOL open_xim( Display *display ) { WARN("Could not find supported input style.\n"); XCloseIM(xim); + TRACE("LeaveCriticalSection( &xim_section ) before\n"); + LeaveCriticalSection( &xim_section ); return FALSE; } else @@ -433,6 +452,10 @@ static BOOL open_xim( Display *display ) thread_data->font_set = NULL; IME_UpdateAssociation(NULL); + + TRACE("LeaveCriticalSection( &xim_section ) before\n"); + LeaveCriticalSection( &xim_section ); + return TRUE; } -- 2.20.1

3 3

[PATCH] d3dx9: Favour source rect position in D3DXLoadSurfaceFromMemory().
by Paul Gofman 13 Sep '19

13 Sep '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41936 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3dx9_36/surface.c | 9 ++++++++- dlls/d3dx9_36/tests/surface.c | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 8e9b834d88..8b85c97e8b 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1836,10 +1836,10 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, DWORD filter, D3DCOLOR color_key) { const struct pixel_format_desc *srcformatdesc, *destformatdesc; + struct volume src_size, dst_size; IDirect3DSurface9 *surface; D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; - struct volume src_size, dst_size; HRESULT hr; TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n", @@ -1899,6 +1899,13 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if (FAILED(hr = lock_surface(dst_surface, dst_rect, &lockrect, &surface, TRUE))) return hr; + if (!(src_rect->left & (srcformatdesc->block_width - 1) + || src_rect->top & (srcformatdesc->block_height - 1))) + src_memory = (BYTE *)src_memory + src_rect->top * src_pitch + src_rect->left + * srcformatdesc->bytes_per_pixel; + else + FIXME("Source rect position is misaligned, src_rect %s.\n", wine_dbgstr_rect(src_rect)); + if (src_format == surfdesc.Format && dst_size.width == src_size.width && dst_size.height == src_size.height diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 4a10492a08..2c7e088f06 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -980,6 +980,15 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) check_pixel_4bpp(&lockrect, 1, 1, 0xc3f04c39); IDirect3DSurface9_UnlockRect(surf); + SetRect(&rect, 1, 1, 2, 2); + SetRect(&destrect, 0, 0, 1, 1); + hr = D3DXLoadSurfaceFromMemory(surf, NULL, &destrect, pixdata_a8b8g8r8, D3DFMT_A8B8G8R8, + 8, NULL, &rect, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); + check_pixel_4bpp(&lockrect, 0, 0, 0x8df62bc3); + IDirect3DSurface9_UnlockRect(surf); + SetRect(&rect, 0, 0, 2, 2); hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, pixdata_a2r10g10b10, D3DFMT_A2R10G10B10, -- 2.21.0

1 0

[PATCH 2/2] configure: Fix libunwind warning logic.
by Huw Davies 13 Sep '19

13 Sep '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 49676f073b..ad7ed007e6 100644 --- a/configure.ac +++ b/configure.ac @@ -1719,7 +1719,7 @@ then fi case $host in aarch64*|*-darwin*) - WINE_NOTICE_WITH(unwind,[test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" != xnono], + WINE_NOTICE_WITH(unwind,[test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" = xnono], [libunwind ${notice_platform}development files not found, stack unwinding won't work.]) ;; esac -- 2.23.0

2 1

[PATCH 2/2] rpcrt4: Implement RpcAsyncCompleteCall for server side.
by Dmitry Timoshkov 13 Sep '19

13 Sep '19

Based on NdrStubCall2 implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/ndr_stubless.c | 92 ++++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/ndr_stubless.h | 1 + dlls/rpcrt4/rpc_async.c | 3 +- 3 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 70a26dd5b3..10de5a4f44 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -2082,3 +2082,95 @@ void RPC_ENTRY NdrAsyncServerCall(PRPC_MESSAGE pRpcMsg) else call_server_func(pServerInfo->DispatchTable[pRpcMsg->ProcNum], args, async_call_data->stack_size); } + +RPC_STATUS NdrpCompleteAsyncServerCall(RPC_ASYNC_STATE *pAsync, void *Reply) +{ + /* pointer to start of stack where arguments start */ + PMIDL_STUB_MESSAGE pStubMsg; + struct async_call_data *async_call_data; + /* the type of pass we are currently doing */ + enum stubless_phase phase; + /* location to put retval into */ + LONG_PTR *retval_ptr; + RPC_STATUS status = RPC_S_OK; + + if (!pAsync->StubInfo) + return RPC_S_INVALID_ASYNC_HANDLE; + + async_call_data = pAsync->StubInfo; + pStubMsg = async_call_data->pStubMsg; + + TRACE("pAsync %p, pAsync->StubInfo %p, pFormat %p\n", pAsync, pAsync->StubInfo, async_call_data->pHandleFormat); + + /* 3. INITOUT */ + TRACE("INITOUT\n"); + retval_ptr = stub_do_args(async_call_data->pStubMsg, async_call_data->pHandleFormat, STUBLESS_INITOUT, async_call_data->number_of_params); + if (retval_ptr) + { + TRACE("stub implementation returned 0x%lx\n", *(LONG_PTR *)Reply); + *retval_ptr = *(LONG_PTR *)Reply; + } + else + TRACE("void stub implementation\n"); + + for (phase = STUBLESS_CALCSIZE; phase <= STUBLESS_FREE; phase++) + { + TRACE("phase = %d\n", phase); + switch (phase) + { + case STUBLESS_GETBUFFER: + if (async_call_data->pProcHeader->Oi_flags & Oi_OBJECT_PROC) + { + ERR("objects not supported\n"); + HeapFree(GetProcessHeap(), 0, async_call_data->pStubMsg->StackTop); + I_RpcFree(async_call_data); + I_RpcFree(pAsync); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + else + { + pStubMsg->RpcMsg->BufferLength = pStubMsg->BufferLength; + /* allocate buffer for [out] and [ret] params */ + status = I_RpcGetBuffer(pStubMsg->RpcMsg); + if (status) + RpcRaiseException(status); + pStubMsg->Buffer = pStubMsg->RpcMsg->Buffer; + } + break; + + case STUBLESS_CALCSIZE: + case STUBLESS_MARSHAL: + case STUBLESS_MUSTFREE: + case STUBLESS_FREE: + stub_do_args(pStubMsg, async_call_data->pHandleFormat, phase, async_call_data->number_of_params); + break; + default: + ERR("shouldn't reach here. phase %d\n", phase); + break; + } + } + +#if 0 /* FIXME */ + if (ext_flags.HasNewCorrDesc) + { + /* free extra correlation package */ + NdrCorrelationFree(pStubMsg); + } + + if (Oif_flags.HasPipes) + { + /* NdrPipesDone(...) */ + } + + /* free the full pointer translation tables */ + if (async_call_data->pProcHeader->Oi_flags & Oi_FULL_PTR_USED) + NdrFullPointerXlatFree(pStubMsg->FullPtrXlatTables); +#endif + + /* free server function stack */ + HeapFree(GetProcessHeap(), 0, async_call_data->pStubMsg->StackTop); + I_RpcFree(async_call_data); + I_RpcFree(pAsync); + + return S_OK; +} diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index fc67cf9020..699a6bcfcf 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -261,3 +261,4 @@ PFORMAT_STRING convert_old_args( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFo unsigned int stack_size, BOOL object_proc, void *buffer, unsigned int size, unsigned int *count ) DECLSPEC_HIDDEN; RPC_STATUS NdrpCompleteAsyncClientCall(RPC_ASYNC_STATE *pAsync, void *Reply) DECLSPEC_HIDDEN; +RPC_STATUS NdrpCompleteAsyncServerCall(RPC_ASYNC_STATE *pAsync, void *Reply) DECLSPEC_HIDDEN; diff --git a/dlls/rpcrt4/rpc_async.c b/dlls/rpcrt4/rpc_async.c index 9c3d90cfba..00c2d6bede 100644 --- a/dlls/rpcrt4/rpc_async.c +++ b/dlls/rpcrt4/rpc_async.c @@ -125,8 +125,7 @@ RPC_STATUS WINAPI RpcAsyncCompleteCall(PRPC_ASYNC_STATE pAsync, void *Reply) if (data->pStubMsg->IsClient) return NdrpCompleteAsyncClientCall(pAsync, Reply); - FIXME("not implemented for server side\n"); - return RPC_S_CALL_FAILED; + return NdrpCompleteAsyncServerCall(pAsync, Reply); } /*********************************************************************** -- 2.20.1

1 0

[PATCH 1/2] rpcrt4: Implement NdrAsyncServerCall.
by Dmitry Timoshkov 13 Sep '19

13 Sep '19

Based on NdrStubCall2 and NdrAsyncClientCall implementations. In order to test asynchronous RPC I used dlls/rpcrt4/tests/server.c as a base, converted int_return() and sum() to use asynchronous RPC on both client and server sides (server.idl doesn't need any changes), and added server.acf: interface IServer { [async] int_return(); [async] sum(); } With this implementation these tests pass under Wine. Since widl doesn't support asynchronous RPC it's impossible to add appropriate Wine tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rpcrt4/ndr_stubless.c | 190 +++++++++++++++++++++++++++++++++---- dlls/rpcrt4/ndr_stubless.h | 15 +++ dlls/rpcrt4/rpc_async.c | 11 ++- 3 files changed, 199 insertions(+), 17 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 90537515ea..70a26dd5b3 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1559,21 +1559,6 @@ void WINAPI NdrServerCallAll( PRPC_MESSAGE msg ) FIXME("%p stub\n", msg); } -struct async_call_data -{ - MIDL_STUB_MESSAGE *pStubMsg; - const NDR_PROC_HEADER *pProcHeader; - PFORMAT_STRING pHandleFormat; - PFORMAT_STRING pParamFormat; - RPC_BINDING_HANDLE hBinding; - /* size of stack */ - unsigned short stack_size; - /* number of parameters. optional for client to give it to us */ - unsigned int number_of_params; - /* correlation cache */ - ULONG_PTR NdrCorrCache[256]; -}; - /* Helper for ndr_async_client_call, to factor out the part that may or may not be * guarded by a try/except block. */ static void do_ndr_async_client_call( const MIDL_STUB_DESC *pStubDesc, PFORMAT_STRING pFormat, void **stack_top ) @@ -1922,5 +1907,178 @@ RPCRTAPI LONG RPC_ENTRY NdrAsyncStubCall(struct IRpcStubBuffer* pThis, void RPC_ENTRY NdrAsyncServerCall(PRPC_MESSAGE pRpcMsg) { - FIXME("unimplemented, %p\n", pRpcMsg); + const MIDL_SERVER_INFO *pServerInfo; + const MIDL_STUB_DESC *pStubDesc; + PFORMAT_STRING pFormat; + /* pointer to start of stack to pass into stub implementation */ + unsigned char *args; + /* header for procedure string */ + const NDR_PROC_HEADER *pProcHeader; + struct async_call_data *async_call_data; + PRPC_ASYNC_STATE pAsync; + RPC_STATUS status; + + TRACE("%p\n", pRpcMsg); + + pServerInfo = ((RPC_SERVER_INTERFACE *)pRpcMsg->RpcInterfaceInformation)->InterpreterInfo; + + pStubDesc = pServerInfo->pStubDesc; + pFormat = pServerInfo->ProcString + pServerInfo->FmtStringOffset[pRpcMsg->ProcNum]; + pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; + + TRACE("NDR Version: 0x%x\n", pStubDesc->Version); + + async_call_data = I_RpcAllocate(sizeof(*async_call_data) + sizeof(MIDL_STUB_MESSAGE) + sizeof(RPC_MESSAGE)); + if (!async_call_data) RpcRaiseException(RPC_X_NO_MEMORY); + async_call_data->pProcHeader = pProcHeader; + + async_call_data->pStubMsg = (PMIDL_STUB_MESSAGE)(async_call_data + 1); + *(PRPC_MESSAGE)(async_call_data->pStubMsg + 1) = *pRpcMsg; + + if (pProcHeader->Oi_flags & Oi_HAS_RPCFLAGS) + { + const NDR_PROC_HEADER_RPC *header_rpc = (const NDR_PROC_HEADER_RPC *)&pFormat[0]; + async_call_data->stack_size = header_rpc->stack_size; + pFormat += sizeof(NDR_PROC_HEADER_RPC); + } + else + { + async_call_data->stack_size = pProcHeader->stack_size; + pFormat += sizeof(NDR_PROC_HEADER); + } + + TRACE("Oi_flags = 0x%02x\n", pProcHeader->Oi_flags); + + /* binding */ + switch (pProcHeader->handle_type) + { + /* explicit binding: parse additional section */ + case 0: + switch (*pFormat) /* handle_type */ + { + case FC_BIND_PRIMITIVE: /* explicit primitive */ + pFormat += sizeof(NDR_EHD_PRIMITIVE); + break; + case FC_BIND_GENERIC: /* explicit generic */ + pFormat += sizeof(NDR_EHD_GENERIC); + break; + case FC_BIND_CONTEXT: /* explicit context */ + pFormat += sizeof(NDR_EHD_CONTEXT); + break; + default: + ERR("bad explicit binding handle type (0x%02x)\n", pProcHeader->handle_type); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + break; + case FC_BIND_GENERIC: /* implicit generic */ + case FC_BIND_PRIMITIVE: /* implicit primitive */ + case FC_CALLBACK_HANDLE: /* implicit callback */ + case FC_AUTO_HANDLE: /* implicit auto handle */ + break; + default: + ERR("bad implicit binding handle type (0x%02x)\n", pProcHeader->handle_type); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + if (pProcHeader->Oi_flags & Oi_OBJECT_PROC) + { + ERR("objects not supported\n"); + I_RpcFree(async_call_data); + RpcRaiseException(RPC_X_BAD_STUB_DATA); + } + + NdrServerInitializeNew(pRpcMsg, async_call_data->pStubMsg, pStubDesc); + + /* create the full pointer translation tables, if requested */ + if (pProcHeader->Oi_flags & Oi_FULL_PTR_USED) + async_call_data->pStubMsg->FullPtrXlatTables = NdrFullPointerXlatInit(0, XLAT_SERVER); + + /* use alternate memory allocation routines */ + if (pProcHeader->Oi_flags & Oi_RPCSS_ALLOC_USED) +#if 0 + NdrRpcSsEnableAllocate(&stubMsg); +#else + FIXME("Set RPCSS memory allocation routines\n"); +#endif + + TRACE("allocating memory for stack of size %x\n", async_call_data->stack_size); + + args = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, async_call_data->stack_size); + async_call_data->pStubMsg->StackTop = args; /* used by conformance of top-level objects */ + + pAsync = I_RpcAllocate(sizeof(*pAsync)); + if (!pAsync) RpcRaiseException(RPC_X_NO_MEMORY); + + status = RpcAsyncInitializeHandle(pAsync, sizeof(*pAsync)); + if (status != RPC_S_OK) + RpcRaiseException(status); + + pAsync->StubInfo = async_call_data; + TRACE("pAsync %p, pAsync->StubInfo %p, pFormat %p\n", pAsync, pAsync->StubInfo, async_call_data->pHandleFormat); + + /* add the implicit pAsync pointer as the first arg to the function */ + *(void **)args = pAsync; + + if (is_oicf_stubdesc(pStubDesc)) + { + const NDR_PROC_PARTIAL_OIF_HEADER *pOIFHeader = (const NDR_PROC_PARTIAL_OIF_HEADER *)pFormat; + /* cache of Oif_flags from v2 procedure header */ + INTERPRETER_OPT_FLAGS Oif_flags; + /* cache of extension flags from NDR_PROC_HEADER_EXTS */ + INTERPRETER_OPT_FLAGS2 ext_flags = { 0 }; + + Oif_flags = pOIFHeader->Oi2Flags; + async_call_data->number_of_params = pOIFHeader->number_of_params; + + pFormat += sizeof(NDR_PROC_PARTIAL_OIF_HEADER); + + TRACE("Oif_flags = %s\n", debugstr_INTERPRETER_OPT_FLAGS(Oif_flags) ); + + if (Oif_flags.HasExtensions) + { + const NDR_PROC_HEADER_EXTS *pExtensions = (const NDR_PROC_HEADER_EXTS *)pFormat; + ext_flags = pExtensions->Flags2; + pFormat += pExtensions->Size; + } + + if (Oif_flags.HasPipes) + { + FIXME("pipes not supported yet\n"); + RpcRaiseException(RPC_X_WRONG_STUB_VERSION); /* FIXME: remove when implemented */ + /* init pipes package */ + /* NdrPipesInitialize(...) */ + } + if (ext_flags.HasNewCorrDesc) + { + /* initialize extra correlation package */ + NdrCorrelationInitialize(async_call_data->pStubMsg, async_call_data->NdrCorrCache, sizeof(async_call_data->NdrCorrCache), 0); + if (ext_flags.Unused & 0x2) /* has range on conformance */ + async_call_data->pStubMsg->CorrDespIncrement = 12; + } + } + else + { + pFormat = convert_old_args( async_call_data->pStubMsg, pFormat, async_call_data->stack_size, + pProcHeader->Oi_flags & Oi_OBJECT_PROC, + /* reuse the correlation cache, it's not needed for v1 format */ + async_call_data->NdrCorrCache, sizeof(async_call_data->NdrCorrCache), &async_call_data->number_of_params ); + } + + /* convert strings, floating point values and endianness into our + * preferred format */ + if ((pRpcMsg->DataRepresentation & 0x0000FFFFUL) != NDR_LOCAL_DATA_REPRESENTATION) + NdrConvert(async_call_data->pStubMsg, pFormat); + + async_call_data->pHandleFormat = pFormat; + + /* 1. UNMARSHAL */ + TRACE("UNMARSHAL\n"); + stub_do_args(async_call_data->pStubMsg, pFormat, STUBLESS_UNMARSHAL, async_call_data->number_of_params); + + /* 2. CALLSERVER */ + TRACE("CALLSERVER\n"); + if (pServerInfo->ThunkTable && pServerInfo->ThunkTable[pRpcMsg->ProcNum]) + pServerInfo->ThunkTable[pRpcMsg->ProcNum](async_call_data->pStubMsg); + else + call_server_func(pServerInfo->DispatchTable[pRpcMsg->ProcNum], args, async_call_data->stack_size); } diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 606513ff24..fc67cf9020 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -224,6 +224,21 @@ typedef struct _NDR_EHD_CONTEXT #include "poppack.h" +struct async_call_data +{ + MIDL_STUB_MESSAGE *pStubMsg; + const NDR_PROC_HEADER *pProcHeader; + PFORMAT_STRING pHandleFormat; + PFORMAT_STRING pParamFormat; + RPC_BINDING_HANDLE hBinding; + /* size of stack */ + unsigned short stack_size; + /* number of parameters. optional for client to give it to us */ + unsigned int number_of_params; + /* correlation cache */ + ULONG_PTR NdrCorrCache[256]; +}; + enum stubless_phase { STUBLESS_UNMARSHAL, diff --git a/dlls/rpcrt4/rpc_async.c b/dlls/rpcrt4/rpc_async.c index 891fc5ad72..9c3d90cfba 100644 --- a/dlls/rpcrt4/rpc_async.c +++ b/dlls/rpcrt4/rpc_async.c @@ -110,6 +110,8 @@ RPC_STATUS WINAPI RpcAsyncGetCallStatus(PRPC_ASYNC_STATE pAsync) */ RPC_STATUS WINAPI RpcAsyncCompleteCall(PRPC_ASYNC_STATE pAsync, void *Reply) { + struct async_call_data *data; + TRACE("(%p, %p)\n", pAsync, Reply); if (!valid_async_handle(pAsync)) @@ -117,7 +119,14 @@ RPC_STATUS WINAPI RpcAsyncCompleteCall(PRPC_ASYNC_STATE pAsync, void *Reply) /* FIXME: check completed */ - return NdrpCompleteAsyncClientCall(pAsync, Reply); + TRACE("pAsync %p, pAsync->StubInfo %p\n", pAsync, pAsync->StubInfo); + + data = pAsync->StubInfo; + if (data->pStubMsg->IsClient) + return NdrpCompleteAsyncClientCall(pAsync, Reply); + + FIXME("not implemented for server side\n"); + return RPC_S_CALL_FAILED; } /*********************************************************************** -- 2.20.1

1 0

[PATCH v2] dwrite: Prefer Windows platform names regardless of record order.
by Akihiro Sagawa 13 Sep '19

13 Sep '19

In v2, fix time out issue (loop variable name was incorrect). Otherwise localized family name of IPA font isn't available in DirectWrite. While Wine enumerates localized name in GDI. N.B. IPA font family (e.g. IPA Mincho) is a bit tricky. It has Japanese (Kanji) name for Japanese Windows, though it has English (ASCII) name for Japanese Macintosh. And due to record order, Wine's DirectWrite chooses Macintosh one. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dwrite/opentype.c | 52 ++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-)

2 1

[PATCH] dwrite: Avoid a magic constant.
by Akihiro Sagawa 13 Sep '19

13 Sep '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[v2 PATCH] dwrite/tests: Silence a compiler warning in test_fontsetbuilder.
by Nikolay Sivov 13 Sep '19

13 Sep '19

From: Gerald Pfeifer <gerald(a)pfeifer.com> GCC 10 alphas (and probably before that) issue font.c: In function ¡test_fontsetbuilder¢: font.c:9149:21: warning: ¡ivalue¢ may be used uninitialized in this function [-Wmaybe-uninitialized] 9149 | wsprintfW(buffW, fmtW, ivalue); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ in dlls/dwrite/tests/font.c. The structure of our code is switch ... { case 1: ivalue =... ; break; case 2: ivalue =... ; break; default: ; } switch ... { case 1: case 2: do something with ivalue; default: ; } so this looks like a false positive, however one that appears rather involved for compilers to handle. Hence, best to pragmatically silence this by initializing ivalue in the default case? Gerald Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 309c0a2b08..7d434222a3 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9105,7 +9105,7 @@ todo_wine static const WCHAR fmtW[] = {'%','u',0}; IDWriteLocalizedStrings *values; WCHAR buffW[255], buff2W[255]; - UINT32 c, ivalue; + UINT32 c, ivalue = 0; BOOL exists; hr = IDWriteFontSet_GetPropertyValues(fontset, 0, id, &exists, &values); -- 2.23.0

1 0