wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Andrey Gusev : d3d11/tests: Fix a typo in define.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: a41519d2a3405702fc77cdae875a1a9d8c64cf3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41519d2a3405702fc77cdae8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 14:30:27 2016 +0300 d3d11/tests: Fix a typo in define. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 86f1d24..591a009 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -239,7 +239,7 @@ static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, check_texture_sub_resource_color_(line, texture, sub_resource_idx, expected_color, max_diff); } -#define check_texture_sub_resource_float(t, s, c, d) check_texture_sub_resource_flot_(__LINE__, t, s, c, d) +#define check_texture_sub_resource_float(t, s, c, d) check_texture_sub_resource_float_(__LINE__, t, s, c, d) static void check_texture_sub_resource_float_(unsigned int line, ID3D11Texture2D *texture, unsigned int sub_resource_idx, float expected_value, BYTE max_diff) {

1 0

Francois Gouget : wined3d: Make wined3d_texture_set_dirty() static.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 08736f50486e60489b86b15acc19010ec5375814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08736f50486e60489b86b15ac… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:39:46 2016 +0200 wined3d: Make wined3d_texture_set_dirty() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3a03bb6..53dbb2f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -116,6 +116,11 @@ void wined3d_texture_validate_location(struct wined3d_texture *texture, TRACE("New locations flags are %s.\n", wined3d_debug_location(sub_resource->locations)); } +static void wined3d_texture_set_dirty(struct wined3d_texture *texture) +{ + texture->flags &= ~(WINED3D_TEXTURE_RGB_VALID | WINED3D_TEXTURE_SRGB_VALID); +} + void wined3d_texture_invalidate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) { @@ -430,11 +435,6 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined wined3d_resource_update_draw_binding(&texture->resource); } -void wined3d_texture_set_dirty(struct wined3d_texture *texture) -{ - texture->flags &= ~(WINED3D_TEXTURE_RGB_VALID | WINED3D_TEXTURE_SRGB_VALID); -} - /* Context activation is done by the caller. */ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 59c5800..7ac0319 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2586,7 +2586,6 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Józef Kucia : d3d11: Fix default view descriptions for 2D array textures.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 445ed18b729c8b72fed18b5c919f40a8aab25e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=445ed18b729c8b72fed18b5c9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:31 2016 +0200 d3d11: Fix default view descriptions for 2D array textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 4 ++-- dlls/d3d11/view.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7c66fe2..133d64b 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1307,7 +1307,7 @@ static void test_create_depthstencil_view(void) U(dsv_desc).Texture2DArray.MipSlice); ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", U(dsv_desc).Texture2DArray.FirstArraySlice); - todo_wine ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, + ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); ID3D10DepthStencilView_Release(dsview); @@ -1518,7 +1518,7 @@ static void test_create_rendertarget_view(void) U(rtv_desc).Texture2DArray.MipSlice); ok(!U(rtv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", U(rtv_desc).Texture2DArray.FirstArraySlice); - todo_wine ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", + ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", U(rtv_desc).Texture2DArray.ArraySize); ID3D10RenderTargetView_Release(rtview); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 03b6113..86f1d24 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1835,7 +1835,7 @@ static void test_create_depthstencil_view(void) U(dsv_desc).Texture2DArray.MipSlice); ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", U(dsv_desc).Texture2DArray.FirstArraySlice); - todo_wine ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, + ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); ID3D11DepthStencilView_Release(dsview); @@ -2047,7 +2047,7 @@ static void test_create_rendertarget_view(void) U(rtv_desc).Texture2DArray.MipSlice); ok(!U(rtv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", U(rtv_desc).Texture2DArray.FirstArraySlice); - todo_wine ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", + ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", U(rtv_desc).Texture2DArray.ArraySize); ID3D11RenderTargetView_Release(rtview); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index c4487d3..5d37d03 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -60,7 +60,7 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_DSV_DIMENSION_TEXTURE1DARRAY; desc->u.Texture1DArray.MipSlice = 0; desc->u.Texture1DArray.FirstArraySlice = 0; - desc->u.Texture1DArray.ArraySize = 1; + desc->u.Texture1DArray.ArraySize = texture_desc.ArraySize; } return S_OK; @@ -100,13 +100,13 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DARRAY; desc->u.Texture2DArray.MipSlice = 0; desc->u.Texture2DArray.FirstArraySlice = 0; - desc->u.Texture2DArray.ArraySize = 1; + desc->u.Texture2DArray.ArraySize = texture_desc.ArraySize; } else { desc->ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY; desc->u.Texture2DMSArray.FirstArraySlice = 0; - desc->u.Texture2DMSArray.ArraySize = 1; + desc->u.Texture2DMSArray.ArraySize = texture_desc.ArraySize; } } @@ -156,7 +156,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE1DARRAY; desc->u.Texture1DArray.MipSlice = 0; desc->u.Texture1DArray.FirstArraySlice = 0; - desc->u.Texture1DArray.ArraySize = 1; + desc->u.Texture1DArray.ArraySize = texture_desc.ArraySize; } return S_OK; @@ -197,13 +197,13 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY; desc->u.Texture2DArray.MipSlice = 0; desc->u.Texture2DArray.FirstArraySlice = 0; - desc->u.Texture2DArray.ArraySize = 1; + desc->u.Texture2DArray.ArraySize = texture_desc.ArraySize; } else { desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY; desc->u.Texture2DMSArray.FirstArraySlice = 0; - desc->u.Texture2DMSArray.ArraySize = 1; + desc->u.Texture2DMSArray.ArraySize = texture_desc.ArraySize; } }

1 0

Józef Kucia : wined3d: Implement SM4 round_ne instruction.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: b922dcc6f143d6470d2ba1ad367d67c952113739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b922dcc6f143d6470d2ba1ad3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:30 2016 +0200 wined3d: Implement SM4 round_ne instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 266f5f5..3c59dd1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5352,6 +5352,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RESINFO */ NULL, /* WINED3DSIH_RET */ shader_hw_ret, + /* WINED3DSIH_ROUND_NE */ NULL, /* WINED3DSIH_ROUND_NI */ NULL, /* WINED3DSIH_ROUND_PI */ NULL, /* WINED3DSIH_ROUND_Z */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f8c4a99..9236bf6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3329,6 +3329,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IMIN: instruction = "min"; break; case WINED3DSIH_MAX: instruction = "max"; break; case WINED3DSIH_MIN: instruction = "min"; break; + case WINED3DSIH_ROUND_NE: instruction = "roundEven"; break; case WINED3DSIH_ROUND_NI: instruction = "floor"; break; case WINED3DSIH_ROUND_PI: instruction = "ceil"; break; case WINED3DSIH_ROUND_Z: instruction = "trunc"; break; @@ -8255,6 +8256,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_REP */ shader_glsl_rep, /* WINED3DSIH_RESINFO */ shader_glsl_resinfo, /* WINED3DSIH_RET */ shader_glsl_ret, + /* WINED3DSIH_ROUND_NE */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_PI */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_Z */ shader_glsl_map2gl, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8f8b727..f8c335c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -157,6 +157,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_REP */ "rep", /* WINED3DSIH_RESINFO */ "resinfo", /* WINED3DSIH_RET */ "ret", + /* WINED3DSIH_ROUND_NE */ "round_ne", /* WINED3DSIH_ROUND_NI */ "round_ni", /* WINED3DSIH_ROUND_PI */ "round_pi", /* WINED3DSIH_ROUND_Z */ "round_z", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 35e6659..b922012 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -157,6 +157,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_OR = 0x3c, WINED3D_SM4_OP_RESINFO = 0x3d, WINED3D_SM4_OP_RET = 0x3e, + WINED3D_SM4_OP_ROUND_NE = 0x40, WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_ROUND_PI = 0x42, WINED3D_SM4_OP_ROUND_Z = 0x43, @@ -656,6 +657,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_OR, WINED3DSIH_OR, "u", "uu"}, {WINED3D_SM4_OP_RESINFO, WINED3DSIH_RESINFO, "f", "iR"}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, + {WINED3D_SM4_OP_ROUND_NE, WINED3DSIH_ROUND_NE, "f", "f"}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "f", "f"}, {WINED3D_SM4_OP_ROUND_PI, WINED3DSIH_ROUND_PI, "f", "f"}, {WINED3D_SM4_OP_ROUND_Z, WINED3DSIH_ROUND_Z, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 274f620..59c5800 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -647,6 +647,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_REP, WINED3DSIH_RESINFO, WINED3DSIH_RET, + WINED3DSIH_ROUND_NE, WINED3DSIH_ROUND_NI, WINED3DSIH_ROUND_PI, WINED3DSIH_ROUND_Z,

1 0

Józef Kucia : ddraw/tests: Test creating flippable cubemaps.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 76d4f54c558c8e3760f730247df3cd8703b806a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d4f54c558c8e3760f730247… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:29 2016 +0200 ddraw/tests: Test creating flippable cubemaps. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 424235f..133d105 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5991,6 +5991,8 @@ static void test_flip(void) IDirectDrawSurface7 *frontbuffer, *backbuffer1, *backbuffer2, *backbuffer3, *surface; DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; DDSURFACEDESC2 surface_desc; + D3DDEVICEDESC7 device_desc; + IDirect3DDevice7 *device; BOOL sysmem_primary; IDirectDraw7 *ddraw; DWORD expected_caps; @@ -6227,6 +6229,54 @@ static void test_flip(void) IDirectDrawSurface7_Release(frontbuffer); } + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + goto done; + } + hr = IDirect3DDevice7_GetCaps(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + IDirect3DDevice7_Release(device); + if (!(device_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("Cubemaps are not supported.\n"); + goto done; + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_TEXTURE; + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + surface_desc.dwBackBufferCount = 3; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_FLIP; + surface_desc.dwFlags |= DDSD_BACKBUFFERCOUNT; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_COMPLEX; + surface_desc.ddsCaps.dwCaps |= DDSCAPS_FLIP; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + surface_desc.ddsCaps.dwCaps |= DDSCAPS_COMPLEX; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + surface_desc.dwBackBufferCount = 1; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + surface_desc.dwBackBufferCount = 0; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + +done: refcount = IDirectDraw7_Release(ddraw); ok(refcount == 0, "The ddraw object was not properly freed, refcount %u.\n", refcount); DestroyWindow(window);

1 0

Józef Kucia : ddraw: Forbid creating flippable cubemaps.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 00bf75066b752193d879c3b1d6ce6cbc20646e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bf75066b752193d879c3b1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:28 2016 +0200 ddraw: Forbid creating flippable cubemaps. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e38e668..d36afe7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5735,6 +5735,13 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + { + WARN("Tried to create a flippable cubemap.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } + if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) { FIXME("Flippable textures not implemented.\n"); @@ -5748,6 +5755,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ { WARN("Tried to specify a back buffer count for a non-flippable surface.\n"); HeapFree(GetProcessHeap(), 0, texture); + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_CUBEMAP) + return DDERR_INVALIDPARAMS; return DDERR_INVALIDCAPS; } }

1 0

Józef Kucia : d3d10core/tests: Add tests for 2D texture RTVs.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: ae78672d2515e1486fdae13553427917a8c4d211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae78672d2515e1486fdae1355… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:27 2016 +0200 d3d10core/tests: Add tests for 2D texture RTVs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 187 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a4fa401..7c66fe2 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #define COBJMACROS #include "initguid.h" #include "d3d11.h" @@ -356,6 +357,9 @@ struct d3d10core_test_context ID3D10InputLayout *input_layout; ID3D10VertexShader *vs; ID3D10Buffer *vb; + + ID3D10PixelShader *ps; + ID3D10Buffer *ps_cb; }; #define init_test_context(c) init_test_context_(__LINE__, c) @@ -405,6 +409,10 @@ static void release_test_context_(unsigned int line, struct d3d10core_test_conte ID3D10VertexShader_Release(context->vs); if (context->vb) ID3D10Buffer_Release(context->vb); + if (context->ps) + ID3D10PixelShader_Release(context->ps); + if (context->ps_cb) + ID3D10Buffer_Release(context->ps_cb); ID3D10RenderTargetView_Release(context->backbuffer_rtv); ID3D10Texture2D_Release(context->backbuffer); @@ -490,6 +498,57 @@ static void draw_quad_(unsigned int line, struct d3d10core_test_context *context ID3D10Device_Draw(context->device, 4, 0); } +#define draw_color_quad(c, color) draw_color_quad_(__LINE__, c, color) +static void draw_color_quad_(unsigned int line, struct d3d10core_test_context *context, const struct vec4 *color) +{ + static const DWORD ps_color_code[] = + { +#if 0 + float4 color; + + float4 main() : SV_TARGET + { + return color; + } +#endif + 0x43425844, 0x80f1c810, 0xdacbbc8b, 0xe07b133e, 0x3059cbfa, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000040, 0x00000040, 0x00000010, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, + 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + + ID3D10Device *device = context->device; + D3D10_BUFFER_DESC buffer_desc; + HRESULT hr; + + if (!context->ps) + { + hr = ID3D10Device_CreatePixelShader(device, ps_color_code, sizeof(ps_color_code), &context->ps); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + } + + if (!context->ps_cb) + { + buffer_desc.ByteWidth = sizeof(*color); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &context->ps_cb); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + } + + ID3D10Device_PSSetShader(device, context->ps); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &context->ps_cb); + + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)context->ps_cb, 0, NULL, color, 0, 0); + + draw_quad_(line, context); +} + static void test_feature_level(void) { D3D_FEATURE_LEVEL feature_level; @@ -1469,6 +1528,133 @@ static void test_create_rendertarget_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_render_target_views(void) +{ + struct texture + { + UINT miplevel_count; + UINT array_size; + }; + struct rtv + { + DXGI_FORMAT format; + D3D10_RTV_DIMENSION dimension; + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; + }; + + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static struct test + { + struct texture texture; + struct rtv rtv; + DWORD expected_colors[4]; + } + tests[] = + { + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 1}, + {0x00000000, 0xff0000ff}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 1, 0, 1}, + {0x00000000, 0xff0000ff}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 1, 1}, + {0x00000000, 0xff0000ff, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 2, 1}, + {0x00000000, 0x00000000, 0xff0000ff, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 3, 1}, + {0x00000000, 0x00000000, 0x00000000, 0xff0000ff}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 4}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 1, 1}, + {0x00000000, 0x00000000, 0xff0000ff, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 1, 0, 1}, + {0x00000000, 0xff0000ff, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 1, 1, 1}, + {0x00000000, 0x00000000, 0x00000000, 0xff0000ff}}, + }; + + struct d3d10core_test_context test_context; + D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Texture2D *texture; + ID3D10Device *device; + unsigned int i, j; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 32; + texture_desc.Height = 32; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + const struct test *test = &tests[i]; + unsigned int sub_resource_count; + + texture_desc.MipLevels = test->texture.miplevel_count; + texture_desc.ArraySize = test->texture.array_size; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + + rtv_desc.Format = texture_desc.Format; + rtv_desc.ViewDimension = test->rtv.dimension; + if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2D) + { + U(rtv_desc).Texture2D.MipSlice = test->rtv.miplevel_idx; + } + else if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2DARRAY) + { + U(rtv_desc).Texture2DArray.MipSlice = test->rtv.miplevel_idx; + U(rtv_desc).Texture2DArray.FirstArraySlice = test->rtv.layer_idx; + U(rtv_desc).Texture2DArray.ArraySize = test->rtv.layer_count; + } + else + { + trace("Test %u: Unhandled view dimension %#x.\n", i, test->rtv.dimension); + } + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); + ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + draw_color_quad(&test_context, &red); + + sub_resource_count = texture_desc.MipLevels * texture_desc.ArraySize; + assert(sub_resource_count <= sizeof(test->expected_colors) / sizeof(*test->expected_colors)); + for (j = 0; j < sub_resource_count; ++j) + check_texture_sub_resource_color(texture, j, test->expected_colors[j], 1); + + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + } + + release_test_context(&test_context); +} + static void test_create_shader_resource_view(void) { D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; @@ -6471,6 +6657,7 @@ START_TEST(device) test_create_depthstencil_view(); test_depthstencil_view_interfaces(); test_create_rendertarget_view(); + test_render_target_views(); test_create_shader_resource_view(); test_create_shader(); test_create_sampler_state();

1 0

Józef Kucia : d3d10core/tests: Check all sub-resources in check_texture_* functions.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 938545c61c99280622509a6934ab5feba1946e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938545c61c99280622509a693… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:26 2016 +0200 d3d10core/tests: Check all sub-resources in check_texture_* functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 83 ++++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8e69656..a4fa401 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -91,12 +91,14 @@ struct texture_readback { ID3D10Texture2D *texture; D3D10_MAPPED_TEXTURE2D mapped_texture; - unsigned int width, height; + unsigned int width, height, sub_resource_idx; }; -static void get_texture_readback(ID3D10Texture2D *texture, struct texture_readback *rb) +static void get_texture_readback(ID3D10Texture2D *texture, unsigned int sub_resource_idx, + struct texture_readback *rb) { D3D10_TEXTURE2D_DESC texture_desc; + unsigned int miplevel; ID3D10Device *device; HRESULT hr; @@ -116,13 +118,16 @@ static void get_texture_readback(ID3D10Texture2D *texture, struct texture_readba return; } - rb->width = texture_desc.Width; - rb->height = texture_desc.Height; + miplevel = sub_resource_idx % texture_desc.MipLevels; + rb->width = max(1, texture_desc.Width >> miplevel); + rb->height = max(1, texture_desc.Height >> miplevel); + rb->sub_resource_idx = sub_resource_idx; ID3D10Device_CopyResource(device, (ID3D10Resource *)rb->texture, (ID3D10Resource *)texture); - if (FAILED(hr = ID3D10Texture2D_Map(rb->texture, 0, D3D10_MAP_READ, 0, &rb->mapped_texture))) + if (FAILED(hr = ID3D10Texture2D_Map(rb->texture, sub_resource_idx, + D3D10_MAP_READ, 0, &rb->mapped_texture))) { - trace("Failed to map texture, hr %#x.\n", hr); + trace("Failed to map sub-resource %u, hr %#x.\n", sub_resource_idx, hr); ID3D10Texture2D_Release(rb->texture); rb->texture = NULL; } @@ -142,7 +147,7 @@ static float get_readback_float(struct texture_readback *rb, unsigned int x, uns static void release_texture_readback(struct texture_readback *rb) { - ID3D10Texture2D_Unmap(rb->texture, 0); + ID3D10Texture2D_Unmap(rb->texture, rb->sub_resource_idx); ID3D10Texture2D_Release(rb->texture); } @@ -151,23 +156,23 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne struct texture_readback rb; DWORD color; - get_texture_readback(texture, &rb); + get_texture_readback(texture, 0, &rb); color = get_readback_color(&rb, x, y); release_texture_readback(&rb); return color; } -#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) -static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, - DWORD expected_color, BYTE max_diff) +#define check_texture_sub_resource_color(t, s, c, d) check_texture_sub_resource_color_(__LINE__, t, s, c, d) +static void check_texture_sub_resource_color_(unsigned int line, ID3D10Texture2D *texture, + unsigned int sub_resource_idx, DWORD expected_color, BYTE max_diff) { struct texture_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; DWORD color = 0; - get_texture_readback(texture, &rb); + get_texture_readback(texture, sub_resource_idx, &rb); for (y = 0; y < rb.height; ++y) { for (x = 0; x < rb.width; ++x) @@ -184,19 +189,33 @@ static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, } release_texture_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected color 0x%08x at (%u, %u).\n", color, x, y); + "Got unexpected color 0x%08x at (%u, %u), sub-resource %u.\n", + color, x, y, sub_resource_idx); } -#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) -static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, - float expected_value, BYTE max_diff) +#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) +static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, + DWORD expected_color, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE2D_DESC texture_desc; + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_color_(line, texture, sub_resource_idx, expected_color, max_diff); +} + +#define check_texture_sub_resource_float(r, s, f, d) check_texture_sub_resource_float_(__LINE__, r, s, f, d) +static void check_texture_sub_resource_float_(unsigned int line, ID3D10Texture2D *texture, + unsigned int sub_resource_idx, float expected_value, BYTE max_diff) { struct texture_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; float value = 0.0f; - get_texture_readback(texture, &rb); + get_texture_readback(texture, sub_resource_idx, &rb); for (y = 0; y < rb.height; ++y) { for (x = 0; x < rb.width; ++x) @@ -213,7 +232,21 @@ static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, } release_texture_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected value %.8e at (%u, %u).\n", value, x, y); + "Got unexpected value %.8e at (%u, %u), sub-resource %u.\n", + value, x, y, sub_resource_idx); +} + +#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) +static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, + float expected_value, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE2D_DESC texture_desc; + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_float_(line, texture, sub_resource_idx, expected_value, max_diff); } static ID3D10Device *create_device(void) @@ -4255,7 +4288,7 @@ static void test_texture(void) draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (y = 0; y < 4; ++y) { for (x = 0; x < 4; ++x) @@ -5121,7 +5154,7 @@ static void test_update_subresource(void) ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, &box, bitmap_data, 4 * sizeof(*bitmap_data), 0); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5137,7 +5170,7 @@ static void test_update_subresource(void) ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, NULL, bitmap_data, 4 * sizeof(*bitmap_data), 0); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5321,7 +5354,7 @@ static void test_copy_subresource_region(void) ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 0, 0, 0, (ID3D10Resource *)src_texture, 0, &box); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5337,7 +5370,7 @@ static void test_copy_subresource_region(void) ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 0, 0, 0, (ID3D10Resource *)src_texture, 0, NULL); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5419,7 +5452,7 @@ static void test_copy_subresource_region(void) ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_buffer, 0, 0, 0, 0, (ID3D10Resource *)src_buffer, 0, &box); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -6402,7 +6435,7 @@ static void test_draw_depth_only(void) draw_quad(&test_context); } } - get_texture_readback(texture, &rb); + get_texture_readback(texture, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j)

1 0

Francois Gouget : riched20/tests: Fix a spelling error in an editor comment.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 155eccd9c67b981e4f535aac6ed9a859268dbc37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=155eccd9c67b981e4f535aac6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:32:50 2016 +0200 riched20/tests: Fix a spelling error in an editor comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 31d5128..fd00487 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5046,7 +5046,7 @@ static void test_EM_REPLACESEL(int redraw) todo_wine ok(!strcmp(buffer, "WTestSomeTextne"), "WM_GETTEXT returned incorrect string\n"); if (!redraw) - /* This is needed to avoid interferring with keybd_event calls + /* This is needed to avoid interfering with keybd_event calls * on other tests that simulate keyboard events. */ SendMessageA(hwndRichEdit, WM_SETREDRAW, TRUE, 0);

1 0

Andrey Gusev : riched20: Fix a typo in TRACE() message.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 33c1a16a18c9ace0079f6569df49f1ecd83e0b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c1a16a18c9ace0079f6569d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 16:37:05 2016 +0300 riched20: Fix a typo in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4b0bfcf..177f303 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -389,7 +389,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, nCharsToDelete is a number of chars to delete from THIS run */ nChars -= nCharsToDelete; shift -= nCharsToDelete; - TRACE("Deleting %d (remaning %d) chars at %d in %s (%d)\n", + TRACE("Deleting %d (remaining %d) chars at %d in %s (%d)\n", nCharsToDelete, nChars, c.nOffset, debugstr_run( run ), run->len);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016