October 2013 - Wine-Commits

Frédéric Delanoy : kernel32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: f56e9ebe38423d549c8cb77e17dc213011a0c04c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56e9ebe38423d549c8cb77e1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 24 00:40:23 2013 +0200 kernel32/tests: Use BOOL type where appropriate. --- dlls/kernel32/tests/alloc.c | 52 ++++++++++++++++++++++------------------- dlls/kernel32/tests/file.c | 24 +++++++++--------- dlls/kernel32/tests/locale.c | 2 +- dlls/kernel32/tests/path.c | 11 ++++---- dlls/kernel32/tests/process.c | 8 +++--- 5 files changed, 51 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f56e9ebe38423d549c8cb…

1 0

Vincent Povirk : gdiplus: Implement remaining dash styles in GdipWidenPath.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 2dbd0e1694ad498d1953b5bf64e1565dede1ebd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dbd0e1694ad498d1953b5bf6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 23 14:55:13 2013 -0500 gdiplus: Implement remaining dash styles in GdipWidenPath. --- dlls/gdiplus/graphicspath.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8fa3cc0..8508b9b 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1941,12 +1941,35 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, REAL segment_pos; int num_tmp_points=0; int draw_start_cap=0; + static const REAL dash_dot_dot[6] = { 3.0, 1.0, 1.0, 1.0, 1.0, 1.0 }; if (end <= start) return; - dash_pattern = pen->dashes; - dash_count = pen->numdashes; + switch (pen->dash) + { + case DashStyleDash: + default: + dash_pattern = dash_dot_dot; + dash_count = 2; + break; + case DashStyleDot: + dash_pattern = &dash_dot_dot[2]; + dash_count = 2; + break; + case DashStyleDashDot: + dash_pattern = dash_dot_dot; + dash_count = 4; + break; + case DashStyleDashDotDot: + dash_pattern = dash_dot_dot; + dash_count = 6; + break; + case DashStyleCustom: + dash_pattern = pen->dashes; + dash_count = pen->numdashes; + break; + } tmp_points = GdipAlloc((end - start + 2) * sizeof(GpPoint)); if (!tmp_points) return; /* FIXME */ @@ -2072,9 +2095,6 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (pen->join == LineJoinRound) FIXME("unimplemented line join %d\n", pen->join); - if (pen->dash != DashStyleSolid && pen->dash != DashStyleCustom) - FIXME("unimplemented dash style %d\n", pen->dash); - if (pen->align != PenAlignmentCenter) FIXME("unimplemented pen alignment %d\n", pen->align); @@ -2087,7 +2107,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if ((type&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) { - if (pen->dash == DashStyleCustom) + if (pen->dash != DashStyleSolid) widen_dashed_figure(flat_path, pen, subpath_start, i, 1, &last_point); else widen_closed_figure(flat_path, pen, subpath_start, i, &last_point); @@ -2095,7 +2115,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, else if (i == flat_path->pathdata.Count-1 || (flat_path->pathdata.Types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) { - if (pen->dash == DashStyleCustom) + if (pen->dash != DashStyleSolid) widen_dashed_figure(flat_path, pen, subpath_start, i, 0, &last_point); else widen_open_figure(flat_path->pathdata.Points, pen, subpath_start, i, pen->startcap, pen->customstart, pen->endcap, pen->customend, &last_point);

1 0

Huw Davies : ole32: When releasing marshal data of a normal ref ignore any remaining weak refs .
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 8235b55917e74a3be687e3be36670bf328569f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8235b55917e74a3be687e3be3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:50 2013 +0100 ole32: When releasing marshal data of a normal ref ignore any remaining weak refs. --- dlls/ole32/stubmanager.c | 2 +- dlls/ole32/tests/marshal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 973114e..9f33056 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -578,7 +578,7 @@ void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const else if (ifstub->flags & MSHLFLAGS_TABLESTRONG) refs = 1; - stub_manager_ext_release(m, refs, tableweak, FALSE); + stub_manager_ext_release(m, refs, tableweak, !tableweak); } /* is an ifstub table marshaled? */ diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index d0865f3..cd49a7c 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1399,12 +1399,12 @@ static void test_tableweak_and_normal_marshal_and_releasedata(void) if (with_external_conn) { +todo_wine ok_more_than_one_lock(); IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 1); } -else todo_wine ok_no_locks(); IStream_Release(data.pStream1);

1 0

Huw Davies : ole32/tests: Add some tests for CoReleaseMarshalData with a combination of normal and weak marshals .
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 17d81e0987afd3e55af9f92a0cb63aa3cd4b8305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d81e0987afd3e55af9f92a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:49 2013 +0100 ole32/tests: Add some tests for CoReleaseMarshalData with a combination of normal and weak marshals. --- dlls/ole32/tests/marshal.c | 98 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 3510aad..d0865f3 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1364,6 +1364,102 @@ todo_wine CloseHandle(thread); } +static void test_tableweak_and_normal_marshal_and_releasedata(void) +{ + HRESULT hr; + DWORD tid; + HANDLE thread; + struct duo_marshal_data data; + + cLocks = 0; + external_connections = 0; + + data.hReadyEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + data.hQuitEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + data.marshal_flags1 = MSHLFLAGS_TABLEWEAK; + data.marshal_flags2 = MSHLFLAGS_NORMAL; + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream1); + ok_ole_success(hr, CreateStreamOnHGlobal); + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream2); + ok_ole_success(hr, CreateStreamOnHGlobal); + + thread = CreateThread(NULL, 0, duo_marshal_thread_proc, &data, 0, &tid); + ok( !WaitForSingleObject(data.hReadyEvent, 10000), "wait timed out\n" ); + CloseHandle(data.hReadyEvent); + + ok_more_than_one_lock(); + ok_non_zero_external_conn(); + + /* release normal - which in the non-external conn case will free the object despite the weak ref. */ + IStream_Seek(data.pStream2, ullZero, STREAM_SEEK_SET, NULL); + release_host_object(tid, 2); + + ok_zero_external_conn(); + ok_last_release_closes(TRUE); + + if (with_external_conn) + { + ok_more_than_one_lock(); + IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); + release_host_object(tid, 1); + } + +else todo_wine + ok_no_locks(); + + IStream_Release(data.pStream1); + IStream_Release(data.pStream2); + + SetEvent(data.hQuitEvent); + ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); + CloseHandle(thread); +} + +static void test_two_tableweak_marshal_and_releasedata(void) +{ + HRESULT hr; + DWORD tid; + HANDLE thread; + struct duo_marshal_data data; + + cLocks = 0; + external_connections = 0; + + data.hReadyEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + data.hQuitEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + data.marshal_flags1 = MSHLFLAGS_TABLEWEAK; + data.marshal_flags2 = MSHLFLAGS_TABLEWEAK; + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream1); + ok_ole_success(hr, CreateStreamOnHGlobal); + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream2); + ok_ole_success(hr, CreateStreamOnHGlobal); + + thread = CreateThread(NULL, 0, duo_marshal_thread_proc, &data, 0, &tid); + ok( !WaitForSingleObject(data.hReadyEvent, 10000), "wait timed out\n" ); + CloseHandle(data.hReadyEvent); + + ok_more_than_one_lock(); + ok_zero_external_conn(); + + /* release one weak ref - the remaining weak ref will keep the obj alive */ + IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); + release_host_object(tid, 1); + + ok_more_than_one_lock(); + + IStream_Seek(data.pStream2, ullZero, STREAM_SEEK_SET, NULL); + release_host_object(tid, 2); + + ok_no_locks(); + + IStream_Release(data.pStream1); + IStream_Release(data.pStream2); + + SetEvent(data.hQuitEvent); + ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); + CloseHandle(thread); +} + /* tests success case of a same-thread table-strong marshal, unmarshal, unmarshal */ static void test_tablestrong_marshal_and_unmarshal_twice(void) { @@ -3435,6 +3531,8 @@ START_TEST(marshal) test_tableweak_marshal_releasedata1(); test_tableweak_marshal_releasedata2(); test_tableweak_and_normal_marshal_and_unmarshal(); + test_tableweak_and_normal_marshal_and_releasedata(); + test_two_tableweak_marshal_and_releasedata(); test_tablestrong_marshal_and_unmarshal_twice(); test_lock_object_external(); test_disconnect_stub();

1 0

Daniel Lehman : kernel32: Don't use depth in RtlInterlockedFlushSList.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 0669a8aca2dec4eaf6632e368832a8aec1c48ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0669a8aca2dec4eaf6632e368… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 22 22:47:26 2013 -0700 kernel32: Don't use depth in RtlInterlockedFlushSList. Depth wraps around at 65536 but list supports more elements. --- dlls/kernel32/tests/sync.c | 18 +++++++++++++++++- dlls/ntdll/rtl.c | 4 ++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index b98d7c4..84c44e0 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -244,8 +244,9 @@ static void test_slist(void) } item1, item2, item3, *pitem; SLIST_HEADER slist_header; - PSLIST_ENTRY entry; + PSLIST_ENTRY entry, next; USHORT size; + int i; VOID (WINAPI *pInitializeSListHead)(PSLIST_HEADER); USHORT (WINAPI *pQueryDepthSList)(PSLIST_HEADER); @@ -323,6 +324,21 @@ static void test_slist(void) } ok(((struct item*)entry)->value == 2, "item 2 not in front of list\n"); ok(((struct item*)entry->Next)->value == 1, "item 1 not at the back of list\n"); + + for (i = 0; i < 65536; i++) + { + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + pInterlockedPushEntrySList(&slist_header, entry); + } + + entry = pInterlockedFlushSList(&slist_header); + ok(entry != NULL, "not flushed\n"); + while (entry) + { + next = entry->Next; + HeapFree(GetProcessHeap(), 0, entry); + entry = next; + } } static void test_event(void) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index abf2ba8..8f6f386 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1080,7 +1080,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) SLIST_HEADER old, new; #ifdef _WIN64 - if (!list->Header16.Depth) return NULL; + if (!list->Header16.NextEntry) return NULL; new.s.Alignment = new.s.Region = 0; new.Header16.HeaderType = 1; /* we use the 16-byte header */ do @@ -1090,7 +1090,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) } while (!interlocked_cmpxchg128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else - if (!list->s.Depth) return NULL; + if (!list->s.Next.Next) return NULL; new.Alignment = 0; do {

1 0

Ken Thomases : winemac: Send WM_CANCELMODE when keyboard layout changes from Cocoa side.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 35f0cf26b0225f31d662c834d55997a7a4bf3c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f0cf26b0225f31d662c834d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 23 20:13:10 2013 -0500 winemac: Send WM_CANCELMODE when keyboard layout changes from Cocoa side. The standard keyboard shortcut for switching the keyboard layout is Command- Space, but the Mac driver never sees the Space key press. So, Wine only sees a press and release of Alt, which puts focus on the menu bar. This prevents that focus change. --- dlls/winemac.drv/keyboard.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index d4a3090..1fffa22 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -905,6 +905,8 @@ void macdrv_keyboard_changed(const macdrv_event *event) thread_data->dead_key_state = 0; macdrv_compute_keyboard_layout(thread_data); + + SendMessageW(GetActiveWindow(), WM_CANCELMODE, 0, 0); }

1 0

André Hentschel : sti/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: c39eac6332b1bc0198fca4a54b4ccff8c4aa0c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39eac6332b1bc0198fca4a54… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:30:12 2013 +0200 sti/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/sti/tests/Makefile.in | 1 - dlls/sti/tests/sti.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/sti/tests/Makefile.in b/dlls/sti/tests/Makefile.in index 008b5be..fc01d8e 100644 --- a/dlls/sti/tests/Makefile.in +++ b/dlls/sti/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS TESTDLL = sti.dll IMPORTS = uuid ole32 diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 9c5e3c7..fa4db8c 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -86,7 +86,7 @@ static void test_version_flag_versus_aw(void) if (pStiCreateInstance) { PSTIW pStiW; - hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, NULL); + hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -100,7 +100,7 @@ static void test_version_flag_versus_aw(void) } else ok(0, "could not create StillImageA, hr = 0x%X\n", hr); - hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); + hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -121,7 +121,7 @@ static void test_version_flag_versus_aw(void) if (pStiCreateInstanceA) { PSTIA pStiA; - hr = pStiCreateInstanceA(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiA, NULL); + hr = pStiCreateInstanceA(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiA, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -142,7 +142,7 @@ static void test_version_flag_versus_aw(void) if (pStiCreateInstanceW) { PSTIW pStiW; - hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, NULL); + hr = pStiCreateInstanceW(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -175,7 +175,7 @@ static void test_stillimage_aggregation(void) But StiCreateInstance* only take PSTI. So how does the non-delegating IUnknown come back to the outer object calling this function? */ - hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, &aggregator); + hr = pStiCreateInstanceW(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, &aggregator); if (SUCCEEDED(hr)) { IStillImageW *pStiW2 = NULL; @@ -240,7 +240,7 @@ static void test_launch_app_registry(void) return; } - hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); + hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); if (SUCCEEDED(hr)) { hr = IStillImage_RegisterLaunchApplication(pStiW, appName, appName);

1 0

Huw Davies : ole32: If an object exposes IExternalConnection then don' t take down the stub manager if we have remaining weak refs in a call that would otherwise ignore them .
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 5077fc895fe98eabd8d511340853db120ad82f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5077fc895fe98eabd8d511340… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:52 2013 +0100 ole32: If an object exposes IExternalConnection then don't take down the stub manager if we have remaining weak refs in a call that would otherwise ignore them. --- dlls/ole32/stubmanager.c | 3 ++- dlls/ole32/tests/marshal.c | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 6e59581..fbbf413 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -440,7 +440,8 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, last_unlock_releases); if (rc == 0) - stub_manager_int_release(m); + if (!(m->extern_conn && last_unlock_releases && m->weakrefs)) + stub_manager_int_release(m); return rc; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 105e644..680b831 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1125,7 +1125,6 @@ static void test_tableweak_marshal_and_unmarshal_twice(void) * behaviour is altered; the remaining weak ref prevents stub shutdown. */ if (with_external_conn) { -todo_wine ok_more_than_one_lock(); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 0); @@ -1347,7 +1346,6 @@ static void test_tableweak_and_normal_marshal_and_unmarshal(void) * behaviour is altered; the remaining weak ref prevents stub shutdown. */ if (with_external_conn) { -todo_wine ok_more_than_one_lock(); IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 1); @@ -1397,7 +1395,6 @@ static void test_tableweak_and_normal_marshal_and_releasedata(void) if (with_external_conn) { -todo_wine ok_more_than_one_lock(); IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 1);

1 0

Huw Davies : ole32/tests: Make the two reference marshalling thread more generic.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 61fb28de3f18d65609f9e26af883ffd5f55694db URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fb28de3f18d65609f9e26af… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:48 2013 +0100 ole32/tests: Make the two reference marshalling thread more generic. --- dlls/ole32/tests/marshal.c | 56 +++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 48f3cea..3510aad 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -346,10 +346,10 @@ static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, M /* asks thread to release the marshal data because it has to be done by the * same thread that marshaled the interface in the first place. */ -static void release_host_object(DWORD tid) +static void release_host_object(DWORD tid, WPARAM wp) { HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL); - PostThreadMessageA(tid, RELEASEMARSHALDATA, 0, (LPARAM)event); + PostThreadMessageA(tid, RELEASEMARSHALDATA, wp, (LPARAM)event); ok( !WaitForSingleObject(event, 10000), "wait timed out\n" ); CloseHandle(event); } @@ -1130,7 +1130,7 @@ static void test_tableweak_marshal_and_unmarshal_twice(void) todo_wine ok_more_than_one_lock(); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - release_host_object(tid); + release_host_object(tid, 0); } /* Without IExternalConnection this line is shows the difference between weak and strong table marshaling @@ -1171,7 +1171,7 @@ static void test_tableweak_marshal_releasedata1(void) /* release the remaining reference on the object by calling * CoReleaseMarshalData in the hosting thread */ IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - release_host_object(tid); + release_host_object(tid, 0); ok_more_than_one_lock(); ok_non_zero_external_conn(); @@ -1224,7 +1224,7 @@ static void test_tableweak_marshal_releasedata2(void) /* release the remaining reference on the object by calling * CoReleaseMarshalData in the hosting thread */ IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - release_host_object(tid); + release_host_object(tid, 0); ok_no_locks(); @@ -1244,27 +1244,27 @@ static void test_tableweak_marshal_releasedata2(void) end_host_object(tid, thread); } -struct weak_and_normal_marshal_data +struct duo_marshal_data { - IStream *pStreamWeak; - IStream *pStreamNormal; + MSHLFLAGS marshal_flags1, marshal_flags2; + IStream *pStream1, *pStream2; HANDLE hReadyEvent; HANDLE hQuitEvent; }; -static DWORD CALLBACK weak_and_normal_marshal_thread_proc(void *p) +static DWORD CALLBACK duo_marshal_thread_proc(void *p) { HRESULT hr; - struct weak_and_normal_marshal_data *data = p; + struct duo_marshal_data *data = p; HANDLE hQuitEvent = data->hQuitEvent; MSG msg; pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - hr = CoMarshalInterface(data->pStreamWeak, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLEWEAK); + hr = CoMarshalInterface(data->pStream1, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, data->marshal_flags1); ok_ole_success(hr, "CoMarshalInterface"); - hr = CoMarshalInterface(data->pStreamNormal, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + hr = CoMarshalInterface(data->pStream2, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, data->marshal_flags2); ok_ole_success(hr, "CoMarshalInterface"); /* force the message queue to be created before signaling parent thread */ @@ -1278,7 +1278,7 @@ static DWORD CALLBACK weak_and_normal_marshal_thread_proc(void *p) { if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA) { - CoReleaseMarshalData(data->pStreamWeak); + CoReleaseMarshalData(msg.wParam == 1 ? data->pStream1 : data->pStream2); SetEvent((HANDLE)msg.lParam); } else @@ -1300,33 +1300,37 @@ static void test_tableweak_and_normal_marshal_and_unmarshal(void) IUnknown *pProxyNormal = NULL; DWORD tid; HANDLE thread; - struct weak_and_normal_marshal_data data; + struct duo_marshal_data data; cLocks = 0; external_connections = 0; data.hReadyEvent = CreateEventA(NULL, FALSE, FALSE, NULL); data.hQuitEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStreamWeak); + data.marshal_flags1 = MSHLFLAGS_TABLEWEAK; + data.marshal_flags2 = MSHLFLAGS_NORMAL; + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream1); ok_ole_success(hr, CreateStreamOnHGlobal); - hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStreamNormal); + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream2); ok_ole_success(hr, CreateStreamOnHGlobal); - thread = CreateThread(NULL, 0, weak_and_normal_marshal_thread_proc, &data, 0, &tid); + thread = CreateThread(NULL, 0, duo_marshal_thread_proc, &data, 0, &tid); ok( !WaitForSingleObject(data.hReadyEvent, 10000), "wait timed out\n" ); CloseHandle(data.hReadyEvent); ok_more_than_one_lock(); ok_non_zero_external_conn(); - IStream_Seek(data.pStreamWeak, ullZero, STREAM_SEEK_SET, NULL); - hr = CoUnmarshalInterface(data.pStreamWeak, &IID_IClassFactory, (void **)&pProxyWeak); + /* weak */ + IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(data.pStream1, &IID_IClassFactory, (void **)&pProxyWeak); ok_ole_success(hr, CoUnmarshalInterface); ok_more_than_one_lock(); - IStream_Seek(data.pStreamNormal, ullZero, STREAM_SEEK_SET, NULL); - hr = CoUnmarshalInterface(data.pStreamNormal, &IID_IClassFactory, (void **)&pProxyNormal); + /* normal */ + IStream_Seek(data.pStream2, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(data.pStream2, &IID_IClassFactory, (void **)&pProxyNormal); ok_ole_success(hr, CoUnmarshalInterface); ok_more_than_one_lock(); @@ -1347,13 +1351,13 @@ static void test_tableweak_and_normal_marshal_and_unmarshal(void) { todo_wine ok_more_than_one_lock(); - IStream_Seek(data.pStreamWeak, ullZero, STREAM_SEEK_SET, NULL); - release_host_object(tid); + IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); + release_host_object(tid, 1); } ok_no_locks(); - IStream_Release(data.pStreamWeak); - IStream_Release(data.pStreamNormal); + IStream_Release(data.pStream1); + IStream_Release(data.pStream2); SetEvent(data.hQuitEvent); ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); @@ -1403,7 +1407,7 @@ static void test_tablestrong_marshal_and_unmarshal_twice(void) /* release the remaining reference on the object by calling * CoReleaseMarshalData in the hosting thread */ IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - release_host_object(tid); + release_host_object(tid, 0); IStream_Release(pStream); ok_no_locks();

1 0

Huw Davies : ole32/tests: Extend the lifecycle tests to objects which expose IExternalConnection.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 14a879085e415c4242819cb0638f60cd317c0a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a879085e415c4242819cb06… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:47 2013 +0100 ole32/tests: Extend the lifecycle tests to objects which expose IExternalConnection. --- dlls/ole32/tests/marshal.c | 236 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 201 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14a879085e415c4242819…

1 0