November 2013 - Wine-Commits

Dmitry Timoshkov : gdiplus/tests: Add a test for bezier data returned by GdipGetRegionData.
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: c9f8f41d185502c0785995e317b63d317e85a6f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f8f41d185502c0785995e31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 14 13:08:58 2013 +0900 gdiplus/tests: Add a test for bezier data returned by GdipGetRegionData. --- dlls/gdiplus/tests/region.c | 67 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index e690b6a..66d950a 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -35,7 +35,7 @@ #define expect(expected, got) ok((got) == (expected), "Expected %.8x, got %.8x\n", (expected), (got)) #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got)) -#define expectf(expected, got) expectf_((expected), (got), 0.0001) +#define expectf(expected, got) expectf_((expected), (got), 0.001) #define expect_magic(value) ok(*(value) == RGNDATA_MAGIC || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) #define expect_dword(value, expected) expect((expected), *(value)) @@ -108,7 +108,7 @@ static void test_getregiondata(void) GpRegion *region, *region2; RegionDataPoint *point; UINT needed; - DWORD buf[100]; + DWORD buf[256]; GpRect rect; GpPath *path; GpMatrix *matrix; @@ -674,6 +674,69 @@ static void test_getregiondata(void) expect(Ok, status); status = GdipDeleteRegion(region); expect(Ok, status); + + /* Test beziers */ + GdipCreatePath(FillModeAlternate, &path); + /* Exactly 90 degrees */ + status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 90.0); + expect(Ok, status); + /* Over 90 degrees */ + status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 100.0); + expect(Ok, status); + 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(136, needed); + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %08x\n", status); + expect(136, needed); + expect_dword(buf, 128); + 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, 112); + expect_magic(buf + 6); + expect_dword(buf + 7, 11); + /* flags 0 means that a path is an array of FLOATs */ + expect_dword(buf + 8, 0); + expect_float(buf + 9, 600.0); + expect_float(buf + 10, 450.0); + expect_float(buf + 11, 600.0); + expect_float(buf + 12, 643.299561); + expect_float(buf + 13, 488.071198); + expect_float(buf + 14, 800.0); + expect_float(buf + 15, 350.0); + expect_float(buf + 16, 800.0); + expect_float(buf + 17, 600.0); + expect_float(buf + 18, 450.0); + expect_float(buf + 19, 600.0); + expect_float(buf + 20, 643.299622); + expect_float(buf + 21, 488.071167); + expect_float(buf + 22, 800.0); + expect_float(buf + 23, 350.0); + expect_float(buf + 24, 800.0); + expect_float(buf + 25, 329.807129); + expect_float(buf + 26, 800.0); + expect_float(buf + 27, 309.688568); + expect_float(buf + 28, 796.574890); + expect_float(buf + 29, 290.084167); + expect_float(buf + 30, 789.799561); + expect_dword(buf + 31, 0x03030300); + expect_dword(buf + 32, 0x03030301); + ok(*(buf + 33) == 0x00030303 /* before win7 */ || + *(buf + 33) == 0x43030303 /* 32-bit win7 */ || *(buf + 33) == 0x4c030303 /* 64-bit win7 */, + "expected 0x00030303 or 0x43030303 or 0x4c030303 got %08x\n", *(buf + 33)); + expect_dword(buf + 34, 0xeeeeeeee); + + status = GdipDeletePath(path); + expect(Ok, status); + status = GdipDeleteRegion(region); + expect(Ok, status); } static void test_isinfinite(void)

1 0

Dmitry Timoshkov : gdiplus/tests: Convert expect_float() to macro to make failure messages print correct line numbers.
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: c11476aeb8c52dee20edbed9ff762360f80d122b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11476aeb8c52dee20edbed9f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 14 13:08:37 2013 +0900 gdiplus/tests: Convert expect_float() to macro to make failure messages print correct line numbers. --- dlls/gdiplus/tests/region.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 2b4f148..2b8cf76 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -38,13 +38,8 @@ #define expectf(expected, got) expectf_((expected), (got), 0.0001) #define expect_magic(value) ok(*(value) == RGNDATA_MAGIC || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) -#define expect_dword(value, expected) expect(expected, *(value)) - -static inline void expect_float(DWORD *value, FLOAT expected) -{ - FLOAT valuef = *(FLOAT*)value; - expectf(expected, valuef); -} +#define expect_dword(value, expected) expect((expected), *(value)) +#define expect_float(value, expected) expectf((expected), *(FLOAT *)(value)) /* We get shorts back, not INTs like a GpPoint */ typedef struct RegionDataPoint @@ -533,20 +528,20 @@ static void test_getregiondata(void) expect_dword(buf + 3, 2); expect_dword(buf + 4, CombineModeUnion); expect_dword(buf + 5, RGNDATA_RECT); - expect_float(buf + 6, 20); - expect_float(buf + 7, 25); - expect_float(buf + 8, 60); - expect_float(buf + 9, 120); + expect_float(buf + 6, 20.0); + expect_float(buf + 7, 25.0); + expect_float(buf + 8, 60.0); + expect_float(buf + 9, 120.0); expect_dword(buf + 10, RGNDATA_PATH); expect_dword(buf + 11, 68); expect_magic(buf + 12); expect_dword(buf + 13, 6); - expect_float(buf + 14, 0x0); + expect_float(buf + 14, 0.0); - expect_float(buf + 15, 50); + expect_float(buf + 15, 50.0); expect_float(buf + 16, 70.2); - expect_float(buf + 17, 60); + expect_float(buf + 17, 60.0); expect_float(buf + 18, 102.8); expect_float(buf + 19, 55.4); expect_float(buf + 20, 122.4); @@ -554,7 +549,7 @@ static void test_getregiondata(void) expect_float(buf + 22, 60.2); expect_float(buf + 23, 45.6); expect_float(buf + 24, 20.2); - expect_float(buf + 25, 50); + expect_float(buf + 25, 50.0); expect_float(buf + 26, 70.2); expect_dword(buf + 27, 0x01010100); ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */,

1 0

Rico Schüller : d3d10/tests: Enable DepthEnable for reproducible results.
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: 8e5ecee1ceaeb52afbb6ad0e1c466d6fda4284f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5ecee1ceaeb52afbb6ad0e1… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Nov 14 11:26:55 2013 +0100 d3d10/tests: Enable DepthEnable for reproducible results. --- dlls/d3d10/tests/effect.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 7f5ce0a..fa24596 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3618,7 +3618,7 @@ RasterizerState rast_state DepthStencilState ds_state { - DepthEnable = false; /* 0x16 */ + DepthEnable = true; /* 0x16 */ DepthWriteMask = zero; /* 0x17 */ DepthFunc = equal; /* 0x18 */ StencilEnable = true; /* 0x19 */ @@ -3675,8 +3675,8 @@ technique10 tech0 #endif static DWORD fx_test_state_groups[] = { - 0x43425844, 0x519ef0cc, 0x85962b86, 0x3c2272fb, - 0x17942172, 0x00000001, 0x00000794, 0x00000001, + 0x43425844, 0xbf7e3418, 0xd2838ea5, 0x8012c315, + 0x7dd76ca7, 0x00000001, 0x00000794, 0x00000001, 0x00000024, 0x30315846, 0x00000768, 0xfeff1001, 0x00000001, 0x00000000, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x0000035c, @@ -3698,7 +3698,7 @@ static DWORD fx_test_state_groups[] = 0x74617453, 0x00bc0065, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x73640000, 0x6174735f, 0x01006574, 0x04000000, - 0x00000000, 0x01000000, 0x02000000, 0x00000000, + 0x01000000, 0x01000000, 0x02000000, 0x00000000, 0x01000000, 0x02000000, 0x03000000, 0x01000000, 0x04000000, 0x01000000, 0x01000000, 0x02000000, 0x04000000, 0x01000000, 0x02000000, 0x05000000, @@ -3865,7 +3865,7 @@ static void test_effect_state_groups(ID3D10Device *device) v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v); d->lpVtbl->GetBackingStore(d, 0, &ds_desc); - ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); ok(ds_desc.DepthFunc == D3D10_COMPARISON_EQUAL, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); @@ -3950,10 +3950,10 @@ static void test_effect_state_groups(ID3D10Device *device) ID3D10Device_OMGetDepthStencilState(device, &ds_state, &stencil_ref); ID3D10DepthStencilState_GetDesc(ds_state, &ds_desc); - ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); + ok(ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); ok(ds_desc.DepthWriteMask == D3D10_DEPTH_WRITE_MASK_ZERO, "Got unexpected DepthWriteMask %#x.\n", ds_desc.DepthWriteMask); - todo_wine ok(ds_desc.DepthFunc == D3D10_COMPARISON_NEVER, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); + ok(ds_desc.DepthFunc == D3D10_COMPARISON_EQUAL, "Got unexpected DepthFunc %#x.\n", ds_desc.DepthFunc); ok(ds_desc.StencilEnable, "Got unexpected StencilEnable %#x.\n", ds_desc.StencilEnable); ok(ds_desc.StencilReadMask == 0x4, "Got unexpected StencilReadMask %#x.\n", ds_desc.StencilReadMask); ok(ds_desc.StencilWriteMask == 0x5, "Got unexpected StencilWriteMask %#x.\n", ds_desc.StencilWriteMask);

1 0

Francois Gouget : vbscript: Fix a trailing FIXME() '\n'.
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: 73bf5f1ae603aa098ae74905bd8126b1d38877b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73bf5f1ae603aa098ae74905b… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 14 10:02:24 2013 +0100 vbscript: Fix a trailing FIXME() '\n'. --- dlls/vbscript/interp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 07b2a92..4a137cd 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -717,7 +717,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, DISPPARAMS *dp) array = V_ARRAY(v); break; default: - FIXME("Unsupported array type %x\v", V_VT(v)); + FIXME("Unsupported array type %x\n", V_VT(v)); return E_NOTIMPL; }

1 0

Henri Verbeet : wined3d: Create a texture for the logo surface.
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: 94509fbd59b59244379e3efb54e78f676dc09e4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=94509fbd59b59244379e3efb5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 14 10:47:19 2013 +0100 wined3d: Create a texture for the logo surface. --- dlls/wined3d/device.c | 33 ++++++++++++++++++++++----------- dlls/wined3d/swapchain.c | 5 +++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8a1af6b..2d65684 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -551,6 +551,8 @@ struct wined3d_swapchain * CDECL wined3d_device_get_swapchain(const struct wined static void device_load_logo(struct wined3d_device *device, const char *filename) { struct wined3d_color_key color_key; + struct wined3d_resource_desc desc; + struct wined3d_surface *surface; HBITMAP hbm; BITMAP bm; HRESULT hr; @@ -574,31 +576,40 @@ static void device_load_logo(struct wined3d_device *device, const char *filename bm.bmHeight = 32; } - hr = wined3d_surface_create(device, bm.bmWidth, bm.bmHeight, WINED3DFMT_B5G6R5_UNORM, 0, - WINED3D_POOL_SYSTEM_MEM, WINED3D_MULTISAMPLE_NONE, 0, WINED3D_SURFACE_MAPPABLE, - NULL, &wined3d_null_parent_ops, &device->logo_surface); - if (FAILED(hr)) - { - ERR("Wine logo requested, but failed to create surface, hr %#x.\n", hr); + desc.resource_type = WINED3D_RTYPE_TEXTURE; + desc.format = WINED3DFMT_B5G6R5_UNORM; + desc.multisample_type = WINED3D_MULTISAMPLE_NONE; + desc.multisample_quality = 0; + desc.usage = 0; + desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.width = bm.bmWidth; + desc.height = bm.bmHeight; + desc.depth = 1; + desc.size = 0; + if (FAILED(hr = wined3d_texture_create_2d(device, &desc, 1, WINED3D_SURFACE_MAPPABLE, + NULL, &wined3d_null_parent_ops, &device->logo_texture))) + { + ERR("Wine logo requested, but failed to create texture, hr %#x.\n", hr); goto out; } + surface = surface_from_resource(wined3d_texture_get_sub_resource(device->logo_texture, 0)); if (dcb) { - if (FAILED(hr = wined3d_surface_getdc(device->logo_surface, &dcs))) + if (FAILED(hr = wined3d_surface_getdc(surface, &dcs))) goto out; BitBlt(dcs, 0, 0, bm.bmWidth, bm.bmHeight, dcb, 0, 0, SRCCOPY); - wined3d_surface_releasedc(device->logo_surface, dcs); + wined3d_surface_releasedc(surface, dcs); color_key.color_space_low_value = 0; color_key.color_space_high_value = 0; - wined3d_surface_set_color_key(device->logo_surface, WINEDDCKEY_SRCBLT, &color_key); + wined3d_surface_set_color_key(surface, WINEDDCKEY_SRCBLT, &color_key); } else { const struct wined3d_color c = {1.0f, 1.0f, 1.0f, 1.0f}; /* Fill the surface with a white color to show that wined3d is there */ - wined3d_device_color_fill(device, device->logo_surface, NULL, &c); + wined3d_device_color_fill(device, surface, NULL, &c); } out: @@ -1014,8 +1025,8 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) context = context_acquire(device, NULL); gl_info = context->gl_info; - if (device->logo_surface) - wined3d_surface_decref(device->logo_surface); + if (device->logo_texture) + wined3d_texture_decref(device->logo_texture); state_unbind_resources(&device->state); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 7a383fd..1b45cd0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -468,9 +468,10 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT NULL, WINED3D_TEXF_POINT); } - if (swapchain->device->logo_surface) + if (swapchain->device->logo_texture) { - struct wined3d_surface *src_surface = swapchain->device->logo_surface; + struct wined3d_surface *src_surface = surface_from_resource( + wined3d_texture_get_sub_resource(swapchain->device->logo_texture, 0)); RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e4ce84d..3c8cc51 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1924,8 +1924,8 @@ struct wined3d_device GLuint cursorTexture; HCURSOR hardwareCursor; - /* The Wine logo surface */ - struct wined3d_surface *logo_surface; + /* The Wine logo texture */ + struct wined3d_texture *logo_texture; /* Textures for when no other textures are mapped */ UINT dummy_texture_2d[MAX_COMBINED_SAMPLERS];

1 0

Henri Verbeet : ddraw: Set the cube map flags for the root surface in ddraw_surface_create_texture () as well.
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: 9e44fadbfe4316d8c8ce01fca2fc374367b71cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e44fadbfe4316d8c8ce01fca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 14 10:47:18 2013 +0100 ddraw: Set the cube map flags for the root surface in ddraw_surface_create_texture() as well. --- dlls/ddraw/ddraw.c | 7 ------- dlls/ddraw/surface.c | 7 +++---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index be39178..8891ed6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3060,13 +3060,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, desc2.ddsCaps.dwCaps |= DDSCAPS_FRONTBUFFER; } - /* The root surface in a cube map is positive x */ - if(desc2.ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) - { - desc2.ddsCaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; - desc2.ddsCaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; - } - if ((desc2.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && (ddraw->cooperative_level & DDSCL_EXCLUSIVE)) { struct wined3d_swapchain_desc swapchain_desc; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 59abb6b..cad449c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5744,10 +5744,6 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, { resource = wined3d_texture_get_sub_resource(wined3d_texture, i * levels + j); mip = wined3d_resource_get_parent(resource); - - if (mip == root) - continue; - mip_desc = &mip->surface_desc; if (j) @@ -5783,6 +5779,9 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, } + if (mip == root) + continue; + *attach = mip; attach = &mip->complex_array[0]; }

1 0

Henri Verbeet : ddraw: Pass the ddraw texture to ddraw_surface_init().
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: 80055e1fcd0140d610d54bf7d48f3843245c7059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80055e1fcd0140d610d54bf7d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 14 10:47:17 2013 +0100 ddraw: Pass the ddraw texture to ddraw_surface_init(). --- dlls/ddraw/ddraw.c | 19 ++++++------------- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/surface.c | 10 +++++++--- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e1da418..be39178 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2722,13 +2722,13 @@ static HRESULT WINAPI ddraw7_StartModeTest(IDirectDraw7 *iface, SIZE *Modes, DWO return DD_OK; } -static HRESULT ddraw_create_surface(struct ddraw *ddraw, DDSURFACEDESC2 *desc, - const struct wined3d_resource_desc *wined3d_desc, DWORD flags, struct ddraw_surface **surface, UINT version) +static HRESULT ddraw_create_surface(struct ddraw *ddraw, struct ddraw_texture *texture, + const struct wined3d_resource_desc *wined3d_desc, DWORD flags, struct ddraw_surface **surface) { HRESULT hr; - TRACE("ddraw %p, desc %p, wined3d_desc %p, flags %#x, surface %p.\n", - ddraw, desc, wined3d_desc, flags, surface); + TRACE("ddraw %p, texture %p, wined3d_desc %p, flags %#x, surface %p.\n", + ddraw, texture, wined3d_desc, flags, surface); /* Create the Surface object */ *surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**surface)); @@ -2738,7 +2738,7 @@ static HRESULT ddraw_create_surface(struct ddraw *ddraw, DDSURFACEDESC2 *desc, return DDERR_OUTOFVIDEOMEMORY; } - if (FAILED(hr = ddraw_surface_init(*surface, ddraw, desc, wined3d_desc, flags, version))) + if (FAILED(hr = ddraw_surface_init(*surface, ddraw, texture, wined3d_desc, flags))) { WARN("Failed to initialize surface, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, *surface); @@ -5105,8 +5105,6 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); 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", @@ -5119,13 +5117,8 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ 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; - /* FIXME: Validate that format, usage, pool, etc. really make sense. */ - if (FAILED(hr = ddraw_create_surface(ddraw, &desc, wined3d_desc, flags, &ddraw_surface, texture->version))) + if (FAILED(hr = ddraw_create_surface(ddraw, container_parent, wined3d_desc, flags, &ddraw_surface))) return hr; *surface = ddraw_surface->wined3d_surface; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1f8048b..85063b1 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -195,8 +195,8 @@ struct ddraw_texture HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, unsigned int version, struct ddraw_surface **surface) DECLSPEC_HIDDEN; -HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, const DDSURFACEDESC2 *desc, - const struct wined3d_resource_desc *wined3d_desc, DWORD flags, UINT version) DECLSPEC_HIDDEN; +HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, + const struct wined3d_resource_desc *wined3d_desc, DWORD flags) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; static inline struct ddraw_surface *impl_from_IDirect3DTexture(IDirect3DTexture *iface) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c88b9d5..59abb6b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5793,9 +5793,11 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc, return DD_OK; } -HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, const DDSURFACEDESC2 *desc, - const struct wined3d_resource_desc *wined3d_desc, DWORD flags, UINT version) +HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, + const struct wined3d_resource_desc *wined3d_desc, DWORD flags) { + DDSURFACEDESC2 *desc = &surface->surface_desc; + unsigned int version = texture->version; HRESULT hr; surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl; @@ -5826,7 +5828,9 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, c surface->texture_outer = (IUnknown *)&surface->IDirectDrawSurface_iface; } - surface->surface_desc = *desc; + *desc = texture->surface_desc; + desc->dwWidth = wined3d_desc->width; + desc->dwHeight = wined3d_desc->height; surface->first_attached = surface; if (FAILED(hr = wined3d_surface_create(ddraw->wined3d_device, wined3d_desc->width, wined3d_desc->height,

1 0

Henri Verbeet : ddraw: Move the surface desc fixups from ddraw_surface_init () to ddraw_surface_create_texture().
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: 10411fb2a10250a69270ecc5cfe2c53517a6d143 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10411fb2a10250a69270ecc5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 14 10:47:16 2013 +0100 ddraw: Move the surface desc fixups from ddraw_surface_init() to ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 35 +------- dlls/ddraw/ddraw_private.h | 6 +- dlls/ddraw/surface.c | 194 +++++++++++++++++++------------------------ 3 files changed, 94 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10411fb2a10250a69270e…

1 0

Henri Verbeet : ddraw: Set WINED3D_SURFACE_PIN_SYSMEM directly in ddraw_surface_create_texture().
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: 45d37313b8d14468d934fed1951946639c4fecdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d37313b8d14468d934fed19… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 14 10:47:15 2013 +0100 ddraw: Set WINED3D_SURFACE_PIN_SYSMEM directly in ddraw_surface_create_texture(). --- dlls/ddraw/ddraw.c | 10 ++-------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 12 +++++++++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a5422da..87bf33d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2868,12 +2868,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, HRESULT hr; DDSURFACEDESC2 desc2; const DWORD sysvidmem = DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY; - /* Some applications assume surfaces will always be mapped at the same - * address. Some of those also assume that this address is valid even when - * the surface isn't mapped, and that updates done this way will be - * visible on the screen. The game Nox is such an application, - * Commandos: Behind Enemy Lines is another. */ - const DWORD flags = WINED3D_SURFACE_PIN_SYSMEM; TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, DDSD, surface, UnkOuter); @@ -3116,7 +3110,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } - if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, flags, &object))) + if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, &object))) { WARN("Failed to create texture, hr %#x.\n", hr); return hr; @@ -3143,7 +3137,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, { struct ddraw_surface *object2 = NULL; - if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, flags, &object2))) + if (FAILED(hr = ddraw_surface_create_texture(ddraw, &desc2, version, &object2))) { if (version == 7) IDirectDrawSurface7_Release(&object->IDirectDrawSurface7_iface); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 8c37a1e..19f1107 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -194,7 +194,7 @@ struct ddraw_texture }; HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 *desc, - unsigned int version, DWORD surface_flags, struct ddraw_surface **surface) DECLSPEC_HIDDEN; + unsigned int version, struct ddraw_surface **surface) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, DDSURFACEDESC2 *desc, DWORD flags, UINT version) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5b34ec7..2b955df 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5594,7 +5594,7 @@ static const struct wined3d_parent_ops ddraw_texture_wined3d_parent_ops = }; HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 *desc, - unsigned int version, DWORD surface_flags, struct ddraw_surface **surface) + unsigned int version, struct ddraw_surface **surface) { struct ddraw_surface *root, *mip, **attach; struct wined3d_resource_desc wined3d_desc; @@ -5658,17 +5658,23 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, const DDSURFACEDESC2 * wined3d_desc.depth = 1; wined3d_desc.size = 0; + /* Some applications assume surfaces will always be mapped at the same + * address. Some of those also assume that this address is valid even when + * the surface isn't mapped, and that updates done this way will be + * visible on the screen. The game Nox is such an application, + * Commandos: Behind Enemy Lines is another. We set + * WINED3D_SURFACE_PIN_SYSMEM because of this. */ if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) { wined3d_desc.resource_type = WINED3D_RTYPE_CUBE_TEXTURE; hr = wined3d_texture_create_cube(ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); + WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); } else { wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE; hr = wined3d_texture_create_2d(ddraw->wined3d_device, &wined3d_desc, levels, - surface_flags, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); + WINED3D_SURFACE_PIN_SYSMEM, texture, &ddraw_texture_wined3d_parent_ops, &wined3d_texture); } if (FAILED(hr))

1 0

Daniel Lehman : msvcp90: Return last index in string:: find_last_not_of_cstr_substr if input is empty.
by Alexandre Julliard Nov. 14, 2013

Nov. 14, 2013

Module: wine Branch: master Commit: 90cb553e5eaec08187e325a5eb7ec8f3c393ac5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90cb553e5eaec08187e325a5e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Sep 12 16:13:47 2012 -0700 msvcp90: Return last index in string::find_last_not_of_cstr_substr if input is empty. --- dlls/msvcp90/string.c | 4 +- dlls/msvcp90/tests/string.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 23322fe..f412ddb 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1837,7 +1837,7 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_find_last_not_of_cstr_substr( TRACE("%p %p %lu %lu\n", this, find, off, len); - if(len>0 && this->size>0) { + if(this->size>0) { if(off >= this->size) off = this->size-1; @@ -3861,7 +3861,7 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_last_not_of_cstr_substr( TRACE("%p %p %lu %lu\n", this, find, off, len); - if(len>0 && this->size>0) { + if(this->size>0) { if(off >= this->size) off = this->size-1; diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 511d846..6cc06ce 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -78,6 +78,7 @@ static int (__thiscall *p_basic_string_char_compare_substr_cstr_len)(basic_strin static size_t (__thiscall *p_basic_string_char_find_cstr_substr)(basic_string_char*, const char*, size_t, size_t); static size_t (__thiscall *p_basic_string_char_rfind_cstr_substr)(basic_string_char*, const char*, size_t, size_t); static basic_string_char* (__thiscall *p_basic_string_char_replace_cstr)(basic_string_char*, size_t, size_t, const char*); +static size_t (__thiscall *p_basic_string_char_find_last_not_of_cstr_substr)(const basic_string_char*, const char*, size_t, size_t); static size_t *p_basic_string_char_npos; @@ -229,6 +230,8 @@ static BOOL init(void) "?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); SET(p_basic_string_char_replace_cstr, "?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_K0PEBD@Z"); + SET(p_basic_string_char_find_last_not_of_cstr_substr, + "?find_last_not_of@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KPEBD_K1(a)Z"); SET(p_basic_string_char_npos, "?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2_KB"); @@ -295,6 +298,8 @@ static BOOL init(void) "?rfind@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); SET(p_basic_string_char_replace_cstr, "?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)IIPBD@Z"); + SET(p_basic_string_char_find_last_not_of_cstr_substr, + "?find_last_not_of@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDII(a)Z"); SET(p_basic_string_char_npos, "?npos@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@2IB"); @@ -708,6 +713,59 @@ static void test_basic_string_wchar_swap(void) { call_func1(p_basic_string_wchar_dtor, &str2); } +static void test_basic_string_char_find_last_not_of(void) { + struct find_last_not_of_test { + const char *str; + const char *find; + size_t off; + size_t len; + size_t ret; + }; + + int i; + size_t ret; + basic_string_char str; + struct find_last_not_of_test tests[] = { + /* simple cases where find is not in string */ + { "AAAAA", "B", 0, 1, 0 }, + { "AAAAA", "B", 5, 1, 4 }, + { "AAAAA", "BCDE", 0, 4, 0 }, + { "AAAAA", "BCDE", 5, 4, 4 }, + + /* simple cases where find is in string */ + { "AAAAA", "A", 5, 1, -1 }, + { "AAAAB", "A", 5, 1, 4 }, + { "AAAAB", "A", 4, 1, 4 }, + { "AAAAB", "A", 3, 1, -1 }, + { "ABCDE", "ABCDE", 0, 5, -1 }, + { "ABCDE", "ABCDE", 5, 5, -1 }, + { "ABCDE", "AB DE", 5, 5, 2 }, + + /* cases where find appears in multiple spots */ + { "ABABA", "A", 0, 1, -1 }, + { "ABABA", "A", 1, 1, 1 }, + { "ABABA", "A", 2, 1, 1 }, + { "ABABA", "A", 3, 1, 3 }, + + /* using empty strings */ + { "", "", 0, 0, -1 }, + { "", "A", 0, 1, -1 }, + { "ABCDE", "", 0, 0, 0 }, + { "ABCDE", "", 3, 0, 3 }, + { "ABCDE", "", 5, 0, 4 }, + }; + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); + + ret = (size_t)call_func4(p_basic_string_char_find_last_not_of_cstr_substr, + &str, tests[i].find, tests[i].off, tests[i].len); + ok(ret == tests[i].ret, "ret = %li tests[%i].ret = %li\n", (long)ret, i, (long)tests[i].ret); + + call_func1(p_basic_string_char_dtor, &str); + } +} + START_TEST(string) { if(!init()) @@ -723,6 +781,7 @@ START_TEST(string) test_basic_string_char_replace(); test_basic_string_wchar(); test_basic_string_wchar_swap(); + test_basic_string_char_find_last_not_of(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0