- wine-devel - winehq.org

[PATCH] po: Update Sinhala translation
by Isira Seneviratne 11 Jan '19

11 Jan '19

2 1

[PATCH 2/2] wined3d: Support WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST in the GLSL blitter.
by Henri Verbeet 11 Jan '19

11 Jan '19

Both the ARBfp and fixed-function blitter support WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST, but the fixed-function blitter requires a compatibility context, and the ARBfp blitter isn't created when the GLSL blitter is available. This fixes a regression introduced by commit 6fc027e5acfb7f7c7f50af421658e5442e896588. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45874 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fc0b2c78bd0..d6fd565bd80 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13116,7 +13116,8 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY + && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) { TRACE("Unsupported blit_op %#x.\n", blit_op); return FALSE; @@ -13168,6 +13169,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *staging_texture = NULL; struct wined3d_glsl_blitter *glsl_blitter; + struct wined3d_color_key alpha_test_key; struct glsl_blitter_program *program; struct wined3d_blitter *next; unsigned int src_level; @@ -13284,8 +13286,20 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli context_invalidate_state(context, STATE_FRAMEBUFFER); } - if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, - op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY))) + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) + { + const struct wined3d_format *f = src_texture->resource.format; + + alpha_test_key.color_space_low_value = 0; + alpha_test_key.color_space_high_value = ~(((1u << f->alpha_size) - 1) << f->alpha_offset); + colour_key = &alpha_test_key; + } + else if (op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + { + colour_key = NULL; + } + + if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, !!colour_key))) { ERR("Failed to get blitter program.\n"); return dst_location; @@ -13310,7 +13324,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli default: break; } - if (op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + if (colour_key) { struct wined3d_color float_key[2]; -- 2.11.0

1 0

[PATCH 1/2] wined3d: Support WINED3D_BLIT_OP_COLOR_BLIT_CKEY in the GLSL blitter.
by Henri Verbeet 11 Jan '19

11 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45874 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5f1a86608ba..fc0b2c78bd0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7659,6 +7659,14 @@ static void shader_glsl_generate_alpha_test(struct wined3d_string_buffer *buffer shader_addline(buffer, " discard;\n"); } +static void shader_glsl_generate_colour_key_test(struct wined3d_string_buffer *buffer, + const char *colour, const char *colour_key_low, const char *colour_key_high) +{ + shader_addline(buffer, "if (all(greaterThanEqual(%s, %s)) && all(lessThan(%s, %s)))\n", + colour, colour_key_low, colour, colour_key_high); + shader_addline(buffer, " discard;\n"); +} + static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info) { @@ -9952,10 +9960,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } if (settings->color_key_enabled) - { - shader_addline(buffer, "if (all(greaterThanEqual(tex0, color_key[0])) && all(lessThan(tex0, color_key[1])))\n"); - shader_addline(buffer, " discard;\n"); - } + shader_glsl_generate_colour_key_test(buffer, "tex0", "color_key[0]", "color_key[1]"); shader_addline(buffer, "ret = ffp_varying_diffuse;\n"); @@ -12499,7 +12504,7 @@ struct glsl_blitter_args { GLenum texture_type; struct color_fixup_desc fixup; - unsigned short padding; + unsigned short use_colour_key; }; struct glsl_blitter_program @@ -12573,6 +12578,8 @@ static void glsl_blitter_generate_p8_shader(struct wined3d_string_buffer *buffer shader_addline(buffer, " index = (index * 255.0 + 0.5) / 256.0;\n"); shader_addline(buffer, " %s = texture%s(sampler_palette, index);\n", output, needs_legacy_glsl_syntax(gl_info) ? "1D" : ""); + if (args->use_colour_key) + shader_glsl_generate_colour_key_test(buffer, output, "colour_key.low", "colour_key.high"); shader_addline(buffer, "}\n"); } @@ -12866,6 +12873,8 @@ static void glsl_blitter_generate_yuv_shader(struct wined3d_string_buffer *buffe shader_addline(buffer, " %s.x = luminance + chroma.x * yuv_coef.x;\n", output); shader_addline(buffer, " %s.y = luminance + chroma.y * yuv_coef.y + chroma.x * yuv_coef.z;\n", output); shader_addline(buffer, " %s.z = luminance + chroma.y * yuv_coef.w;\n", output); + if (args->use_colour_key) + shader_glsl_generate_colour_key_test(buffer, output, "colour_key.low", "colour_key.high"); shader_addline(buffer, "}\n"); } @@ -12878,6 +12887,8 @@ static void glsl_blitter_generate_plain_shader(struct wined3d_string_buffer *buf shader_addline(buffer, " %s = texture%s(sampler, out_texcoord.%s);\n", output, needs_legacy_glsl_syntax(gl_info) ? tex_type : "", swizzle); shader_glsl_color_correction_ext(buffer, output, WINED3DSP_WRITEMASK_ALL, args->fixup); + if (args->use_colour_key) + shader_glsl_generate_colour_key_test(buffer, output, "colour_key.low", "colour_key.high"); shader_addline(buffer, "}\n"); } @@ -12947,6 +12958,12 @@ static GLuint glsl_blitter_generate_program(struct wined3d_glsl_blitter *blitter string_buffer_clear(buffer); shader_glsl_add_version_declaration(buffer, gl_info); shader_addline(buffer, "uniform sampler%s sampler;\n", tex_type); + if (args->use_colour_key) + { + shader_addline(buffer, "uniform struct\n{\n"); + shader_addline(buffer, " vec4 low, high;\n"); + shader_addline(buffer, "} colour_key;\n"); + } declare_in_varying(gl_info, buffer, FALSE, "vec3 out_texcoord;\n"); /* TODO: Declare the out variable with the correct type (and put it in the * blitter args). */ @@ -13041,7 +13058,7 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, /* Context activation is done by the caller. */ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl_blitter *blitter, - struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl) + struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl, BOOL use_colour_key) { const struct wined3d_gl_info *gl_info = context->gl_info; struct glsl_blitter_program *program; @@ -13051,6 +13068,7 @@ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl memset(&args, 0, sizeof(args)); args.texture_type = texture_gl->target; args.fixup = texture_gl->t.resource.format->color_fixup; + args.use_colour_key = use_colour_key; if ((entry = wine_rb_get(&blitter->programs, &args))) return WINE_RB_ENTRY_VALUE(entry, struct glsl_blitter_program, entry); @@ -13098,7 +13116,7 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT) + if (blit_op != WINED3D_BLIT_OP_COLOR_BLIT && blit_op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY) { TRACE("Unsupported blit_op %#x.\n", blit_op); return FALSE; @@ -13266,7 +13284,8 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli context_invalidate_state(context, STATE_FRAMEBUFFER); } - if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl))) + if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, + op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY))) { ERR("Failed to get blitter program.\n"); return dst_location; @@ -13291,6 +13310,16 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli default: break; } + if (op == WINED3D_BLIT_OP_COLOR_BLIT_CKEY) + { + struct wined3d_color float_key[2]; + + wined3d_format_get_float_color_key(src_texture->resource.format, colour_key, float_key); + location = GL_EXTCALL(glGetUniformLocation(program->id, "colour_key.low")); + GL_EXTCALL(glUniform4fv(location, 1, &float_key[0].r)); + location = GL_EXTCALL(glGetUniformLocation(program->id, "colour_key.high")); + GL_EXTCALL(glUniform4fv(location, 1, &float_key[1].r)); + } context_draw_shaded_quad(context, src_texture_gl, src_sub_resource_idx, src_rect, dst_rect, filter); GL_EXTCALL(glUseProgram(0)); -- 2.11.0

1 0

[PATCH] msacm32: Reference count local drivers.
by Zhiyi Zhang 11 Jan '19

11 Jan '19

One local driver can be assigned to multiple driver ids. When releasing the driver id, check if the reference count of a local driver is one before actually releasing the local driver. Fix Kindred Spirits on the Roof (Steam ID: 402620) crashing at multiple places. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/msacm32/internal.c | 12 +++++++++++- dlls/msacm32/wineacm.h | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index aad071e8ad..7d324a8b27 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -737,12 +737,17 @@ static PWINE_ACMLOCALDRIVER MSACM_pLastACMLocalDriver; static PWINE_ACMLOCALDRIVER MSACM_UnregisterLocalDriver(PWINE_ACMLOCALDRIVER paldrv) { PWINE_ACMLOCALDRIVER pNextACMLocalDriver; + LONG ref; if (paldrv->pACMInstList) { ERR("local driver instances still present after closing all drivers - memory leak\n"); return NULL; } + ref = InterlockedDecrement(&paldrv->ref); + if (ref) + return paldrv; + if (paldrv == MSACM_pFirstACMLocalDriver) MSACM_pFirstACMLocalDriver = paldrv->pNextACMLocalDrv; if (paldrv == MSACM_pLastACMLocalDriver) @@ -883,7 +888,11 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri /* look up previous instance of local driver module */ for (paldrv = MSACM_pFirstACMLocalDriver; paldrv; paldrv = paldrv->pNextACMLocalDrv) { - if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) return paldrv; + if (paldrv->hModule == hModule && paldrv->lpDrvProc == lpDriverProc) + { + InterlockedIncrement(&paldrv->ref); + return paldrv; + } } paldrv = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMLOCALDRIVER)); @@ -892,6 +901,7 @@ PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDri paldrv->hModule = hModule; paldrv->lpDrvProc = lpDriverProc; paldrv->pACMInstList = NULL; + paldrv->ref = 1; paldrv->pNextACMLocalDrv = NULL; paldrv->pPrevACMLocalDrv = MSACM_pLastACMLocalDriver; diff --git a/dlls/msacm32/wineacm.h b/dlls/msacm32/wineacm.h index 406e01bf21..98d1ab5a2c 100644 --- a/dlls/msacm32/wineacm.h +++ b/dlls/msacm32/wineacm.h @@ -52,6 +52,7 @@ typedef struct _WINE_ACMLOCALDRIVER PWINE_ACMLOCALDRIVERINST pACMInstList; PWINE_ACMLOCALDRIVER pNextACMLocalDrv; PWINE_ACMLOCALDRIVER pPrevACMLocalDrv; + LONG ref; } WINE_ACMLOCALDRIVER; typedef struct _WINE_ACMLOCALDRIVERINST -- 2.19.2

3 3

[PATCH v2] dsound: Trace ref in a consistent way
by Alistair Leslie-Hughes 11 Jan '19

11 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/buffer.c | 16 ++++++++-------- dlls/dsound/capture.c | 10 +++++----- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/primary.c | 4 ++-- dlls/dsound/propset.c | 4 ++-- dlls/dsound/sound3d.c | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index cb7ff78..5262628 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -60,7 +60,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -344,7 +344,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_AddRef(IDirectSoundBuffer8 *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -361,7 +361,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) ref = capped_refcount_dec(&This->ref); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now: %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -369,7 +369,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -1237,7 +1237,7 @@ static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&This->refiks); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1254,7 +1254,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) ref = capped_refcount_dec(&This->refiks); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now: %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -1262,7 +1262,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index c849624..8fc2749 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -137,7 +137,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -150,7 +150,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -263,7 +263,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_AddRef(IDirectSoundCaptureBuff IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -276,7 +276,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_Release(IDirectSoundCaptureBuf IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -851,7 +851,7 @@ static ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) { ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref + 1); + TRACE("(%p) ref %d\n", device, ref); if (!ref) { TRACE("deleting object\n"); diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 71ede7d..2fbb3ce 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -189,7 +189,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) { ULONG ref = InterlockedIncrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref - 1); + TRACE("(%p) ref %d\n", device, ref); return ref; } @@ -197,7 +197,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) { HRESULT hr; ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref was %u\n", device, ref + 1); + TRACE("(%p) ref %d\n", device, ref); if (!ref) { int i; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f74db2f..a30fc5e 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -675,7 +675,7 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer8 *iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); return ref; @@ -704,7 +704,7 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer8 *iface) if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) primary ref is now %d\n", This, ref); + TRACE("(%p) primary ref %d\n", This, ref); return ref; } diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 0272ac0..92aae8f 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -81,7 +81,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -89,7 +89,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 118bb60..27fc416 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -396,7 +396,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(IDirectSound3DBuffer *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -409,7 +409,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -744,7 +744,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *if IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -761,7 +761,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(IDirectSound3DListener *i if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } -- 1.9.1

2 1

[PATCH v1 1/2] kernel32: Fix MoveFileWithProgressW from closing same handle twice
by Jon Doron 11 Jan '19

11 Jan '19

Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 41f0d34aa4..554f96a2b1 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1392,6 +1392,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } NtClose( dest_handle ); + dest_handle = NULL; } else if (status != STATUS_OBJECT_NAME_NOT_FOUND) { -- 2.19.2

1 1

[PATCH 6/6] d3d9/tests: Add test for clearing surfaces with different sizes.
by Józef Kucia 10 Jan '19

10 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 107 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b4f512ed0aff..9a62f873dce3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -239,10 +239,10 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) #define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color) { + D3DCOLOR color = 0xdeadbeef; struct surface_readback rb; D3DSURFACE_DESC desc; unsigned int x, y; - D3DCOLOR color; HRESULT hr; hr = IDirect3DSurface9_GetDesc(rt, &desc); @@ -261,7 +261,7 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR e break; } release_surface_readback(&rb); - ok_(__FILE__, line)(color == 0x000000ff, "Got unexpected color 0x%08x.\n", color); + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -1349,6 +1349,108 @@ done: DestroyWindow(window); } +static void test_clear_different_size_surfaces(void) +{ + IDirect3DSurface9 *ds, *rt, *rt2; + IDirect3DDevice9 *device; + D3DFORMAT ds_format; + D3DLOCKED_RECT lr; + unsigned int x, y; + D3DVIEWPORT9 vp; + IDirect3D9 *d3d; + D3DCAPS9 caps; + WORD *depth; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 1, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 2, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt2, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + + if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) + { + ds_format = D3DFMT_D16_LOCKABLE; + } + else + { + ds_format = D3DFMT_D24S8; + } + + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 4, 4, ds_format, + D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(hr == D3D_OK, "Failed to create depth surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(hr == D3D_OK, "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + if (caps.NumSimultaneousRTs >= 2) + { + hr = IDirect3DDevice9_SetRenderTarget(device, 1, rt2); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + } + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 640; + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.5f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + check_rt_color(rt, 0x00ff0000); + + if (caps.NumSimultaneousRTs >= 2) + check_rt_color(rt2, 0x00ff0000); + + if (ds_format == D3DFMT_D16_LOCKABLE) + { + hr = IDirect3DSurface9_LockRect(ds, &lr, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock rect, hr %#x.\n", hr); + for (y = 0; y < 4; ++y) + { + depth = (WORD *)((BYTE *)lr.pBits + y * lr.Pitch); + for (x = 0; x < 4; ++x) + { + ok(abs(depth[x] - 0x7fff) <= 2, "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); + } + } + hr = IDirect3DSurface9_UnlockRect(ds); + ok(hr == D3D_OK, "Failed to unlock rect, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + } + else + { + skip("D3DFMT_D16_LOCKABLE is not supported.\n"); + } + + IDirect3DSurface9_Release(rt); + IDirect3DSurface9_Release(rt2); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void color_fill_test(void) { IDirect3DSurface9 *surface; @@ -24465,6 +24567,7 @@ START_TEST(visual) lighting_test(); test_specular_lighting(); clear_test(); + test_clear_different_size_surfaces(); color_fill_test(); fog_test(); test_cube_wrap(); -- 2.19.2

2 1

[PATCH 5/6] wined3d: Do not limit draw rect to intersection of all render target views.
by Józef Kucia 10 Jan '19

10 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c67cc6ce3f0f..7471d24e7ee7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -605,7 +605,6 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; unsigned int rt_count, i; - RECT view_rect; rt_count = flags & WINED3DCLEAR_TARGET ? cs->device->adapter->d3d_info.limits.max_rt_count : 0; @@ -627,17 +626,11 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * for (i = 0; i < rt_count; ++i) { if ((view = state->fb->render_targets[i])) - { - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); wined3d_resource_acquire(view->resource); - } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { view = state->fb->depth_stencil; - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); wined3d_resource_acquire(view->resource); } -- 2.19.2

2 1

[PATCH 4/6] wined3d: Limit surface_cpu_blt_colour_fill() to dimensions of render target view.
by Józef Kucia 10 Jan '19

10 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5dbac1c6aec9..1b6e7a5a0654 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2970,8 +2970,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; - w = box->right - box->left; - h = box->bottom - box->top; + w = min(box->right, view->width) - box->left; + h = min(box->bottom, view->height) - box->top; texture = texture_from_resource(view->resource); map_binding = texture->resource.map_binding; -- 2.19.2

2 1

[PATCH 3/6] wined3d: Split clears for different size resources in ffp_blitter_clear().
by Józef Kucia 10 Jan '19

10 Jan '19

We cannot reliably clear attachments of different sizes using a single glClear() command. The OpenGL spec says: "If the attachment sizes are not all identical, the results of rendering are defined only within the largest area that can fit in all of the attachments. This area is defined as the intersection of rectangles having a lower left of (0, 0) and an upper right of (width, height) for each attachment. Contents of attachments outside this area are undefined after execution of a rendering command (as defined in section 2.4)." Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 61 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a36d010e7930..5dbac1c6aec9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2052,8 +2052,12 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { + BOOL have_previous_rect = FALSE, have_identical_size = TRUE; struct wined3d_rendertarget_view *view; + struct wined3d_fb_state tmp_fb; + unsigned int next_rt_count = 0; struct wined3d_blitter *next; + RECT previous_rect, rect; DWORD next_flags = 0; unsigned int i; @@ -2071,6 +2075,8 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de { next_flags |= WINED3DCLEAR_TARGET; flags &= ~WINED3DCLEAR_TARGET; + next_rt_count = rt_count; + rt_count = 0; break; } @@ -2089,11 +2095,60 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } if (flags) - device_clear_render_targets(device, flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, - clear_rects, draw_rect, flags, colour, depth, stencil); + { + for (i = 0; i < rt_count; ++i) + { + if (!(view = fb->render_targets[i])) + continue; + + SetRect(&rect, 0, 0, view->width, view->height); + IntersectRect(&rect, draw_rect, &rect); + if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + have_identical_size = FALSE; + previous_rect = rect; + have_previous_rect = TRUE; + } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + view = fb->depth_stencil; + + SetRect(&rect, 0, 0, view->width, view->height); + IntersectRect(&rect, draw_rect, &rect); + if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + have_identical_size = FALSE; + previous_rect = rect; + have_previous_rect = TRUE; + } + + if (have_identical_size) + { + device_clear_render_targets(device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); + } + else + { + for (i = 0; i < rt_count; ++i) + { + if (!(view = fb->render_targets[i])) + continue; + + tmp_fb.render_targets[0] = view; + tmp_fb.depth_stencil = NULL; + device_clear_render_targets(device, 1, &tmp_fb, rect_count, + clear_rects, draw_rect, WINED3DCLEAR_TARGET, colour, depth, stencil); + } + if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) + { + tmp_fb.render_targets[0] = NULL; + tmp_fb.depth_stencil = fb->depth_stencil; + device_clear_render_targets(device, 0, &tmp_fb, rect_count, + clear_rects, draw_rect, flags & ~WINED3DCLEAR_TARGET, colour, depth, stencil); + } + } + } if (next_flags && (next = blitter->next)) - next->ops->blitter_clear(next, device, next_flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, + next->ops->blitter_clear(next, device, next_rt_count, fb, rect_count, clear_rects, draw_rect, next_flags, colour, depth, stencil); } -- 2.19.2

2 1

[PATCH 2/6] wined3d: Use accurate rt_count in ffp_blitter_clear().
by Józef Kucia 10 Jan '19

10 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 85f94899cd60..a36d010e7930 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2089,11 +2089,11 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } if (flags) - device_clear_render_targets(device, rt_count, fb, rect_count, + device_clear_render_targets(device, flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, clear_rects, draw_rect, flags, colour, depth, stencil); if (next_flags && (next = blitter->next)) - next->ops->blitter_clear(next, device, rt_count, fb, rect_count, + next->ops->blitter_clear(next, device, next_flags & WINED3DCLEAR_TARGET ? rt_count : 0, fb, rect_count, clear_rects, draw_rect, next_flags, colour, depth, stencil); } -- 2.19.2

2 1

[PATCH 1/6] wined3d: Sanitise clear flags passed to blitters.
by Józef Kucia 10 Jan '19

10 Jan '19

In order to not trigger "if (flags)" conditions in ffp_blitter_clear() unnecessarily. Also, avoids passing WINED3DCLEAR_SYNCHRONOUS, which is handled at the level of command stream. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index aa8eef7a2e01..c67cc6ce3f0f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -612,7 +612,7 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; - op->flags = flags; + op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); op->rt_count = rt_count; op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); @@ -655,7 +655,7 @@ void wined3d_cs_emit_clear_rendertarget_view(struct wined3d_cs *cs, struct wined op->fb = (void *)&op->rects[1]; op->opcode = WINED3D_CS_OP_CLEAR; - op->flags = flags; + op->flags = flags & (WINED3DCLEAR_TARGET | WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); if (flags & WINED3DCLEAR_TARGET) { op->rt_count = 1; -- 2.19.2

2 1

[PATCH 3/3] windowscodecs: Simplify the buffer size check in copy_pixels() helper.
by Dmitry Timoshkov 10 Jan '19

10 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 7650c755ba..78281519b8 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -82,7 +82,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if (dststride < bytesperrow) return E_INVALIDARG; - if ((dststride * (rc->Height-1)) + ((rc->Width * bpp) + 7)/8 > dstbuffersize) + if ((dststride * (rc->Height-1)) + bytesperrow > dstbuffersize) return E_INVALIDARG; /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */ -- 2.20.1

2 1

[PATCH] windowscodecs/tests: Fix typos in TIFF test data.
by Dmitry Timoshkov 10 Jan '19

10 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 8da843bdcc..c15e4985e6 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -220,7 +220,7 @@ static struct tiff_resolution_image_data { 0x11, 0x22, 0x33, 0 } }; -static const struct +static const struct tiff_24bpp_data { USHORT byte_order; USHORT version; @@ -247,12 +247,12 @@ static const struct { 0x102, IFD_SHORT, 1, 8 }, /* BITSPERSAMPLE */ { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ - { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_1bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_24bpp_data, pixel_data) }, /* STRIPOFFSETS */ { 0x115, IFD_SHORT, 1, 3 }, /* SAMPLESPERPIXEL */ { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ - { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ - { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* XRESOLUTION */ - { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* YRESOLUTION */ + { 0x117, IFD_LONG, 1, 3 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_24bpp_data, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_24bpp_data, res) }, /* YRESOLUTION */ { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ }, 0, -- 2.20.1

2 1

[PATCH vkd3d] Update copyright info for 2019.
by Józef Kucia 10 Jan '19

10 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COPYING b/COPYING index 32417ceba701..4bb951fc423f 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright 2016-2018 the Vkd3d project authors (see the file AUTHORS for a +Copyright 2016-2019 the Vkd3d project authors (see the file AUTHORS for a complete list) Vkd3d is free software; you can redistribute it and/or modify it under -- 2.19.2

2 1

[PATCH vkd3d v2 3/3] tests: Add multithreaded private data test.
by Józef Kucia 10 Jan '19

10 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b8563b32e91e..f34b82c855d7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2832,6 +2832,159 @@ static void test_private_data(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +struct private_data +{ + ID3D12Object *object; + GUID guid; + unsigned int value; +}; + +static void private_data_thread_main(void *untyped_data) +{ + struct private_data *data = untyped_data; + unsigned int i; + HRESULT hr; + + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, 0, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +struct private_data_interface +{ + ID3D12Object *object; + GUID guid; + IUnknown *iface; +}; + +static void private_data_interface_thread_main(void *untyped_data) +{ + struct private_data_interface *data = untyped_data; + unsigned int i; + HRESULT hr; + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +static void test_multithread_private_data(void) +{ + static const GUID guid = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0x00}}; + struct private_data_interface private_data_interface[4]; + HANDLE private_data_interface_thread[4]; + struct private_data private_data[4]; + ID3D12RootSignature *root_signature; + HANDLE private_data_thread[4]; + IUnknown *test_object, *unk; + ID3D12Device *device; + ID3D12Object *object; + unsigned int value; + unsigned int size; + unsigned int id; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + root_signature = create_empty_root_signature(device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + hr = ID3D12RootSignature_QueryInterface(root_signature, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12RootSignature_Release(root_signature); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&test_object); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0, id = 1; i < ARRAY_SIZE(private_data_interface); ++i, ++id) + { + private_data_interface[i].object = object; + private_data_interface[i].guid = guid; + private_data_interface[i].guid.Data4[7] = id; + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&private_data_interface[i].iface); + ok(hr == S_OK, "Failed to create fence %u, hr %#x.\n", i, hr); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i, ++id) + { + private_data[i].object = object; + private_data[i].guid = guid; + private_data[i].guid.Data4[7] = id; + private_data[i].value = id; + } + + for (i = 0; i < 4; ++i) + { + private_data_interface_thread[i] = create_thread(private_data_interface_thread_main, &private_data_interface[i]); + private_data_thread[i] = create_thread(private_data_thread_main, &private_data[i]); + } + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < 4; ++i) + { + ok(join_thread(private_data_interface_thread[i]), "Failed to join thread %u.\n", i); + ok(join_thread(private_data_thread[i]), "Failed to join thread %u.\n", i); + } + + for (i = 0; i < ARRAY_SIZE(private_data_interface); ++i) + { + size = sizeof(unk); + hr = ID3D12Object_GetPrivateData(object, &private_data_interface[i].guid, &size, &unk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(unk == private_data_interface[i].iface, "Got %p, expected %p.\n", unk, private_data_interface[i].iface); + IUnknown_Release(unk); + refcount = IUnknown_Release(private_data_interface[i].iface); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i) + { + size = sizeof(value); + hr = ID3D12Object_GetPrivateData(object, &private_data[i].guid, &size, &value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(value == private_data[i].value, "Got %u, expected %u.\n", value, private_data[i].value); + } + + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IUnknown_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Object_Release(object); + ok(!refcount, "Object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_reset_command_allocator(void) { ID3D12CommandAllocator *command_allocator, *command_allocator2; @@ -22327,6 +22480,7 @@ START_TEST(d3d12) run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); run_test(test_private_data); + run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); run_test(test_gpu_signal_fence); -- 2.19.2

3 2

[PATCH vkd3d v2 2/3] vkd3d: Protect private data with mutex.
by Józef Kucia 10 Jan '19

10 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Fix memory leak in d3d12_command_signature_create(). --- libs/vkd3d/command.c | 38 ++++++++++++++++++++++------ libs/vkd3d/device.c | 9 ++++--- libs/vkd3d/resource.c | 51 +++++++++++++++++++++++++++++++------- libs/vkd3d/state.c | 20 ++++++++++++--- libs/vkd3d/utils.c | 50 ++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 21 ++++++++++++---- 6 files changed, 156 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4bf11d4b9997..ce4af4e6a6fd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -578,6 +578,7 @@ static const struct ID3D12FenceVtbl d3d12_fence_vtbl = static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { + HRESULT hr; int rc; fence->ID3D12Fence_iface.lpVtbl = &d3d12_fence_vtbl; @@ -598,7 +599,11 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->events_size = 0; fence->event_count = 0; - vkd3d_private_store_init(&fence->private_store); + if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) + { + pthread_mutex_destroy(&fence->mutex); + return hr; + } fence->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1182,6 +1187,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo VkCommandPoolCreateInfo command_pool_info; struct vkd3d_queue *queue; VkResult vr; + HRESULT hr; + + if (FAILED(hr = vkd3d_private_store_init(&allocator->private_store))) + return hr; if (!(queue = d3d12_device_get_vkd3d_queue(device, type))) queue = device->direct_queue; @@ -1201,6 +1210,7 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo &allocator->vk_command_pool))) < 0) { WARN("Failed to create Vulkan command pool, vr %d.\n", vr); + vkd3d_private_store_destroy(&allocator->private_store); return hresult_from_vk_result(vr); } @@ -1240,8 +1250,6 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->current_command_list = NULL; - vkd3d_private_store_init(&allocator->private_store); - allocator->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -4287,17 +4295,24 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->refcount = 1; list->type = type; + + if (FAILED(hr = vkd3d_private_store_init(&list->private_store))) + return hr; + list->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); - vkd3d_private_store_init(&list->private_store); - list->allocator = allocator; if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) + { d3d12_command_list_reset_state(list, initial_pipeline_state); + } else + { + vkd3d_private_store_destroy(&list->private_store); ID3D12Device_Release(&device->ID3D12Device_iface); + } return hr; } @@ -4696,6 +4711,8 @@ static const struct ID3D12CommandQueueVtbl d3d12_command_queue_vtbl = static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, struct d3d12_device *device, const D3D12_COMMAND_QUEUE_DESC *desc) { + HRESULT hr; + queue->ID3D12CommandQueue_iface.lpVtbl = &d3d12_command_queue_vtbl; queue->refcount = 1; @@ -4711,7 +4728,8 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, if (desc->Flags) FIXME("Ignoring flags %#x.\n", desc->Flags); - vkd3d_private_store_init(&queue->private_store); + if (FAILED(hr = vkd3d_private_store_init(&queue->private_store))) + return hr; queue->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -4899,6 +4917,7 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ { struct d3d12_command_signature *object; unsigned int i; + HRESULT hr; for (i = 0; i < desc->NumArgumentDescs; ++i) { @@ -4934,7 +4953,12 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ memcpy((void *)object->desc.pArgumentDescs, desc->pArgumentDescs, desc->NumArgumentDescs * sizeof(*desc->pArgumentDescs)); - vkd3d_private_store_init(&object->private_store); + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free((void *)object->desc.pArgumentDescs); + vkd3d_free(object); + return hr; + } object->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7a7f4aaa143c..9b09f66b7251 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2526,18 +2526,21 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = d3d12_device_init_pipeline_cache(device))) goto out_free_vk_resources; - if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + if (FAILED(hr = vkd3d_private_store_init(&device->private_store))) goto out_free_pipeline_cache; + if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + goto out_free_private_store; + vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); - vkd3d_private_store_init(&device->private_store); - return S_OK; +out_free_private_store: + vkd3d_private_store_destroy(&device->private_store); out_free_pipeline_cache: d3d12_device_destroy_pipeline_cache(device); out_free_vk_resources: diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ffce926e476a..5b4110886299 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -379,15 +379,20 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hresult_from_errno(rc); } + if (FAILED(hr = vkd3d_private_store_init(&heap->private_store))) + { + pthread_mutex_destroy(&heap->mutex); + return hr; + } + if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, heap->desc.Flags, &memory_requirements, &heap->vk_memory, &heap->vk_memory_type))) { + vkd3d_private_store_destroy(&heap->private_store); pthread_mutex_destroy(&heap->mutex); return hr; } - vkd3d_private_store_init(&heap->private_store); - heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1179,7 +1184,11 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->heap = NULL; resource->heap_offset = 0; - vkd3d_private_store_init(&resource->private_store); + if (FAILED(hr = vkd3d_private_store_init(&resource->private_store))) + { + d3d12_resource_destroy(resource, device); + return hr; + } resource->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1325,6 +1334,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, { struct d3d12_device *d3d12_device = unsafe_impl_from_ID3D12Device(device); struct d3d12_resource *object; + HRESULT hr; TRACE("device %p, create_info %p, resource %p.\n", device, create_info, resource); @@ -1357,9 +1367,15 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->present_state = create_info->present_state; else object->present_state = D3D12_RESOURCE_STATE_COMMON; + + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free(object); + return hr; + } + object->device = d3d12_device; ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface); - vkd3d_private_store_init(&object->private_store); TRACE("Created resource %p.\n", object); @@ -2526,18 +2542,23 @@ static const struct ID3D12DescriptorHeapVtbl d3d12_descriptor_heap_vtbl = d3d12_descriptor_heap_GetGPUDescriptorHandleForHeapStart, }; -static void d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descriptor_heap, +static HRESULT d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descriptor_heap, struct d3d12_device *device, const D3D12_DESCRIPTOR_HEAP_DESC *desc) { + HRESULT hr; + descriptor_heap->ID3D12DescriptorHeap_iface.lpVtbl = &d3d12_descriptor_heap_vtbl; descriptor_heap->refcount = 1; descriptor_heap->desc = *desc; - vkd3d_private_store_init(&descriptor_heap->private_store); + if (FAILED(hr = vkd3d_private_store_init(&descriptor_heap->private_store))) + return hr; descriptor_heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); + + return S_OK; } HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, @@ -2545,6 +2566,7 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, { size_t max_descriptor_count, descriptor_size; struct d3d12_descriptor_heap *object; + HRESULT hr; if (!(descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, desc->Type))) { @@ -2570,7 +2592,12 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, descriptors[descriptor_size * desc->NumDescriptors])))) return E_OUTOFMEMORY; - d3d12_descriptor_heap_init(object, device, desc); + if (FAILED(hr = d3d12_descriptor_heap_init(object, device, desc))) + { + vkd3d_free(object); + return hr; + } + memset(object->descriptors, 0, descriptor_size * desc->NumDescriptors); TRACE("Created descriptor heap %p.\n", object); @@ -2722,6 +2749,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H VkQueryPoolCreateInfo pool_info; unsigned int element_count; VkResult vr; + HRESULT hr; element_count = DIV_ROUND_UP(desc->Count, sizeof(*object->availability_mask) * CHAR_BIT); if (!(object = vkd3d_malloc(offsetof(struct d3d12_query_heap, availability_mask[element_count])))) @@ -2775,15 +2803,20 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H return E_INVALIDARG; } + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free(object); + return hr; + } + if ((vr = VK_CALL(vkCreateQueryPool(device->vk_device, &pool_info, NULL, &object->vk_query_pool))) < 0) { WARN("Failed to create Vulkan query pool, vr %d.\n", vr); + vkd3d_private_store_destroy(&object->private_store); vkd3d_free(object); return hresult_from_vk_result(vr); } - vkd3d_private_store_init(&object->private_store); - ID3D12Device_AddRef(&device->ID3D12Device_iface); TRACE("Created query heap %p.\n", object); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ee91c725f75d..771ef241738a 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -999,7 +999,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa &root_signature->vk_pipeline_layout))) goto fail; - vkd3d_private_store_init(&root_signature->private_store); + if (FAILED(hr = vkd3d_private_store_init(&root_signature->private_store))) + goto fail; root_signature->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1516,7 +1517,16 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hresult_from_vk_result(vr); } - vkd3d_private_store_init(&state->private_store); + if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) + { + VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); + if (state->vk_set_layout) + VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); + if (state->vk_pipeline_layout) + VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); + vkd3d_free(state->uav_counters); + return hr; + } state->vk_bind_point = VK_PIPELINE_BIND_POINT_COMPUTE; state->device = device; @@ -2359,7 +2369,11 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s list_init(&graphics->compiled_pipelines); - vkd3d_private_store_init(&state->private_store); + if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) + { + VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL)); + goto fail; + } state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; state->device = device; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index ed4d77fea8cd..0144fdc1bd40 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -566,41 +566,79 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int *out_size, void *out) { const struct vkd3d_private_data *data; + HRESULT hr = S_OK; unsigned int size; + int rc; if (!out_size) return E_INVALIDARG; + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + if (!(data = vkd3d_private_store_get_private_data(store, tag))) { *out_size = 0; - return DXGI_ERROR_NOT_FOUND; + hr = DXGI_ERROR_NOT_FOUND; + goto done; } size = *out_size; *out_size = data->size; if (!out) - return S_OK; + goto done; if (size < data->size) - return DXGI_ERROR_MORE_DATA; + { + hr = DXGI_ERROR_MORE_DATA; + goto done; + } if (data->is_object) IUnknown_AddRef(data->u.object); memcpy(out, data->u.data, data->size); - return S_OK; +done: + pthread_mutex_unlock(&store->mutex); + return hr; } HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int data_size, const void *data) { - return vkd3d_private_store_set_private_data(store, tag, data, data_size, false); + HRESULT hr; + int rc; + + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + hr = vkd3d_private_store_set_private_data(store, tag, data, data_size, false); + + pthread_mutex_unlock(&store->mutex); + return hr; } HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, const GUID *tag, const IUnknown *object) { const void *data = object ? object : (void *)&object; - return vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); + HRESULT hr; + int rc; + + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + hr = vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); + + pthread_mutex_unlock(&store->mutex); + return hr; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c0c15b245902..9ffaa7920eb1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -76,6 +76,10 @@ struct vkd3d_vk_device_procs }; #undef DECLARE_VK_PFN +HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; +HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; +HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; + struct vkd3d_vulkan_info { /* instance extensions */ @@ -165,6 +169,8 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, struct vkd3d_private_store { + pthread_mutex_t mutex; + struct list content; }; @@ -190,9 +196,16 @@ static inline void vkd3d_private_data_destroy(struct vkd3d_private_data *data) vkd3d_free(data); } -static inline void vkd3d_private_store_init(struct vkd3d_private_store *store) +static inline HRESULT vkd3d_private_store_init(struct vkd3d_private_store *store) { + int rc; + list_init(&store->content); + + if ((rc = pthread_mutex_init(&store->mutex, NULL))) + ERR("Failed to initialize mutex, error %d.\n", rc); + + return hresult_from_errno(rc); } static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store) @@ -203,6 +216,8 @@ static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store { vkd3d_private_data_destroy(data); } + + pthread_mutex_destroy(&store->mutex); } HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, @@ -977,10 +992,6 @@ static inline void debug_ignored_node_mask(unsigned int mask) FIXME("Ignoring node mask 0x%08x.\n", mask); } -HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; -HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; -HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; - HRESULT vkd3d_load_vk_global_procs(struct vkd3d_vk_global_procs *procs, PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) DECLSPEC_HIDDEN; HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, -- 2.19.2

2 1

[PATCH] windowscodecs: Implement conversion to 32bppRGBA.
by Zhiyi Zhang 10 Jan '19

10 Jan '19

This fix Naruto Shippuden games crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/windowscodecs/converter.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6e7bb8e781..2444e3f3e6 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -55,6 +55,7 @@ enum pixelformat { format_32bppBGR, format_32bppBGRA, format_32bppPBGRA, + format_32bppRGBA, format_48bppRGB, format_64bppRGBA, format_32bppCMYK, @@ -907,6 +908,35 @@ static HRESULT copypixels_to_32bppPBGRA(struct FormatConverter *This, const WICR } } +static HRESULT copypixels_to_32bppRGBA(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + + switch (source_format) + { + case format_32bppRGBA: + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + return S_OK; + default: + hr = copypixels_to_32bppBGRA(This, prc, cbStride, cbBufferSize, pbBuffer, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + + for (y=0; y<prc->Height; y++) + for (x=0; x<prc->Width; x++) + { + BYTE b = pbBuffer[cbStride*y+4*x]; + pbBuffer[cbStride*y+4*x] = pbBuffer[cbStride*y+4*x+2]; + pbBuffer[cbStride*y+4*x+2] = b; + } + } + return hr; + } +} + static HRESULT copypixels_to_24bppBGR(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { @@ -1237,6 +1267,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_32bppGrayFloat, &GUID_WICPixelFormat32bppGrayFloat, copypixels_to_32bppGrayFloat}, {format_32bppBGR, &GUID_WICPixelFormat32bppBGR, copypixels_to_32bppBGR}, {format_32bppBGRA, &GUID_WICPixelFormat32bppBGRA, copypixels_to_32bppBGRA}, + {format_32bppRGBA, &GUID_WICPixelFormat32bppRGBA, copypixels_to_32bppRGBA}, {format_32bppPBGRA, &GUID_WICPixelFormat32bppPBGRA, copypixels_to_32bppPBGRA}, {format_48bppRGB, &GUID_WICPixelFormat48bppRGB, NULL}, {format_64bppRGBA, &GUID_WICPixelFormat64bppRGBA, NULL}, -- 2.19.2

1 1

[PATCH] dsound: Trace ref in a consistent way
by Alistair Leslie-Hughes 10 Jan '19

10 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dsound/buffer.c | 16 ++++++++-------- dlls/dsound/capture.c | 10 +++++----- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/primary.c | 4 ++-- dlls/dsound/propset.c | 4 ++-- dlls/dsound/sound3d.c | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index cb7ff78..7e4b57e 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -60,7 +60,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -344,7 +344,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_AddRef(IDirectSoundBuffer8 *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -361,7 +361,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) ref = capped_refcount_dec(&This->ref); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now: %d\n", This, ref); + TRACE("(%p) ref: %d\n", This, ref); return ref; } @@ -369,7 +369,7 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -1237,7 +1237,7 @@ static ULONG WINAPI IKsPropertySetImpl_AddRef(IKsPropertySet *iface) IDirectSoundBufferImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&This->refiks); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -1254,7 +1254,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) ref = capped_refcount_dec(&This->refiks); if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now: %d\n", This, ref); + TRACE("(%p) ref: %d\n", This, ref); return ref; } @@ -1262,7 +1262,7 @@ static ULONG WINAPI IKsPropertySetImpl_Release(IKsPropertySet *iface) if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index c849624..8fc2749 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -137,7 +137,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_AddRef(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedIncrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -150,7 +150,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundNotify(iface); ULONG ref = InterlockedDecrement(&This->refn); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -263,7 +263,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_AddRef(IDirectSoundCaptureBuff IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -276,7 +276,7 @@ static ULONG WINAPI IDirectSoundCaptureBufferImpl_Release(IDirectSoundCaptureBuf IDirectSoundCaptureBufferImpl *This = impl_from_IDirectSoundCaptureBuffer8(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) capturebuffer_destroy(This); @@ -851,7 +851,7 @@ static ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) { ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref + 1); + TRACE("(%p) ref %d\n", device, ref); if (!ref) { TRACE("deleting object\n"); diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 71ede7d..2fbb3ce 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -189,7 +189,7 @@ static HRESULT DirectSoundDevice_Create(DirectSoundDevice ** ppDevice) static ULONG DirectSoundDevice_AddRef(DirectSoundDevice * device) { ULONG ref = InterlockedIncrement(&(device->ref)); - TRACE("(%p) ref was %d\n", device, ref - 1); + TRACE("(%p) ref %d\n", device, ref); return ref; } @@ -197,7 +197,7 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) { HRESULT hr; ULONG ref = InterlockedDecrement(&(device->ref)); - TRACE("(%p) ref was %u\n", device, ref + 1); + TRACE("(%p) ref %d\n", device, ref); if (!ref) { int i; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f74db2f..a30fc5e 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -675,7 +675,7 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(IDirectSoundBuffer8 *iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); return ref; @@ -704,7 +704,7 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer8 *iface) if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) primary ref is now %d\n", This, ref); + TRACE("(%p) primary ref %d\n", This, ref); return ref; } diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 0272ac0..92aae8f 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -81,7 +81,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_AddRef(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); return ref; } @@ -89,7 +89,7 @@ static ULONG WINAPI IKsPrivatePropertySetImpl_Release(LPKSPROPERTYSET iface) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 118bb60..27fc416 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -396,7 +396,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_AddRef(IDirectSound3DBuffer *iface) IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -409,7 +409,7 @@ static ULONG WINAPI IDirectSound3DBufferImpl_Release(IDirectSound3DBuffer *iface IDirectSoundBufferImpl *This = impl_from_IDirectSound3DBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref + 1); + TRACE("(%p) ref %d\n", This, ref); if (!ref && !InterlockedDecrement(&This->numIfaces)) secondarybuffer_destroy(This); @@ -744,7 +744,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(IDirectSound3DListener *if IDirectSoundBufferImpl *This = impl_from_IDirectSound3DListener(iface); ULONG ref = InterlockedIncrement(&This->ref3D); - TRACE("(%p) ref was %d\n", This, ref - 1); + TRACE("(%p) ref %d\n", This, ref); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -761,7 +761,7 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(IDirectSound3DListener *i if(!ref) capped_refcount_dec(&This->numIfaces); - TRACE("(%p) ref is now %d\n", This, ref); + TRACE("(%p) ref %d\n", This, ref); return ref; } -- 1.9.1

2 1

[PATCH] ntoskrnl.exe/tests: Zero-initialize test_input struct.
by Gijs Vermeulen 10 Jan '19

10 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46346 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5675818e28..387fe81633 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -156,6 +156,7 @@ static void main_test(void) pRtlDosPathNameToNtPathName_U( pathW, &pathU, NULL, NULL ); test_input = heap_alloc(sizeof(*test_input) + pathU.Length); + memset(test_input, 0, sizeof(*test_input) + pathU.Length); test_input->running_under_wine = !strcmp(winetest_platform, "wine"); test_input->winetest_report_success = winetest_report_success; test_input->winetest_debug = winetest_debug; -- 2.20.1

1 0

[PATCH] shell32: Rename SHELL32_714 to PathIsTemporaryW
by Alex Henrie 10 Jan '19

10 Jan '19

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This function is documented at http://undoc.airesoft.co.uk/shell32.dll/PathIsTemporaryW.php --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index bf8b5121d7..771f5e38d9 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -260,7 +260,7 @@ 701 stdcall CDefFolderMenu_Create2(ptr ptr long ptr ptr ptr long ptr ptr) 704 stdcall -noname GUIDFromStringW(wstr ptr) 709 stdcall SHGetSetFolderCustomSettings(ptr wstr long) - 714 stdcall @(ptr) SHELL32_714 # PathIsTemporaryW + 714 stdcall -noname PathIsTemporaryW(wstr) 723 stdcall -noname SHCreateSessionKey(long ptr) 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall -noname RestartDialogEx(long wstr long long) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 6ed0c9000f..b04a56e783 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1623,12 +1623,12 @@ BOOL WINAPI GUIDFromStringW(LPCWSTR str, LPGUID guid) } /************************************************************************* - * @ [SHELL32.714] + * PathIsTemporaryW [SHELL32.714] */ -DWORD WINAPI SHELL32_714(LPVOID x) +BOOL WINAPI PathIsTemporaryW(const WCHAR *path) { - FIXME("(%s)stub\n", debugstr_w(x)); - return 0; + FIXME("(%s) stub\n", debugstr_w(path)); + return FALSE; } typedef struct _PSXA -- 2.20.1

2 1

[PATCH] oledb32/tests: Add convert DBTYPE_DATE -> DBTYPE_DBTIMESTAMP test
by Alistair Leslie-Hughes 10 Jan '19

10 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/tests/convert.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 4a5c05e..e59c872 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3612,6 +3612,7 @@ static void test_converttotimestamp(void) '.','0','1','7','0','0','0','0','0','0',0}; DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; DBTIMESTAMP ts1 = {2013, 5, 14, 2, 4, 12, 17000000}; + DATE date; DBTIMESTAMP dst; DBSTATUS dst_status; DBLENGTH dst_len; @@ -3653,6 +3654,14 @@ static void test_converttotimestamp(void) ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 77, "got %ld\n", dst_len); + + dst_len = 0x1234; + date = 41408.086250; + hr = IDataConvert_DataConvert(convert, DBTYPE_DATE, DBTYPE_DBTIMESTAMP, 0, &dst_len, &date, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); } static void test_converttoiunknown(void) -- 1.9.1

1 0

Wine staging 4.0-rc5 release
by Alistair Leslie-Hughes 09 Jan '19

09 Jan '19

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 4.0-rc5 (830 patches are applied to wine vanilla) * Reviewed and upstreamed patches. No extra changes were made this week. Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game. * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH vkd3d 2/3] vkd3d: Protect private data with mutex.
by Józef Kucia 09 Jan '19

09 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 37 +++++++++++++++++++++------ libs/vkd3d/device.c | 9 ++++--- libs/vkd3d/resource.c | 51 +++++++++++++++++++++++++++++++------- libs/vkd3d/state.c | 20 ++++++++++++--- libs/vkd3d/utils.c | 50 ++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 21 ++++++++++++---- 6 files changed, 155 insertions(+), 33 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4bf11d4b9997..986efb2d3b63 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -578,6 +578,7 @@ static const struct ID3D12FenceVtbl d3d12_fence_vtbl = static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { + HRESULT hr; int rc; fence->ID3D12Fence_iface.lpVtbl = &d3d12_fence_vtbl; @@ -598,7 +599,11 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->events_size = 0; fence->event_count = 0; - vkd3d_private_store_init(&fence->private_store); + if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) + { + pthread_mutex_destroy(&fence->mutex); + return hr; + } fence->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1182,6 +1187,10 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo VkCommandPoolCreateInfo command_pool_info; struct vkd3d_queue *queue; VkResult vr; + HRESULT hr; + + if (FAILED(hr = vkd3d_private_store_init(&allocator->private_store))) + return hr; if (!(queue = d3d12_device_get_vkd3d_queue(device, type))) queue = device->direct_queue; @@ -1201,6 +1210,7 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo &allocator->vk_command_pool))) < 0) { WARN("Failed to create Vulkan command pool, vr %d.\n", vr); + vkd3d_private_store_destroy(&allocator->private_store); return hresult_from_vk_result(vr); } @@ -1240,8 +1250,6 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo allocator->current_command_list = NULL; - vkd3d_private_store_init(&allocator->private_store); - allocator->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -4287,17 +4295,24 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->refcount = 1; list->type = type; + + if (FAILED(hr = vkd3d_private_store_init(&list->private_store))) + return hr; + list->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); - vkd3d_private_store_init(&list->private_store); - list->allocator = allocator; if (SUCCEEDED(hr = d3d12_command_allocator_allocate_command_buffer(allocator, list))) + { d3d12_command_list_reset_state(list, initial_pipeline_state); + } else + { + vkd3d_private_store_destroy(&list->private_store); ID3D12Device_Release(&device->ID3D12Device_iface); + } return hr; } @@ -4696,6 +4711,8 @@ static const struct ID3D12CommandQueueVtbl d3d12_command_queue_vtbl = static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, struct d3d12_device *device, const D3D12_COMMAND_QUEUE_DESC *desc) { + HRESULT hr; + queue->ID3D12CommandQueue_iface.lpVtbl = &d3d12_command_queue_vtbl; queue->refcount = 1; @@ -4711,7 +4728,8 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, if (desc->Flags) FIXME("Ignoring flags %#x.\n", desc->Flags); - vkd3d_private_store_init(&queue->private_store); + if (FAILED(hr = vkd3d_private_store_init(&queue->private_store))) + return hr; queue->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -4899,6 +4917,7 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ { struct d3d12_command_signature *object; unsigned int i; + HRESULT hr; for (i = 0; i < desc->NumArgumentDescs; ++i) { @@ -4934,7 +4953,11 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ memcpy((void *)object->desc.pArgumentDescs, desc->pArgumentDescs, desc->NumArgumentDescs * sizeof(*desc->pArgumentDescs)); - vkd3d_private_store_init(&object->private_store); + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free(object); + return hr; + } object->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7a7f4aaa143c..9b09f66b7251 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2526,18 +2526,21 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = d3d12_device_init_pipeline_cache(device))) goto out_free_vk_resources; - if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + if (FAILED(hr = vkd3d_private_store_init(&device->private_store))) goto out_free_pipeline_cache; + if (FAILED(hr = vkd3d_fence_worker_start(&device->fence_worker, device))) + goto out_free_private_store; + vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); - vkd3d_private_store_init(&device->private_store); - return S_OK; +out_free_private_store: + vkd3d_private_store_destroy(&device->private_store); out_free_pipeline_cache: d3d12_device_destroy_pipeline_cache(device); out_free_vk_resources: diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ffce926e476a..5b4110886299 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -379,15 +379,20 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hresult_from_errno(rc); } + if (FAILED(hr = vkd3d_private_store_init(&heap->private_store))) + { + pthread_mutex_destroy(&heap->mutex); + return hr; + } + if (FAILED(hr = vkd3d_allocate_device_memory(device, &heap->desc.Properties, heap->desc.Flags, &memory_requirements, &heap->vk_memory, &heap->vk_memory_type))) { + vkd3d_private_store_destroy(&heap->private_store); pthread_mutex_destroy(&heap->mutex); return hr; } - vkd3d_private_store_init(&heap->private_store); - heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1179,7 +1184,11 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->heap = NULL; resource->heap_offset = 0; - vkd3d_private_store_init(&resource->private_store); + if (FAILED(hr = vkd3d_private_store_init(&resource->private_store))) + { + d3d12_resource_destroy(resource, device); + return hr; + } resource->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1325,6 +1334,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, { struct d3d12_device *d3d12_device = unsafe_impl_from_ID3D12Device(device); struct d3d12_resource *object; + HRESULT hr; TRACE("device %p, create_info %p, resource %p.\n", device, create_info, resource); @@ -1357,9 +1367,15 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->present_state = create_info->present_state; else object->present_state = D3D12_RESOURCE_STATE_COMMON; + + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free(object); + return hr; + } + object->device = d3d12_device; ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface); - vkd3d_private_store_init(&object->private_store); TRACE("Created resource %p.\n", object); @@ -2526,18 +2542,23 @@ static const struct ID3D12DescriptorHeapVtbl d3d12_descriptor_heap_vtbl = d3d12_descriptor_heap_GetGPUDescriptorHandleForHeapStart, }; -static void d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descriptor_heap, +static HRESULT d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descriptor_heap, struct d3d12_device *device, const D3D12_DESCRIPTOR_HEAP_DESC *desc) { + HRESULT hr; + descriptor_heap->ID3D12DescriptorHeap_iface.lpVtbl = &d3d12_descriptor_heap_vtbl; descriptor_heap->refcount = 1; descriptor_heap->desc = *desc; - vkd3d_private_store_init(&descriptor_heap->private_store); + if (FAILED(hr = vkd3d_private_store_init(&descriptor_heap->private_store))) + return hr; descriptor_heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); + + return S_OK; } HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, @@ -2545,6 +2566,7 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, { size_t max_descriptor_count, descriptor_size; struct d3d12_descriptor_heap *object; + HRESULT hr; if (!(descriptor_size = ID3D12Device_GetDescriptorHandleIncrementSize(&device->ID3D12Device_iface, desc->Type))) { @@ -2570,7 +2592,12 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, descriptors[descriptor_size * desc->NumDescriptors])))) return E_OUTOFMEMORY; - d3d12_descriptor_heap_init(object, device, desc); + if (FAILED(hr = d3d12_descriptor_heap_init(object, device, desc))) + { + vkd3d_free(object); + return hr; + } + memset(object->descriptors, 0, descriptor_size * desc->NumDescriptors); TRACE("Created descriptor heap %p.\n", object); @@ -2722,6 +2749,7 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H VkQueryPoolCreateInfo pool_info; unsigned int element_count; VkResult vr; + HRESULT hr; element_count = DIV_ROUND_UP(desc->Count, sizeof(*object->availability_mask) * CHAR_BIT); if (!(object = vkd3d_malloc(offsetof(struct d3d12_query_heap, availability_mask[element_count])))) @@ -2775,15 +2803,20 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H return E_INVALIDARG; } + if (FAILED(hr = vkd3d_private_store_init(&object->private_store))) + { + vkd3d_free(object); + return hr; + } + if ((vr = VK_CALL(vkCreateQueryPool(device->vk_device, &pool_info, NULL, &object->vk_query_pool))) < 0) { WARN("Failed to create Vulkan query pool, vr %d.\n", vr); + vkd3d_private_store_destroy(&object->private_store); vkd3d_free(object); return hresult_from_vk_result(vr); } - vkd3d_private_store_init(&object->private_store); - ID3D12Device_AddRef(&device->ID3D12Device_iface); TRACE("Created query heap %p.\n", object); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ee91c725f75d..771ef241738a 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -999,7 +999,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa &root_signature->vk_pipeline_layout))) goto fail; - vkd3d_private_store_init(&root_signature->private_store); + if (FAILED(hr = vkd3d_private_store_init(&root_signature->private_store))) + goto fail; root_signature->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1516,7 +1517,16 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hresult_from_vk_result(vr); } - vkd3d_private_store_init(&state->private_store); + if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) + { + VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); + if (state->vk_set_layout) + VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); + if (state->vk_pipeline_layout) + VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); + vkd3d_free(state->uav_counters); + return hr; + } state->vk_bind_point = VK_PIPELINE_BIND_POINT_COMPUTE; state->device = device; @@ -2359,7 +2369,11 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s list_init(&graphics->compiled_pipelines); - vkd3d_private_store_init(&state->private_store); + if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) + { + VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL)); + goto fail; + } state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; state->device = device; diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index ed4d77fea8cd..0144fdc1bd40 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -566,41 +566,79 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int *out_size, void *out) { const struct vkd3d_private_data *data; + HRESULT hr = S_OK; unsigned int size; + int rc; if (!out_size) return E_INVALIDARG; + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + if (!(data = vkd3d_private_store_get_private_data(store, tag))) { *out_size = 0; - return DXGI_ERROR_NOT_FOUND; + hr = DXGI_ERROR_NOT_FOUND; + goto done; } size = *out_size; *out_size = data->size; if (!out) - return S_OK; + goto done; if (size < data->size) - return DXGI_ERROR_MORE_DATA; + { + hr = DXGI_ERROR_MORE_DATA; + goto done; + } if (data->is_object) IUnknown_AddRef(data->u.object); memcpy(out, data->u.data, data->size); - return S_OK; +done: + pthread_mutex_unlock(&store->mutex); + return hr; } HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int data_size, const void *data) { - return vkd3d_private_store_set_private_data(store, tag, data, data_size, false); + HRESULT hr; + int rc; + + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + hr = vkd3d_private_store_set_private_data(store, tag, data, data_size, false); + + pthread_mutex_unlock(&store->mutex); + return hr; } HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, const GUID *tag, const IUnknown *object) { const void *data = object ? object : (void *)&object; - return vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); + HRESULT hr; + int rc; + + if ((rc = pthread_mutex_lock(&store->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + hr = vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); + + pthread_mutex_unlock(&store->mutex); + return hr; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c0c15b245902..9ffaa7920eb1 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -76,6 +76,10 @@ struct vkd3d_vk_device_procs }; #undef DECLARE_VK_PFN +HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; +HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; +HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; + struct vkd3d_vulkan_info { /* instance extensions */ @@ -165,6 +169,8 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, struct vkd3d_private_store { + pthread_mutex_t mutex; + struct list content; }; @@ -190,9 +196,16 @@ static inline void vkd3d_private_data_destroy(struct vkd3d_private_data *data) vkd3d_free(data); } -static inline void vkd3d_private_store_init(struct vkd3d_private_store *store) +static inline HRESULT vkd3d_private_store_init(struct vkd3d_private_store *store) { + int rc; + list_init(&store->content); + + if ((rc = pthread_mutex_init(&store->mutex, NULL))) + ERR("Failed to initialize mutex, error %d.\n", rc); + + return hresult_from_errno(rc); } static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store) @@ -203,6 +216,8 @@ static inline void vkd3d_private_store_destroy(struct vkd3d_private_store *store { vkd3d_private_data_destroy(data); } + + pthread_mutex_destroy(&store->mutex); } HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, @@ -977,10 +992,6 @@ static inline void debug_ignored_node_mask(unsigned int mask) FIXME("Ignoring node mask 0x%08x.\n", mask); } -HRESULT hresult_from_errno(int rc) DECLSPEC_HIDDEN; -HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; -HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN; - HRESULT vkd3d_load_vk_global_procs(struct vkd3d_vk_global_procs *procs, PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr) DECLSPEC_HIDDEN; HRESULT vkd3d_load_vk_instance_procs(struct vkd3d_vk_instance_procs *procs, -- 2.19.2

2 2

[PATCH vkd3d 1/3] vkd3d: Handle NULL pointers in vkd3d_private_store_set_private_data().
by Józef Kucia 09 Jan '19

09 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 6841bfb180d2..ed4d77fea8cd 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -527,6 +527,17 @@ static HRESULT vkd3d_private_store_set_private_data(struct vkd3d_private_store * struct vkd3d_private_data *d, *old_data; const void *ptr = data; + if (!data) + { + if ((d = vkd3d_private_store_get_private_data(store, tag))) + { + vkd3d_private_data_destroy(d); + return S_OK; + } + + return S_FALSE; + } + if (is_object) { if (data_size != sizeof(IUnknown *)) @@ -584,25 +595,12 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int data_size, const void *data) { - struct vkd3d_private_data *d; - - if (!data) - { - if (!(d = vkd3d_private_store_get_private_data(store, tag))) - return S_FALSE; - - vkd3d_private_data_destroy(d); - return S_OK; - } - return vkd3d_private_store_set_private_data(store, tag, data, data_size, false); } HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, const GUID *tag, const IUnknown *object) { - if (!object) - return vkd3d_set_private_data(store, tag, sizeof(object), &object); - - return vkd3d_private_store_set_private_data(store, tag, object, sizeof(object), true); + const void *data = object ? object : (void *)&object; + return vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); } -- 2.19.2

2 1

[PATCH] d3dx9: Return correct comment length from get_instr_length().
by Matteo Bruni 09 Jan '19

09 Jan '19

From: Paul Gofman <gofmanp(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46435. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 8 +++++--- dlls/d3dx9_36/tests/shader.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index acbbf0718ad..e8ce3dd796c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2415,18 +2415,20 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { + DWORD opcode = *byte_code & 0xffff; unsigned int len = 0; + if (opcode == D3DSIO_COMMENT) + return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + if (major > 1) return (*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT; - switch (*byte_code & 0xffff) + switch (opcode) { case D3DSIO_END: ERR("Unexpected END token.\n"); return 0; - case D3DSIO_COMMENT: - return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; case D3DSIO_DEF: case D3DSIO_DEFI: return 5; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 74251d079da..a1a47ec357b 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6463,6 +6463,7 @@ static void test_shader_semantics(void) vs_3_0[] = { 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, 0x0200000f, 0x00000000, /* comment */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ -- 2.19.2

1 0

[PATCH] d3dcompiler_43: Define D3D_COMPILER_VERSION.
by Matteo Bruni 09 Jan '19

09 Jan '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Supersedes patch 156439. It turns out I tested the previous patch with d3dcompiler_43, which was the only one missing the define in the makefile... dlls/d3dcompiler_43/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index c31aa6c2a62..40f80150105 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,6 +1,7 @@ MODULE = d3dcompiler_43.dll IMPORTS = dxguid uuid EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asmparser.c \ -- 2.19.2

1 0

[PATCH] d3dx9: Return correct comment length from get_instr_length().
by Paul Gofman 09 Jan '19

09 Jan '19

For bug https://bugs.winehq.org/show_bug.cgi?id=46435. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- It is not a regression as this code did not change since December 2017. Still suggesting it now as the bug involves potential out of bounds (read) access and the fix looks pretty obvious. dlls/d3dx9_36/shader.c | 8 +++++--- dlls/d3dx9_36/tests/shader.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index acbbf0718a..e8ce3dd796 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2415,18 +2415,20 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { + DWORD opcode = *byte_code & 0xffff; unsigned int len = 0; + if (opcode == D3DSIO_COMMENT) + return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + if (major > 1) return (*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT; - switch (*byte_code & 0xffff) + switch (opcode) { case D3DSIO_END: ERR("Unexpected END token.\n"); return 0; - case D3DSIO_COMMENT: - return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; case D3DSIO_DEF: case D3DSIO_DEFI: return 5; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 1086e5e9d6..b67ffb209c 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6457,6 +6457,7 @@ static void test_shader_semantics(void) vs_3_0[] = { 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, 0x0200000f, 0x00000000, /* comment */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ -- 2.20.1

1 0

[PATCH 1/3] shell32/tests: Test that ShellView picks up external file changes
by Nigel Baillie 09 Jan '19

09 Jan '19

Signed-off-by: Nigel Baillie <metreckk(a)gmail.com> --- dlls/shell32/tests/shlview.c | 89 ++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f5d96c8d44..4d0cf641a7 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1502,6 +1502,94 @@ todo_wine IUnknown_Release(unk); } +static void do_events(void) +{ + MSG msg; + while(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)){ + TranslateMessage(&msg); + DispatchMessageA(&msg); + } +} + +static void test_external_change(void) +{ + IShellFolder *desktop, *folder; + FOLDERSETTINGS settings; + IShellView *view; + IShellBrowser *browser; + IFolderView *fv; + HWND hwnd_view; + LPITEMIDLIST pidl; + HRESULT hr; + HANDLE file; + INT count; + RECT r; + BOOLEAN b; + static const WCHAR test_folder_path[] = + {'C',':','\\','s','h','l','v','i','e','w','_','t','e','s','t',0}; + static const WCHAR test_file_path[] = + {'C',':','\\','s','h','l','v','i','e','w','_','t','e','s','t','\\','f','.','t','x','t',0}; + + /* create test folder, get a PIDL to it */ + b = CreateDirectoryW(test_folder_path, NULL); + ok(b, "failed to create test directory\n"); + + pidl = ILCreateFromPathW(test_folder_path); + ok(pidl != NULL, "couldn't get a PIDL to the test directory\n"); + + /* Get an IFolderView for the test folder */ + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got (0x%08x) when trying to grab desktop folder\n", hr); + + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder, (void**)&folder); + ok(hr == S_OK, "got (0x%08x) from BindToObject\n", hr); + + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IShellView, (void**)&view); + ok(hr == S_OK, "got (0x%08x) from CreateViewObject\n", hr); + + hr = IShellView_QueryInterface(view, &IID_IFolderView, (void**)&fv); + ok(hr == S_OK, "got (0x%08x) when trying to get an IFolderView interface\n", hr); + + /* create window */ + browser = IShellBrowserImpl_Construct(); + settings.ViewMode = FVM_ICON; + settings.fFlags = 0; + hwnd_view = (HWND)0xdeadbeef; + SetRect(&r, 0, 0, 100, 100); + hr = IShellView_CreateViewWindow(view, NULL, &settings, browser, &r, &hwnd_view); + ok(hr == S_OK, "got (0x%08x) when trying to create view window\n", hr); + ok(IsWindow(hwnd_view), "got %p instead of a valid HWND\n", hwnd_view); + + /* item count should be zero */ + IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); + ok(count == 0, "count should've been 0, but was %i\n", count); + + /* create test file */ + file = CreateFileW(test_file_path, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to create test file\n"); + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); /* we don't actually need the file open */ + + /* let the shlview figure out that it was created */ + Sleep(1000); + do_events(); + + /* it should now show the new file! */ + IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); + ok(count == 1, "count should've been 1, but was %i\n", count); + + /* cleanup */ + hr = IShellView_DestroyViewWindow(view); + DeleteFileW(test_file_path); + RemoveDirectoryW(test_folder_path); + IShellBrowser_Release(browser); + IFolderView_Release(fv); + IShellView_Release(view); + IShellFolder_Release(desktop); +} + START_TEST(shlview) { OleInitialize(NULL); @@ -1518,6 +1606,7 @@ START_TEST(shlview) test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx(); test_newmenu(); + test_external_change(); OleUninitialize(); } -- 2.19.1

4 11

[PATCH 3/5] wined3d: Simplify wined3d_cs_emit_clear() slightly.
by Józef Kucia 09 Jan '19

09 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5ea25e992aa5..aa8eef7a2e01 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -600,22 +600,20 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - unsigned int rt_count = cs->device->adapter->d3d_info.limits.max_rt_count; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; + unsigned int rt_count, i; RECT view_rect; - unsigned int i; + + rt_count = flags & WINED3DCLEAR_TARGET ? cs->device->adapter->d3d_info.limits.max_rt_count : 0; op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags; - if (flags & WINED3DCLEAR_TARGET) - op->rt_count = rt_count; - else - op->rt_count = 0; + op->rt_count = rt_count; op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) @@ -626,16 +624,13 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->rect_count = rect_count; memcpy(op->rects, rects, sizeof(*rects) * rect_count); - if (flags & WINED3DCLEAR_TARGET) + for (i = 0; i < rt_count; ++i) { - for (i = 0; i < rt_count; ++i) + if ((view = state->fb->render_targets[i])) { - if ((view = state->fb->render_targets[i])) - { - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); - wined3d_resource_acquire(view->resource); - } + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); + wined3d_resource_acquire(view->resource); } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) -- 2.19.2

2 1

[PATCH 2/5] ddraw/tests: Fix compilation on systems that don't support nameless unions.
by Józef Kucia 09 Jan '19

09 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 18 ++++++++-------- dlls/ddraw/tests/ddraw2.c | 22 ++++++++++---------- dlls/ddraw/tests/ddraw4.c | 44 +++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 44 +++++++++++++++++++-------------------- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9e562de5c44d..d36120426f92 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4368,7 +4368,7 @@ static void fill_surface(IDirectDrawSurface *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -9114,11 +9114,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -9184,7 +9184,7 @@ static void test_cross_device_blt(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_VIDEOMEMORY; - U5(surface_desc).dwBackBufferCount = 2; + surface_desc.dwBackBufferCount = 2; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -10610,7 +10610,7 @@ static void test_ck_operation(void) surface_desc.dwWidth = 4; surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; @@ -11266,10 +11266,10 @@ static void test_clear(void) /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; viewport_set_background(device, viewport, green); hr = IDirect3DViewport_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e4a866e23619..7cbfce056fdd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4977,7 +4977,7 @@ static void fill_surface(IDirectDrawSurface *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -10246,11 +10246,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -10316,7 +10316,7 @@ static void test_cross_device_blt(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_VIDEOMEMORY; - U5(surface_desc).dwBackBufferCount = 2; + surface_desc.dwBackBufferCount = 2; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -11965,7 +11965,7 @@ static void test_ck_operation(void) surface_desc.dwWidth = 4; surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; @@ -12688,10 +12688,10 @@ static void test_clear(void) /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; viewport_set_background(device, viewport, green); hr = IDirect3DViewport2_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); @@ -12993,7 +12993,7 @@ static void test_viewport(void) memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(ds, &surface_desc); - z_fmt = U4(surface_desc).ddpfPixelFormat; + z_fmt = surface_desc.ddpfPixelFormat; for (i = 0; i < ARRAY_SIZE(rt_sizes); ++i) { @@ -13010,7 +13010,7 @@ static void test_viewport(void) surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - U4(surface_desc).ddpfPixelFormat = z_fmt; + surface_desc.ddpfPixelFormat = z_fmt; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &ds, NULL); ok(SUCCEEDED(hr), "Failed to create depth buffer, hr %#x (i %u).\n", hr, i); hr = IDirectDrawSurface_AddAttachedSurface(rt, ds); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 92ca9f6eb4b1..9b47c2bd3ca9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6295,7 +6295,7 @@ static void fill_surface(IDirectDrawSurface4 *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -11714,11 +11714,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface4_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface4_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -11802,12 +11802,12 @@ static void test_cross_device_blt(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; - surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); - surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 16; - U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00007c00; - U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x000003e0; - U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000001f; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x0000001f; hr = IDirectDraw4_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -13695,10 +13695,10 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -13834,11 +13834,11 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; - U5(U4(surface_desc.ddpfPixelFormat)).dwRGBAlphaBitMask = 0xff000000; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + U5(U4(surface_desc).ddpfPixelFormat).dwRGBAlphaBitMask = 0xff000000; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &src, NULL); @@ -14807,10 +14807,10 @@ static void test_clear(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ccb22d538823..fbc27376a530 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6093,7 +6093,7 @@ static void fill_surface(IDirectDrawSurface7 *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -11624,11 +11624,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface7_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface7_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -11712,12 +11712,12 @@ static void test_cross_device_blt(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; - surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); - surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 16; - U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00007c00; - U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x000003e0; - U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000001f; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x0000001f; hr = IDirectDraw7_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -12952,10 +12952,10 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -13091,11 +13091,11 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; - U5(U4(surface_desc.ddpfPixelFormat)).dwRGBAlphaBitMask = 0xff000000; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + U5(U4(surface_desc).ddpfPixelFormat).dwRGBAlphaBitMask = 0xff000000; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src, NULL); @@ -14152,10 +14152,10 @@ static void test_clear(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); -- 2.19.2

3 2

[PATCH 1/5] ddraw/tests: Add tests for attaching depth buffers of different sizes.
by Józef Kucia 09 Jan '19

09 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 47 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 59d07b7d76fc..9e562de5c44d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4991,6 +4991,53 @@ static void test_surface_attachment(void) IDirectDrawSurface_Release(surface2); IDirectDrawSurface_Release(surface1); + /* Test depth surfaces of different sizes. */ + 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_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(surface_desc.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(surface_desc.ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(surface4); + IDirectDrawSurface_Release(surface3); + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8b9b249a3a4e..e4a866e23619 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6015,6 +6015,53 @@ static void test_surface_attachment(void) IDirectDrawSurface_Release(surface2); IDirectDrawSurface_Release(surface1); + /* Test depth surfaces of different sizes. */ + 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_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(surface_desc.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(surface_desc.ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface2_Release(surface4); + IDirectDrawSurface2_Release(surface3); + IDirectDrawSurface2_Release(surface2); + IDirectDrawSurface2_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1c4841891e40..92ca9f6eb4b1 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7327,6 +7327,53 @@ static void test_surface_attachment(void) IDirectDrawSurface4_Release(surface2); IDirectDrawSurface4_Release(surface1); + /* Test depth surfaces of different sizes. */ + 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_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface4_Release(surface4); + IDirectDrawSurface4_Release(surface3); + IDirectDrawSurface4_Release(surface2); + IDirectDrawSurface4_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 9ab8644191f5..ccb22d538823 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7157,6 +7157,53 @@ static void test_surface_attachment(void) IDirectDrawSurface7_Release(surface2); IDirectDrawSurface7_Release(surface1); + /* Test depth surfaces of different sizes. */ + 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_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(surface4); + IDirectDrawSurface7_Release(surface3); + IDirectDrawSurface7_Release(surface2); + IDirectDrawSurface7_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); -- 2.19.2

3 2

[PATCH 2/3] windowscodecs: Remove redundant checks from the TIFF decoder's CopyPixels implementation.
by Dmitry Timoshkov 09 Jan '19

09 Jan '19

Common copy_pixels() helper already performs theses checks, and the buffer size check is wrong. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 2 -- dlls/windowscodecs/tiffformat.c | 9 --------- 2 files changed, 11 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 8da843bdcc..ff9c4b9a74 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -598,11 +598,9 @@ static void test_tiff_24bpp(void) ok(hr == E_INVALIDARG, "CopyPixels(%u) should fail: %#x\n", stride, hr); else { -todo_wine_if(stride > 3) ok(hr == S_OK, "CopyPixels(%u) error %#x\n", stride, hr); for (i = 0; i < sizeof(data); i++) -todo_wine_if(stride > 3) ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); } } diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 93af5594a7..2d265e8694 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1080,7 +1080,6 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, WICRect rc; HRESULT hr=S_OK; BYTE *dst_tilepos; - UINT bytesperrow; WICRect rect; TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); @@ -1100,14 +1099,6 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, return E_INVALIDARG; } - bytesperrow = ((This->decode_info.bpp * prc->Width)+7)/8; - - if (cbStride < bytesperrow) - return E_INVALIDARG; - - if ((cbStride * prc->Height) > cbBufferSize) - return E_INVALIDARG; - min_tile_x = prc->X / This->decode_info.tile_width; min_tile_y = prc->Y / This->decode_info.tile_height; max_tile_x = (prc->X+prc->Width-1) / This->decode_info.tile_width; -- 2.20.1

2 2

[PATCH] d3dcompiler.h: Define D3DCOMPILER_DLL to d3dcompiler_47.dll.
by Jacek Caban 09 Jan '19

09 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is consistent with importlib. include/d3dcompiler.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

3 3

[PATCH 1/3] windowscodecs/tests: Add a test for copying pixels of a 24bpp TIFF format.
by Dmitry Timoshkov 09 Jan '19

09 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 103 ++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 36de69e467..8da843bdcc 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -219,6 +219,46 @@ static struct tiff_resolution_image_data { 72, 1 }, /* value will be filled with test data */ { 0x11, 0x22, 0x33, 0 } }; + +static const struct +{ + USHORT byte_order; + USHORT version; + ULONG dir_offset; + USHORT number_of_entries; + struct IFD_entry entry[13]; + ULONG next_IFD; + struct IFD_rational res; + BYTE pixel_data[3]; +} tiff_24bpp_data = +{ +#ifdef WORDS_BIGENDIAN + 'M' | 'M' << 8, +#else + 'I' | 'I' << 8, +#endif + 42, + FIELD_OFFSET(struct tiff_1bpp_data, number_of_entries), + 13, + { + { 0xff, IFD_SHORT, 1, 0 }, /* SUBFILETYPE */ + { 0x100, IFD_LONG, 1, 1 }, /* IMAGEWIDTH */ + { 0x101, IFD_LONG, 1, 1 }, /* IMAGELENGTH */ + { 0x102, IFD_SHORT, 1, 8 }, /* BITSPERSAMPLE */ + { 0x103, IFD_SHORT, 1, 1 }, /* COMPRESSION: XP doesn't accept IFD_LONG here */ + { 0x106, IFD_SHORT, 1, 2 }, /* PHOTOMETRIC */ + { 0x111, IFD_LONG, 1, FIELD_OFFSET(struct tiff_1bpp_data, pixel_data) }, /* STRIPOFFSETS */ + { 0x115, IFD_SHORT, 1, 3 }, /* SAMPLESPERPIXEL */ + { 0x116, IFD_LONG, 1, 1 }, /* ROWSPERSTRIP */ + { 0x117, IFD_LONG, 1, 1 }, /* STRIPBYTECOUNT */ + { 0x11a, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* XRESOLUTION */ + { 0x11b, IFD_RATIONAL, 1, FIELD_OFFSET(struct tiff_1bpp_data, res) }, /* YRESOLUTION */ + { 0x128, IFD_SHORT, 1, 2 }, /* RESOLUTIONUNIT */ + }, + 0, + { 900, 3 }, + { 0x11, 0x22, 0x33 } +}; #include "poppack.h" static IWICImagingFactory *factory; @@ -509,6 +549,68 @@ static void test_tiff_resolution(void) } } +static void test_tiff_24bpp(void) +{ + HRESULT hr; + IWICBitmapDecoder *decoder; + IWICBitmapFrameDecode *frame; + UINT count, width, height, i, stride; + double dpi_x, dpi_y; + GUID format; + WICRect rc; + BYTE data[3]; + static const BYTE expected_data[] = { 0x33,0x22,0x11 }; + + decoder = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data)); + ok(decoder != NULL, "Failed to load TIFF image data\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); + ok(hr == S_OK, "GetFrameCount error %#x\n", hr); + ok(count == 1, "got %u\n", count); + + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); + ok(hr == S_OK, "GetFrame error %#x\n", hr); + + hr = IWICBitmapFrameDecode_GetSize(frame, &width, &height); + ok(hr == S_OK, "GetSize error %#x\n", hr); + ok(width == 1, "got %u\n", width); + ok(height == 1, "got %u\n", height); + + hr = IWICBitmapFrameDecode_GetResolution(frame, &dpi_x, &dpi_y); + ok(hr == S_OK, "GetResolution error %#x\n", hr); + ok(dpi_x == 300.0, "got %f\n", dpi_x); + ok(dpi_y == 300.0, "got %f\n", dpi_y); + + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormat24bppBGR), + "got wrong format %s\n", wine_dbgstr_guid(&format)); + + for (stride = 0; stride <= 32; stride++) + { + memset(data, 0, sizeof(data)); + rc.X = 0; + rc.Y = 0; + rc.Width = 1; + rc.Height = 1; + hr = IWICBitmapFrameDecode_CopyPixels(frame, &rc, stride, sizeof(data), data); + if (stride < 3) + ok(hr == E_INVALIDARG, "CopyPixels(%u) should fail: %#x\n", stride, hr); + else + { +todo_wine_if(stride > 3) + ok(hr == S_OK, "CopyPixels(%u) error %#x\n", stride, hr); + + for (i = 0; i < sizeof(data); i++) +todo_wine_if(stride > 3) + ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); + } + } + + IWICBitmapFrameDecode_Release(frame); + IWICBitmapDecoder_Release(decoder); +} + START_TEST(tiffformat) { HRESULT hr; @@ -524,6 +626,7 @@ START_TEST(tiffformat) test_QueryCapability(); test_tiff_8bpp_alpha(); test_tiff_resolution(); + test_tiff_24bpp(); IWICImagingFactory_Release(factory); CoUninitialize(); -- 2.20.1

2 1

[PATCH 1/5] user32/tests: Add test for 8 bit image stretch mode in CopyImage().
by Paul Gofman 09 Jan '19

09 Jan '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/user32/tests/cursoricon.c | 49 +++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index c598b232a0..f00d3f2a0c 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2755,17 +2755,19 @@ static COLORREF get_color_from_bits(const unsigned char *bits, const BITMAPINFO unsigned int row, unsigned int column) { const BITMAPINFOHEADER *h = &bmi->bmiHeader; + unsigned int stride, shift, mask; const unsigned char *data; - unsigned int stride; RGBQUAD color; - ok(h->biBitCount == 1 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); + ok(h->biBitCount <= 8 || h->biBitCount >= 24, "Unsupported bit count %u.\n", h->biBitCount); stride = ((h->biBitCount * h->biWidth + 7) / 8 + 3) & ~3; data = bits + row * stride + column * h->biBitCount / 8; if (h->biBitCount >= 24) return RGB(data[2], data[1], data[0]); - color = bmi->bmiColors[!!(data[0] & (1u << (7 - (column % 8))))]; + shift = 8 - h->biBitCount - (column * h->biBitCount) % 8; + mask = ~(~0u << h->biBitCount); + color = bmi->bmiColors[(data[0] >> shift) & mask]; return RGB(color.rgbRed, color.rgbGreen, color.rgbBlue); } @@ -2783,6 +2785,18 @@ static void test_CopyImage_StretchMode(void) 0x3f, 0xff, 0x00, 0x3f, 0xff, 0x3f, 0x00, 0x00, 0x3f, 0xff, 0x7f, 0x00, 0xff, 0x3f, 0x00, 0x00, }; + static const unsigned char test_bits_8[] = + { + 0x00, 0xff, 0x00, 0xff, + 0x00, 0x00, 0x00, 0x00, + 0xff, 0x55, 0x00, 0xff, + 0x00, 0xff, 0xff, 0x00, + }; + static const unsigned char expected_bits_8[] = + { + 0xff, 0xff, 0x00, 0x00, + 0x55, 0xff, 0x00, 0x00, + }; static const unsigned char test_bits_1[] = { 0x30, 0x0, 0x0, 0x0, @@ -2795,6 +2809,12 @@ static void test_CopyImage_StretchMode(void) 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, }; + static const RGBQUAD colors_bits_1[] = + { + {0, 0, 0}, + {0xff, 0xff, 0xff}, + }; + static RGBQUAD colors_bits_8[256]; static const struct { @@ -2802,19 +2822,25 @@ static void test_CopyImage_StretchMode(void) WORD bit_count; const unsigned char *test_bits, *expected_bits; size_t test_bits_size, result_bits_size; + const RGBQUAD *bmi_colors; + size_t bmi_colors_size; BOOL todo; } tests[] = { {4, 4, 2, 2, 24, test_bits_24, expected_bits_24, - sizeof(test_bits_24), sizeof(expected_bits_24), TRUE}, + sizeof(test_bits_24), sizeof(expected_bits_24), NULL, 0, TRUE}, {4, 4, 2, 2, 1, test_bits_1, expected_bits_1, - sizeof(test_bits_1), sizeof(expected_bits_1), FALSE}, + sizeof(test_bits_1), sizeof(expected_bits_1), colors_bits_1, + sizeof(colors_bits_1), FALSE}, + {4, 4, 2, 2, 8, test_bits_8, expected_bits_8, + sizeof(test_bits_8), sizeof(expected_bits_8), colors_bits_8, + sizeof(colors_bits_8), TRUE}, }; HBITMAP bitmap, bitmap_copy; + unsigned int row, column, i; unsigned char *result_bits; - unsigned int row, column; unsigned int test_index; unsigned char *bits; BITMAPINFO *bmi; @@ -2825,14 +2851,19 @@ static void test_CopyImage_StretchMode(void) bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biPlanes = 1; bmi->bmiHeader.biCompression = BI_RGB; - bmi->bmiColors[1].rgbRed = 0xff; - bmi->bmiColors[1].rgbGreen = 0xff; - bmi->bmiColors[1].rgbBlue = 0xff; + + for (i = 0; i < 256; ++i) + colors_bits_8[i].rgbRed = colors_bits_8[i].rgbGreen = colors_bits_8[i].rgbBlue = i; hdc = GetDC(NULL); for (test_index = 0; test_index < ARRAY_SIZE(tests); ++test_index) { + if (tests[test_index].bmi_colors) + memcpy(bmi->bmiColors, tests[test_index].bmi_colors, tests[test_index].bmi_colors_size); + else + memset(bmi->bmiColors, 0, 256 * sizeof(RGBQUAD)); + bmi->bmiHeader.biWidth = tests[test_index].width; bmi->bmiHeader.biHeight = tests[test_index].height; bmi->bmiHeader.biBitCount = tests[test_index].bit_count; -- 2.20.1

3 7

[PATCH] po: Update German translation.
by Julian Rüger 09 Jan '19

09 Jan '19

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH vkd3d 3/3] tests: Add multithreaded private data test.
by Józef Kucia 09 Jan '19

09 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b8563b32e91e..f34b82c855d7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2832,6 +2832,159 @@ static void test_private_data(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +struct private_data +{ + ID3D12Object *object; + GUID guid; + unsigned int value; +}; + +static void private_data_thread_main(void *untyped_data) +{ + struct private_data *data = untyped_data; + unsigned int i; + HRESULT hr; + + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, 0, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateData(data->object, &data->guid, sizeof(data->value), &data->value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +struct private_data_interface +{ + ID3D12Object *object; + GUID guid; + IUnknown *iface; +}; + +static void private_data_interface_thread_main(void *untyped_data) +{ + struct private_data_interface *data = untyped_data; + unsigned int i; + HRESULT hr; + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(data->object, &data->guid, data->iface); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } +} + +static void test_multithread_private_data(void) +{ + static const GUID guid = {0xfdb37466, 0x428f, 0x4edf, {0xa3, 0x7f, 0x9b, 0x1d, 0xf4, 0x88, 0xc5, 0x00}}; + struct private_data_interface private_data_interface[4]; + HANDLE private_data_interface_thread[4]; + struct private_data private_data[4]; + ID3D12RootSignature *root_signature; + HANDLE private_data_thread[4]; + IUnknown *test_object, *unk; + ID3D12Device *device; + ID3D12Object *object; + unsigned int value; + unsigned int size; + unsigned int id; + unsigned int i; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + root_signature = create_empty_root_signature(device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + hr = ID3D12RootSignature_QueryInterface(root_signature, &IID_ID3D12Object, (void **)&object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12RootSignature_Release(root_signature); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&test_object); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + for (i = 0, id = 1; i < ARRAY_SIZE(private_data_interface); ++i, ++id) + { + private_data_interface[i].object = object; + private_data_interface[i].guid = guid; + private_data_interface[i].guid.Data4[7] = id; + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&private_data_interface[i].iface); + ok(hr == S_OK, "Failed to create fence %u, hr %#x.\n", i, hr); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i, ++id) + { + private_data[i].object = object; + private_data[i].guid = guid; + private_data[i].guid.Data4[7] = id; + private_data[i].value = id; + } + + for (i = 0; i < 4; ++i) + { + private_data_interface_thread[i] = create_thread(private_data_interface_thread_main, &private_data_interface[i]); + private_data_thread[i] = create_thread(private_data_thread_main, &private_data[i]); + } + + for (i = 0; i < 100000; ++i) + { + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, test_object); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < 4; ++i) + { + ok(join_thread(private_data_interface_thread[i]), "Failed to join thread %u.\n", i); + ok(join_thread(private_data_thread[i]), "Failed to join thread %u.\n", i); + } + + for (i = 0; i < ARRAY_SIZE(private_data_interface); ++i) + { + size = sizeof(unk); + hr = ID3D12Object_GetPrivateData(object, &private_data_interface[i].guid, &size, &unk); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(unk == private_data_interface[i].iface, "Got %p, expected %p.\n", unk, private_data_interface[i].iface); + IUnknown_Release(unk); + refcount = IUnknown_Release(private_data_interface[i].iface); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + } + for (i = 0; i < ARRAY_SIZE(private_data); ++i) + { + size = sizeof(value); + hr = ID3D12Object_GetPrivateData(object, &private_data[i].guid, &size, &value); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ok(value == private_data[i].value, "Got %u, expected %u.\n", value, private_data[i].value); + } + + hr = ID3D12Object_SetPrivateDataInterface(object, &guid, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IUnknown_Release(test_object); + ok(!refcount, "Test object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Object_Release(object); + ok(!refcount, "Object has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_reset_command_allocator(void) { ID3D12CommandAllocator *command_allocator, *command_allocator2; @@ -22327,6 +22480,7 @@ START_TEST(d3d12) run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); run_test(test_private_data); + run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); run_test(test_gpu_signal_fence); -- 2.19.2

1 0

[PATCH v2] ntoskrnl.exe: fix handling relocations on page boundary
by Rafał H 09 Jan '19

09 Jan '19

Code is only used for non-page-aligned device drivers. Previously if relocation was happening on page boundary it crashed because only one page had changed protection in load_driver_module. Now code is copied from ntdll and changes protection for all module pages before actual relocation starts. Fixes running MTA: San Andreas game. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28254 Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 102 +++++++++++++++++++++++++++-------- 1 file changed, 80 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d8a87a6ad0..e130fac302 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -25,6 +25,7 @@ #include "wine/port.h" #include <stdarg.h> +#include <assert.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -3295,6 +3296,84 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return ldr; } +/* convert PE image VirtualAddress to Real Address */ +static inline void *get_rva( HMODULE module, DWORD va ) +{ + return (void *)((char *)module + va); +} + +/* Copied from ntdll with checks for page alignment and characteristics removed */ +static NTSTATUS perform_relocations( void *module, SIZE_T len ) +{ + IMAGE_NT_HEADERS *nt; + char *base; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + INT_PTR delta; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + base = (char *)nt->OptionalHeader.ImageBase; + + assert( module != base ); + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + { + WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + if (!relocs->Size) return STATUS_SUCCESS; + if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; + + if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) + return STATUS_INVALID_IMAGE_FORMAT; + + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + + TRACE( "relocating from %p-%p to %p-%p\n", + base, base + len, module, (char *)module + len ); + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - base; + + while (rel < end - 1 && rel->SizeOfBlock) + { + if (rel->VirtualAddress >= len) + { + WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); + return STATUS_ACCESS_VIOLATION; + } + rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) return STATUS_INVALID_IMAGE_FORMAT; + } + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } + + return STATUS_SUCCESS; +} + /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { @@ -3318,28 +3397,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - DWORD old; - IMAGE_BASE_RELOCATION *rel, *end; - - if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) - { - TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); - end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); - while (rel < end && rel->SizeOfBlock) - { - void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); - rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), - (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); - if (!rel) goto error; - } - /* make sure we don't try again */ - size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; - VirtualProtect( nt, size, PAGE_READWRITE, &old ); - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, &old ); - } + perform_relocations(module, nt->OptionalHeader.SizeOfImage); } /* make sure imports are relocated too */ -- 2.17.1

1 0

[PATCH] testbot: There is no point unsetting $ENV.
by Francois Gouget 09 Jan '19

09 Jan '19

It is not a special environment variable or perl value and typically does not even exist. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 1 - testbot/bin/Janitor.pl | 1 - testbot/bin/LibvirtTool.pl | 2 -- testbot/bin/WineRunBuild.pl | 1 - testbot/bin/WineRunReconfig.pl | 1 - testbot/bin/WineRunTask.pl | 1 - testbot/bin/WineRunWineTest.pl | 1 - testbot/bin/WineSendLog.pl | 1 - testbot/bin/build/Build.pl | 1 - testbot/bin/build/Reconfig.pl | 1 - testbot/bin/build/WineReconfig.pl | 1 - testbot/bin/build/WineTest.pl | 1 - testbot/scripts/CheckWineTestBot.pl | 1 - 13 files changed, 14 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 79b25fac..9ffdf968 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -742,7 +742,6 @@ sub main() } $ENV{PATH} = "/usr/bin:/bin"; - delete $ENV{ENV}; $SIG{CHLD} = \&REAPER; $WineTestBot::Engine::Notify::RunningInEngine = 1; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 12084512..e7662852 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -77,7 +77,6 @@ sub Error(@) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; # Grab the command line options my ($Usage, $DryRun); diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index e6742f4c..a078fcbd 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -88,8 +88,6 @@ EOF # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; - # Grab the command line options my ($Usage, $Action, $VMKey); diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 68e6be4c..b1349f0d 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -73,7 +73,6 @@ sub Error(@) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 9bb402a6..2c8acdd6 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -74,7 +74,6 @@ sub Error(@) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index fea8c03f..e6112fd8 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -104,7 +104,6 @@ sub TakeScreenshot($$) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 5ce1448e..8792be39 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -103,7 +103,6 @@ sub TakeScreenshot($$) # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index a651c097..1d13454f 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -407,7 +407,6 @@ EOF # $ENV{PATH} = "/usr/bin:/bin"; -delete $ENV{ENV}; my $Usage; sub ValidateNumber($$) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index b50a25ca..894686da 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -115,7 +115,6 @@ sub BuildTestExecutables($$$) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my ($Usage, $PatchFile, $MissionStatement); while (@ARGV) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index b720788e..c43fbda3 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -111,7 +111,6 @@ sub UpdateWineBuilds($$) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $MissionStatement); while (@ARGV) diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 77810958..4e03c314 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -143,7 +143,6 @@ sub UpdateWinePrefixes($) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my ($Usage, $OptUpdate, $OptBuild, $OptNoRm, $OptAddOns, $OptWinePrefix, $MissionStatement); while (@ARGV) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index b588b8d3..eb0012db 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -210,7 +210,6 @@ sub TestExe($$$) # $ENV{PATH} = "/usr/lib/ccache:/usr/bin:/bin"; -delete $ENV{ENV}; my $Action = ""; my ($Usage, $OptNoSubmit, $MissionStatement, $FileName, $BaseTag); diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index a0c0bda5..9c2e2911 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -39,7 +39,6 @@ use WineTestBot::Config; use WineTestBot::Engine::Notify; $ENV{PATH} = "/sbin:/usr/sbin:/usr/bin:/bin"; -delete $ENV{ENV}; my $rc = 0; if (! PingEngine()) -- 2.20.1

1 0

[PATCH] wininet/tests: Add some tests for GetUrlCacheConfigInfo.
by Dmitry Timoshkov 09 Jan '19

09 Jan '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/tests/Makefile.in | 2 +- dlls/wininet/tests/urlcache.c | 103 +++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in index cf1a86acd8..ae18bb72fa 100644 --- a/dlls/wininet/tests/Makefile.in +++ b/dlls/wininet/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wininet.dll -IMPORTS = wininet crypt32 ws2_32 user32 advapi32 +IMPORTS = wininet crypt32 ws2_32 user32 advapi32 shell32 C_SRCS = \ ftp.c \ diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 3799500489..acd4ff247c 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -27,6 +30,7 @@ #include "winnls.h" #include "wininet.h" #include "winineti.h" +#include "shlobj.h" #include "wine/test.h" @@ -1100,6 +1104,104 @@ static void test_trailing_slash(void) DeleteFileA(filename); } +static void get_cache_path(DWORD flags, char path[MAX_PATH], char path_win8[MAX_PATH]) +{ + BOOL ret; + int folder = -1; + const char *suffix = ""; + const char *suffix_win8 = ""; + + switch (flags) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + folder = CSIDL_INTERNET_CACHE; + suffix = "\\Content.IE5\\"; + suffix_win8 = "\\IE\\"; + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + folder = CSIDL_COOKIES; + suffix = "\\"; + suffix_win8 = "\\"; + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + folder = CSIDL_HISTORY; + suffix = "\\History.IE5\\"; + suffix_win8 = "\\History.IE5\\"; + break; + + default: + ok(0, "unexpected flags %#x\n", flags); + break; + } + + ret = SHGetSpecialFolderPathA(0, path, folder, FALSE); + ok(ret, "SHGetSpecialFolderPath error %u\n", GetLastError()); + + strcpy(path_win8, path); + strcat(path_win8, suffix_win8); + + strcat(path, suffix); +} + +static void test_GetUrlCacheConfigInfo(void) +{ + INTERNET_CACHE_CONFIG_INFOA info; + struct + { + INTERNET_CACHE_CONFIG_INFOA *info; + DWORD dwStructSize; + DWORD flags; + BOOL ret; + DWORD error; + } td[] = + { +#if 0 /* crashes under Vista */ + { NULL, 0, 0, FALSE, ERROR_INVALID_PARAMETER }, +#endif + { &info, 0, 0, TRUE }, + { &info, sizeof(info) - 1, 0, TRUE }, + { &info, sizeof(info) + 1, 0, TRUE }, + { &info, 0, CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_CONTENT_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_COOKIES_PATHS_FC, TRUE }, + { &info, 0, CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + { &info, sizeof(info), CACHE_CONFIG_HISTORY_PATHS_FC, TRUE }, + }; + int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(td); i++) + { + if (td[i].info) + { + memset(&info, 0, sizeof(*td[i].info)); + info.dwStructSize = td[i].dwStructSize; + } + + SetLastError(0xdeadbeef); + ret = GetUrlCacheConfigInfoA(td[i].info, NULL, td[i].flags); +todo_wine + ok(ret == td[i].ret, "%d: expected %d, got %d\n", i, td[i].ret, ret); + if (!ret) +todo_wine + ok(GetLastError() == td[i].error, "%d: expected %u, got %u\n", i, td[i].error, GetLastError()); + else + { + char path[MAX_PATH], path_win8[MAX_PATH]; + + get_cache_path(td[i].flags, path, path_win8); + + ok(info.dwStructSize == td[i].dwStructSize, "got %u\n", info.dwStructSize); + ok(!lstrcmpA(info.u.s.CachePath, path) || !lstrcmpA(info.u.s.CachePath, path_win8), + "%d: expected %s or %s, got %s\n", i, path, path_win8, info.u.s.CachePath); + } + } +} + START_TEST(urlcache) { HMODULE hdll; @@ -1124,4 +1226,5 @@ START_TEST(urlcache) test_FindCloseUrlCache(); test_GetDiskInfoA(); test_trailing_slash(); + test_GetUrlCacheConfigInfo(); } -- 2.20.1

1 0

[PATCH] oledb32: Support Milliseconds when converting BSTR -> DBTIMESTAMP
by Alistair Leslie-Hughes 09 Jan '19

09 Jan '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oledb32/convert.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/convert.c | 8 ++++---- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f18c756..9b909fd 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -527,6 +527,45 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->second = st.wSecond; d->fraction = st.wMilliseconds * 1000000; } + else + { + WCHAR *de = s; + DWORD len = SysStringLen(s); + + TRACE("String with Milliseconds: %s\n", debugstr_w(s)); + + VariantClear(&var); + + while (len && de[len] != '.') + { + len--; + } + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocStringLen(s, len); + if ((hr = VariantChangeType(&var, &var, 0, VT_DATE)) == S_OK) + { + SYSTEMTIME st; + + hr = (VariantTimeToSystemTime( V_DATE(&var), &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + d->hour = st.wHour; + d->minute = st.wMinute; + d->second = st.wSecond; + d->fraction = 0; + + VariantClear(&var); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(de + (len+1)); + if(VariantChangeType(&var, &var, 0, VT_I4) == S_OK) + { + TRACE("Millseconds: %d\n", V_I4(&var)); + d->fraction = V_I4(&var); + } + } + } VariantClear(&var); } diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 5dab9ff..4a5c05e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -3641,10 +3641,10 @@ static void test_converttotimestamp(void) bstr = SysAllocString(strFullW); dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBTIMESTAMP, 0, &dst_len, &bstr, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); - todo_wine ok(hr == S_OK, "got %08x\n", hr); - todo_wine ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); - todo_wine ok(dst_len == sizeof(dst), "got %ld\n", dst_len); - todo_wine ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts1, &dst, sizeof(ts1)), "Wrong timestamp\n"); SysFreeString(bstr); V_VT(&var) = VT_NULL; -- 1.9.1

2 2

[PATCH v2 5/5] d3d9/tests: Add test for clearing surfaces with different sizes.
by Józef Kucia 08 Jan '19

08 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: * Use check_rt_color(). * Fix failures on testbot - use other depth stencil format when D16_LOCKABLE is not supported. --- dlls/d3d9/tests/visual.c | 107 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 51229f2b8268..00f15d3ef4c8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -214,10 +214,10 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) #define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color) { + D3DCOLOR color = 0xdeadbeef; struct surface_readback rb; D3DSURFACE_DESC desc; unsigned int x, y; - D3DCOLOR color; HRESULT hr; hr = IDirect3DSurface9_GetDesc(rt, &desc); @@ -236,7 +236,7 @@ static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR e break; } release_surface_readback(&rb); - ok_(__FILE__, line)(color == 0x000000ff, "Got unexpected color 0x%08x.\n", color); + ok_(__FILE__, line)(color == expected_color, "Got unexpected color 0x%08x.\n", color); } static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) @@ -1324,6 +1324,108 @@ done: DestroyWindow(window); } +static void test_clear_different_size_surfaces(void) +{ + IDirect3DSurface9 *ds, *rt, *rt2; + IDirect3DDevice9 *device; + D3DFORMAT ds_format; + D3DLOCKED_RECT lr; + unsigned int x, y; + D3DVIEWPORT9 vp; + IDirect3D9 *d3d; + D3DCAPS9 caps; + WORD *depth; + HWND window; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 1, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 2, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt2, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + + if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) + { + ds_format = D3DFMT_D16_LOCKABLE; + } + else + { + ds_format = D3DFMT_D24S8; + } + + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 4, 4, ds_format, + D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(hr == D3D_OK, "Failed to create depth surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(hr == D3D_OK, "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + if (caps.NumSimultaneousRTs >= 2) + { + hr = IDirect3DDevice9_SetRenderTarget(device, 1, rt2); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + } + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 640; + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.5f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + check_rt_color(rt, 0x00ff0000); + + if (caps.NumSimultaneousRTs >= 2) + check_rt_color(rt2, 0x00ff0000); + + if (ds_format == D3DFMT_D16_LOCKABLE) + { + hr = IDirect3DSurface9_LockRect(ds, &lr, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock rect, hr %#x.\n", hr); + for (y = 0; y < 4; ++y) + { + depth = (WORD *)((BYTE *)lr.pBits + y * lr.Pitch); + for (x = 0; x < 4; ++x) + { + ok(abs(depth[x] - 0x7fff) <= 2, "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); + } + } + hr = IDirect3DSurface9_UnlockRect(ds); + ok(hr == D3D_OK, "Failed to unlock rect, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + } + else + { + skip("D3DFMT_D16_LOCKABLE is not supported.\n"); + } + + IDirect3DSurface9_Release(rt); + IDirect3DSurface9_Release(rt2); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void color_fill_test(void) { IDirect3DSurface9 *surface; @@ -24420,6 +24522,7 @@ START_TEST(visual) lighting_test(); test_specular_lighting(); clear_test(); + test_clear_different_size_surfaces(); color_fill_test(); fog_test(); test_cube_wrap(); -- 2.19.2

1 0

[PATCH] rpcndr.h: Don't use unnamed struct for NDR_SCONTEXT declaration.
by Jacek Caban 08 Jan '19

08 Jan '19

Fixes C++ warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- mingw-w64 does the same as this patch. PSDK uses an unnamed struct (but cl doesn't emit a warning). The warning is: In file included from /home/jacek/wine/wine-git/include/wtypes.h:8:0, from /home/jacek/wine/wine-git/include/winscard.h:22, from /home/jacek/wine/wine-git/include/windows.h:70, from test.cpp:2: /home/jacek/wine/wine-git/include/rpcndr.h:188:16: warning: ‘_MIDL_STUB_MESSAGE’ has a field ‘_MIDL_STUB_MESSAGE::SavedContextHandles’ whose type depends on the type ‘<unnamed struct>’ which has no linkage [-Wsubobject-linkage] typedef struct _MIDL_STUB_MESSAGE ^~~~~~~~~~~~~~~~~~ /home/jacek/wine/wine-git/include/rpcndr.h:491:16: warning: ‘_SCONTEXT_QUEUE’ has a field ‘_SCONTEXT_QUEUE::ArrayOfObjects’ whose type depends on the type ‘<unnamed struct>’ which has no linkage [-Wsubobject-linkage] typedef struct _SCONTEXT_QUEUE { ^~~~~~~~~~~~~~~ include/rpcndr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] winnt.h: Avoid using attributes on elaborated type specifier.
by Jacek Caban 08 Jan '19

08 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes C++ warning: winnt.h:781:35: warning: attributes ignored on elaborated-type-specifier that is not a forward declaration [-Wattributes] typedef struct DECLSPEC_ALIGN(16) _SLIST_ENTRY *PSLIST_ENTRY; ^~~~~~~~~~~~ include/winnt.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

1 0

[PATCH] wine/debug.h: Avoid narrowing conversions in struct initializers.
by Jacek Caban 08 Jan '19

08 Jan '19

Fixes using the header from C++. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The error is: wine-git/include/wine/debug.h:365:69: error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned char’ inside { } [-Wnarrowing] static struct __wine_debug_channel __wine_dbch_##ch = { ~0, #ch }; \ ^ test.cpp:6:1: note: in expansion of macro ‘WINE_DEFAULT_DEBUG_CHANNEL’ include/wine/debug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH v2 2/2] d3d8: Avoid calling wined3d_device_process_vertices() with unmappable source buffers.
by Henri Verbeet 08 Jan '19

08 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebased onto test changes. This supersedes patch 156415. dlls/d3d8/device.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/tests/visual.c | 4 ++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 334812540e8..b2a6e48da09 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2592,14 +2592,54 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertexbuffer *dst = unsafe_impl_from_IDirect3DVertexBuffer8(dst_buffer); + struct d3d8_vertexbuffer *d3d8_buffer; + struct wined3d_buffer *wined3d_buffer; + unsigned int i, offset, stride, map; HRESULT hr; TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, flags %#x.\n", iface, src_start_idx, dst_idx, vertex_count, dst_buffer, flags); wined3d_mutex_lock(); + + /* Note that an alternative approach would be to simply create these + * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we + * do for draws. In some regards that would be easier, but it seems less + * than optimal to upload data to the GPU only to subsequently download it + * again. */ + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d8_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d8_buffer->wined3d_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, dst->wined3d_buffer, NULL, flags, dst->fvf); + + map = device->sysmem_vb; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d8_buffer = wined3d_buffer_get_parent(wined3d_buffer); + if (FAILED(wined3d_device_set_stream_source(device->wined3d_device, + i, d3d8_buffer->draw_buffer, offset, stride))) + ERR("Failed to set stream source.\n"); + } + wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cbe6c975e08..43b286b0373 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10596,12 +10596,12 @@ static void test_sysmem_draw(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, 0); - todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DVertexBuffer8_Lock(dst_vb, 0, 0, (BYTE **)&dst_data, 0); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(quad); ++i) { - todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 4), "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w); -- 2.11.0

2 1

[PATCH v2 1/2] d3d8/tests: Add a test for ProcessVertices() on D3DPOOL_SYSTEMMEM buffers.
by Henri Verbeet 08 Jan '19

08 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Increased tolerance from 1 to 4 for testbot WARP. This supersedes patch 156417. dlls/d3d8/tests/visual.c | 82 ++++++++++++++++++++++++++++++++++++++++++++---- include/d3d8.h | 2 +- 2 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cdb46708763..cbe6c975e08 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -19,6 +19,7 @@ /* See comment in dlls/d3d9/tests/visual.c for general guidelines */ +#include <limits.h> #include <math.h> #define COBJMACROS @@ -62,6 +63,30 @@ static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) return TRUE; } +static BOOL compare_float(float f, float g, unsigned int ulps) +{ + int x = *(int *)&f; + int y = *(int *)&g; + + if (x < 0) + x = INT_MIN - x; + if (y < 0) + y = INT_MIN - y; + + if (abs(x - y) > ulps) + return FALSE; + + return TRUE; +} + +static BOOL compare_vec4(const struct vec4 *vec, float x, float y, float z, float w, unsigned int ulps) +{ + return compare_float(vec->x, x, ulps) + && compare_float(vec->y, y, ulps) + && compare_float(vec->z, z, ulps) + && compare_float(vec->w, w, ulps); +} + static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER8 *identifier) { return !strcmp(identifier->Driver, "d3d10warp.dll"); @@ -10448,11 +10473,14 @@ static void test_color_vertex(void) static void test_sysmem_draw(void) { - IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1; + IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1, *dst_vb; + D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DIndexBuffer8 *ib; IDirect3DDevice8 *device; + struct vec4 *dst_data; IDirect3D8 *d3d; D3DCOLOR colour; + unsigned int i; ULONG refcount; HWND window; HRESULT hr; @@ -10474,10 +10502,10 @@ static void test_sysmem_draw(void) } quad[] = { - {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, - {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, - {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, - {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + {{-0.5f, -0.5f, 0.0f}, 0xffff0000}, + {{-0.5f, 0.5f, 0.0f}, 0xff00ff00}, + {{ 0.5f, -0.5f, 0.0f}, 0xff0000ff}, + {{ 0.5f, 0.5f, 0.0f}, 0xffffffff}, }; static const struct vec3 quad_s0[] = { @@ -10510,7 +10538,17 @@ static void test_sysmem_draw(void) d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, window, TRUE))) + + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; + present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = window; + present_parameters.Windowed = TRUE; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + if (FAILED(hr = IDirect3D8_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + window, D3DCREATE_MIXED_VERTEXPROCESSING, &present_parameters, &device))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D8_Release(d3d); @@ -10547,6 +10585,37 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice8_CreateVertexBuffer(device, ARRAY_SIZE(quad) * sizeof(*dst_data), + 0, D3DFVF_XYZRHW, D3DPOOL_SYSTEMMEM, &dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SOFTWAREVERTEXPROCESSING, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_ProcessVertices(device, 0, 0, ARRAY_SIZE(quad), dst_vb, 0); + todo_wine ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(dst_vb, 0, 0, (BYTE **)&dst_data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + todo_wine ok(compare_vec4(&dst_data[i], quad[i].position.x * 320.0f + 320.0f, + -quad[i].position.y * 240.0f + 240.0f, 0.0f, 1.0f, 4), + "Got unexpected vertex %u {%.8e, %.8e, %.8e, %.8e}.\n", + i, dst_data[i].x, dst_data[i].y, dst_data[i].z, dst_data[i].w); + } + hr = IDirect3DVertexBuffer8_Unlock(dst_vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SOFTWAREVERTEXPROCESSING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -10633,6 +10702,7 @@ static void test_sysmem_draw(void) IDirect3DVertexBuffer8_Release(vb_s0); IDirect3DDevice8_DeleteVertexShader(device, vs); IDirect3DIndexBuffer8_Release(ib); + IDirect3DVertexBuffer8_Release(dst_vb); IDirect3DVertexBuffer8_Release(vb); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); diff --git a/include/d3d8.h b/include/d3d8.h index d56e67fed79..51eed8b7dda 100644 --- a/include/d3d8.h +++ b/include/d3d8.h @@ -1014,7 +1014,7 @@ DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown) #define IDirect3DDevice8_DrawIndexedPrimitive(p,a,b,c,d,e) (p)->lpVtbl->DrawIndexedPrimitive(p,a,b,c,d,e) #define IDirect3DDevice8_DrawPrimitiveUP(p,a,b,c,d) (p)->lpVtbl->DrawPrimitiveUP(p,a,b,c,d) #define IDirect3DDevice8_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) -#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->lpVtbl->processVertices(p,a,b,c,d,e) +#define IDirect3DDevice8_ProcessVertices(p,a,b,c,d,e) (p)->lpVtbl->ProcessVertices(p,a,b,c,d,e) #define IDirect3DDevice8_CreateVertexShader(p,a,b,c,d) (p)->lpVtbl->CreateVertexShader(p,a,b,c,d) #define IDirect3DDevice8_SetVertexShader(p,a) (p)->lpVtbl->SetVertexShader(p,a) #define IDirect3DDevice8_GetVertexShader(p,a) (p)->lpVtbl->GetVertexShader(p,a) -- 2.11.0

1 0

[PATCH 5/5] d3d9/tests: Add test for clearing surfaces with different sizes.
by Józef Kucia 08 Jan '19

08 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 110 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 51229f2b8268..3db61db12c7e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1324,6 +1324,115 @@ done: DestroyWindow(window); } +static void test_clear_different_size_surfaces(void) +{ + IDirect3DSurface9 *ds, *rt, *rt2; + struct surface_readback rb; + IDirect3DDevice9 *device; + D3DLOCKED_RECT lr; + unsigned int x, y; + D3DVIEWPORT9 vp; + IDirect3D9 *d3d; + D3DCAPS9 caps; + WORD *depth; + HWND window; + DWORD color; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 1, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 1, 2, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt2, NULL); + ok(hr == D3D_OK, "Failed to create render target surface, hr %#x.\n", hr); + + if (SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, D3DFMT_D16_LOCKABLE))) + { + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 4, 4, D3DFMT_D16_LOCKABLE, + D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(hr == D3D_OK, "Failed to create depth surface, hr %#x.\n", hr); + } + else + { + skip("D3DFMT_D16_LOCKABLE is not supported.\n"); + ds = NULL; + } + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(hr == D3D_OK, "Failed to set depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + if (caps.NumSimultaneousRTs >= 2) + { + hr = IDirect3DDevice9_SetRenderTarget(device, 1, rt2); + ok(hr == D3D_OK, "Failed to set render target, hr %#x.\n", hr); + } + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 640; + vp.MinZ = 0.0f; + vp.MaxZ = 1.0f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(hr == D3D_OK, "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.5f, 0); + ok(hr == D3D_OK, "Failed to clear, hr %#x.\n", hr); + + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 0, 0); + ok(color == 0xffff0000, "Got color 0x%08x.\n", color); + release_surface_readback(&rb); + + if (caps.NumSimultaneousRTs >= 2) + { + get_rt_readback(rt2, &rb); + for (y = 0; y < 2; ++y) + { + color = get_readback_color(&rb, 0, y); + ok(color == 0xffff0000, "Got color 0x%08x at %u.\n", color, y); + } + release_surface_readback(&rb); + } + + if (ds) + { + hr = IDirect3DSurface9_LockRect(ds, &lr, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Failed to lock rect, hr %#x.\n", hr); + for (y = 0; y < 4; ++y) + { + depth = (WORD *)((BYTE *)lr.pBits + y * lr.Pitch); + for (x = 0; x < 4; ++x) + { + ok(abs(depth[x] - 0x7fff) <= 2, "Got depth 0x%04x at %u, %u.\n", depth[x], x, y); + } + } + hr = IDirect3DSurface9_UnlockRect(ds); + ok(hr == D3D_OK, "Failed to unlock rect, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + } + + IDirect3DSurface9_Release(rt); + IDirect3DSurface9_Release(rt2); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void color_fill_test(void) { IDirect3DSurface9 *surface; @@ -24420,6 +24529,7 @@ START_TEST(visual) lighting_test(); test_specular_lighting(); clear_test(); + test_clear_different_size_surfaces(); color_fill_test(); fog_test(); test_cube_wrap(); -- 2.19.2

2 1

[PATCH 5/5] dxdiagn: Handle Red Hat and VMware in vendor_id_to_manufacturer_string().
by Henri Verbeet 08 Jan '19

08 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxdiagn/provider.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index ec30574b840..ede7344f95a 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -920,31 +920,37 @@ static BOOL get_texture_memory(GUID *adapter, DWORD *available_mem) static const WCHAR *vendor_id_to_manufacturer_string(DWORD vendor_id) { + unsigned int i; + static const WCHAR atiW[] = {'A','T','I',' ','T','e','c','h','n','o','l','o','g','i','e','s',' ','I','n','c','.',0}; static const WCHAR nvidiaW[] = {'N','V','I','D','I','A',0}; static const WCHAR intelW[] = {'I','n','t','e','l',' ','C','o','r','p','o','r','a','t','i','o','n',0}; + static const WCHAR vmwareW[] = {'V','M','w','a','r','e',0}; + static const WCHAR redhatW[] = {'R','e','d',' ','H','a','t',0}; static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',0}; - - /* Enumeration copied from dlls/wined3d/wined3d_private.h and slightly modified. */ - enum pci_vendor + static const struct { - HW_VENDOR_AMD = 0x1002, - HW_VENDOR_NVIDIA = 0x10de, - HW_VENDOR_INTEL = 0x8086, + DWORD id; + const WCHAR *name; + } + vendors[] = + { + {0x1002, atiW}, + {0x10de, nvidiaW}, + {0x15ad, vmwareW}, + {0x1af4, redhatW}, + {0x8086, intelW}, }; - switch (vendor_id) + for (i = 0; i < ARRAY_SIZE(vendors); ++i) { - case HW_VENDOR_AMD: - return atiW; - case HW_VENDOR_NVIDIA: - return nvidiaW; - case HW_VENDOR_INTEL: - return intelW; - default: - FIXME("Unknown PCI vendor ID 0x%04x\n", vendor_id); - return unknownW; + if (vendors[i].id == vendor_id) + return vendors[i].name; } + + FIXME("Unknown PCI vendor ID 0x%04x.\n", vendor_id); + + return unknownW; } static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node) -- 2.11.0

2 1

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-devel