November 2019 - Wine-devel - list.winehq.org

[PATCH 2/3] widl: Don't use fixed size buffer in ctl2_encode_string.
by Jacek Caban 08 Nov '19

08 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/write_msft.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)

1 0

[PATCH 1/3] widl: Don't use fixed size buffer in ctl2_encode_name.
by Jacek Caban 08 Nov '19

08 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/write_msft.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)

1 0

[PATCH v4 1/2] user32/tests: Wait for parent thread to complete before checking window.
by Rémi Bernon 08 Nov '19

08 Nov '19

This test is failing from time to time. Making sure the parent thread has terminated before continuing triggers the underlying race condition, and makes the test to always fail. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Notes: v4: General clean up: * Directly check the window in grand child thread instead of waiting. It should have been destroyed already as we waited for thread completion. * Start the threads before flushing events and cleaning up sequences, it should be the same at the end but it gives more time for children to create their own windows. * Share all the handles from the main stack. Wait directly on the child thread handle from the grand child instead of using an additional event. * Increase some of the remaining timeouts, it still sometimes times out on testbot Windows VMs otherwise. The failure was hard to reproduce. The most reliable way without the sleep added here is to start multiple runs on the testbot, changing locale for each run. The locale change seems to have an impact on the timing and triggers the race condition. dlls/user32/tests/msg.c | 61 +++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 193a20fd958..a1deab10de5 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8548,6 +8548,8 @@ static void test_paint_messages(void) struct wnd_event { HWND hwnd; + HWND child_hwnd; + HANDLE child; HANDLE grand_child; HANDLE start_event; HANDLE stop_event; @@ -8580,44 +8582,50 @@ static DWORD CALLBACK create_grand_child_thread( void *param ) struct wnd_event *wnd_event = param; HWND hchild; MSG msg; + DWORD ret; hchild = CreateWindowExA(0, "TestWindowClass", "Test child", - WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); + WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->child_hwnd, 0, 0, NULL); ok (hchild != 0, "Failed to create child window\n"); flush_events(); flush_sequence(); SetEvent( wnd_event->start_event ); - for (;;) - { - MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_ALLINPUT); - if (!IsWindow( hchild )) break; /* will be destroyed when parent thread exits */ - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - } + ret = WaitForSingleObject( wnd_event->child, 5000 ); + ok( !ret, "WaitForSingleObject returned %x, error: %u\n", ret, GetLastError() ); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + todo_wine + ok( !IsWindow( hchild ), "Child window not destroyed\n" ); + return 0; } static DWORD CALLBACK create_child_thread( void *param ) { struct wnd_event *wnd_event = param; - struct wnd_event child_event; DWORD ret, tid; MSG msg; - child_event.hwnd = CreateWindowExA(0, "TestWindowClass", "Test child", - WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); - ok (child_event.hwnd != 0, "Failed to create child window\n"); - SetFocus( child_event.hwnd ); + wnd_event->child_hwnd = CreateWindowExA( 0, "TestWindowClass", "Test child", + WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, + wnd_event->hwnd, 0, 0, NULL ); + ok (wnd_event->child_hwnd, "Failed to create child windows\n"); + SetFocus( wnd_event->child_hwnd ); + + wnd_event->grand_child = CreateThread( NULL, 0, create_grand_child_thread, wnd_event, 0, &tid ); + ok( wnd_event->grand_child, "CreateThread failed, error %u\n", GetLastError() ); + flush_events(); flush_sequence(); - child_event.start_event = wnd_event->start_event; - wnd_event->grand_child = CreateThread(NULL, 0, create_grand_child_thread, &child_event, 0, &tid); for (;;) { - DWORD ret = MsgWaitForMultipleObjects(1, &child_event.start_event, FALSE, 1000, QS_SENDMESSAGE); + ret = MsgWaitForMultipleObjects(1, &wnd_event->start_event, FALSE, 5000, QS_SENDMESSAGE); if (ret != 1) break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } + ok( !ret, "MsgWaitForMultipleObjects failed %x, error: %u\n", ret, GetLastError() ); + ret = WaitForSingleObject( wnd_event->stop_event, 5000 ); ok( !ret, "WaitForSingleObject failed %x\n", ret ); return 0; @@ -8751,33 +8759,38 @@ static void test_interthread_messages(void) wnd_event.hwnd = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); ok (wnd_event.hwnd != 0, "Failed to create parent window\n"); + + wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL ); + wnd_event.stop_event = CreateEventA( NULL, TRUE, FALSE, NULL ); + + wnd_event.child = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); + ok( wnd_event.child, "CreateThread failed, error %u\n", GetLastError() ); + flush_events(); flush_sequence(); log_all_parent_messages++; - wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL ); - wnd_event.stop_event = CreateEventA( NULL, TRUE, FALSE, NULL ); - hThread = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); for (;;) { - ret = MsgWaitForMultipleObjects(1, &wnd_event.start_event, FALSE, 1000, QS_SENDMESSAGE); + ret = MsgWaitForMultipleObjects(1, &wnd_event.start_event, FALSE, 5000, QS_SENDMESSAGE); if (ret != 1) break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ok( !ret, "MsgWaitForMultipleObjects failed %x\n", ret ); /* now wait for the thread without processing messages; this shouldn't deadlock */ SetEvent( wnd_event.stop_event ); - ret = WaitForSingleObject( hThread, 5000 ); + + ret = WaitForSingleObject( wnd_event.child, 5000 ); ok( !ret, "WaitForSingleObject failed %x\n", ret ); - CloseHandle( hThread ); ret = WaitForSingleObject( wnd_event.grand_child, 5000 ); - ok( !ret, "WaitForSingleObject failed %x\n", ret ); - CloseHandle( wnd_event.grand_child ); + ok( !ret, "WaitForSingleObject failed %x, error: %u\n", ret, GetLastError() ); + CloseHandle( wnd_event.child ); + CloseHandle( wnd_event.grand_child ); CloseHandle( wnd_event.start_event ); CloseHandle( wnd_event.stop_event ); flush_events(); - ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); + ok_sequence(WmExitThreadSeq, "destroy child on thread exit", TRUE); log_all_parent_messages--; DestroyWindow( wnd_event.hwnd ); -- 2.24.0.rc2

2 3

[PATCH 2/2] vbscript: Implement script persistence.
by Jacek Caban 08 Nov '19

08 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Persistent code has to be re-executed if the script is uninitialized and then reinitialized and restarted. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 5 ++++- dlls/vbscript/vbscript.c | 12 ++++++++++++ dlls/vbscript/vbscript.h | 3 +++ 3 files changed, 19 insertions(+), 1 deletion(-)

1 0

[PATCH 1/2] vbscript: Avoid special casing the global function when compiling a function's variables.
by Jacek Caban 08 Nov '19

08 Nov '19

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 77 +++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 45 deletions(-)

1 0

[PATCH] jscript/tests: Use wchar string literals instead of a2bstr helper.
by Jacek Caban 08 Nov '19

08 Nov '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/jscript.c | 50 +++++++++++++++--------------------- 1 file changed, 20 insertions(+), 30 deletions(-)

1 0

vkd3d: DXIL control flow progress
by Hans-Kristian Arntzen 08 Nov '19

08 Nov '19

I'd like to update the ML on control-flow progress and demonstrate some problems. The WIP repo is here: https://github.com/HansKristian-Work/DXIL2SPIRV. I'm developing it as a standalone module for time being. Control flow in DXIL is a complicated beast as it's a soup of gotos, as it is LLVM. The only saving grace is that it must be reducible, i.e. no branching straight into a loop, or arbitrary backward gotos. The main problem with emitting SPIR-V is: - For every conditional branch we need a selection merge construct with a unique merge block which header dominates. - For every loop header, we need a loop merge with designated continue block and unique merge block which header dominates. - Cannot break out of more than one loop construct at a time (guess what DXIL does!). The main complication currently is that we need ladder breaking. Here's a concrete example: cbuffer Buff : register(b10, space1) { int count1; int count2; int data[1024]; }; float get_r() { float r = 0.0; [loop] for (int i = 0; i < count1; i++) { [loop] for (int j = 0; j < count2; j++) { if (data[i ^ j] == 40) return r; // <-- goto end; when inlined r += float(data[i ^ j]); } } return r; } float4 main(float4 pos : POSITION, float4 pos2 : COLOR) : SV_Position { float r = get_r(); return r.xxxx; } This gets compiled into: ... define void @main() { %Buff_cbuffer = call %dx.types.Handle @dx.op.createHandle(i32 57, i8 2, i32 0, i32 10, i1 false) ; CreateHandle(resourceClass,rangeId,index,nonUniformIndex) %1 = call %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32 59, %dx.types.Handle %Buff_cbuffer, i32 0) ; CBufferLoadLegacy(handle,regIndex) %2 = extractvalue %dx.types.CBufRet.i32 %1, 0 %3 = icmp sgt i32 %2, 0 br i1 %3, label %.lr.ph2.preheader, label %"\01?get_r@@YAMXZ.exit" .lr.ph2.preheader: ; preds = %0 br label %.lr.ph2 .lr.ph2: ; preds = %._crit_edge, %.lr.ph2.preheader %i.i.0 = phi i32 [ %19, %._crit_edge ], [ 0, %.lr.ph2.preheader ] %r.i.0 = phi float [ %r.i.2, %._crit_edge ], [ 0.000000e+00, %.lr.ph2.preheader ] %4 = call %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32 59, %dx.types.Handle %Buff_cbuffer, i32 0) ; CBufferLoadLegacy(handle,regIndex) %5 = extractvalue %dx.types.CBufRet.i32 %4, 1 %6 = icmp sgt i32 %5, 0 br i1 %6, label %.lr.ph.preheader, label %._crit_edge .lr.ph.preheader: ; preds = %.lr.ph2 br label %.lr.ph .lr.ph: ; preds = %12, %.lr.ph.preheader %j.i.0 = phi i32 [ %15, %12 ], [ 0, %.lr.ph.preheader ] %r.i.1 = phi float [ %14, %12 ], [ %r.i.0, %.lr.ph.preheader ] %7 = xor i32 %j.i.0, %i.i.0 %8 = add i32 %7, 1 %9 = call %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32 59, %dx.types.Handle %Buff_cbuffer, i32 %8) ; CBufferLoadLegacy(handle,regIndex) %10 = extractvalue %dx.types.CBufRet.i32 %9, 0 %11 = icmp eq i32 %10, 40 br i1 %11, label %"\01?get_r@@YAMXZ.exit.loopexit", label %12 ; <label>:12 ; preds = %.lr.ph %13 = sitofp i32 %10 to float %14 = fadd fast float %13, %r.i.1 %15 = add nuw nsw i32 %j.i.0, 1 %16 = call %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32 59, %dx.types.Handle %Buff_cbuffer, i32 0) ; CBufferLoadLegacy(handle,regIndex) %17 = extractvalue %dx.types.CBufRet.i32 %16, 1 %18 = icmp slt i32 %15, %17 br i1 %18, label %.lr.ph, label %._crit_edge.loopexit, !llvm.loop !25 ._crit_edge.loopexit: ; preds = %12 br label %._crit_edge ._crit_edge: ; preds = %._crit_edge.loopexit, %.lr.ph2 %r.i.2 = phi float [ %r.i.0, %.lr.ph2 ], [ %14, %._crit_edge.loopexit ] %19 = add nuw nsw i32 %i.i.0, 1 %20 = call %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32 59, %dx.types.Handle %Buff_cbuffer, i32 0) ; CBufferLoadLegacy(handle,regIndex) %21 = extractvalue %dx.types.CBufRet.i32 %20, 0 %22 = icmp slt i32 %19, %21 br i1 %22, label %.lr.ph2, label %"\01?get_r@@YAMXZ.exit.loopexit.11", !llvm.loop !27 "\01?get_r@@YAMXZ.exit.loopexit": ; preds = %.lr.ph br label %"\01?get_r@@YAMXZ.exit" "\01?get_r@@YAMXZ.exit.loopexit.11": ; preds = %._crit_edge br label %"\01?get_r@@YAMXZ.exit" "\01?get_r@@YAMXZ.exit": ; preds = %"\01?get_r@@YAMXZ.exit.loopexit.11", %"\01?get_r@@YAMXZ.exit.loopexit", %0 %.0 = phi float [ 0.000000e+00, %0 ], [ %r.i.1, %"\01?get_r@@YAMXZ.exit.loopexit" ], [ %r.i.2, %"\01?get_r@@YAMXZ.exit.loopexit.11" ] call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float %.0) ; StoreOutput(outputSigId,rowIndex,colIndex,value) call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float %.0) ; StoreOutput(outputSigId,rowIndex,colIndex,value) call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float %.0) ; StoreOutput(outputSigId,rowIndex,colIndex,value) call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 3, float %.0) ; StoreOutput(outputSigId,rowIndex,colIndex,value) ret void } ... The "return r;" inside the inner loop turns into a full "exit". This is a very common pattern where inlined leaf functions return. For a normal HLSL -> SPIR-V path, spirv-opt carefully introduces ladders to convert a return into a chain of breaks. We have no such luxury in DXIL. Basically, the return becomes a forward goto. After a lot of implementation weirdness, I can turn this into SPIR-V which validates. Only control flow is emitted since I haven't looked at actual codegen. The resulting GLSL from SPIRV-Cross ends up looking something like: #version 450 void main() { bool COND1; if (COND1) { bool _lr_ph2_preheader; bool _lr_ph2; bool _lr_ph2_succ; bool _lr_ph_preheader; bool _lr_ph; bool COND11; bool _get_r_YAMXZ_exit_loopexit; bool _crit_edge_loopexit_pred; bool _crit_edge_loopexit; bool _crit_edge; do { if (_lr_ph2_succ) { do { if (_lr_ph) { break; // <-- goto end; } else { } } while (!COND11); if (!_crit_edge_loopexit_pred) // <-- Ladder to handle goto { break; } } } while (!_crit_edge); bool _get_r_YAMXZ_exit_loopexit_11_pred; if (_get_r_YAMXZ_exit_loopexit_11_pred) // <-- Ladder to handle goto { bool _get_r_YAMXZ_exit_loopexit_11; } bool _get_r_YAMXZ_exit_loopexit_11_succ; } // end: bool _get_r_YAMXZ_exit; } Some other complications left to consider will be to deal with Phi nodes properly, and switch blocks. Cheers, Hans-Kristian

1 0

[PATCH v5 1/7] vbscript: Release the code list when the script is closed.
by Gabriel Ivăncescu 08 Nov '19

08 Nov '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/vbscript.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 6d2bb54..938e517 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -193,13 +193,10 @@ static void release_script(script_ctx_t *ctx) heap_pool_init(&ctx->heap); } -static void destroy_script(script_ctx_t *ctx) +static void release_code_list(script_ctx_t *ctx) { while(!list_empty(&ctx->code_list)) release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry)); - - release_script(ctx); - heap_free(ctx); } static void decrease_state(VBScript *This, SCRIPTSTATE state) @@ -221,6 +218,8 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) break; release_script(This->ctx); This->thread_id = 0; + if(state == SCRIPTSTATE_CLOSED) + release_code_list(This->ctx); break; case SCRIPTSTATE_CLOSED: break; @@ -396,7 +395,7 @@ static ULONG WINAPI VBScript_Release(IActiveScript *iface) if(!ref) { decrease_state(This, SCRIPTSTATE_CLOSED); - destroy_script(This->ctx); + heap_free(This->ctx); heap_free(This); } -- 2.21.0

2 12

[PATCH] ole32: Add separate enumerator implementation for IEnumSTATPROPSETSTG.
by Nikolay Sivov 08 Nov '19

08 Nov '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- The goal is to get rid of enumx.c, allowing clean implementation of changes in staging like ole32-STGPROP/0003-ole32-Implement-returning-a-name-in-IEnumSTATPROPSTG.patch dlls/ole32/stg_prop.c | 329 ++++++++++++++++++++++-------------- dlls/ole32/tests/stg_prop.c | 115 +++++++++++++ 2 files changed, 317 insertions(+), 127 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 9e13c135ad..2e43d16b35 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -51,6 +51,7 @@ #include "winuser.h" #include "wine/asm.h" #include "wine/debug.h" +#include "wine/heap.h" #include "dictionary.h" #include "storage32.h" #include "enumx.h" @@ -142,9 +143,7 @@ static HRESULT PropertyStorage_StringCopy(LPCSTR src, LCID srcCP, LPSTR *dst, LCID targetCP); static const IPropertyStorageVtbl IPropertyStorage_Vtbl; -static const IEnumSTATPROPSETSTGVtbl IEnumSTATPROPSETSTG_Vtbl; static const IEnumSTATPROPSTGVtbl IEnumSTATPROPSTG_Vtbl; -static HRESULT create_EnumSTATPROPSETSTG(StorageImpl *, IEnumSTATPROPSETSTG**); static HRESULT create_EnumSTATPROPSTG(PropertyStorage_impl *, IEnumSTATPROPSTG**); /*********************************************************************** @@ -2143,6 +2142,201 @@ static HRESULT PropertyStorage_ConstructEmpty(IStream *stm, * Implementation of IPropertySetStorage */ +struct enum_stat_propset_stg +{ + IEnumSTATPROPSETSTG IEnumSTATPROPSETSTG_iface; + LONG refcount; + STATPROPSETSTG *stats; + size_t current; + size_t count; +}; + +static struct enum_stat_propset_stg *impl_from_IEnumSTATPROPSETSTG(IEnumSTATPROPSETSTG *iface) +{ + return CONTAINING_RECORD(iface, struct enum_stat_propset_stg, IEnumSTATPROPSETSTG_iface); +} + +static HRESULT WINAPI enum_stat_propset_stg_QueryInterface(IEnumSTATPROPSETSTG *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IEnumSTATPROPSETSTG) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IEnumSTATPROPSETSTG_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI enum_stat_propset_stg_AddRef(IEnumSTATPROPSETSTG *iface) +{ + struct enum_stat_propset_stg *psenum = impl_from_IEnumSTATPROPSETSTG(iface); + LONG refcount = InterlockedIncrement(&psenum->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI enum_stat_propset_stg_Release(IEnumSTATPROPSETSTG *iface) +{ + struct enum_stat_propset_stg *psenum = impl_from_IEnumSTATPROPSETSTG(iface); + LONG refcount = InterlockedDecrement(&psenum->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + heap_free(psenum->stats); + heap_free(psenum); + } + + return refcount; +} + +static HRESULT WINAPI enum_stat_propset_stg_Next(IEnumSTATPROPSETSTG *iface, ULONG celt, + STATPROPSETSTG *ret, ULONG *fetched) +{ + struct enum_stat_propset_stg *psenum = impl_from_IEnumSTATPROPSETSTG(iface); + ULONG count = 0; + + TRACE("%p, %u, %p, %p.\n", iface, celt, ret, fetched); + + if (psenum->current == ~0u) + psenum->current = 0; + + while (count < celt && psenum->current < psenum->count) + ret[count++] = psenum->stats[psenum->current++]; + + if (fetched) + *fetched = count; + + return count < celt ? S_FALSE : S_OK; +} + +static HRESULT WINAPI enum_stat_propset_stg_Skip(IEnumSTATPROPSETSTG *iface, ULONG celt) +{ + FIXME("%p, %u.\n", iface, celt); + + return S_OK; +} + +static HRESULT WINAPI enum_stat_propset_stg_Reset(IEnumSTATPROPSETSTG *iface) +{ + struct enum_stat_propset_stg *psenum = impl_from_IEnumSTATPROPSETSTG(iface); + + TRACE("%p.\n", iface); + + psenum->current = ~0u; + + return S_OK; +} + +static HRESULT WINAPI enum_stat_propset_stg_Clone(IEnumSTATPROPSETSTG *iface, IEnumSTATPROPSETSTG **ppenum) +{ + FIXME("%p, %p.\n", iface, ppenum); + + return E_NOTIMPL; +} + +static const IEnumSTATPROPSETSTGVtbl enum_stat_propset_stg_vtbl = +{ + enum_stat_propset_stg_QueryInterface, + enum_stat_propset_stg_AddRef, + enum_stat_propset_stg_Release, + enum_stat_propset_stg_Next, + enum_stat_propset_stg_Skip, + enum_stat_propset_stg_Reset, + enum_stat_propset_stg_Clone, +}; + +static HRESULT create_enum_stat_propset_stg(StorageImpl *storage, IEnumSTATPROPSETSTG **ret) +{ + IStorage *stg = &storage->base.IStorage_iface; + IEnumSTATSTG *penum = NULL; + STATSTG stat; + ULONG count; + HRESULT hr; + + struct enum_stat_propset_stg *enum_obj; + + enum_obj = heap_alloc_zero(sizeof(*enum_obj)); + if (!enum_obj) + return E_OUTOFMEMORY; + + enum_obj->IEnumSTATPROPSETSTG_iface.lpVtbl = &enum_stat_propset_stg_vtbl; + enum_obj->refcount = 1; + + /* add all the property set elements into a list */ + hr = IStorage_EnumElements(stg, 0, NULL, 0, &penum); + if (FAILED(hr)) + goto done; + + /* Allocate stats array and fill it. */ + while ((hr = IEnumSTATSTG_Next(penum, 1, &stat, &count)) == S_OK) + { + enum_obj->count++; + CoTaskMemFree(stat.pwcsName); + } + + if (FAILED(hr)) + goto done; + + enum_obj->stats = heap_alloc(enum_obj->count * sizeof(*enum_obj->stats)); + if (!enum_obj->stats) + { + hr = E_OUTOFMEMORY; + goto done; + } + enum_obj->count = 0; + + if (FAILED(hr = IEnumSTATSTG_Reset(penum))) + goto done; + + while (IEnumSTATSTG_Next(penum, 1, &stat, &count) == S_OK) + { + if (!stat.pwcsName) + continue; + + if (stat.pwcsName[0] == 5 && stat.type == STGTY_STREAM) + { + STATPROPSETSTG *ptr = &enum_obj->stats[enum_obj->count++]; + + PropStgNameToFmtId(stat.pwcsName, &ptr->fmtid); + + TRACE("adding %s - %s.\n", debugstr_w(stat.pwcsName), debugstr_guid(&ptr->fmtid)); + + ptr->mtime = stat.mtime; + ptr->atime = stat.atime; + ptr->ctime = stat.ctime; + ptr->grfFlags = stat.grfMode; + ptr->clsid = stat.clsid; + } + CoTaskMemFree(stat.pwcsName); + } + +done: + + if (penum) + IEnumSTATSTG_Release(penum); + + if (SUCCEEDED(hr)) + { + *ret = &enum_obj->IEnumSTATPROPSETSTG_iface; + } + else + { + *ret = NULL; + IEnumSTATPROPSETSTG_Release(&enum_obj->IEnumSTATPROPSETSTG_iface); + } + + return hr; +} + /************************************************************************ * IPropertySetStorage_fnQueryInterface (IUnknown) * @@ -2310,124 +2504,16 @@ static HRESULT WINAPI IPropertySetStorage_fnDelete( return IStorage_DestroyElement(&This->base.IStorage_iface, name); } -/************************************************************************ - * IPropertySetStorage_fnEnum (IPropertySetStorage) - */ -static HRESULT WINAPI IPropertySetStorage_fnEnum( - IPropertySetStorage *ppstg, - IEnumSTATPROPSETSTG** ppenum) -{ - StorageImpl *This = impl_from_IPropertySetStorage(ppstg); - return create_EnumSTATPROPSETSTG(This, ppenum); -} - -/************************************************************************ - * Implement IEnumSTATPROPSETSTG using enumx - */ -static HRESULT WINAPI IEnumSTATPROPSETSTG_fnQueryInterface( - IEnumSTATPROPSETSTG *iface, - REFIID riid, - void** ppvObject) -{ - return enumx_QueryInterface((enumx_impl*)iface, riid, ppvObject); -} - -static ULONG WINAPI IEnumSTATPROPSETSTG_fnAddRef( - IEnumSTATPROPSETSTG *iface) -{ - return enumx_AddRef((enumx_impl*)iface); -} - -static ULONG WINAPI IEnumSTATPROPSETSTG_fnRelease( - IEnumSTATPROPSETSTG *iface) +static HRESULT WINAPI IPropertySetStorage_fnEnum(IPropertySetStorage *iface, IEnumSTATPROPSETSTG **enum_obj) { - return enumx_Release((enumx_impl*)iface); -} + StorageImpl *storage = impl_from_IPropertySetStorage(iface); -static HRESULT WINAPI IEnumSTATPROPSETSTG_fnNext( - IEnumSTATPROPSETSTG *iface, - ULONG celt, - STATPROPSETSTG *rgelt, - ULONG *pceltFetched) -{ - return enumx_Next((enumx_impl*)iface, celt, rgelt, pceltFetched); -} + TRACE("%p, %p.\n", iface, enum_obj); -static HRESULT WINAPI IEnumSTATPROPSETSTG_fnSkip( - IEnumSTATPROPSETSTG *iface, - ULONG celt) -{ - return enumx_Skip((enumx_impl*)iface, celt); -} - -static HRESULT WINAPI IEnumSTATPROPSETSTG_fnReset( - IEnumSTATPROPSETSTG *iface) -{ - return enumx_Reset((enumx_impl*)iface); -} - -static HRESULT WINAPI IEnumSTATPROPSETSTG_fnClone( - IEnumSTATPROPSETSTG *iface, - IEnumSTATPROPSETSTG **ppenum) -{ - return enumx_Clone((enumx_impl*)iface, (enumx_impl**)ppenum); -} - -static HRESULT create_EnumSTATPROPSETSTG( - StorageImpl *This, - IEnumSTATPROPSETSTG** ppenum) -{ - IStorage *stg = &This->base.IStorage_iface; - IEnumSTATSTG *penum = NULL; - STATSTG stat; - ULONG count; - HRESULT r; - STATPROPSETSTG statpss; - enumx_impl *enumx; - - TRACE("%p %p\n", This, ppenum); - - enumx = enumx_allocate(&IID_IEnumSTATPROPSETSTG, - &IEnumSTATPROPSETSTG_Vtbl, - sizeof (STATPROPSETSTG)); - - /* add all the property set elements into a list */ - r = IStorage_EnumElements(stg, 0, NULL, 0, &penum); - if (FAILED(r)) - { - enumx_Release(enumx); - return E_OUTOFMEMORY; - } - - while (1) - { - count = 0; - r = IEnumSTATSTG_Next(penum, 1, &stat, &count); - if (FAILED(r)) - break; - if (!count) - break; - if (!stat.pwcsName) - continue; - if (stat.pwcsName[0] == 5 && stat.type == STGTY_STREAM) - { - PropStgNameToFmtId(stat.pwcsName, &statpss.fmtid); - TRACE("adding %s (%s)\n", debugstr_w(stat.pwcsName), - debugstr_guid(&statpss.fmtid)); - statpss.mtime = stat.mtime; - statpss.atime = stat.atime; - statpss.ctime = stat.ctime; - statpss.grfFlags = stat.grfMode; - statpss.clsid = stat.clsid; - enumx_add_element(enumx, &statpss); - } - CoTaskMemFree(stat.pwcsName); - } - IEnumSTATSTG_Release(penum); - - *ppenum = (IEnumSTATPROPSETSTG*) enumx; + if (!enum_obj) + return E_INVALIDARG; - return S_OK; + return create_enum_stat_propset_stg(storage, enum_obj); } /************************************************************************ @@ -2550,17 +2636,6 @@ static const IPropertyStorageVtbl IPropertyStorage_Vtbl = IPropertyStorage_fnStat, }; -static const IEnumSTATPROPSETSTGVtbl IEnumSTATPROPSETSTG_Vtbl = -{ - IEnumSTATPROPSETSTG_fnQueryInterface, - IEnumSTATPROPSETSTG_fnAddRef, - IEnumSTATPROPSETSTG_fnRelease, - IEnumSTATPROPSETSTG_fnNext, - IEnumSTATPROPSETSTG_fnSkip, - IEnumSTATPROPSETSTG_fnReset, - IEnumSTATPROPSETSTG_fnClone, -}; - static const IEnumSTATPROPSTGVtbl IEnumSTATPROPSTG_Vtbl = { IEnumSTATPROPSTG_fnQueryInterface, diff --git a/dlls/ole32/tests/stg_prop.c b/dlls/ole32/tests/stg_prop.c index 24ae03efc1..b2ed1a7081 100644 --- a/dlls/ole32/tests/stg_prop.c +++ b/dlls/ole32/tests/stg_prop.c @@ -669,10 +669,125 @@ static void testFmtId(void) } } +static void test_propertyset_storage_enum(void) +{ + IPropertyStorage *prop_storage, *prop_storage2; + IPropertySetStorage *ps_storage; + IEnumSTATPROPSETSTG *ps_enum; + WCHAR filename[MAX_PATH]; + STATPROPSETSTG psstg; + DWORD ret, fetched; + IStorage *storage; + FILETIME ftime; + HRESULT hr; + + ret = GetTempFileNameW(L".", L"stg", 0, filename); + ok(ret, "Failed to get temporary file name.\n"); + + hr = StgCreateDocfile(filename, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, &storage); + ok(hr == S_OK, "Failed to crate storage, hr %#x.\n", hr); + + hr = StgCreatePropSetStg(storage, 0, &ps_storage); + ok(hr == S_OK, "Failed to create property set storage, hr %#x.\n", hr); + + hr = IPropertySetStorage_Create(ps_storage, &FMTID_SummaryInformation, &IID_IUnknown, PROPSETFLAG_ANSI, + STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &prop_storage); + ok(hr == S_OK, "Failed to create property storage, hr %#x.\n", hr); + + hr = IPropertyStorage_Stat(prop_storage, &psstg); + ok(hr == S_OK, "Failed to get prop storage stats, hr %#x.\n", hr); +todo_wine + ok(IsEqualCLSID(&psstg.clsid, &IID_IUnknown), "Unexpected storage clsid %s.\n", wine_dbgstr_guid(&psstg.clsid)); + + hr = IPropertySetStorage_Enum(ps_storage, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IPropertySetStorage_Enum(ps_storage, &ps_enum); + ok(hr == S_OK, "Failed to get enum object, hr %#x.\n", hr); + + memset(&psstg, 0, sizeof(psstg)); + hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched); + ok(hr == S_OK, "Failed to get enum item, hr %#x.\n", hr); + ok(fetched == 1, "Unexpected fetched count.\n"); + ok(IsEqualCLSID(&psstg.fmtid, &FMTID_SummaryInformation), "Unexpected fmtid %s.\n", + wine_dbgstr_guid(&psstg.fmtid)); + ok(psstg.mtime.dwHighDateTime == 0 && psstg.mtime.dwLowDateTime == 0, "Unexpected mtime %#x / %#x.\n", + psstg.mtime.dwHighDateTime, psstg.mtime.dwLowDateTime); + + memset(&ftime, 0, sizeof(ftime)); + ftime.dwLowDateTime = 1; + hr = IPropertyStorage_SetTimes(prop_storage, NULL, NULL, &ftime); +todo_wine + ok(hr == S_OK, "Failed to set storage times, hr %#x.\n", hr); + + hr = IEnumSTATPROPSETSTG_Reset(ps_enum); + ok(hr == S_OK, "Failed to reset enumerator, hr %#x.\n", hr); + memset(&psstg, 0, sizeof(psstg)); + hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched); + ok(hr == S_OK, "Failed to get enum item, hr %#x.\n", hr); + ok(fetched == 1, "Unexpected fetched count.\n"); + ok(IsEqualCLSID(&psstg.fmtid, &FMTID_SummaryInformation), "Unexpected fmtid %s.\n", + wine_dbgstr_guid(&psstg.fmtid)); + ok(psstg.mtime.dwHighDateTime == 0 && psstg.mtime.dwLowDateTime == 0, "Unexpected mtime %#x / %#x.\n", + psstg.mtime.dwHighDateTime, psstg.mtime.dwLowDateTime); + hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched); + ok(hr == S_FALSE, "Unexpected hr #x.\n", hr); + + hr = IPropertySetStorage_Create(ps_storage, &FMTID_SummaryInformation, &IID_IUnknown, PROPSETFLAG_ANSI, + STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &prop_storage2); + ok(hr == S_OK, "Failed to create property storage, hr %#x.\n", hr); + + hr = IEnumSTATPROPSETSTG_Reset(ps_enum); + ok(hr == S_OK, "Failed to reset enumerator, hr %#x.\n", hr); + hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched); + ok(hr == S_OK, "Failed to get enum item, hr %#x.\n", hr); + ok(fetched == 1, "Unexpected fetched count.\n"); + hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched); + ok(hr == S_FALSE, "Failed to get enum item, hr %#x.\n", hr); + + /* Skipping. */ + hr = IEnumSTATPROPSETSTG_Reset(ps_enum); + ok(hr == S_OK, "Failed to reset enumerator, hr %#x.\n", hr); + hr = IEnumSTATPROPSETSTG_Skip(ps_enum, 2); +todo_wine + ok(hr == S_FALSE, "Failed to skip, hr %#x.\n", hr); + hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched); +todo_wine + ok(hr == S_FALSE, "Failed to get enum item, hr %#x.\n", hr); + + hr = IEnumSTATPROPSETSTG_Reset(ps_enum); + ok(hr == S_OK, "Failed to reset enumerator, hr %#x.\n", hr); + hr = IEnumSTATPROPSETSTG_Skip(ps_enum, 1); + ok(hr == S_OK, "Failed to skip, hr %#x.\n", hr); + hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched); +todo_wine + ok(hr == S_FALSE, "Failed to get enum item, hr %#x.\n", hr); + + hr = IEnumSTATPROPSETSTG_Reset(ps_enum); + ok(hr == S_OK, "Failed to reset enumerator, hr %#x.\n", hr); +todo_wine { + hr = IEnumSTATPROPSETSTG_Skip(ps_enum, 0); + ok(hr == S_FALSE, "Failed to skip, hr %#x.\n", hr); + hr = IEnumSTATPROPSETSTG_Next(ps_enum, 1, &psstg, &fetched); + ok(hr == S_FALSE, "Failed to get enum item, hr %#x.\n", hr); +} + IEnumSTATPROPSETSTG_Release(ps_enum); + + IPropertyStorage_Release(prop_storage2); + IPropertyStorage_Release(prop_storage); + + IPropertySetStorage_Release(ps_storage); + IStorage_Release(storage); + + ret = DeleteFileW(filename); + ok(ret, "Failed to delete storage file.\n"); +} + START_TEST(stg_prop) { init_function_pointers(); testProps(); testCodepage(); testFmtId(); + test_propertyset_storage_enum(); } -- 2.24.0.rc1

1 0

[PATCH v3 1/2] user32/tests: Wait for parent thread to complete before checking messages.
by Rémi Bernon 08 Nov '19

08 Nov '19

This test is failing from time to time. Making sure the parent thread is complete before continuing triggers the underlying race condition, and makes the test to always fail. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Notes: v3: As we wait for the child thread completion, the grand child now copies its parameter from the stack of its parent to avoid accessing invalid memory. The failure was hard to reproduce. The most reliable way without the sleep added here is to start multiple runs on the testbot, changing locale for each run. The locale change seems to have an impact on the timing and triggers the race condition. dlls/user32/tests/msg.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 193a20fd958..c18c90762ab 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8551,6 +8551,7 @@ struct wnd_event HANDLE grand_child; HANDLE start_event; HANDLE stop_event; + HANDLE child_stopped_event; }; static DWORD WINAPI thread_proc(void *param) @@ -8577,16 +8578,20 @@ static DWORD WINAPI thread_proc(void *param) static DWORD CALLBACK create_grand_child_thread( void *param ) { - struct wnd_event *wnd_event = param; + struct wnd_event wnd_event = *(struct wnd_event *)param; HWND hchild; MSG msg; + DWORD ret; hchild = CreateWindowExA(0, "TestWindowClass", "Test child", - WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); + WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event.hwnd, 0, 0, NULL); ok (hchild != 0, "Failed to create child window\n"); flush_events(); flush_sequence(); - SetEvent( wnd_event->start_event ); + SetEvent( wnd_event.start_event ); + + ret = WaitForSingleObject( wnd_event.child_stopped_event, 500 ); + ok( !ret, "WaitForSingleObject failed %x\n", ret ); for (;;) { @@ -8611,6 +8616,7 @@ static DWORD CALLBACK create_child_thread( void *param ) flush_events(); flush_sequence(); child_event.start_event = wnd_event->start_event; + child_event.child_stopped_event = wnd_event->child_stopped_event; wnd_event->grand_child = CreateThread(NULL, 0, create_grand_child_thread, &child_event, 0, &tid); for (;;) { @@ -8756,6 +8762,7 @@ static void test_interthread_messages(void) log_all_parent_messages++; wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL ); wnd_event.stop_event = CreateEventA( NULL, TRUE, FALSE, NULL ); + wnd_event.child_stopped_event = CreateEventA( NULL, TRUE, FALSE, NULL ); hThread = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); for (;;) { @@ -8770,14 +8777,17 @@ static void test_interthread_messages(void) ok( !ret, "WaitForSingleObject failed %x\n", ret ); CloseHandle( hThread ); + SetEvent( wnd_event.child_stopped_event ); ret = WaitForSingleObject( wnd_event.grand_child, 5000 ); + todo_wine ok( !ret, "WaitForSingleObject failed %x\n", ret ); CloseHandle( wnd_event.grand_child ); CloseHandle( wnd_event.start_event ); CloseHandle( wnd_event.stop_event ); + CloseHandle( wnd_event.child_stopped_event ); flush_events(); - ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); + ok_sequence(WmExitThreadSeq, "destroy child on thread exit", TRUE); log_all_parent_messages--; DestroyWindow( wnd_event.hwnd ); -- 2.24.0.rc2

2 4