October 2013 - Wine-commits

Jacek Caban : wininet: Compile tests with -D__WINESRC__.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: e857a70ae2c4ddba8b231ee2d3cd98f518b66f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e857a70ae2c4ddba8b231ee2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 24 12:15:43 2013 +0200 wininet: Compile tests with -D__WINESRC__. --- dlls/wininet/tests/Makefile.in | 1 - dlls/wininet/tests/ftp.c | 24 +- dlls/wininet/tests/http.c | 678 ++++++++++++++++++------------------ dlls/wininet/tests/internet.c | 78 +++--- dlls/wininet/tests/url.c | 28 +- dlls/wininet/tests/urlcache.c | 146 ++++---- dlls/wininet/tests/wininet_test.h | 2 +- 7 files changed, 478 insertions(+), 479 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e857a70ae2c4ddba8b231…

1 0

Stefan Dösinger : d3d9/tests: Remove the rtpatch test.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 9c19266a247a2f4e1f88a3258026af33c6cd6efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c19266a247a2f4e1f88a3258… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:39 2013 +0200 d3d9/tests: Remove the rtpatch test. It segfaults on Win7 + Nvidia Kepler and apparently returns different return values on Windows 8. Since this functionality isn't supported on any HW I doubt games will care. --- dlls/d3d9/tests/device.c | 113 ---------------------------------------------- 1 files changed, 0 insertions(+), 113 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 02b4174..32fe8c7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6357,118 +6357,6 @@ static void test_swvp_buffer(void) DestroyWindow(window); } -static void test_rtpatch(void) -{ - IDirect3DDevice9 *device; - IDirect3D9 *d3d9; - UINT refcount; - HWND window; - HRESULT hr; - IDirect3DVertexBuffer9 *buffer; - IDirect3DVertexDeclaration9 *decl; - static const unsigned int bufsize = 16; - struct - { - float x, y, z; - } *data; - D3DRECTPATCH_INFO patch; - static const float num_segs[] = {1.0f, 1.0f, 1.0f, 1.0f}; - UINT handle = 0x1234; - D3DCAPS9 caps; - - /* Position input, this generates tesselated positions, but do not generate normals - * or texture coordinates. The d3d documentation isn't clear on how to do this */ - static const D3DVERTEXELEMENT9 decl_elements[] = { - {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, - D3DDECL_END() - }; - - if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) - { - skip("Failed to create IDirect3D9 object, skipping tests.\n"); - return; - } - - window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(d3d9, window, window, TRUE))) - { - skip("Failed to create a D3D device, skipping tests.\n"); - IDirect3D9_Release(d3d9); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if (caps.DevCaps & D3DDEVCAPS_RTPATCHES) - { - /* The draw methods return the same values, but the patch handle support - * is different on the refrast, which is the only d3d implementation - * known to support tri/rect patches */ - skip("Device supports patches, skipping unsupported patch test\n"); - IDirect3DDevice9_Release(device); - IDirect3D9_Release(d3d9); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &decl); - ok(SUCCEEDED(hr), "Failed to create vertex declaration, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); - ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); - - hr = IDirect3DDevice9_CreateVertexBuffer(device, bufsize * sizeof(*data), D3DUSAGE_RTPATCHES, 0, - D3DPOOL_MANAGED, &buffer, NULL); - ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); - hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, (void **)&data, 0); - ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); - memset(data, 0, bufsize * sizeof(*data)); - hr = IDirect3DVertexBuffer9_Unlock(buffer); - ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); - - hr = IDirect3DDevice9_SetStreamSource(device, 0, buffer, 0, sizeof(*data)); - ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - patch.StartVertexOffsetWidth = 0; - patch.StartVertexOffsetHeight = 0; - patch.Width = 4; - patch.Height = 4; - patch.Stride = 4; - patch.Basis = D3DBASIS_BEZIER; - patch.Degree = D3DDEGREE_CUBIC; - hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawRectPatch(device, 0, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DrawRectPatch(device, 0, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch outside scene, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DeletePatch(device, handle); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice9_DeletePatch(device, 0); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice9_DeletePatch(device, 0x1235); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - - IDirect3DVertexDeclaration9_Release(decl); - IDirect3DVertexBuffer9_Release(buffer); - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D9_Release(d3d9); - DestroyWindow(window); -} - static void test_npot_textures(void) { IDirect3DDevice9 *device = NULL; @@ -7506,7 +7394,6 @@ START_TEST(device) test_surface_blocks(); test_set_palette(); test_swvp_buffer(); - test_rtpatch(); test_npot_textures(); test_vidmem_accounting(); test_volume_locking();

1 0

Stefan Dösinger : d3d8/tests: Remove the rtpatch test.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 672e3ee1b4bab50f792cf2e3f6a31805d97143c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672e3ee1b4bab50f792cf2e3f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:40 2013 +0200 d3d8/tests: Remove the rtpatch test. --- dlls/d3d8/tests/device.c | 115 ---------------------------------------------- 1 files changed, 0 insertions(+), 115 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 7932a7f..9db5335 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4846,120 +4846,6 @@ static void test_swvp_buffer(void) DestroyWindow(window); } -static void test_rtpatch(void) -{ - IDirect3DDevice8 *device; - IDirect3D8 *d3d8; - UINT refcount; - HWND window; - HRESULT hr; - IDirect3DVertexBuffer8 *buffer; - DWORD shader; - static const unsigned int bufsize = 16; - struct - { - float x, y, z; - } *data; - D3DRECTPATCH_INFO patch; - static const float num_segs[] = {1.0f, 1.0f, 1.0f, 1.0f}; - UINT handle = 0x1234; - D3DCAPS8 caps; - - /* Position input, this generates tesselated positions, but do not generate normals - * or texture coordinates. The d3d documentation isn't clear on how to do this */ - static const DWORD decl[] = - { - D3DVSD_STREAM(0), - D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), /* D3DVSDE_POSITION, Register v0 */ - D3DVSD_END() - }; - - if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) - { - skip("Failed to create d3d8 object, skipping tests.\n"); - return; - } - - window = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, - 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(d3d8, window, window, TRUE))) - { - skip("Failed to create a D3D device, skipping tests.\n"); - IDirect3D8_Release(d3d8); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - if (caps.DevCaps & D3DDEVCAPS_RTPATCHES) - { - /* The draw methods return the same values, but the patch handle support - * is different on the refrast, which is the only d3d implementation - * known to support tri/rect patches */ - skip("Device supports patches, skipping unsupported patch test\n"); - IDirect3DDevice8_Release(device); - IDirect3D8_Release(d3d8); - DestroyWindow(window); - return; - } - - hr = IDirect3DDevice8_CreateVertexShader(device, decl, NULL, &shader, 0); - ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, shader); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); - - hr = IDirect3DDevice8_CreateVertexBuffer(device, bufsize * sizeof(*data), D3DUSAGE_RTPATCHES, 0, - D3DPOOL_MANAGED, &buffer); - ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); - hr = IDirect3DVertexBuffer8_Lock(buffer, 0, 0, (BYTE **)&data, 0); - ok(SUCCEEDED(hr), "Failed to lock buffer, hr %#x.\n", hr); - memset(data, 0, bufsize * sizeof(*data)); - hr = IDirect3DVertexBuffer8_Unlock(buffer); - ok(SUCCEEDED(hr), "Failed to unlock buffer, hr %#x.\n", hr); - - hr = IDirect3DDevice8_SetStreamSource(device, 0, buffer, sizeof(*data)); - ok(SUCCEEDED(hr), "Failed to set stream source, hr %#x.\n", hr); - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - - patch.StartVertexOffsetWidth = 0; - patch.StartVertexOffsetHeight = 0; - patch.Width = 4; - patch.Height = 4; - patch.Stride = 4; - patch.Basis = D3DBASIS_BEZIER; - patch.Order = D3DORDER_CUBIC; - hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawRectPatch(device, handle, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawRectPatch(device, 0, num_segs, NULL); - ok(SUCCEEDED(hr), "Failed to draw rect patch, hr %#x.\n", hr); - - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DrawRectPatch(device, 0, num_segs, &patch); - ok(SUCCEEDED(hr), "Failed to draw rect patch outside scene, hr %#x.\n", hr); - - hr = IDirect3DDevice8_DeletePatch(device, handle); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice8_DeletePatch(device, 0); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - hr = IDirect3DDevice8_DeletePatch(device, 0x1235); - ok(hr == D3DERR_INVALIDCALL, "DeletePatch returned hr %#x.\n", hr); - - IDirect3DDevice8_DeleteVertexShader(device, shader); - IDirect3DVertexBuffer8_Release(buffer); - refcount = IDirect3DDevice8_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D8_Release(d3d8); - DestroyWindow(window); -} - static void test_npot_textures(void) { IDirect3DDevice8 *device = NULL; @@ -5928,7 +5814,6 @@ START_TEST(device) test_surface_blocks(); test_set_palette(); test_swvp_buffer(); - test_rtpatch(); test_npot_textures(); test_volume_locking(); test_update_volumetexture();

1 0

Stefan Dösinger : wined3d: Remove SCRATCH and SYSMEM lockability warnings.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 331bb68edb601e95aa307fdfd7064655164ecb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331bb68edb601e95aa307fdfd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:41 2013 +0200 wined3d: Remove SCRATCH and SYSMEM lockability warnings. They are not needed any more, resource_access_from_pool takes care of this. --- dlls/wined3d/surface.c | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index daa26e2..a4cbd81 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6795,20 +6795,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN * Levels need to be checked too, since they all affect what can be done. */ switch (pool) { - case WINED3D_POOL_SCRATCH: - if (!lockable) - { - FIXME("Called with a pool of SCRATCH and a lockable of FALSE " - "which are mutually exclusive, setting lockable to TRUE.\n"); - lockable = TRUE; - } - break; - - case WINED3D_POOL_SYSTEM_MEM: - if (!lockable) - FIXME("Called with a pool of SYSTEMMEM and a lockable of FALSE, this is acceptable but unexpected.\n"); - break; - case WINED3D_POOL_MANAGED: if (usage & WINED3DUSAGE_DYNAMIC) FIXME("Called with a pool of MANAGED and a usage of DYNAMIC which are mutually exclusive.\n"); @@ -6819,6 +6805,10 @@ static HRESULT surface_init(struct wined3d_surface *surface, UINT alignment, UIN WARN("Creating a lockable surface with a POOL of DEFAULT, that doesn't specify DYNAMIC usage.\n"); break; + case WINED3D_POOL_SCRATCH: + case WINED3D_POOL_SYSTEM_MEM: + break; + default: FIXME("Unknown pool %#x.\n", pool); break;

1 0

Stefan Dösinger : ddraw: Make default pool resources dynamic.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 9e0ba3eab0a20fdcadeb252e793adfcdd221ff36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0ba3eab0a20fdcadeb252e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:42 2013 +0200 ddraw: Make default pool resources dynamic. To make DDLOCK_DISCARDCONTENTS actually do anything. The MAPPABLE flag is now redundant. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e01f923..964428a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2873,7 +2873,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, * the surface isn't mapped, and that updates done this way will be * visible on the screen. The game Nox is such an application, * Commandos: Behind Enemy Lines is another. */ - const DWORD flags = WINED3D_SURFACE_MAPPABLE | WINED3D_SURFACE_PIN_SYSMEM; + const DWORD flags = WINED3D_SURFACE_PIN_SYSMEM; TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, DDSD, surface, UnkOuter); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e11b633..bbe7d0e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5623,7 +5623,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac } else { - wined3d_desc.usage = WINED3DUSAGE_TEXTURE; + wined3d_desc.usage = WINED3DUSAGE_TEXTURE | WINED3DUSAGE_DYNAMIC; pool = WINED3D_POOL_DEFAULT; } @@ -5771,6 +5771,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, /* Videomemory adds localvidmem. This is mutually exclusive with * systemmemory and texturemanage. */ desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM; + usage |= WINED3DUSAGE_DYNAMIC; } format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat);

1 0

Stefan Dösinger : ddraw/tests: Test DDLOCK_DISCARDCONTENTS.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: e47edf47fe8c20e1af665d5ff21aa548d15202be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47edf47fe8c20e1af665d5ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:43 2013 +0200 ddraw/tests: Test DDLOCK_DISCARDCONTENTS. --- dlls/ddraw/tests/ddraw1.c | 96 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 96 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 392 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e47edf47fe8c20e1af665…

1 0

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

24 Oct '13

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

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

24 Oct '13

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: Add some tests for CoReleaseMarshalData with a combination of normal and weak marshals .
by Alexandre Julliard 24 Oct '13

24 Oct '13

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

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

24 Oct '13

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