November 2016 - Wine-commits

Józef Kucia : d3d8/tests: Port test_check_device_format() from d3d9.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 606cd128aec41a3fabafffd14db512f16cfe2c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=606cd128aec41a3fabafffd14… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:10 2016 +0100 d3d8/tests: Port test_check_device_format() from d3d9. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 95567ca..a912592 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7903,6 +7903,37 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } +static void test_check_device_format(void) +{ + IDirect3D8 *d3d; + HRESULT hr; + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_VERTEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_VERTEXDATA); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_SOFTWAREPROCESSING, D3DRTYPE_INDEXBUFFER, D3DFMT_INDEX16); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + IDirect3D8_Release(d3d); +} + static void test_miptree_layout(void) { unsigned int pool_idx, format_idx, base_dimension, level_count, offset, i, j; @@ -8152,6 +8183,7 @@ START_TEST(device) test_lost_device(); test_resource_priority(); test_swapchain_parameters(); + test_check_device_format(); test_miptree_layout(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL));

1 0

Józef Kucia : wined3d: Get rid of WINED3DFMT_VERTEXDATA.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: aa11efc4af2cdd34bf0c11da0121b15ba4cebc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa11efc4af2cdd34bf0c11da0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:11 2016 +0100 wined3d: Get rid of WINED3DFMT_VERTEXDATA. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +--- dlls/d3d9/device.c | 4 +--- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/utils.c | 2 -- include/wine/wined3d.h | 1 - 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 33ff7a5..fae5610 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -83,7 +83,6 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_X8D24_UNORM: return D3DFMT_D24X8; case WINED3DFMT_S4X4_UINT_D24_UNORM: return D3DFMT_D24X4S4; case WINED3DFMT_D16_UNORM: return D3DFMT_D16; - case WINED3DFMT_VERTEXDATA: return D3DFMT_VERTEXDATA; case WINED3DFMT_R16_UINT: return D3DFMT_INDEX16; case WINED3DFMT_R32_UINT: return D3DFMT_INDEX32; default: @@ -134,11 +133,10 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_D24X8: return WINED3DFMT_X8D24_UNORM; case D3DFMT_D24X4S4: return WINED3DFMT_S4X4_UINT_D24_UNORM; case D3DFMT_D16: return WINED3DFMT_D16_UNORM; - case D3DFMT_VERTEXDATA: return WINED3DFMT_VERTEXDATA; case D3DFMT_INDEX16: return WINED3DFMT_R16_UINT; case D3DFMT_INDEX32: return WINED3DFMT_R32_UINT; default: - FIXME("Unhandled D3DFORMAT %#x\n", format); + FIXME("Unhandled D3DFORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN; } } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b8c4638..dab19ab 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -80,7 +80,6 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_L16_UNORM: return D3DFMT_L16; case WINED3DFMT_D32_FLOAT: return D3DFMT_D32F_LOCKABLE; case WINED3DFMT_S8_UINT_D24_FLOAT: return D3DFMT_D24FS8; - case WINED3DFMT_VERTEXDATA: return D3DFMT_VERTEXDATA; case WINED3DFMT_R16_UINT: return D3DFMT_INDEX16; case WINED3DFMT_R32_UINT: return D3DFMT_INDEX32; case WINED3DFMT_R16G16B16A16_SNORM: return D3DFMT_Q16W16V16U16; @@ -145,7 +144,6 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_L16: return WINED3DFMT_L16_UNORM; case D3DFMT_D32F_LOCKABLE: return WINED3DFMT_D32_FLOAT; case D3DFMT_D24FS8: return WINED3DFMT_S8_UINT_D24_FLOAT; - case D3DFMT_VERTEXDATA: return WINED3DFMT_VERTEXDATA; case D3DFMT_INDEX16: return WINED3DFMT_R16_UINT; case D3DFMT_INDEX32: return WINED3DFMT_R32_UINT; case D3DFMT_Q16W16V16U16: return WINED3DFMT_R16G16B16A16_SNORM; @@ -157,7 +155,7 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) case D3DFMT_A32B32G32R32F: return WINED3DFMT_R32G32B32A32_FLOAT; case D3DFMT_CxV8U8: return WINED3DFMT_R8G8_SNORM_Cx; default: - FIXME("Unhandled D3DFORMAT %#x\n", format); + FIXME("Unhandled D3DFORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN; } } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 25c1853..202ce32 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1578,7 +1578,7 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, return WINED3DERR_OUTOFVIDEOMEMORY; } - hr = buffer_init(object, device, size, usage, WINED3DFMT_VERTEXDATA, + hr = buffer_init(object, device, size, usage, WINED3DFMT_UNKNOWN, pool, WINED3D_BIND_VERTEX_BUFFER, NULL, parent, parent_ops); if (FAILED(hr)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2171611..6ab851d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -136,7 +136,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_D16_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, {WINED3DFMT_D32_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 0}, {WINED3DFMT_S8_UINT_D24_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, - {WINED3DFMT_VERTEXDATA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -3664,7 +3663,6 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_S4X4_UINT_D24_UNORM); FMT_TO_STR(WINED3DFMT_L16_UNORM); FMT_TO_STR(WINED3DFMT_S8_UINT_D24_FLOAT); - FMT_TO_STR(WINED3DFMT_VERTEXDATA); FMT_TO_STR(WINED3DFMT_R8G8_SNORM_Cx); FMT_TO_STR(WINED3DFMT_ATI1N); FMT_TO_STR(WINED3DFMT_ATI2N); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9d234d6..c7ecef1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -123,7 +123,6 @@ enum wined3d_format_id WINED3DFMT_S4X4_UINT_D24_UNORM, WINED3DFMT_L16_UNORM, WINED3DFMT_S8_UINT_D24_FLOAT, - WINED3DFMT_VERTEXDATA, WINED3DFMT_R8G8_SNORM_Cx, WINED3DFMT_R32G32B32A32_TYPELESS, WINED3DFMT_R32G32B32A32_FLOAT,

1 0

Józef Kucia : d3d9/tests: Add test for evicting bound resources.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 5b0cd6fa3e67f9799829bd5769f078351b00dd27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0cd6fa3e67f9799829bd576… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:12 2016 +0100 d3d9/tests: Add test for evicting bound resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 20e3eb9..e25e85c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -21931,6 +21931,143 @@ done: DestroyWindow(window); } +static void test_evict_bound_resources(void) +{ + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + D3DCOLOR color; + HWND window; + void *data; + HRESULT hr; + + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + }; + static const unsigned short indices[] = {0, 1, 2, 3, 2, 1}; + + window = create_window(); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_MANAGED, &ib, NULL); + ok(SUCCEEDED(hr), "Failed to create index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(green_quad), 0, + D3DFVF_XYZ | D3DFVF_DIFFUSE, D3DPOOL_MANAGED, &vb, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(green_quad), (void **)&data, 0); + ok(hr == D3D_OK, "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, green_quad, sizeof(green_quad)); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), (void **)&data, 0); + ok(hr == D3D_OK, "Failed to lock index buffer, hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Failed to unlock index buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Failed to set index buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 4 * sizeof(DWORD)); + ok(hr == D3D_OK, "Failed to set stream source, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_EvictManagedResources(device); + ok(hr == D3D_OK, "Failed to evict managed resources, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + IDirect3DIndexBuffer9_Release(ib); + IDirect3DVertexBuffer9_Release(vb); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -22056,4 +22193,5 @@ START_TEST(visual) test_color_clamping(); test_line_antialiasing_blending(); test_dsy(); + test_evict_bound_resources(); }

1 0

Józef Kucia : wined3d: Mark buffers as used in wined3d_buffer_copy().
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 20b989ef86de7e36b7ec9feee49b0bfa9f284b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b989ef86de7e36b7ec9feee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 3 12:21:13 2016 +0100 wined3d: Mark buffers as used in wined3d_buffer_copy(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 202ce32..564b1fc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1264,6 +1264,9 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ DWORD dst_location; HRESULT hr; + buffer_mark_used(dst_buffer); + buffer_mark_used(src_buffer); + device = dst_buffer->resource.device; context = context_acquire(device, NULL);

1 0

Alistair Leslie-Hughes : dpnet: Correctly initialize the DPN_SP_CAPS structure.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 7fb80b9029b369d4ee9125b552aa3fd2aa0b6a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb80b9029b369d4ee9125b55… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 2 09:13:24 2016 +0000 dpnet: Correctly initialize the DPN_SP_CAPS structure. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/peer.c | 1 + dlls/dpnet/tests/client.c | 1 + dlls/dpnet/tests/peer.c | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 264ca70..4862e67 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -544,6 +544,7 @@ static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) { + dpnspcaps->dwSize = sizeof(DPN_SP_CAPS); dpnspcaps->dwFlags = DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS | DPNSPCAPS_SUPPORTSTHREADPOOL; dpnspcaps->dwNumThreads = 3; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 6732034..cfa7e10 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -197,6 +197,7 @@ static void test_get_sp_caps(void) hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); ok((caps.dwFlags & (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS), diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index f6c413f..9d06c80 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -198,6 +198,7 @@ static void test_get_sp_caps(void) hr = IDirectPlay8Peer_GetSPCaps(peer, &CLSID_DP8SP_TCPIP, &caps, 0); ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); ok((caps.dwFlags & (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS)) == (DPNSPCAPS_SUPPORTSDPNSRV | DPNSPCAPS_SUPPORTSBROADCAST | DPNSPCAPS_SUPPORTSALLADAPTERS),

1 0

Alistair Leslie-Hughes : dpnet: Close resets back to an uninitialized state.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: eef69511f5d1347af95ffb8556ec6e4712dd3afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=eef69511f5d1347af95ffb855… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 2 09:13:37 2016 +0000 dpnet: Close resets back to an uninitialized state. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 9 ++++++--- dlls/dpnet/tests/client.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 36df50d..de338d8 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -253,9 +253,12 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_GetServerAddress(IDirectPlay8Client static HRESULT WINAPI IDirectPlay8ClientImpl_Close(IDirectPlay8Client *iface, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + FIXME("(%p):(%x): Stub\n", This, dwFlags); + + This->msghandler = NULL; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_ReturnBuffer(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index cfa7e10..4753d74 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -319,6 +319,33 @@ static void test_cleanup_dp(void) CoUninitialize(); } +static void test_close(void) +{ + HRESULT hr; + static IDirectPlay8Client* client2; + DPN_SP_CAPS caps; + + hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client2); + ok(hr == S_OK, "got 0x%x\n", hr); + + memset(&caps, 0, sizeof(DPN_SP_CAPS)); + caps.dwSize = sizeof(DPN_SP_CAPS); + + hr = IDirectPlay8Client_Initialize(client2, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got %x\n", hr); + + hr = IDirectPlay8Client_GetSPCaps(client2, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "got %x\n", hr); + + hr = IDirectPlay8Client_Close(client2, 0); + ok(hr == DPN_OK, "got %x\n", hr); + + hr = IDirectPlay8Client_GetSPCaps(client2, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_UNINITIALIZED, "got %x\n", hr); + + IDirectPlay8Client_Release(client2); +} + START_TEST(client) { if(!test_init_dp()) @@ -329,5 +356,6 @@ START_TEST(client) test_get_sp_caps(); test_player_info(); test_lobbyclient(); + test_close(); test_cleanup_dp(); }

1 0

Alistair Leslie-Hughes : dpnet: Initialize winsock.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: db003d4a0860516219efe5bcb6624de2c97f8e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db003d4a0860516219efe5bcb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 2 09:13:49 2016 +0000 dpnet: Initialize winsock. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/Makefile.in | 2 +- dlls/dpnet/client.c | 4 ++++ dlls/dpnet/dpnet_main.c | 43 +++++++++++++++++++++++++++++++++++++------ dlls/dpnet/dpnet_private.h | 2 ++ dlls/dpnet/lobbiedapp.c | 2 ++ dlls/dpnet/peer.c | 2 ++ dlls/dpnet/server.c | 2 ++ 7 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index 880b7bd..541e104 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = dpnet.dll IMPORTLIB = dpnet -IMPORTS = dxguid uuid ole32 advapi32 +IMPORTS = dxguid uuid ole32 advapi32 ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index de338d8..9692e38 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -115,6 +115,8 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_Initialize(IDirectPlay8Client *ifac This->msghandler = pfn; This->flags = dwFlags; + init_winsock(); + return DPN_OK; } @@ -443,6 +445,8 @@ static HRESULT WINAPI lobbyclient_Initialize(IDirectPlay8LobbyClient *iface, voi This->msghandler = msghandler; This->flags = flags; + init_winsock(); + return DPN_OK; } diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 042b95a..cc80ebc 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -40,15 +40,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); static HINSTANCE instance; +static BOOL winsock_loaded = FALSE; + +static BOOL WINAPI winsock_startup(INIT_ONCE *once, void *param, void **context) +{ + WSADATA wsa_data; + DWORD res; + + res = WSAStartup(MAKEWORD(1,1), &wsa_data); + if(res == ERROR_SUCCESS) + winsock_loaded = TRUE; + else + ERR("WSAStartup failed: %u\n", res); + return TRUE; +} + +void init_winsock(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, winsock_startup, NULL, NULL); +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved); - if (fdwReason == DLL_PROCESS_ATTACH) { - instance = hInstDLL; - DisableThreadLibraryCalls(hInstDLL); - } - return TRUE; + TRACE("%p,%x,%p\n", hInstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + instance = hInstDLL; + DisableThreadLibraryCalls(hInstDLL); + break; + + case DLL_PROCESS_DETACH: + if (lpvReserved) break; + if(winsock_loaded) + WSACleanup(); + break; + } + return TRUE; } /*********************************************************************** diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index dc6a4f1..89e0777 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -26,6 +26,7 @@ #endif #include <wine/list.h> +#include "winsock2.h" #include "wine/unicode.h" #include "dplay8.h" @@ -135,6 +136,7 @@ extern HRESULT DPNET_CreateDirectPlay8ThreadPool(LPCLASSFACTORY iface, LPUNKNOWN extern HRESULT DPNET_CreateDirectPlay8LobbyClient(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppobj) DECLSPEC_HIDDEN; extern void init_dpn_sp_caps(DPN_SP_CAPS *dpnspcaps) DECLSPEC_HIDDEN; +extern void init_winsock(void) DECLSPEC_HIDDEN; /* used for generic dumping (copied from ddraw) */ typedef struct { diff --git a/dlls/dpnet/lobbiedapp.c b/dlls/dpnet/lobbiedapp.c index 507a895..8ec9ad1 100644 --- a/dlls/dpnet/lobbiedapp.c +++ b/dlls/dpnet/lobbiedapp.c @@ -101,6 +101,8 @@ static HRESULT WINAPI IDirectPlay8LobbiedApplicationImpl_Initialize(IDirectPlay8 This->usercontext = pvUserContext; This->connection = pdpnhConnection; + init_winsock(); + return DPN_OK; } diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 4862e67..fe62d59 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -122,6 +122,8 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, This->msghandler = pfn; This->flags = dwFlags; + init_winsock(); + return DPN_OK; } diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index cd54ba4..d91822e 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -118,6 +118,8 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_Initialize(IDirectPlay8Server *ifac This->msghandler = pfn; This->flags = dwFlags; + init_winsock(); + return DPN_OK; }

1 0

Donat Enikeev : secur32: AddSecurityPackage stub.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: ede761b166e3ea56418ff3c1f3565f35ea9481b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede761b166e3ea56418ff3c1f… Author: Donat Enikeev <donat(a)enikeev.net> Date: Tue Nov 1 13:21:52 2016 +0300 secur32: AddSecurityPackage stub. Signed-off-by: Donat Enikeev <donat(a)enikeev.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/secur32.c | 12 ++++++++++++ dlls/secur32/secur32.spec | 4 ++-- include/sspi.h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 5035ec36..c7e353f 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1057,6 +1057,18 @@ BOOLEAN WINAPI GetComputerObjectNameW( return status; } +SECURITY_STATUS WINAPI AddSecurityPackageA(LPSTR name, SECURITY_PACKAGE_OPTIONS *options) +{ + FIXME("(%s %p)\n", debugstr_a(name), options); + return E_NOTIMPL; +} + +SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR name, SECURITY_PACKAGE_OPTIONS *options) +{ + FIXME("(%s %p)\n", debugstr_w(name), options); + return E_NOTIMPL; +} + /*********************************************************************** * GetUserNameExA (SECUR32.@) */ diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index 623ffe5..8135958 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -6,8 +6,8 @@ @ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) @ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) @ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) -@ stub AddSecurityPackageA -@ stub AddSecurityPackageW +@ stdcall AddSecurityPackageA(str ptr) +@ stdcall AddSecurityPackageW(wstr ptr) @ stdcall ApplyControlToken(ptr ptr) @ stdcall CompleteAuthToken(ptr ptr) @ stdcall DecryptMessage(ptr ptr long ptr) diff --git a/include/sspi.h b/include/sspi.h index 501406f..9e44a6d 100644 --- a/include/sspi.h +++ b/include/sspi.h @@ -130,6 +130,18 @@ typedef struct _SecPkgInfoW SEC_WCHAR *Comment; } SecPkgInfoW, *PSecPkgInfoW; +typedef struct _SECURITY_PACKAGE_OPTIONS { + ULONG Size; + ULONG Type; + ULONG Flags; + ULONG SignatureSize; + void *Signature; +} SECURITY_PACKAGE_OPTIONS, *PSECURITY_PACKAGE_OPTIONS; + +SECURITY_STATUS WINAPI AddSecurityPackageA(LPSTR,SECURITY_PACKAGE_OPTIONS*); +SECURITY_STATUS WINAPI AddSecurityPackageW(LPWSTR,SECURITY_PACKAGE_OPTIONS*); +#define AddSecurityPackage WINELIB_NAME_AW(AddSecurityPackage) + #define SecPkgInfo WINELIB_NAME_AW(SecPkgInfo) #define PSecPkgInfo WINELIB_NAME_AW(PSecPkgInfo)

1 0

Alexandre Julliard : rpcrt4: Include ntstatus.h before headers that may need it.
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: 38b57b30fe2b0a0c7d5eb0e0f2222b1dec824167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38b57b30fe2b0a0c7d5eb0e0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 18:06:22 2016 +0100 rpcrt4: Include ntstatus.h before headers that may need it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 67a0220..2537a3f 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -33,6 +33,9 @@ #include <stdlib.h> #include <sys/types.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS + #if defined(__MINGW32__) || defined (_MSC_VER) # include <ws2tcpip.h> # ifndef EADDRINUSE @@ -77,8 +80,6 @@ # define ioctlsocket ioctl #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ -#include "ntstatus.h" -#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winnls.h"

1 0

Huw Davies : rpcrt4/tests: Extend the tests for NdrDllGetClassObject().
by Alexandre Julliard 03 Nov '16

03 Nov '16

Module: wine Branch: master Commit: f4d598ae0844c3a8f6fdc532080e9c014135c4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d598ae0844c3a8f6fdc5320… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 3 17:49:21 2016 +0000 rpcrt4/tests: Extend the tests for NdrDllGetClassObject(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index d098d60..7c71d60 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -44,6 +44,7 @@ static GUID IID_if1 = {0x12345678, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if2 = {0x12345679, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if3 = {0x1234567a, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if4 = {0x1234567b, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; +static CLSID CLSID_psfact = {0x1234567c, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static int my_alloc_called; static int my_free_called; @@ -458,7 +459,6 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) IPSFactoryBuffer *ppsf = NULL; const PCInterfaceProxyVtblList* proxy_vtbl; const PCInterfaceStubVtblList* stub_vtbl; - const CLSID PSDispatch = {0x20420, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46}}; const CLSID CLSID_Unknown = {0x45678, 0x1234, 0x6666, {0xff, 0x67, 0x45, 0x98, 0x76, 0x12, 0x34, 0x56}}; static const GUID * const interfaces[] = { &IID_if1, &IID_if2, &IID_if3, &IID_if4 }; UINT i; @@ -475,13 +475,13 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) void *CStd_DebugServerQueryInterface = GetProcAddress(hmod, "CStdStubBuffer_DebugServerQueryInterface"); void *CStd_DebugServerRelease = GetProcAddress(hmod, "CStdStubBuffer_DebugServerRelease"); - r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, - &CLSID_Unknown, &PSFactoryBuffer); + r = NdrDllGetClassObject(&CLSID_Unknown, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); ok(r == CLASS_E_CLASSNOTAVAILABLE, "NdrDllGetClassObject with unknown clsid should have returned CLASS_E_CLASSNOTAVAILABLE instead of 0x%x\n", r); ok(ppsf == NULL, "NdrDllGetClassObject should have set ppsf to NULL on failure\n"); - r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, - &PSDispatch, &PSFactoryBuffer); + r = NdrDllGetClassObject(&CLSID_psfact, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); ok(r == S_OK, "ret %08x\n", r); ok(ppsf != NULL, "ppsf == NULL\n"); @@ -603,10 +603,29 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) ok(PSFactoryBuffer.RefCount == 1, "ref count %d\n", PSFactoryBuffer.RefCount); IPSFactoryBuffer_Release(ppsf); + /* One can also search by IID */ + r = NdrDllGetClassObject(&IID_if3, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); + ok(r == S_OK, "ret %08x\n", r); + ok(ppsf != NULL, "ppsf == NULL\n"); + IPSFactoryBuffer_Release(ppsf); + r = NdrDllGetClassObject(&IID_if3, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, NULL, &PSFactoryBuffer); ok(r == S_OK, "ret %08x\n", r); ok(ppsf != NULL, "ppsf == NULL\n"); + IPSFactoryBuffer_Release(ppsf); + + /* but only if the PS factory implements it */ + r = NdrDllGetClassObject(&IID_IDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); + ok(r == CLASS_E_CLASSNOTAVAILABLE, "ret %08x\n", r); + + /* Create it again to return */ + r = NdrDllGetClassObject(&CLSID_psfact, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_psfact, &PSFactoryBuffer); + ok(r == S_OK, "ret %08x\n", r); + ok(ppsf != NULL, "ppsf == NULL\n"); return ppsf; }

1 0