March 2014 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9/tests: Use a separate device for srgbwrite_format_test().
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: e93ff4063f291de0be61ce5f895812cb867892e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e93ff4063f291de0be61ce5f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 17 08:47:26 2014 +0100 d3d9/tests: Use a separate device for srgbwrite_format_test(). --- dlls/d3d9/tests/visual.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bb42e7a..ff23acf 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12936,11 +12936,14 @@ static void fp_special_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(ps); } -static void srgbwrite_format_test(IDirect3DDevice9 *device) +static void srgbwrite_format_test(void) { IDirect3D9 *d3d; IDirect3DSurface9 *rt, *backbuffer; IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + ULONG refcount; + HWND window; HRESULT hr; int i; DWORD color_rgb = 0x00808080, color_srgb = 0x00bcbcbc, color; @@ -12970,8 +12973,16 @@ static void srgbwrite_format_test(IDirect3DDevice9 *device) { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f} }; - hr = IDirect3DDevice9_GetDirect3D(device, &d3d); - ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); @@ -12991,10 +13002,10 @@ static void srgbwrite_format_test(IDirect3DDevice9 *device) continue; } - hr = IDirect3DDevice9_CreateTexture(device, 8, 8, 1, D3DUSAGE_RENDERTARGET, formats[i].fmt, - D3DPOOL_DEFAULT, &texture, NULL); + hr = IDirect3DDevice9_CreateTexture(device, 8, 8, 1, D3DUSAGE_RENDERTARGET, + formats[i].fmt, D3DPOOL_DEFAULT, &texture, NULL); ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff0000, 0.0f, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff0000, 1.0f, 0); ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &rt); @@ -13055,11 +13066,12 @@ static void srgbwrite_format_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); } - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "SetTextureStageState failed, hr %#x.\n", hr); - - IDirect3D9_Release(d3d); IDirect3DSurface9_Release(backbuffer); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void ds_size_test(IDirect3DDevice9 *device) @@ -15579,11 +15591,11 @@ START_TEST(visual) shadow_test(device_ptr); fp_special_test(device_ptr); depth_bounds_test(device_ptr); - srgbwrite_format_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + srgbwrite_format_test(); update_surface_test(); multisample_get_rtdata_test(); zenable_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for depth_bounds_test().
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: f281ca2214d57c2b6b48da09d3cfffda6eb8beba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f281ca2214d57c2b6b48da09d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 17 08:47:27 2014 +0100 d3d9/tests: Use a separate device for depth_bounds_test(). --- dlls/d3d9/tests/visual.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ff23acf..4387e55 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11605,7 +11605,7 @@ static void depth_clamp_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); } -static void depth_bounds_test(IDirect3DDevice9 *device) +static void depth_bounds_test(void) { const struct tvertex quad1[] = { @@ -11634,19 +11634,29 @@ static void depth_bounds_test(IDirect3DDevice9 *device) float f; } tmpvalue; - IDirect3D9 *d3d = NULL; IDirect3DSurface9 *offscreen_surface = NULL; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - IDirect3DDevice9_GetDirect3D(device, &d3d); - if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - 0, D3DRTYPE_SURFACE, MAKEFOURCC('N','V','D','B')) != D3D_OK) { - skip("No NVDB (depth bounds test) support\n"); - IDirect3D9_Release(d3d); - return; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_SURFACE, MAKEFOURCC('N','V','D','B')) != D3D_OK) + { + skip("No NVDB (depth bounds test) support, skipping tests.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; } - IDirect3D9_Release(d3d); hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, MAKEFOURCC('N','V','D','B'), D3DPOOL_DEFAULT, &offscreen_surface, NULL); @@ -11719,6 +11729,11 @@ static void depth_bounds_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void depth_buffer_test(IDirect3DDevice9 *device) @@ -15590,11 +15605,11 @@ START_TEST(visual) intz_test(device_ptr); shadow_test(device_ptr); fp_special_test(device_ptr); - depth_bounds_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + depth_bounds_test(); srgbwrite_format_test(); update_surface_test(); multisample_get_rtdata_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for fp_special_test().
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: b1fbee3340d37da068ca10606c8838c03d642071 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1fbee3340d37da068ca10606… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 17 08:47:28 2014 +0100 d3d9/tests: Use a separate device for fp_special_test(). --- dlls/d3d9/tests/visual.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4387e55..cbf1928 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12745,7 +12745,7 @@ static void clip_planes_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(offscreen); } -static void fp_special_test(IDirect3DDevice9 *device) +static void fp_special_test(void) { /* Microsoft's assembler generates nan and inf with "1.#QNAN" and "1.#INF." respectively */ static const DWORD vs_header[] = @@ -12870,18 +12870,33 @@ static void fp_special_test(IDirect3DDevice9 *device) }; IDirect3DPixelShader9 *ps; + IDirect3DDevice9 *device; UINT body_size = 0; + IDirect3D9 *d3d; DWORD *vs_code; + ULONG refcount; D3DCAPS9 caps; + HWND window; HRESULT hr; UINT i; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0) || caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) { skip("No shader model 2.0 support, skipping floating point specials test.\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE1(0)); @@ -12949,6 +12964,11 @@ static void fp_special_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetPixelShader(device, NULL); ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); IDirect3DPixelShader9_Release(ps); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void srgbwrite_format_test(void) @@ -15604,11 +15624,11 @@ START_TEST(visual) depth_blit_test(device_ptr); intz_test(device_ptr); shadow_test(device_ptr); - fp_special_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + fp_special_test(); depth_bounds_test(); srgbwrite_format_test(); update_surface_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for shadow_test().
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: 7071bf199f097b0fd0176f7e5a5f363a88fb9cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7071bf199f097b0fd0176f7e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 17 08:47:29 2014 +0100 d3d9/tests: Use a separate device for shadow_test(). --- dlls/d3d9/tests/visual.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cbf1928..13d363b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12410,7 +12410,7 @@ static void intz_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(rt); } -static void shadow_test(IDirect3DDevice9 *device) +static void shadow_test(void) { static const DWORD ps_code[] = { @@ -12474,21 +12474,33 @@ static void shadow_test(IDirect3DDevice9 *device) IDirect3DSurface9 *original_ds, *original_rt, *rt; IDirect3DPixelShader9 *ps; - IDirect3D9 *d3d9; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; D3DCAPS9 caps; + HWND window; HRESULT hr; UINT i; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0)) { skip("No pixel shader 2.0 support, skipping shadow test.\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } - hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); - ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DDevice9_GetDepthStencilSurface(device, &original_ds); @@ -12529,9 +12541,9 @@ static void shadow_test(IDirect3DDevice9 *device) IDirect3DSurface9 *ds; unsigned int j; - hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, format); - if (FAILED(hr)) continue; + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, format))) + continue; hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 1, D3DUSAGE_DEPTHSTENCIL, format, D3DPOOL_DEFAULT, &texture, NULL); @@ -12598,18 +12610,15 @@ static void shadow_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); } - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); IDirect3DPixelShader9_Release(ps); - - hr = IDirect3DDevice9_SetDepthStencilSurface(device, original_ds); - ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); IDirect3DSurface9_Release(original_ds); - IDirect3DSurface9_Release(original_rt); IDirect3DSurface9_Release(rt); - - IDirect3D9_Release(d3d9); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void clip_planes(IDirect3DDevice9 *device, const char *test_name) @@ -15623,11 +15632,11 @@ START_TEST(visual) depth_buffer2_test(device_ptr); depth_blit_test(device_ptr); intz_test(device_ptr); - shadow_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + shadow_test(); fp_special_test(); depth_bounds_test(); srgbwrite_format_test();

1 0

Austin English : setupapi: Make sure DeviceInterfaceData-> cbSize is initialized in SetupDiEnumDeviceInterfaces.
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: 8d854a4830776aaacb70161709db315d54eb77f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d854a4830776aaacb7016170… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Mar 14 19:45:19 2014 -0400 setupapi: Make sure DeviceInterfaceData->cbSize is initialized in SetupDiEnumDeviceInterfaces. --- dlls/setupapi/devinst.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 33dea82..ef56d2b 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2795,8 +2795,11 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } + /* In case application fails to check return value, clear output */ memset(DeviceInterfaceData, 0, sizeof(*DeviceInterfaceData)); + DeviceInterfaceData->cbSize = sizeof(SP_DEVICE_INTERFACE_DATA); + if (DeviceInfoData) { struct DeviceInfo *devInfo =

1 0

Hans Leidekker : wbemprox: Implement Win32_LogicalDisk.VolumeSerialNumber.
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: e50c4d0f3209528e1e94f37acbc46ca94fb3e867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50c4d0f3209528e1e94f37ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 17 09:36:55 2014 +0100 wbemprox: Implement Win32_LogicalDisk.VolumeSerialNumber. --- dlls/wbemprox/builtin.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 118ec0a..66f2882 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -263,6 +263,8 @@ static const WCHAR prop_varianttypeW[] = {'V','a','r','i','a','n','t','T','y','p','e',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; +static const WCHAR prop_volumeserialnumberW[] = + {'V','o','l','u','m','e','S','e','r','i','a','l','N','u','m','b','e','r',0}; /* column definitions must be kept in sync with record structures below */ static const struct column col_baseboard[] = @@ -335,12 +337,13 @@ static const struct column col_diskpartition[] = }; static const struct column col_logicaldisk[] = { - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_drivetypeW, CIM_UINT32, VT_I4 }, - { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_freespaceW, CIM_UINT64 }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_sizeW, CIM_UINT64 } + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_drivetypeW, CIM_UINT32, VT_I4 }, + { prop_filesystemW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_freespaceW, CIM_UINT64 }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_sizeW, CIM_UINT64 }, + { prop_volumeserialnumberW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_networkadapter[] = { @@ -625,6 +628,7 @@ struct record_logicaldisk UINT64 freespace; const WCHAR *name; UINT64 size; + const WCHAR *volumeserialnumber; }; struct record_networkadapter { @@ -1520,6 +1524,17 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex return status; } +static WCHAR *get_volumeserialnumber( const WCHAR *root ) +{ + static const WCHAR fmtW[] = {'%','0','8','X',0}; + DWORD serial = 0; + WCHAR buffer[9]; + + GetVolumeInformationW( root, NULL, 0, &serial, NULL, NULL, NULL, 0 ); + sprintfW( buffer, fmtW, serial ); + return heap_strdupW( buffer ); +} + static enum fill_status fill_logicaldisk( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = {'%','c',':',0}; @@ -1545,12 +1560,13 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr rec = (struct record_logicaldisk *)(table->data + offset); sprintfW( device_id, fmtW, 'A' + i ); - rec->device_id = heap_strdupW( device_id ); - rec->drivetype = type; - rec->filesystem = get_filesystem( root ); - rec->freespace = get_freespace( root, &size ); - rec->name = heap_strdupW( device_id ); - rec->size = size; + rec->device_id = heap_strdupW( device_id ); + rec->drivetype = type; + rec->filesystem = get_filesystem( root ); + rec->freespace = get_freespace( root, &size ); + rec->name = heap_strdupW( device_id ); + rec->size = size; + rec->volumeserialnumber = get_volumeserialnumber( root ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row );

1 0

Stefan Dösinger : ddraw: Use the new private store api.
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: 7d793715f3a18162f1d53472e371cea826b8bf78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d793715f3a18162f1d53472e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 16 20:38:58 2014 +0100 ddraw: Use the new private store api. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 74 +++++++++++++++++++++++++++++--------------- dlls/wined3d/resource.c | 8 +---- 3 files changed, 51 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0f7f755..2bf8132 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -150,6 +150,7 @@ struct ddraw_surface struct ddraw *ddraw; struct wined3d_surface *wined3d_surface; struct wined3d_texture *wined3d_texture; + struct wined3d_private_store private_store; struct d3d_device *device1; /* This implementation handles attaching surfaces to other surfaces */ diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 13aa813..5cfec01 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -2246,25 +2246,18 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_SetPrivateData(IDirectDrawSurface7 *iface, - REFGUID tag, void *Data, DWORD Size, DWORD Flags) + REFGUID tag, void *data, DWORD size, DWORD flags) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, tag %s, data %p, data_size %u, flags %#x.\n", - iface, debugstr_guid(tag), Data, Size, Flags); + iface, debugstr_guid(tag), data, size, flags); wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_set_private_data(resource, tag, Data, Size, Flags); + hr = wined3d_private_store_set_private_data(&surface->private_store, tag, data, size, flags); wined3d_mutex_unlock(); - - switch(hr) - { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return hr; - } + return hr_ddraw_from_wined3d(hr); } static HRESULT WINAPI ddraw_surface4_SetPrivateData(IDirectDrawSurface4 *iface, @@ -2294,23 +2287,45 @@ static HRESULT WINAPI ddraw_surface4_SetPrivateData(IDirectDrawSurface4 *iface, * For more details, see IWineD3DSurface::GetPrivateData * *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface, REFGUID tag, void *Data, DWORD *Size) +static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface, REFGUID tag, void *data, DWORD *size) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct wined3d_resource *resource; + const struct wined3d_private_data *stored_data; HRESULT hr; TRACE("iface %p, tag %s, data %p, data_size %p.\n", - iface, debugstr_guid(tag), Data, Size); - - if(!Data) - return DDERR_INVALIDPARAMS; + iface, debugstr_guid(tag), data, size); wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_get_private_data(resource, tag, Data, Size); - wined3d_mutex_unlock(); + stored_data = wined3d_private_store_get_private_data(&surface->private_store, tag); + if (!stored_data) + { + hr = DDERR_NOTFOUND; + goto done; + } + if (!size) + { + hr = DDERR_INVALIDPARAMS; + goto done; + } + if (*size < stored_data->size) + { + *size = stored_data->size; + hr = DDERR_MOREDATA; + goto done; + } + if (!data) + { + hr = DDERR_INVALIDPARAMS; + goto done; + } + *size = stored_data->size; + memcpy(data, stored_data->content.data, stored_data->size); + hr = DD_OK; + +done: + wined3d_mutex_unlock(); return hr; } @@ -2340,17 +2355,22 @@ static HRESULT WINAPI ddraw_surface4_GetPrivateData(IDirectDrawSurface4 *iface, static HRESULT WINAPI ddraw_surface7_FreePrivateData(IDirectDrawSurface7 *iface, REFGUID tag) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct wined3d_resource *resource; - HRESULT hr; + struct wined3d_private_data *entry; TRACE("iface %p, tag %s.\n", iface, debugstr_guid(tag)); wined3d_mutex_lock(); - resource = wined3d_surface_get_resource(surface->wined3d_surface); - hr = wined3d_resource_free_private_data(resource, tag); + entry = wined3d_private_store_get_private_data(&surface->private_store, tag); + if (!entry) + { + wined3d_mutex_unlock(); + return DDERR_NOTFOUND; + } + + wined3d_private_store_free_private_data(&surface->private_store, entry); wined3d_mutex_unlock(); - return hr; + return DD_OK; } static HRESULT WINAPI ddraw_surface4_FreePrivateData(IDirectDrawSurface4 *iface, REFGUID tag) @@ -5469,6 +5489,8 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren if (surface == surface->ddraw->primary) surface->ddraw->primary = NULL; + wined3d_private_store_cleanup(&surface->private_store); + HeapFree(GetProcessHeap(), 0, surface); } @@ -6095,5 +6117,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s surface->wined3d_surface = wined3d_surface; *parent_ops = &ddraw_surface_wined3d_parent_ops; + wined3d_private_store_init(&surface->private_store); + return DD_OK; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 782cc9f..43bd7ce 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -192,13 +192,7 @@ HRESULT CDECL wined3d_resource_get_private_data(const struct wined3d_resource *r if (d->flags & WINED3DSPD_IUNKNOWN) { *(IUnknown **)data = d->content.object; - if (resource->device->wined3d->dxVersion != 7) - { - /* D3D8 and D3D9 addref the private data, DDraw does not. This - * can't be handled in ddraw because it doesn't know if the - * pointer returned is an IUnknown * or just a blob. */ - IUnknown_AddRef(d->content.object); - } + IUnknown_AddRef(d->content.object); } else {

1 0

Stefan Dösinger : ddraw/tests: Test GetPrivateData size behavior.
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: 1d9ff5c43b4630be0791508c0b7d9f6e1379dd39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9ff5c43b4630be0791508c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 16 20:38:59 2014 +0100 ddraw/tests: Test GetPrivateData size behavior. --- dlls/ddraw/tests/ddraw4.c | 26 ++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 26 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bb725e7..f01f812 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6122,13 +6122,39 @@ static void test_private_data(void) hr = IDirectDrawSurface4_SetPrivateData(surface, &IID_IDirect3D, ddraw, sizeof(ddraw), DDSPD_IUNKNOWNPOINTER); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + size = 2 * sizeof(ptr); hr = IDirectDrawSurface4_GetPrivateData(surface, &IID_IDirect3D, &ptr, &size); ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + ok(size == sizeof(ddraw), "Got unexpected size %u.\n", size); refcount2 = get_refcount(ptr); /* Object is NOT addref'ed by the getter. */ ok(ptr == (IUnknown *)ddraw, "Returned interface pointer is %p, expected %p.\n", ptr, ddraw); ok(refcount2 == refcount + 1, "Got unexpected refcount %u.\n", refcount2); + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = IDirectDrawSurface4_GetPrivateData(surface, &IID_IDirect3D, NULL, &size); + ok(hr == DDERR_MOREDATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(ddraw), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = IDirectDrawSurface4_GetPrivateData(surface, &IID_IDirect3D, NULL, &size); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + ok(size == 2 * sizeof(ptr), "Got unexpected size %u.\n", size); + size = 1; + hr = IDirectDrawSurface4_GetPrivateData(surface, &IID_IDirect3D, &ptr, &size); + ok(hr == DDERR_MOREDATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(ddraw), "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = IDirectDrawSurface4_GetPrivateData(surface, &IID_IDirect3DViewport, NULL, NULL); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = IDirectDrawSurface4_GetPrivateData(surface, &IID_IDirect3DViewport, &ptr, &size); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + ok(size == 0xdeadbabe, "Got unexpected size %u.\n", size); + hr = IDirectDrawSurface4_GetPrivateData(surface, &IID_IDirect3D, NULL, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + refcount3 = IDirectDrawSurface4_Release(surface); ok(!refcount3, "Got unexpected refcount %u.\n", refcount3); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 15e89a1..1efde27 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5977,13 +5977,39 @@ static void test_private_data(void) hr = IDirectDrawSurface7_SetPrivateData(surface, &IID_IDirect3D, ddraw, sizeof(ddraw), DDSPD_IUNKNOWNPOINTER); ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + size = 2 * sizeof(ptr); hr = IDirectDrawSurface7_GetPrivateData(surface, &IID_IDirect3D, &ptr, &size); ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + ok(size == sizeof(ddraw), "Got unexpected size %u.\n", size); refcount2 = get_refcount(ptr); /* Object is NOT addref'ed by the getter. */ ok(ptr == (IUnknown *)ddraw, "Returned interface pointer is %p, expected %p.\n", ptr, ddraw); ok(refcount2 == refcount + 1, "Got unexpected refcount %u.\n", refcount2); + ptr = (IUnknown *)0xdeadbeef; + size = 1; + hr = IDirectDrawSurface7_GetPrivateData(surface, &IID_IDirect3D, NULL, &size); + ok(hr == DDERR_MOREDATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(ddraw), "Got unexpected size %u.\n", size); + size = 2 * sizeof(ptr); + hr = IDirectDrawSurface7_GetPrivateData(surface, &IID_IDirect3D, NULL, &size); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + ok(size == 2 * sizeof(ptr), "Got unexpected size %u.\n", size); + size = 1; + hr = IDirectDrawSurface7_GetPrivateData(surface, &IID_IDirect3D, &ptr, &size); + ok(hr == DDERR_MOREDATA, "Got unexpected hr %#x.\n", hr); + ok(size == sizeof(ddraw), "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = IDirectDrawSurface7_GetPrivateData(surface, &IID_IDirect3DViewport, NULL, NULL); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = IDirectDrawSurface7_GetPrivateData(surface, &IID_IDirect3DViewport, &ptr, &size); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + ok(size == 0xdeadbabe, "Got unexpected size %u.\n", size); + hr = IDirectDrawSurface7_GetPrivateData(surface, &IID_IDirect3D, NULL, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + refcount3 = IDirectDrawSurface7_Release(surface); ok(!refcount3, "Got unexpected refcount %u.\n", refcount3);

1 0

Stefan Dösinger : ddraw/tests: Add mipmap private data tests.
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: 4a62f81d0de48c9e2deabc31062721d0252cec1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a62f81d0de48c9e2deabc310… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 16 23:14:09 2014 +0100 ddraw/tests: Add mipmap private data tests. --- dlls/ddraw/tests/ddraw4.c | 33 ++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f01f812..84faf1c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6047,13 +6047,16 @@ static void test_surface_attachment(void) static void test_private_data(void) { IDirectDraw4 *ddraw; - IDirectDrawSurface4 *surface; + IDirectDrawSurface4 *surface, *surface2; DDSURFACEDESC2 surface_desc; ULONG refcount, refcount2, refcount3; IUnknown *ptr; DWORD size = sizeof(ptr); HRESULT hr; HWND window; + DDSCAPS2 caps = {DDSCAPS_COMPLEX, 0, 0, 0}; + DWORD data[] = {1, 2, 3, 4}; + DDCAPS hal_caps; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -6163,6 +6166,34 @@ static void test_private_data(void) refcount2 = get_refcount((IUnknown *)ddraw); ok(refcount2 == refcount - 1, "Got unexpected refcount %u.\n", refcount2); + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) == (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) + { + reset_ddsd(&surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + surface_desc.dwHeight = 4; + surface_desc.dwWidth = 4; + U2(surface_desc).dwMipMapCount = 2; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(surface, &caps, &surface2); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_SetPrivateData(surface, &IID_IDirect3D, data, sizeof(data), 0); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetPrivateData(surface2, &IID_IDirect3D, NULL, NULL); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface4_Release(surface2); + IDirectDrawSurface4_Release(surface); + } + else + skip("Mipmapped textures not supported, skipping mipmap private data test.\n"); + refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1efde27..b7c9508 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5902,13 +5902,16 @@ static void test_surface_attachment(void) static void test_private_data(void) { IDirectDraw7 *ddraw; - IDirectDrawSurface7 *surface; + IDirectDrawSurface7 *surface, *surface2; DDSURFACEDESC2 surface_desc; ULONG refcount, refcount2, refcount3; IUnknown *ptr; DWORD size = sizeof(ptr); HRESULT hr; HWND window; + DDSCAPS2 caps = {DDSCAPS_COMPLEX, 0, 0, 0}; + DWORD data[] = {1, 2, 3, 4}; + DDCAPS hal_caps; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -6018,6 +6021,34 @@ static void test_private_data(void) refcount2 = get_refcount((IUnknown *)ddraw); ok(refcount2 == refcount - 1, "Got unexpected refcount %u.\n", refcount2); + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) == (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) + { + reset_ddsd(&surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_MIPMAPCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + surface_desc.dwHeight = 4; + surface_desc.dwWidth = 4; + U2(surface_desc).dwMipMapCount = 2; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &caps, &surface2); + ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_SetPrivateData(surface, &IID_IDirect3D, data, sizeof(data), 0); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetPrivateData(surface2, &IID_IDirect3D, NULL, NULL); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(surface2); + IDirectDrawSurface7_Release(surface); + } + else + skip("Mipmapped textures not supported, skipping mipmap private data test.\n"); + refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); DestroyWindow(window);

1 0

Stefan Dösinger : ddraw/tests: Use a custom GUID for the private data tests.
by Alexandre Julliard 17 Mar '14

17 Mar '14

Module: wine Branch: master Commit: bd69346d2c15b93ec41b0e7dd7658540bdc66fbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd69346d2c15b93ec41b0e7dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 16 23:14:10 2014 +0100 ddraw/tests: Use a custom GUID for the private data tests. --- dlls/ddraw/tests/ddraw4.c | 56 ++++++++++++++++++++++++++++----------------- dlls/ddraw/tests/ddraw7.c | 56 ++++++++++++++++++++++++++++----------------- 2 files changed, 70 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd69346d2c15b93ec41b0…

1 0