April 2020 - Wine-devel - list.winehq.org

[PATCH v2 1/2] winapi_test: Do not multiply type size when it is undefined, in _refresh().
by Serge Gautherie 14 Apr '20

14 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- 'Use of uninitialized value $type_size in multiplication (*) at tools/winapi/c_type.pm line 244.' --- tools/winapi/c_type.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/winapi/c_type.pm b/tools/winapi/c_type.pm index b00cf81..c6aeb6a 100644 --- a/tools/winapi/c_type.pm +++ b/tools/winapi/c_type.pm @@ -239,8 +239,14 @@ sub _refresh($) } else { - print STDERR "$type_name -> type_size=undef, count=$count\n" if (!defined $type_size); - $type_size *= int($count); + if (!defined $type_size) + { + print STDERR "$type_name -> type_size=undef, count=$count\n"; + } + else + { + $type_size *= int($count); + } } } if ($bitfield_size != 0) -- 2.10.0.windows.1

2 3

[PATCH 01/13] msscript.ocx: Move parse_script_text up.
by Gabriel Ivăncescu 14 Apr '20

14 Apr '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- So it's near the other helpers and will be needed for later patches in the series. dlls/msscript.ocx/msscript.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c4c6485..6d098cd 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -237,6 +237,20 @@ static HRESULT start_script(struct ScriptControl *control) return hr; } +static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) +{ + EXCEPINFO excepinfo; + HRESULT hr; + + hr = start_script(control); + if (FAILED(hr)) return hr; + + hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, + NULL, NULL, 0, 1, flag, res, &excepinfo); + /* FIXME: more error handling */ + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -1008,20 +1022,6 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } -static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) -{ - EXCEPINFO excepinfo; - HRESULT hr; - - hr = start_script(control); - if (FAILED(hr)) return hr; - - hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, - NULL, NULL, 0, 1, flag, res, &excepinfo); - /* FIXME: more error handling */ - return hr; -} - static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) { ScriptControl *This = impl_from_IScriptControl(iface); -- 2.21.0

2 14

[PATCH vkd3d] tests: Introduce compare_uint().
by Chip Davis 14 Apr '20

14 Apr '20

Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- tests/d3d12_test_utils.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 5092183..e4c8e58 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -53,20 +53,19 @@ static void set_viewport(D3D12_VIEWPORT *vp, float x, float y, vp->MaxDepth = max_depth; } +static bool compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + + return diff <= max_diff; +} + static bool compare_color(DWORD c1, DWORD c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return false; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return false; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return false; - c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) - return false; - return true; + return compare_uint(c1 & 0xff, c2 & 0xff, max_diff) + && compare_uint((c1 >> 8) & 0xff, (c2 >> 8) & 0xff, max_diff) + && compare_uint((c1 >> 16) & 0xff, (c2 >> 16) & 0xff, max_diff) + && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff); } static D3D12_SHADER_BYTECODE shader_bytecode(const DWORD *code, size_t size) -- 2.24.0

2 1

[PATCH] wined3d: Use GL_APPLE_rgb_422 for UYVY and YUY2 surfaces.
by Chip Davis 14 Apr '20

14 Apr '20

Theoretically, we could use it to support UYVY and YUY2 *textures* as well, but it would still require converting from YUV to RGB after sampling. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 14 ++++++++++++-- dlls/wined3d/glsl_shader.c | 10 ++++++++++ dlls/wined3d/utils.c | 8 ++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 36c920dc6e0..961d7acf131 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6951,7 +6951,7 @@ static void arbfp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3 heap_free(arbfp_blitter); } -static void gen_packed_yuv_read(struct wined3d_string_buffer *buffer, +static void gen_packed_yuv_read(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type, char *luminance) { char chroma; @@ -6972,6 +6972,16 @@ static void gen_packed_yuv_read(struct wined3d_string_buffer *buffer, if (type->res_type == WINED3D_GL_RES_TYPE_TEX_RECT) texinstr = "TEX"; + if (gl_info->supported[APPLE_RGB_422]) + { + /* In this case, things are much simpler. The only thing we have to do here + * is YUV-RGB conversion. */ + shader_addline(buffer, "TEX luminance, fragment.texcoord[0], texture[0], %s\n", tex); + shader_addline(buffer, "MOV chroma.xy, luminance.xz\n"); + shader_addline(buffer, "MOV luminance.%c, luminance.y\n", *luminance); + return; + } + /* First we have to read the chroma values. This means we need at least two pixels(no filtering), * or 4 pixels(with filtering). To get the unmodified chromas, we have to rid ourselves of the * filtering when we sample the texture. @@ -7479,7 +7489,7 @@ static GLuint gen_yuv_shader(const struct wined3d_gl_info *gl_info, const struct { case COMPLEX_FIXUP_UYVY: case COMPLEX_FIXUP_YUY2: - gen_packed_yuv_read(&buffer, type, &luminance_component); + gen_packed_yuv_read(&buffer, gl_info, type, &luminance_component); break; case COMPLEX_FIXUP_YV12: diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c7feff85efb..207ba892e24 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12499,6 +12499,16 @@ static void gen_packed_yuv_read(struct wined3d_string_buffer *buffer, tex = needs_legacy_glsl_syntax(gl_info) ? tex_type : ""; + if (gl_info->supported[APPLE_RGB_422]) + { + /* In this case, things are much simpler. The only thing we have to do here + * is YUV-RGB conversion. */ + shader_addline(buffer, " vec3 yuv = vec3(texture%s(sampler, out_texcoord.xy));\n", tex); + shader_addline(buffer, " luminance = yuv.y;\n"); + shader_addline(buffer, " chroma = yuv.xz;\n"); + return; + } + /* First we have to read the chroma values. This means we need at least * two pixels (no filtering), or 4 pixels (with filtering). To get the * unmodified chroma, we have to rid ourselves of the filtering when we diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dec7eecd7ee..b50813db3a1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1312,6 +1312,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = * Macs, so probably the endianness differs. This could be tested as soon as we have a Windows and MacOS on a big * endian machine */ + {WINED3DFMT_UYVY, GL_RGB_RAW_422_APPLE, GL_RGB_RAW_422_APPLE, 0, + GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, 0, + WINED3DFMT_FLAG_FILTERING, + APPLE_RGB_422, NULL}, {WINED3DFMT_UYVY, GL_RG8, GL_RG8, 0, GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, @@ -1324,6 +1328,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_FILTERING, APPLE_YCBCR_422, NULL}, + {WINED3DFMT_YUY2, GL_RGB_RAW_422_APPLE, GL_RGB_RAW_422_APPLE, 0, + GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, 0, + WINED3DFMT_FLAG_FILTERING, + APPLE_RGB_422, NULL}, {WINED3DFMT_YUY2, GL_RG8, GL_RG8, 0, GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, -- 2.24.0

2 1

[PATCH 1/4] ddraw: Never consider system memory surface lost.
by Paul Gofman 14 Apr '20

14 Apr '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48923 Fixes a regression triggered by 530a3d94de949030f8d74bacd6c20986b32f1a31. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 3 ++- dlls/ddraw/tests/ddraw7.c | 54 ++++++++++++++++++++++++++++++++++++--- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 95e9fba901..c6a94088cb 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4899,7 +4899,7 @@ void ddraw_update_lost_surfaces(struct ddraw *ddraw) LIST_FOR_EACH_ENTRY(surface, &ddraw->surface_list, struct ddraw_surface, surface_list_entry) { - surface->is_lost = TRUE; + surface->is_lost = !(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY); } ddraw->device_state = DDRAW_DEVICE_STATE_OK; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 20143891d3..53617bb9ab 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -35,7 +35,8 @@ static inline struct ddraw_surface *impl_from_IDirectDrawGammaControl(IDirectDra static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) { - return surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost; + return !(surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + && (surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost); } /* This is slow, of course. Also, in case of locks, we can't prevent other diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e44308761b..d3ea36e980 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -9269,6 +9269,7 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { IDirectDrawSurface7 *surface, *back_buffer; + IDirectDrawSurface7 *sysmem_surface; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw7 *ddraw; @@ -9284,7 +9285,7 @@ static void test_lost_device(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); @@ -9292,7 +9293,16 @@ static void test_lost_device(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; U5(surface_desc).dwBackBufferCount = 1; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + 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_SYSTEMMEMORY; + surface_desc.dwWidth = 100; + surface_desc.dwHeight = 100; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9300,6 +9310,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9309,6 +9321,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9318,6 +9332,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9327,6 +9343,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9336,6 +9354,8 @@ static void test_lost_device(void) todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ @@ -9345,12 +9365,16 @@ static void test_lost_device(void) surface_desc.dwFlags = DDSD_CAPS; surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_TestCooperativeLevel(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ret = SetForegroundWindow(GetDesktopWindow()); ok(ret, "Failed to set foreground window.\n"); @@ -9358,6 +9382,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ret = SetForegroundWindow(window1); ok(ret, "Failed to set foreground window.\n"); @@ -9365,6 +9391,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9372,6 +9400,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_RestoreAllSurfaces(ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9379,6 +9409,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirectDrawSurface7_Release(surface); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -9387,7 +9419,7 @@ static void test_lost_device(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; U5(surface_desc).dwBackBufferCount = 1; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); - ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9397,6 +9429,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9406,6 +9440,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window1, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9415,6 +9451,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9424,6 +9462,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_NORMAL | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9433,6 +9473,8 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_NOEXCLUSIVEMODE, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window2, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); @@ -9442,6 +9484,8 @@ static void test_lost_device(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); memset(&caps, 0, sizeof(caps)); caps.dwCaps = DDSCAPS_FLIP; @@ -9454,8 +9498,10 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_IsLost(back_buffer); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface7_Release(back_buffer); + IDirectDrawSurface7_Release(sysmem_surface); IDirectDrawSurface7_Release(surface); refcount = IDirectDraw7_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount); -- 2.25.2

2 4

[PATCH v2 2/2] winapi_test: Fix a verifying loop on headers, which never finds any type name.
by Serge Gautherie 14 Apr '20

14 Apr '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/winapi_test | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8..784b4c4 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -859,8 +859,7 @@ foreach my $test_dir (@test_dirs) { foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { $output->prefix("$header: "); - $header =~ s%^include/%%; - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; + my $type_name2type = $file2types{$pointer_size}{$header}; foreach my $_type_name (sort(keys(%$type_name2type))) { my $type_name = $_type_name; @@ -874,10 +873,10 @@ $output->prefix("$winapi_dir/tests.dat: "); foreach my $type_name (sort(keys(%type_names_used))) { my $found = 0; foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; - if (exists($type_name2type{$type_name})) { - $found = 1; - } + if (exists($file2types{$pointer_size}{$header}{$type_name})) { + $found = 1; + last; + } } if (!$found) { -- 2.10.0.windows.1

1 0

[PATCH v2 1/4] d3dcompiler: Check for multiple matrix majority keywords on typedefs.
by Zebediah Figura 14 Apr '20

14 Apr '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/hlsl.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 67393f6ca97..5381fa211a2 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -814,6 +814,10 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(type->modifiers, v->loc); + if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) + && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) + hlsl_report_message(v->loc, HLSL_LEVEL_ERROR, "more than one matrix majority keyword"); + ret = add_type_to_scope(hlsl_ctx.cur_scope, type); if (!ret) { -- 2.26.0

3 9

[PATCH v3] d3dx9: Add support for D3DFMT_P8 in DDS files.
by Matteo Bruni 14 Apr '20

14 Apr '20

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=48731 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Supersedes 182693, 183345. dlls/d3dx9_36/surface.c | 12 +++++ dlls/d3dx9_36/tests/surface.c | 92 +++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 42e7bf16f1f..a5143cbee4a 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -108,6 +108,7 @@ static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) #define DDS_PF_ALPHA 0x1 #define DDS_PF_ALPHA_ONLY 0x2 #define DDS_PF_FOURCC 0x4 +#define DDS_PF_INDEXED 0x20 #define DDS_PF_RGB 0x40 #define DDS_PF_YUV 0x200 #define DDS_PF_LUMINANCE 0x20000 @@ -349,6 +350,15 @@ static D3DFORMAT dds_alpha_to_d3dformat(const struct dds_pixel_format *pixel_for return D3DFMT_UNKNOWN; } +static D3DFORMAT dds_indexed_to_d3dformat(const struct dds_pixel_format *pixel_format) +{ + if (pixel_format->bpp == 8) + return D3DFMT_P8; + + WARN("Unknown indexed pixel format (%u).\n", pixel_format->bpp); + return D3DFMT_UNKNOWN; +} + static D3DFORMAT dds_bump_to_d3dformat(const struct dds_pixel_format *pixel_format) { if (pixel_format->bpp == 16 && pixel_format->rmask == 0x00ff && pixel_format->gmask == 0xff00) @@ -381,6 +391,8 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi if (pixel_format->flags & DDS_PF_FOURCC) return dds_fourcc_to_d3dformat(pixel_format->fourcc); + if (pixel_format->flags & DDS_PF_INDEXED) + return dds_indexed_to_d3dformat(pixel_format); if (pixel_format->flags & DDS_PF_RGB) return dds_rgb_to_d3dformat(pixel_format); if (pixel_format->flags & DDS_PF_LUMINANCE) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index d5d3d6d2112..e9b9e041785 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -107,6 +107,87 @@ static const unsigned char noimage[4] = { 0x11,0x22,0x33,0x44 }; +/* 16x4 8-bit dds */ +static const unsigned char dds_8bit[] = +{ + 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x0f,0x10,0x00,0x00,0x04,0x00,0x00,0x00, + 0x10,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, + 0x47,0x49,0x4d,0x50,0x2d,0x44,0x44,0x53,0x5a,0x09,0x03,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, + 0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff, + 0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0xec,0x27,0x00,0xff,0x8c,0xcd,0x12,0xff, + 0x78,0x01,0x14,0xff,0x50,0xcd,0x12,0xff,0x00,0x3d,0x8c,0xff,0x02,0x00,0x00,0xff, + 0x47,0x00,0x00,0xff,0xda,0x07,0x02,0xff,0x50,0xce,0x12,0xff,0xea,0x11,0x01,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x08,0x3d,0x8c,0xff,0x08,0x01,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x60,0xcc,0x12,0xff, + 0xa1,0xb2,0xd4,0xff,0xda,0x07,0x02,0xff,0x47,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x50,0xce,0x12,0xff,0x00,0x00,0x14,0xff,0xa8,0xcc,0x12,0xff,0x3c,0xb2,0xd4,0xff, + 0xda,0x07,0x02,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x01,0xff, + 0x21,0x00,0x00,0xff,0xd8,0xcb,0x12,0xff,0x54,0xcd,0x12,0xff,0x8b,0x4f,0xd5,0xff, + 0x00,0x04,0xda,0xff,0x00,0x00,0x00,0xff,0x3d,0x04,0x91,0xff,0x70,0xce,0x18,0xff, + 0xb4,0xcc,0x12,0xff,0x6b,0x4e,0xd5,0xff,0xb0,0xcc,0x12,0xff,0x00,0x00,0x00,0xff, + 0xc8,0x05,0x91,0xff,0x98,0xc7,0xcc,0xff,0x7c,0xcd,0x12,0xff,0x51,0x05,0x91,0xff, + 0x48,0x07,0x14,0xff,0x6d,0x05,0x91,0xff,0x00,0x07,0xda,0xff,0xa0,0xc7,0xcc,0xff, + 0x00,0x07,0xda,0xff,0x3a,0x77,0xd5,0xff,0xda,0x07,0x02,0xff,0x7c,0x94,0xd4,0xff, + 0xe0,0xce,0xd6,0xff,0x0a,0x80,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x78,0x9a,0xab,0xff,0xde,0x08,0x18,0xff,0xda,0x07,0x02,0xff,0x30,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x50,0xce,0x12,0xff,0x8c,0xcd,0x12,0xff,0xd0,0xb7,0xd8,0xff, + 0x00,0x00,0x00,0xff,0x60,0x32,0xd9,0xff,0x30,0xc1,0x1a,0xff,0xa8,0xcd,0x12,0xff, + 0xa4,0xcd,0x12,0xff,0xc0,0x1d,0x4b,0xff,0x46,0x71,0x0e,0xff,0xc0,0x1d,0x4b,0xff, + 0x09,0x87,0xd4,0xff,0x00,0x00,0x00,0xff,0xf6,0x22,0x00,0xff,0x64,0xcd,0x12,0xff, + 0x00,0x00,0x00,0xff,0xca,0x1d,0x4b,0xff,0x09,0x87,0xd4,0xff,0xaa,0x02,0x05,0xff, + 0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0xc0,0x1d,0x4b,0xff, + 0xcd,0xab,0xba,0xff,0x00,0x00,0x00,0xff,0xa4,0xcd,0x12,0xff,0xc0,0x1d,0x4b,0xff, + 0xd4,0xcd,0x12,0xff,0xa6,0x4c,0xd5,0xff,0x00,0xf0,0xfd,0xff,0xd4,0xcd,0x12,0xff, + 0xf4,0x4c,0xd5,0xff,0x90,0xcd,0x12,0xff,0xc2,0x4c,0xd5,0xff,0x82,0x00,0x00,0xff, + 0xaa,0x02,0x05,0xff,0x88,0xd4,0xba,0xff,0x14,0x00,0x00,0xff,0x01,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x10,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x0c,0x08,0x13,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0xd0,0xcd,0x12,0xff,0xc6,0x84,0xf1,0xff,0x7c,0x84,0xf1,0xff,0x20,0x20,0xf5,0xff, + 0x00,0x00,0x0a,0xff,0xf0,0xb0,0x94,0xff,0x64,0x6c,0xf1,0xff,0x85,0x6c,0xf1,0xff, + 0x8b,0x4f,0xd5,0xff,0x00,0x04,0xda,0xff,0x88,0xd4,0xba,0xff,0x82,0x00,0x00,0xff, + 0x39,0xde,0xd4,0xff,0x10,0x50,0xd5,0xff,0xaa,0x02,0x05,0xff,0x00,0x00,0x00,0xff, + 0x4f,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5c,0xce,0x12,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5c,0xce,0x12,0xff, + 0xaa,0x02,0x05,0xff,0x4c,0xce,0x12,0xff,0x39,0xe6,0xd4,0xff,0x00,0x00,0x00,0xff, + 0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x5b,0xe6,0xd4,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x68,0x50,0xcd,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x00,0x00,0x00,0xff,0x10,0x00,0x00,0xff,0xe3,0xea,0x90,0xff,0x5c,0xce,0x12,0xff, + 0x18,0x00,0x00,0xff,0x88,0xd4,0xba,0xff,0x82,0x00,0x00,0xff,0x00,0x00,0x00,0xff, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01, + 0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01 +}; + /* 2x2 24-bit dds, 2 mipmaps */ static const unsigned char dds_24bit[] = { 0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x0a,0x00,0x02,0x00,0x00,0x00, @@ -650,6 +731,17 @@ static void test_D3DXGetImageInfo(void) ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); } else skip("Couldn't get image info from 16-bit DDS file in memory\n"); + memset(&info, 0, sizeof(info)); + hr = D3DXGetImageInfoFromFileInMemory(dds_8bit, sizeof(dds_8bit), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x\n", hr); + ok(info.Width == 16, "Got width %u.\n", info.Width); + ok(info.Height == 4, "Got height %u.\n", info.Height); + ok(info.Depth == 1, "Got depth %u.\n", info.Depth); + ok(info.MipLevels == 1, "Got miplevels %u.\n", info.MipLevels); + ok(info.Format == D3DFMT_P8, "Got format %#x.\n", info.Format); + ok(info.ResourceType == D3DRTYPE_TEXTURE, "Got resource type %#x.\n", info.ResourceType); + ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x.\n", info.ImageFileFormat); + hr = D3DXGetImageInfoFromFileInMemory(dds_cube_map, sizeof(dds_cube_map), &info); ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); if (hr == D3D_OK) { -- 2.24.1

1 0

[PATCH 1/5] devenum/tests: Use wide character string literals.
by Zebediah Figura 14 Apr '20

14 Apr '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/tests/devenum.c | 283 +++++++++++++++-------------------- 1 file changed, 120 insertions(+), 163 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 726f2bf2cd8..a666b2753b6 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -37,15 +37,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; -static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':',0}; -static const WCHAR clsidW[] = {'C','L','S','I','D',0}; -static const WCHAR waveW[] = {'w','a','v','e',':',0}; -static const WCHAR dmoW[] = {'d','m','o',':',0}; -static const WCHAR swW[] = {'s','w',':',0}; -static const WCHAR cmW[] = {'c','m',':',0}; -static const WCHAR backslashW[] = {'\\',0}; - static void test_devenum(IBindCtx *bind_ctx) { IEnumMoniker *enum_cat, *enum_moniker; @@ -71,14 +62,14 @@ static void test_devenum(IBindCtx *bind_ctx) ok(hr == S_OK, "IMoniker_BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); ok(hr == S_OK, "Failed to read CLSID: %#x\n", hr); hr = CLSIDFromString(V_BSTR(&var), &cat_guid); ok(hr == S_OK, "got %#x\n", hr); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == S_OK, "Failed to read FriendlyName: %#x\n", hr); if (winetest_debug > 1) @@ -112,7 +103,7 @@ static void test_devenum(IBindCtx *bind_ctx) hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok((hr == S_OK) | (hr == ERROR_KEY_DOES_NOT_EXIST), "IPropertyBag_Read failed: %#x\n", hr); @@ -253,7 +244,6 @@ DEFINE_GUID(CLSID_TestFilter, 0xdeadbeef,0xcf51,0x43e6,0xb6,0xc5,0x29,0x9e,0xa8 static void test_register_filter(void) { - static const WCHAR name[] = {'d','e','v','e','n','u','m',' ','t','e','s','t',0}; IFilterMapper2 *mapper2; IMoniker *mon = NULL; REGFILTER2 rgf2 = {0}; @@ -266,7 +256,7 @@ static void test_register_filter(void) rgf2.dwMerit = MERIT_UNLIKELY; S2(U(rgf2)).cPins2 = 0; - hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, name, &mon, NULL, NULL, &rgf2); + hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, L"devenum test", &mon, NULL, NULL, &rgf2); if (hr == E_ACCESSDENIED) { skip("Not enough permissions to register filters\n"); @@ -284,7 +274,7 @@ static void test_register_filter(void) IMoniker_Release(mon); mon = NULL; - hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, name, &mon, &CLSID_AudioRendererCategory, NULL, &rgf2); + hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, L"devenum test", &mon, &CLSID_AudioRendererCategory, NULL, &rgf2); ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); ok(find_moniker(&CLSID_AudioRendererCategory, mon), "filter should be registered\n"); @@ -310,7 +300,7 @@ static IMoniker *check_display_name_(int line, IParseDisplayName *parser, WCHAR hr = IMoniker_GetDisplayName(mon, NULL, NULL, &str); ok_(__FILE__, line)(hr == S_OK, "GetDisplayName failed: %#x\n", hr); - ok_(__FILE__, line)(!lstrcmpW(str, buffer), "got %s\n", wine_dbgstr_w(str)); + ok_(__FILE__, line)(!wcscmp(str, buffer), "got %s\n", wine_dbgstr_w(str)); CoTaskMemFree(str); @@ -320,9 +310,6 @@ static IMoniker *check_display_name_(int line, IParseDisplayName *parser, WCHAR static void test_directshow_filter(void) { - static const WCHAR instanceW[] = {'\\','I','n','s','t','a','n','c','e',0}; - static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; - static WCHAR testW[] = {'\\','t','e','s','t',0}; IParseDisplayName *parser; IPropertyBag *prop_bag; IMoniker *mon; @@ -335,10 +322,9 @@ static void test_directshow_filter(void) hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, swW); - StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, testW); + wcscpy(buffer, L"@device:sw:"); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\test"); mon = check_display_name(parser, buffer); /* Test writing and reading from the property bag */ @@ -348,13 +334,13 @@ static void test_directshow_filter(void) ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); /* writing causes the key to be created */ V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(testW); - hr = IPropertyBag_Write(prop_bag, friendly_name, &var); + V_BSTR(&var) = SysAllocString(L"test"); + hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); if (hr != E_ACCESSDENIED) { ok(hr == S_OK, "Write failed: %#x\n", hr); @@ -362,17 +348,16 @@ static void test_directshow_filter(void) ok(find_moniker(&CLSID_AudioRendererCategory, mon), "filter should be registered\n"); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!lstrcmpW(V_BSTR(&var), testW), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!wcscmp(V_BSTR(&var), L"test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); IMoniker_Release(mon); /* devenum doesn't give us a way to unregister—we have to do that manually */ - lstrcpyW(buffer, clsidW); - StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, instanceW); - lstrcatW(buffer, testW); + wcscpy(buffer, L"CLSID\\"); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\Instance\\test"); res = RegDeleteKeyW(HKEY_CLASSES_ROOT, buffer); ok(!res, "RegDeleteKey failed: %lu\n", res); } @@ -382,29 +367,27 @@ static void test_directshow_filter(void) /* name can be anything */ - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, swW); - lstrcatW(buffer, testW+1); + wcscpy(buffer, L"@device:sw:test"); mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(testW); - hr = IPropertyBag_Write(prop_bag, friendly_name, &var); + V_BSTR(&var) = SysAllocString(L"test"); + hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); if (hr != E_ACCESSDENIED) { ok(hr == S_OK, "Write failed: %#x\n", hr); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!lstrcmpW(V_BSTR(&var), testW), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!wcscmp(V_BSTR(&var), L"test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); IMoniker_Release(mon); @@ -422,7 +405,6 @@ static void test_directshow_filter(void) static void test_codec(void) { - static WCHAR testW[] = {'\\','t','e','s','t',0}; IParseDisplayName *parser; IPropertyBag *prop_bag; IMoniker *mon; @@ -434,10 +416,9 @@ static void test_codec(void) hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, cmW); - StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, testW); + wcscpy(buffer, L"@device:cm:"); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\test"); mon = check_display_name(parser, buffer); /* Test writing and reading from the property bag */ @@ -447,25 +428,25 @@ static void test_codec(void) ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(testW); - hr = IPropertyBag_Write(prop_bag, friendly_name, &var); + V_BSTR(&var) = SysAllocString(L"test"); + hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); ok(hr == S_OK, "Write failed: %#x\n", hr); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!lstrcmpW(V_BSTR(&var), testW), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!wcscmp(V_BSTR(&var), L"test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); /* unlike DirectShow filters, these are automatically generated, so * enumerating them will destroy the key */ ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); IPropertyBag_Release(prop_bag); @@ -476,7 +457,6 @@ static void test_codec(void) static void test_dmo(void) { - static const WCHAR name[] = {'d','e','v','e','n','u','m',' ','t','e','s','t',0}; IParseDisplayName *parser; IPropertyBag *prop_bag; WCHAR buffer[200]; @@ -487,10 +467,9 @@ static void test_dmo(void) hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, dmoW); - StringFromGUID2(&CLSID_TestFilter, buffer + lstrlenW(buffer), CHARS_IN_GUID); - StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + wcscpy(buffer, L"@device:dmo:"); + StringFromGUID2(&CLSID_TestFilter, buffer + wcslen(buffer), CHARS_IN_GUID); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); mon = check_display_name(parser, buffer); ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "DMO should not be registered\n"); @@ -499,15 +478,15 @@ static void test_dmo(void) ok(hr == S_OK, "got %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == E_FAIL, "got %#x\n", hr); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(name); - hr = IPropertyBag_Write(prop_bag, friendly_name, &var); + V_BSTR(&var) = SysAllocString(L"devenum test"); + hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); ok(hr == E_ACCESSDENIED, "Write failed: %#x\n", hr); - hr = DMORegister(name, &CLSID_TestFilter, &CLSID_AudioRendererCategory, 0, 0, NULL, 0, NULL); + hr = DMORegister(L"devenum test", &CLSID_TestFilter, &CLSID_AudioRendererCategory, 0, 0, NULL, 0, NULL); if (hr != E_FAIL) { ok(hr == S_OK, "got %#x\n", hr); @@ -515,18 +494,18 @@ static void test_dmo(void) ok(find_moniker(&CLSID_AudioRendererCategory, mon), "DMO should be registered\n"); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == S_OK, "got %#x\n", hr); - ok(!lstrcmpW(V_BSTR(&var), name), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!wcscmp(V_BSTR(&var), L"devenum test"), "got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); V_VT(&var) = VT_BSTR; - V_BSTR(&var) = SysAllocString(name); - hr = IPropertyBag_Write(prop_bag, friendly_name, &var); + V_BSTR(&var) = SysAllocString(L"devenum test"); + hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var); ok(hr == E_ACCESSDENIED, "Write failed: %#x\n", hr); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "got %#x\n", hr); hr = DMOUnregister(&CLSID_TestFilter, &CLSID_AudioRendererCategory); @@ -539,7 +518,6 @@ static void test_dmo(void) static void test_legacy_filter(void) { - static const WCHAR nameW[] = {'t','e','s','t',0}; IParseDisplayName *parser; IPropertyBag *prop_bag; IFilterMapper *mapper; @@ -554,7 +532,7 @@ static void test_legacy_filter(void) hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper, (void **)&mapper); ok(hr == S_OK, "Failed to create FilterMapper: %#x\n", hr); - hr = IFilterMapper_RegisterFilter(mapper, CLSID_TestFilter, nameW, 0xdeadbeef); + hr = IFilterMapper_RegisterFilter(mapper, CLSID_TestFilter, L"test", 0xdeadbeef); if (hr == VFW_E_BAD_KEY) { win_skip("not enough permissions to register filters\n"); @@ -562,11 +540,10 @@ static void test_legacy_filter(void) } ok(hr == S_OK, "RegisterFilter failed: %#x\n", hr); - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, cmW); - StringFromGUID2(&CLSID_LegacyAmFilterCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, backslashW); - StringFromGUID2(&CLSID_TestFilter, buffer + lstrlenW(buffer), CHARS_IN_GUID); + wcscpy(buffer, L"@device:cm:"); + StringFromGUID2(&CLSID_LegacyAmFilterCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\"); + StringFromGUID2(&CLSID_TestFilter, buffer + wcslen(buffer), CHARS_IN_GUID); mon = check_display_name(parser, buffer); ok(find_moniker(&CLSID_LegacyAmFilterCategory, mon), "filter should be registered\n"); @@ -575,17 +552,17 @@ static void test_legacy_filter(void) ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); StringFromGUID2(&CLSID_TestFilter, buffer, CHARS_IN_GUID); - ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); @@ -604,9 +581,6 @@ end: static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *module, void *context) { - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','D','i','r','e','c','t','S','o','u','n','d',' ','D','e','v','i','c','e',0}; - static const WCHAR directsoundW[] = {'D','i','r','e','c','t','S','o','u','n','d',':',' ',0}; - static const WCHAR dsguidW[] = {'D','S','G','u','i','d',0}; IParseDisplayName *parser; IPropertyBag *prop_bag; IMoniker *mon; @@ -617,23 +591,22 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod if (guid) { - lstrcpyW(name, directsoundW); - lstrcatW(name, desc); + wcscpy(name, L"DirectSound: "); + wcscat(name, desc); } else { - lstrcpyW(name, defaultW); + wcscpy(name, L"Default DirectSound Device"); guid = (GUID *)&GUID_NULL; } hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, cmW); - StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, backslashW); - lstrcatW(buffer, name); + wcscpy(buffer, L"@device:cm:"); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\"); + wcscat(buffer, name); mon = check_display_name(parser, buffer); @@ -641,19 +614,17 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) { /* Win8+ uses the GUID instead of the device name */ IPropertyBag_Release(prop_bag); IMoniker_Release(mon); - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, cmW); - StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, backslashW); - lstrcatW(buffer, directsoundW); - StringFromGUID2(guid, buffer + lstrlenW(buffer) - 1, CHARS_IN_GUID); + wcscpy(buffer, L"@device:cm:"); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\DirectSound: "); + StringFromGUID2(guid, buffer + wcslen(buffer) - 1, CHARS_IN_GUID); mon = check_display_name(parser, buffer); @@ -661,27 +632,27 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); } ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!lstrcmpW(name, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); StringFromGUID2(&CLSID_DSoundRender, buffer, CHARS_IN_GUID); - ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, dsguidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"DSGuid", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); StringFromGUID2(guid, buffer, CHARS_IN_GUID); - ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); @@ -693,8 +664,6 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod static void test_waveout(void) { - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','W','a','v','e','O','u','t',' ','D','e','v','i','c','e',0}; - static const WCHAR waveoutidW[] = {'W','a','v','e','O','u','t','I','d',0}; IParseDisplayName *parser; IPropertyBag *prop_bag; IMoniker *mon; @@ -717,15 +686,14 @@ static void test_waveout(void) waveOutGetDevCapsW(i, &caps, sizeof(caps)); if (i == -1) /* WAVE_MAPPER */ - name = defaultW; + name = L"Default WaveOut Device"; else name = caps.szPname; - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, cmW); - StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, backslashW); - lstrcatW(buffer, name); + wcscpy(buffer, L"@device:cm:"); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\"); + wcscat(buffer, name); mon = check_display_name(parser, buffer); @@ -733,7 +701,7 @@ static void test_waveout(void) ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) { IPropertyBag_Release(prop_bag); @@ -744,35 +712,33 @@ static void test_waveout(void) (DWORD_PTR) endpoint, sizeof(endpoint)); ok(!mmr, "waveOutMessage failed: %u\n", mmr); - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, cmW); - StringFromGUID2(&CLSID_AudioRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, backslashW); - lstrcatW(buffer, waveW); - lstrcatW(buffer, wcschr(endpoint, '}') + 2); + wcscpy(buffer, L"@device:cm:"); + StringFromGUID2(&CLSID_AudioRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\wave:"); + wcscat(buffer, wcschr(endpoint, '}') + 2); mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); } ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!wcsncmp(name, V_BSTR(&var), lstrlenW(name)), "expected %s, got %s\n", + ok(!wcsncmp(name, V_BSTR(&var), wcslen(name)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); StringFromGUID2(&CLSID_AudioRender, buffer, CHARS_IN_GUID); - ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, waveoutidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"WaveOutId", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); @@ -786,7 +752,6 @@ static void test_waveout(void) static void test_wavein(void) { - static const WCHAR waveinidW[] = {'W','a','v','e','I','n','I','d',0}; IParseDisplayName *parser; IPropertyBag *prop_bag; IMoniker *mon; @@ -807,11 +772,10 @@ static void test_wavein(void) { waveInGetDevCapsW(i, &caps, sizeof(caps)); - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, cmW); - StringFromGUID2(&CLSID_AudioInputDeviceCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, backslashW); - lstrcatW(buffer, caps.szPname); + wcscpy(buffer, L"@device:cm:"); + StringFromGUID2(&CLSID_AudioInputDeviceCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\"); + wcscat(buffer, caps.szPname); mon = check_display_name(parser, buffer); @@ -819,7 +783,7 @@ static void test_wavein(void) ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) { IPropertyBag_Release(prop_bag); @@ -830,35 +794,33 @@ static void test_wavein(void) (DWORD_PTR) endpoint, sizeof(endpoint)); ok(!mmr, "waveInMessage failed: %u\n", mmr); - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, cmW); - StringFromGUID2(&CLSID_AudioInputDeviceCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, backslashW); - lstrcatW(buffer, waveW); - lstrcatW(buffer, wcschr(endpoint, '}') + 2); + wcscpy(buffer, L"@device:cm:"); + StringFromGUID2(&CLSID_AudioInputDeviceCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\wave:"); + wcscat(buffer, wcschr(endpoint, '}') + 2); mon = check_display_name(parser, buffer); hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); } ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!wcsncmp(caps.szPname, V_BSTR(&var), lstrlenW(caps.szPname)), "expected %s, got %s\n", + ok(!wcsncmp(caps.szPname, V_BSTR(&var), wcslen(caps.szPname)), "expected %s, got %s\n", wine_dbgstr_w(caps.szPname), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); StringFromGUID2(&CLSID_AudioRecord, buffer, CHARS_IN_GUID); - ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, waveinidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"WaveInId", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); @@ -872,8 +834,6 @@ static void test_wavein(void) static void test_midiout(void) { - static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',' ','M','i','d','i','O','u','t',' ','D','e','v','i','c','e',0}; - static const WCHAR midioutidW[] = {'M','i','d','i','O','u','t','I','d',0}; IParseDisplayName *parser; IPropertyBag *prop_bag; IMoniker *mon; @@ -894,15 +854,14 @@ static void test_midiout(void) midiOutGetDevCapsW(i, &caps, sizeof(caps)); if (i == -1) /* MIDI_MAPPER */ - name = defaultW; + name = L"Default MidiOut Device"; else name = caps.szPname; - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, cmW); - StringFromGUID2(&CLSID_MidiRendererCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, backslashW); - lstrcatW(buffer, name); + wcscpy(buffer, L"@device:cm:"); + StringFromGUID2(&CLSID_MidiRendererCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\"); + wcscat(buffer, name); mon = check_display_name(parser, buffer); @@ -910,22 +869,22 @@ static void test_midiout(void) ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!lstrcmpW(name, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); StringFromGUID2(&CLSID_AVIMIDIRender, buffer, CHARS_IN_GUID); - ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, midioutidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"MidiOutId", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); ok(V_I4(&var) == i, "expected %d, got %d\n", i, V_I4(&var)); @@ -939,7 +898,6 @@ static void test_midiout(void) static void test_vfw(void) { - static const WCHAR fcchandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; IParseDisplayName *parser; IPropertyBag *prop_bag; IMoniker *mon; @@ -968,11 +926,10 @@ static void test_vfw(void) ICGetInfo(hic, &info, sizeof(info)); ICClose(hic); - lstrcpyW(buffer, deviceW); - lstrcatW(buffer, cmW); - StringFromGUID2(&CLSID_VideoCompressorCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); - lstrcatW(buffer, backslashW); - lstrcatW(buffer, name); + wcscpy(buffer, L"@device:cm:"); + StringFromGUID2(&CLSID_VideoCompressorCategory, buffer + wcslen(buffer), CHARS_IN_GUID); + wcscat(buffer, L"\\"); + wcscat(buffer, name); mon = check_display_name(parser, buffer); @@ -980,24 +937,24 @@ static void test_vfw(void) ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); VariantInit(&var); - hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FriendlyName", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!lstrcmpW(info.szDescription, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(info.szDescription, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(info.szDescription), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"CLSID", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); StringFromGUID2(&CLSID_AVICo, buffer, CHARS_IN_GUID); - ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); - hr = IPropertyBag_Read(prop_bag, fcchandlerW, &var, NULL); + hr = IPropertyBag_Read(prop_bag, L"FccHandler", &var, NULL); ok(hr == S_OK, "Read failed: %#x\n", hr); - ok(!lstrcmpW(name, V_BSTR(&var)), "expected %s, got %s\n", + ok(!wcscmp(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); -- 2.26.0

1 4

[PATCH resend 3/3] comctl32/imagelist: Add support for ILD_PRESERVEALPHA.
by Ziqing Hui 14 Apr '20

14 Apr '20

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 38 +++++++++++++++++++++------------ dlls/comctl32/tests/imagelist.c | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-)

1 0