November 2013 - Wine-commits

André Hentschel : mscoree/tests: Don't expect a 2. x runtime.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: dc60ed45961f76a9f766f2d2259bc0abb912b4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc60ed45961f76a9f766f2d22… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 13 00:08:01 2013 +0100 mscoree/tests: Don't expect a 2.x runtime. --- dlls/mscoree/tests/metahost.c | 76 +++++++++++++++++++++------------------- 1 files changed, 40 insertions(+), 36 deletions(-) diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index 7794e74..d00bb4f 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -64,6 +64,44 @@ static void cleanup(void) FreeLibrary(hmscoree); } +static WCHAR *strrchrW( WCHAR *str, WCHAR ch ) +{ + WCHAR *ret = NULL; + do { if (*str == ch) ret = str; } while (*str++); + return ret; +} + +static void test_getruntime(WCHAR *version) +{ + static const WCHAR dotzero[] = {'.','0',0}; + WCHAR *dot; + HRESULT hr; + ICLRRuntimeInfo *info; + DWORD count; + WCHAR buf[MAX_PATH]; + + hr = ICLRMetaHost_GetRuntime(metahost, NULL, &IID_ICLRRuntimeInfo, (void**)&info); + ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr); + + hr = ICLRMetaHost_GetRuntime(metahost, version, &IID_ICLRRuntimeInfo, (void**)&info); + ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + if (hr != S_OK) return; + + count = MAX_PATH; + hr = ICLRRuntimeInfo_GetVersionString(info, buf, &count); + ok(hr == S_OK, "GetVersionString returned %x\n", hr); + ok(count == lstrlenW(buf)+1, "GetVersionString returned count %u but string of length %u\n", count, lstrlenW(buf)+1); + ok(lstrcmpW(buf, version) == 0, "got unexpected version %s\n", wine_dbgstr_w(buf)); + + ICLRRuntimeInfo_Release(info); + + /* Versions must match exactly. */ + dot = strrchrW(version, '.'); + lstrcpyW(dot, dotzero); + hr = ICLRMetaHost_GetRuntime(metahost, version, &IID_ICLRRuntimeInfo, (void**)&info); + ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr); +} + static void test_enumruntimes(void) { IEnumUnknown *runtime_enum; @@ -100,8 +138,9 @@ static void test_enumruntimes(void) trace("runtime found: %s\n", wine_dbgstr_w(buf)); ICLRRuntimeInfo_Release(runtime_info); - IUnknown_Release(unk); + + test_getruntime(buf); } ok(hr == S_FALSE, "IEnumUnknown_Next returned %x\n", hr); @@ -109,39 +148,6 @@ static void test_enumruntimes(void) IEnumUnknown_Release(runtime_enum); } -static void test_getruntime(void) -{ - static const WCHAR twodotzero[] = {'v','2','.','0','.','5','0','7','2','7',0}; - static const WCHAR twodotzerodotzero[] = {'v','2','.','0','.','0',0}; - HRESULT hr; - ICLRRuntimeInfo *info; - DWORD count; - WCHAR buf[MAX_PATH]; - - hr = ICLRMetaHost_GetRuntime(metahost, NULL, &IID_ICLRRuntimeInfo, (void**)&info); - ok(hr == E_POINTER, "GetVersion failed, hr=%x\n", hr); - - hr = ICLRMetaHost_GetRuntime(metahost, twodotzero, &IID_ICLRRuntimeInfo, (void**)&info); - if (hr == CLR_E_SHIM_RUNTIME) - /* FIXME: Get Mono properly packaged so we can fail here. */ - todo_wine ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); - else - ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); - if (hr != S_OK) return; - - count = MAX_PATH; - hr = ICLRRuntimeInfo_GetVersionString(info, buf, &count); - ok(hr == S_OK, "GetVersionString returned %x\n", hr); - ok(count == lstrlenW(buf)+1, "GetVersionString returned count %u but string of length %u\n", count, lstrlenW(buf)+1); - ok(lstrcmpW(buf, twodotzero) == 0, "got unexpected version %s\n", wine_dbgstr_w(buf)); - - ICLRRuntimeInfo_Release(info); - - /* Versions must match exactly. */ - hr = ICLRMetaHost_GetRuntime(metahost, twodotzerodotzero, &IID_ICLRRuntimeInfo, (void**)&info); - ok(hr == CLR_E_SHIM_RUNTIME, "GetVersion failed, hr=%x\n", hr); -} - static void WINAPI notification_callback(ICLRRuntimeInfo *pRuntimeInfo, CallbackThreadSetFnPtr pfnCallbackThreadSet, CallbackThreadUnsetFnPtr pfnCallbackThreadUnset) { @@ -165,8 +171,6 @@ START_TEST(metahost) return; test_enumruntimes(); - - test_getruntime(); test_notification(); cleanup();

1 0

Dmitry Timoshkov : gdiplus/tests: Add some invalid parameter tests for GdipGetRegionData.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 619e96831439f42b1fbce54d5bc897254c6c8ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=619e96831439f42b1fbce54d5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 13 14:00:17 2013 +0900 gdiplus/tests: Add some invalid parameter tests for GdipGetRegionData. --- dlls/gdiplus/tests/region.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 23c7a07..8e0dc9f 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -118,14 +118,30 @@ static void test_getregiondata(void) GpPath *path; GpMatrix *matrix; - memset(buf, 0xee, sizeof(buf)); - status = GdipCreateRegion(&region); ok(status == Ok, "status %08x\n", status); + needed = 0; status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed); + + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, 0, &needed); + ok(status == InvalidParameter, "status %08x\n", status); + + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, 4, &needed); +todo_wine + ok(status == InsufficientBuffer, "status %08x\n", status); +todo_wine + expect(4, needed); +todo_wine + expect_dword(buf, 0xeeeeeeee); + + memset(buf, 0xee, sizeof(buf)); + needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); expect(20, needed);

1 0

Dmitry Timoshkov : gdiplus/tests: Test GdipGetRegionData behaviour with an integer path that can' t be stored as an array of shorts.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 8dc170e2ca686ea22f8e5ccb5bc9793ed8dfa3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc170e2ca686ea22f8e5ccb5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 13 14:00:22 2013 +0900 gdiplus/tests: Test GdipGetRegionData behaviour with an integer path that can't be stored as an array of shorts. --- dlls/gdiplus/tests/region.c | 97 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 8e0dc9f..dcf5092 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -567,6 +567,103 @@ todo_wine expect(Ok, status); status = GdipDeleteRegion(region); expect(Ok, status); + + /* Test how shorts are stored in the region path data */ + status = GdipCreatePath(FillModeAlternate, &path); + ok(status == Ok, "status %08x\n", status); + GdipAddPathRectangleI(path, -1969, -1974, 1995, 1997); + + status = GdipCreateRegionPath(path, &region); + ok(status == Ok, "status %08x\n", status); + needed = 0; + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); + expect(56, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + expect(56, needed); + expect_dword(buf, 48); + trace("buf[1] = %08x\n", buf[1]); + expect_magic(buf + 2); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_PATH); + expect_dword(buf + 5, 32); + expect_magic(buf + 6); + expect_dword(buf + 7, 4); + /* flags 0x4000 means that a path is an array of shorts instead of FLOATs */ + expect_dword(buf + 8, 0x4000); + point = (RegionDataPoint*)(buf + 9); + expect(-1969, point[0].X); + expect(-1974, point[0].Y); + expect(26, point[1].X); /* buf + 10 */ + expect(-1974, point[1].Y); + expect(26, point[2].X); /* buf + 11 */ + expect(23, point[2].Y); + expect(-1969, point[3].X); /* buf + 12 */ + expect(23, point[3].Y); + expect_dword(buf + 13, 0x81010100); /* 0x01010100 if we don't close the path */ + + status = GdipDeletePath(path); + expect(Ok, status); + status = GdipDeleteRegion(region); + expect(Ok, status); + + /* Test with integers that can't be stored as shorts */ + status = GdipCreatePath(FillModeAlternate, &path); + ok(status == Ok, "status %08x\n", status); + GdipAddPathRectangleI(path, -196900, -197400, 199500, 199700); + + status = GdipCreateRegionPath(path, &region); + ok(status == Ok, "status %08x\n", status); + needed = 0; + status = GdipGetRegionDataSize(region, &needed); + ok(status == Ok, "status %08x\n", status); +todo_wine + expect(72, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); +todo_wine + expect(72, needed); +todo_wine + expect_dword(buf, 64); + trace("buf[1] = %08x\n", buf[1]); + expect_magic(buf + 2); + expect_dword(buf + 3, 0); + expect_dword(buf + 4, RGNDATA_PATH); +todo_wine + expect_dword(buf + 5, 48); + expect_magic(buf + 6); + expect_dword(buf + 7, 4); + /* flags 0 means that a path is an array of FLOATs */ +todo_wine + expect_dword(buf + 8, 0); +todo_wine + expect_float(buf + 9, -196900.0); +todo_wine + expect_float(buf + 10, -197400.0); +todo_wine + expect_float(buf + 11, 2600.0); +todo_wine + expect_float(buf + 12, -197400.0); +todo_wine + expect_float(buf + 13, 2600.0); +todo_wine + expect_float(buf + 14, 2300.0); +todo_wine + expect_float(buf + 15, -196900.0); +todo_wine + expect_float(buf + 16, 2300.0); +todo_wine + expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ + + status = GdipDeletePath(path); + expect(Ok, status); + status = GdipDeleteRegion(region); + expect(Ok, status); } static void test_isinfinite(void)

1 0

Dmitry Timoshkov : gdiplus: Add a check for passed buffer size to GdipGetRegionData.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 761391f156e67404d3c4db801f28da51d06d3654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761391f156e67404d3c4db801… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 13 14:00:26 2013 +0900 gdiplus: Add a check for passed buffer size to GdipGetRegionData. --- dlls/gdiplus/region.c | 12 +++++++++++- dlls/gdiplus/tests/region.c | 3 --- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index aef2ac7..0295e62 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -828,12 +828,22 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, DWORD num_children; } *region_header; INT filled = 0; + UINT required; + GpStatus status; TRACE("%p, %p, %d, %p\n", region, buffer, size, needed); - if (!(region && buffer && size)) + if (!region || !buffer || !size) return InvalidParameter; + status = GdipGetRegionDataSize(region, &required); + if (status != Ok) return status; + if (size < required) + { + if (needed) *needed = size; + return InsufficientBuffer; + } + region_header = (struct _region_header *)buffer; region_header->size = sizeheader_size + get_element_size(&region->node); region_header->checksum = 0; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index dcf5092..77fb4fe 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -133,11 +133,8 @@ static void test_getregiondata(void) memset(buf, 0xee, sizeof(buf)); needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, 4, &needed); -todo_wine ok(status == InsufficientBuffer, "status %08x\n", status); -todo_wine expect(4, needed); -todo_wine expect_dword(buf, 0xeeeeeeee); memset(buf, 0xee, sizeof(buf));

1 0

Dmitry Timoshkov : gdiplus: Check whether region path points really fit into shorts.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 56a65007214b244710418f62ed8a1d5d1e257d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=56a65007214b244710418f62e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 13 14:00:30 2013 +0900 gdiplus: Check whether region path points really fit into shorts. --- dlls/gdiplus/region.c | 6 ++++-- dlls/gdiplus/tests/region.c | 14 -------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 0295e62..5d95fcd 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -96,8 +96,10 @@ static BOOL is_integer_path(const GpPath *path) for (i = 0; i < path->pathdata.Count; i++) { - if (path->pathdata.Points[i].X != gdip_round(path->pathdata.Points[i].X) || - path->pathdata.Points[i].Y != gdip_round(path->pathdata.Points[i].Y)) + short x, y; + x = gdip_round(path->pathdata.Points[i].X); + y = gdip_round(path->pathdata.Points[i].Y); + if (path->pathdata.Points[i].X != (REAL)x || path->pathdata.Points[i].Y != (REAL)y) return FALSE; } return TRUE; diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 77fb4fe..2b4f148 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -617,44 +617,30 @@ static void test_getregiondata(void) needed = 0; status = GdipGetRegionDataSize(region, &needed); ok(status == Ok, "status %08x\n", status); -todo_wine expect(72, needed); memset(buf, 0xee, sizeof(buf)); needed = 0; status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); ok(status == Ok, "status %08x\n", status); -todo_wine expect(72, needed); -todo_wine expect_dword(buf, 64); trace("buf[1] = %08x\n", buf[1]); expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); -todo_wine expect_dword(buf + 5, 48); expect_magic(buf + 6); expect_dword(buf + 7, 4); /* flags 0 means that a path is an array of FLOATs */ -todo_wine expect_dword(buf + 8, 0); -todo_wine expect_float(buf + 9, -196900.0); -todo_wine expect_float(buf + 10, -197400.0); -todo_wine expect_float(buf + 11, 2600.0); -todo_wine expect_float(buf + 12, -197400.0); -todo_wine expect_float(buf + 13, 2600.0); -todo_wine expect_float(buf + 14, 2300.0); -todo_wine expect_float(buf + 15, -196900.0); -todo_wine expect_float(buf + 16, 2300.0); -todo_wine expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ status = GdipDeletePath(path);

1 0

Henri Verbeet : ddraw: Create textures for swapchain surfaces.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: d6f12fcdc81cfc40aaec57cf4e4b189500677154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f12fcdc81cfc40aaec57cf4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 13 10:12:06 2013 +0100 ddraw: Create textures for swapchain surfaces. --- dlls/ddraw/ddraw.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1dafa1e..6496ac3 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5143,14 +5143,23 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ DWORD flags, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); - struct ddraw_texture *texture = container_parent; - DDSURFACEDESC2 desc = texture->surface_desc; struct ddraw_surface *ddraw_surface; + struct ddraw_texture *texture; + DDSURFACEDESC2 desc; HRESULT hr; TRACE("device_parent %p, container_parent %p, wined3d_desc %p, sub_resource_idx %u, flags %#x, surface %p.\n", device_parent, container_parent, wined3d_desc, sub_resource_idx, flags, surface); + /* We have a swapchain texture. */ + if (container_parent == ddraw) + return wined3d_surface_create(ddraw->wined3d_device, wined3d_desc->width, wined3d_desc->height, + wined3d_desc->format, wined3d_desc->usage, wined3d_desc->pool, wined3d_desc->multisample_type, + wined3d_desc->multisample_quality, WINED3D_SURFACE_MAPPABLE, NULL, + &ddraw_null_wined3d_parent_ops, surface); + + texture = container_parent; + desc = texture->surface_desc; desc.dwWidth = wined3d_desc->width; desc.dwHeight = wined3d_desc->height; @@ -5179,6 +5188,8 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_surface **surface) { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); + struct wined3d_resource_desc texture_desc; + struct wined3d_texture *texture; HRESULT hr; TRACE("device_parent %p, container_parent %p, desc %p, surface %p.\n", @@ -5190,10 +5201,19 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic return E_FAIL; } - if (SUCCEEDED(hr = wined3d_surface_create(ddraw->wined3d_device, desc->width, desc->height, desc->format, - desc->usage, desc->pool, desc->multisample_type, desc->multisample_quality, WINED3D_SURFACE_MAPPABLE, - ddraw, &ddraw_frontbuffer_parent_ops, surface))) - ddraw->wined3d_frontbuffer = *surface; + texture_desc = *desc; + texture_desc.resource_type = WINED3D_RTYPE_TEXTURE; + if (FAILED(hr = wined3d_texture_create_2d(ddraw->wined3d_device, &texture_desc, 1, + WINED3D_SURFACE_MAPPABLE, ddraw, &ddraw_frontbuffer_parent_ops, &texture))) + { + WARN("Failed to create texture, hr %#x.\n", hr); + return hr; + } + + *surface = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); + ddraw->wined3d_frontbuffer = *surface; + wined3d_surface_incref(*surface); + wined3d_texture_decref(texture); return hr; }

1 0

Henri Verbeet : ddraw: Create textures for "standalone" surfaces.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 6ea9afe7011a65f6c7f67b303f13e672907a93f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea9afe7011a65f6c7f67b303… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 13 10:12:07 2013 +0100 ddraw: Create textures for "standalone" surfaces. --- dlls/ddraw/ddraw.c | 12 ++---------- dlls/ddraw/device.c | 8 +++++--- dlls/ddraw/surface.c | 19 ++++++++++++++++--- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 6496ac3..f924a09 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3116,17 +3116,9 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) + if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, flags, &object))) { - if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, flags, &object))) - { - WARN("Failed to create texture, hr %#x.\n", hr); - return hr; - } - } - else if (FAILED(hr = ddraw_create_surface(ddraw, &desc2, flags, &object, version))) - { - WARN("ddraw_create_surface failed, hr %#x.\n", hr); + WARN("Failed to create texture, hr %#x.\n", hr); return hr; } object->is_complex_root = TRUE; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b7511bc..874d78d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4668,14 +4668,16 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct ddraw_surface *surf = unsafe_impl_from_IDirectDrawSurface7(texture); + struct wined3d_texture *wined3d_texture = NULL; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); - /* Texture may be NULL here */ + if (surf && (surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + wined3d_texture = surf->wined3d_texture; + wined3d_mutex_lock(); - hr = wined3d_device_set_texture(device->wined3d_device, - stage, surf ? surf->wined3d_texture : NULL); + hr = wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 808cd5f..5b34ec7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -484,6 +484,9 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surface, surface->ref7, surface->ref4, surface->ref3, surface->ref2, surface->ref1); } + if (surface->wined3d_texture + && !(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + wined3d_texture_decref(surface->wined3d_texture); if (surface->wined3d_surface) wined3d_surface_decref(surface->wined3d_surface); } @@ -505,7 +508,8 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) wined3d_mutex_unlock(); return iface_count; } - if (This->wined3d_texture) /* If it's a texture, destroy the wined3d texture. */ + /* If it's a texture, destroy the wined3d texture. */ + if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) wined3d_texture_decref(This->wined3d_texture); else ddraw_surface_cleanup(This); @@ -5579,7 +5583,8 @@ static void STDMETHODCALLTYPE ddraw_texture_wined3d_object_destroyed(void *paren TRACE("texture %p.\n", texture); - ddraw_surface_cleanup(texture->root); + if (texture->surface_desc.ddsCaps.dwCaps & DDSCAPS_TEXTURE) + ddraw_surface_cleanup(texture->root); HeapFree(GetProcessHeap(), 0, parent); } @@ -5632,11 +5637,19 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 * } else { - wined3d_desc.usage = WINED3DUSAGE_TEXTURE | WINED3DUSAGE_DYNAMIC; + wined3d_desc.usage = WINED3DUSAGE_DYNAMIC; + if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) + wined3d_desc.usage |= WINED3DUSAGE_TEXTURE; pool = WINED3D_POOL_DEFAULT; } wined3d_desc.format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat); + if (wined3d_desc.format == WINED3DFMT_UNKNOWN) + { + WARN("Unsupported / unknown pixelformat.\n"); + return DDERR_INVALIDPIXELFORMAT; + } + wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; wined3d_desc.pool = pool;

1 0

Henri Verbeet : ddraw: Create textures for additional surfaces.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: afe5ceb7292c494e14bb1417d0e22234c0610b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe5ceb7292c494e14bb1417d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 13 10:12:08 2013 +0100 ddraw: Create textures for additional surfaces. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f924a09..a5422da 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3143,7 +3143,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, { struct ddraw_surface *object2 = NULL; - if (FAILED(hr = ddraw_create_surface(ddraw, &desc2, flags, &object2, version))) + if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, flags, &object2))) { if (version == 7) IDirectDrawSurface7_Release(&object->IDirectDrawSurface7_iface);

1 0

Henri Verbeet : wined3d: Create textures for converted surfaces.
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: 7c928b6c5cddbe5305ce0f3e98822520086ce922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c928b6c5cddbe5305ce0f3e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 13 10:12:09 2013 +0100 wined3d: Create textures for converted surfaces. --- dlls/wined3d/surface.c | 46 ++++++++++++++++++++-------------------------- 1 files changed, 20 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a4cbd81..03403bd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3310,23 +3310,13 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo return NULL; } -/***************************************************************************** - * surface_convert_format - * - * Creates a duplicate of a surface in a different format. Is used by Blt to - * blit between surfaces with different formats. - * - * Parameters - * source: Source surface - * fmt: Requested destination format - * - *****************************************************************************/ -static struct wined3d_surface *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt) +static struct wined3d_texture *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt) { struct wined3d_map_desc src_map, dst_map; const struct d3dfmt_converter_desc *conv; - struct wined3d_surface *ret = NULL; - HRESULT hr; + struct wined3d_texture *ret = NULL; + struct wined3d_resource_desc desc; + struct wined3d_surface *dst; conv = find_converter(source->resource.format->id, to_fmt); if (!conv) @@ -3337,35 +3327,39 @@ static struct wined3d_surface *surface_convert_format(struct wined3d_surface *so } /* FIXME: Multisampled conversion? */ - if (FAILED(hr = wined3d_surface_create(source->resource.device, source->resource.width, source->resource.height, - to_fmt, 0, WINED3D_POOL_SCRATCH, WINED3D_MULTISAMPLE_NONE, 0, + wined3d_resource_get_desc(&source->resource, &desc); + desc.format = to_fmt; + desc.usage = 0; + desc.pool = WINED3D_POOL_SCRATCH; + if (FAILED(wined3d_texture_create_2d(source->resource.device, &desc, 1, WINED3D_SURFACE_MAPPABLE | WINED3D_SURFACE_DISCARD, NULL, &wined3d_null_parent_ops, &ret))) { ERR("Failed to create a destination surface for conversion.\n"); return NULL; } + dst = surface_from_resource(wined3d_texture_get_sub_resource(ret, 0)); memset(&src_map, 0, sizeof(src_map)); memset(&dst_map, 0, sizeof(dst_map)); - if (FAILED(hr = wined3d_surface_map(source, &src_map, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_surface_map(source, &src_map, NULL, WINED3D_MAP_READONLY))) { ERR("Failed to lock the source surface.\n"); - wined3d_surface_decref(ret); + wined3d_texture_decref(ret); return NULL; } - if (FAILED(hr = wined3d_surface_map(ret, &dst_map, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, WINED3D_MAP_READONLY))) { ERR("Failed to lock the destination surface.\n"); wined3d_surface_unmap(source); - wined3d_surface_decref(ret); + wined3d_texture_decref(ret); return NULL; } conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch, source->resource.width, source->resource.height); - wined3d_surface_unmap(ret); + wined3d_surface_unmap(dst); wined3d_surface_unmap(source); return ret; @@ -5945,7 +5939,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { int bpp, srcheight, srcwidth, dstheight, dstwidth, width; const struct wined3d_format *src_format, *dst_format; - struct wined3d_surface *orig_src = src_surface; + struct wined3d_texture *src_texture = NULL; struct wined3d_map_desc dst_map, src_map; const BYTE *sbase = NULL; HRESULT hr = WINED3D_OK; @@ -5971,13 +5965,13 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { if (dst_surface->resource.format->id != src_surface->resource.format->id) { - src_surface = surface_convert_format(src_surface, dst_format->id); - if (!src_surface) + if (!(src_texture = surface_convert_format(src_surface, dst_format->id))) { /* The conv function writes a FIXME */ WARN("Cannot convert source surface format to dest format.\n"); goto release; } + src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, 0)); } wined3d_surface_map(src_surface, &src_map, NULL, WINED3D_MAP_READONLY); src_format = src_surface->resource.format; @@ -6431,8 +6425,8 @@ release: if (src_surface && src_surface != dst_surface) wined3d_surface_unmap(src_surface); /* Release the converted surface, if any. */ - if (src_surface && src_surface != orig_src) - wined3d_surface_decref(src_surface); + if (src_texture) + wined3d_texture_decref(src_texture); return hr; }

1 0

Henri Verbeet : wined3d: Don' t map the destination surface read-only in surface_convert_format().
by Alexandre Julliard 13 Nov '13

13 Nov '13

Module: wine Branch: master Commit: c3da4ce08800d831e2419b1078b2ec0a7c7e8f17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3da4ce08800d831e2419b107… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 13 10:12:10 2013 +0100 wined3d: Don't map the destination surface read-only in surface_convert_format(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 03403bd..f8c7cf8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3348,7 +3348,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_surface *so wined3d_texture_decref(ret); return NULL; } - if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, 0))) { ERR("Failed to lock the destination surface.\n"); wined3d_surface_unmap(source);

1 0