wine-devel

wine-devel@winehq.org

8 participants
84486 discussions

[PATCH 2/2] wbemprox: Flesh out a bit SystemRestore::Enable() implementation.
by Dmitry Timoshkov 22 Dec '20

22 Dec '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/sysrestore.c | 48 +++++++++++++++++++++++++++++++++++-- dlls/wbemprox/tests/query.c | 2 +- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/sysrestore.c b/dlls/wbemprox/sysrestore.c index b840d220b5..d59077381f 100644 --- a/dlls/wbemprox/sysrestore.c +++ b/dlls/wbemprox/sysrestore.c @@ -45,8 +45,52 @@ HRESULT disable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClass HRESULT enable_restore( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) { - FIXME("stub\n"); - return S_OK; + VARIANT drive, retval; + IWbemClassObject *sig, *out_params = NULL; + HRESULT hr; + + TRACE("%p, %p\n", in, out); + + hr = IWbemClassObject_Get( in, L"Drive", 0, &drive, NULL, NULL ); + if (hr != S_OK) return hr; + + hr = create_signature( L"SystemRestore", L"Enable", PARAM_OUT, &sig ); + if (hr != S_OK) + { + VariantClear( &drive ); + return hr; + } + + if (out) + { + hr = IWbemClassObject_SpawnInstance( sig, 0, &out_params ); + if (hr != S_OK) + { + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + return hr; + } + } + + FIXME("%s: stub\n", wine_dbgstr_variant(&drive)); + + VariantClear( &drive ); + IWbemClassObject_Release( sig ); + + if (out_params) + { + set_variant( VT_UI4, ERROR_SUCCESS, NULL, &retval ); + hr = IWbemClassObject_Put( out_params, L"ReturnValue", 0, &retval, CIM_UINT32 ); + } + + if (hr == S_OK && out) + { + *out = out_params; + IWbemClassObject_AddRef( out_params ); + } + if (out_params) IWbemClassObject_Release( out_params ); + + return hr; } HRESULT get_last_restore_status( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 1c7a615dd4..67c0b218ce 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1805,7 +1805,7 @@ static void test_SystemRestore( IWbemServices *services ) out = NULL; hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); - if (hr == S_OK && out) + if (hr == S_OK) { VariantInit( &var ); hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); -- 2.29.2

1 0

[PATCH] comctl32/tests: add test for getting listview data during sorting.
by Jiangyi Chen 22 Dec '20

22 Dec '20

3 2

[PATCH] conhost: Fix copy-paste typos in selection coordinates.
by Jacek Caban 21 Dec '20

21 Dec '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50052 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/conhost/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] amstream/tests: Define NONAMELESSUNION.
by Zebediah Figura 21 Dec '20

21 Dec '20

Old versions of gcc allow nameless unions, but can't parse them in designated initializers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50378 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/amstream/tests/amstream.c | 255 +++++++++++++++++---------------- 1 file changed, 128 insertions(+), 127 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 279b040339c..648d5ee93c3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include "wine/test.h" #include "dshow.h" @@ -79,7 +80,7 @@ static const VIDEOINFO rgb565_video_info = .bmiHeader.biPlanes = 1, .bmiHeader.biBitCount = 16, .bmiHeader.biCompression = BI_BITFIELDS, - .dwBitMasks = {0xf800, 0x07e0, 0x001f}, + .u.dwBitMasks = {0xf800, 0x07e0, 0x001f}, }; static const VIDEOINFO rgb24_video_info = @@ -158,7 +159,7 @@ static const DDSURFACEDESC rgb8_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8, - .ddpfPixelFormat.dwRGBBitCount = 8, + .ddpfPixelFormat.u1.dwRGBBitCount = 8, }; static const DDSURFACEDESC rgb555_format = @@ -167,10 +168,10 @@ static const DDSURFACEDESC rgb555_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 16, - .ddpfPixelFormat.dwRBitMask = 0x7c00, - .ddpfPixelFormat.dwGBitMask = 0x03e0, - .ddpfPixelFormat.dwBBitMask = 0x001f, + .ddpfPixelFormat.u1.dwRGBBitCount = 16, + .ddpfPixelFormat.u2.dwRBitMask = 0x7c00, + .ddpfPixelFormat.u3.dwGBitMask = 0x03e0, + .ddpfPixelFormat.u4.dwBBitMask = 0x001f, }; static const DDSURFACEDESC rgb565_format = @@ -179,10 +180,10 @@ static const DDSURFACEDESC rgb565_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 16, - .ddpfPixelFormat.dwRBitMask = 0xf800, - .ddpfPixelFormat.dwGBitMask = 0x07e0, - .ddpfPixelFormat.dwBBitMask = 0x001f, + .ddpfPixelFormat.u1.dwRGBBitCount = 16, + .ddpfPixelFormat.u2.dwRBitMask = 0xf800, + .ddpfPixelFormat.u3.dwGBitMask = 0x07e0, + .ddpfPixelFormat.u4.dwBBitMask = 0x001f, }; static const DDSURFACEDESC rgb24_format = @@ -191,10 +192,10 @@ static const DDSURFACEDESC rgb24_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 24, - .ddpfPixelFormat.dwRBitMask = 0xff0000, - .ddpfPixelFormat.dwGBitMask = 0x00ff00, - .ddpfPixelFormat.dwBBitMask = 0x0000ff, + .ddpfPixelFormat.u1.dwRGBBitCount = 24, + .ddpfPixelFormat.u2.dwRBitMask = 0xff0000, + .ddpfPixelFormat.u3.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.u4.dwBBitMask = 0x0000ff, }; static const DDSURFACEDESC rgb32_format = @@ -203,10 +204,10 @@ static const DDSURFACEDESC rgb32_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 32, - .ddpfPixelFormat.dwRBitMask = 0xff0000, - .ddpfPixelFormat.dwGBitMask = 0x00ff00, - .ddpfPixelFormat.dwBBitMask = 0x0000ff, + .ddpfPixelFormat.u1.dwRGBBitCount = 32, + .ddpfPixelFormat.u2.dwRBitMask = 0xff0000, + .ddpfPixelFormat.u3.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.u4.dwBBitMask = 0x0000ff, }; static const DDSURFACEDESC argb32_format = @@ -215,11 +216,11 @@ static const DDSURFACEDESC argb32_format = .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS, - .ddpfPixelFormat.dwRGBBitCount = 32, - .ddpfPixelFormat.dwRBitMask = 0xff0000, - .ddpfPixelFormat.dwGBitMask = 0x00ff00, - .ddpfPixelFormat.dwBBitMask = 0x0000ff, - .ddpfPixelFormat.dwRGBAlphaBitMask = 0xff000000, + .ddpfPixelFormat.u1.dwRGBBitCount = 32, + .ddpfPixelFormat.u2.dwRBitMask = 0xff0000, + .ddpfPixelFormat.u3.dwGBitMask = 0x00ff00, + .ddpfPixelFormat.u4.dwBBitMask = 0x0000ff, + .ddpfPixelFormat.u5.dwRGBAlphaBitMask = 0xff000000, }; static const DDSURFACEDESC yuy2_format = @@ -229,7 +230,7 @@ static const DDSURFACEDESC yuy2_format = .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_FOURCC, .ddpfPixelFormat.dwFourCC = MAKEFOURCC('Y', 'U', 'Y', '2'), - .ddpfPixelFormat.dwYUVBitCount = 16, + .ddpfPixelFormat.u1.dwYUVBitCount = 16, }; static const DDSURFACEDESC yv12_format = @@ -239,7 +240,7 @@ static const DDSURFACEDESC yv12_format = .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_FOURCC, .ddpfPixelFormat.dwFourCC = MAKEFOURCC('Y', 'V', '1', '2'), - .ddpfPixelFormat.dwYUVBitCount = 12, + .ddpfPixelFormat.u1.dwYUVBitCount = 12, }; static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -3799,9 +3800,9 @@ static void test_ddrawstream_receive_connection(void) ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); format = yuy2_format; - format.ddpfPixelFormat.dwRBitMask = 0xf800; - format.ddpfPixelFormat.dwGBitMask = 0x07e0; - format.ddpfPixelFormat.dwBBitMask = 0x001f; + format.ddpfPixelFormat.u2.dwRBitMask = 0xf800; + format.ddpfPixelFormat.u3.dwGBitMask = 0x07e0; + format.ddpfPixelFormat.u4.dwBBitMask = 0x001f; hr = IDirectDrawMediaStream_SetFormat(ddraw_stream, &format, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5116,7 +5117,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED1, - .ddpfPixelFormat.dwRGBBitCount = 1, + .ddpfPixelFormat.u1.dwRGBBitCount = 1, }; static const DDSURFACEDESC rgb2_format = { @@ -5124,7 +5125,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED2, - .ddpfPixelFormat.dwRGBBitCount = 2, + .ddpfPixelFormat.u1.dwRGBBitCount = 2, }; static const DDSURFACEDESC rgb4_format = { @@ -5132,7 +5133,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED4, - .ddpfPixelFormat.dwRGBBitCount = 4, + .ddpfPixelFormat.u1.dwRGBBitCount = 4, }; static const DDSURFACEDESC rgb4to8_format = { @@ -5140,7 +5141,7 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXEDTO8, - .ddpfPixelFormat.dwRGBBitCount = 4, + .ddpfPixelFormat.u1.dwRGBBitCount = 4, }; static const DDSURFACEDESC rgb332_format = { @@ -5148,10 +5149,10 @@ static void test_ddrawstream_set_format(void) .dwFlags = DDSD_PIXELFORMAT, .ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT), .ddpfPixelFormat.dwFlags = DDPF_RGB, - .ddpfPixelFormat.dwRGBBitCount = 8, - .ddpfPixelFormat.dwRBitMask = 0xe0, - .ddpfPixelFormat.dwGBitMask = 0x1c, - .ddpfPixelFormat.dwBBitMask = 0x03, + .ddpfPixelFormat.u1.dwRGBBitCount = 8, + .ddpfPixelFormat.u2.dwRBitMask = 0xe0, + .ddpfPixelFormat.u3.dwGBitMask = 0x1c, + .ddpfPixelFormat.u4.dwBBitMask = 0x03, }; IDirectDrawMediaStream *ddraw_stream; @@ -5231,19 +5232,19 @@ static void test_ddrawstream_set_format(void) check_ddrawstream_set_format(ddraw_stream, &format, NULL, DDERR_INVALIDSURFACETYPE); format = rgb565_format; - format.ddpfPixelFormat.dwRBitMask = 0x001f; - format.ddpfPixelFormat.dwGBitMask = 0x07e0; - format.ddpfPixelFormat.dwBBitMask = 0xf800; + format.ddpfPixelFormat.u2.dwRBitMask = 0x001f; + format.ddpfPixelFormat.u3.dwGBitMask = 0x07e0; + format.ddpfPixelFormat.u4.dwBBitMask = 0xf800; check_ddrawstream_set_format(ddraw_stream, &format, NULL, DDERR_INVALIDSURFACETYPE); format = rgb32_format; - format.ddpfPixelFormat.dwRBitMask = 0x00ff00; - format.ddpfPixelFormat.dwGBitMask = 0x0000ff; - format.ddpfPixelFormat.dwBBitMask = 0xff0000; + format.ddpfPixelFormat.u2.dwRBitMask = 0x00ff00; + format.ddpfPixelFormat.u3.dwGBitMask = 0x0000ff; + format.ddpfPixelFormat.u4.dwBBitMask = 0xff0000; check_ddrawstream_set_format(ddraw_stream, &format, NULL, DDERR_INVALIDSURFACETYPE); format = yuy2_format; - format.ddpfPixelFormat.dwYUVBitCount = 0; + format.ddpfPixelFormat.u1.dwYUVBitCount = 0; check_ddrawstream_set_format(ddraw_stream, &format, NULL, E_INVALIDARG); format = rgb32_format; @@ -5289,10 +5290,10 @@ static void test_ddrawstream_set_format(void) "Got subtype %s.\n", wine_dbgstr_guid(&source.source.pin.mt.subtype)); hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, NULL, &desired_format, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(current_format.ddpfPixelFormat.dwRGBBitCount == 8, - "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.dwRGBBitCount); - ok(desired_format.ddpfPixelFormat.dwRGBBitCount == 8, - "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.dwRGBBitCount); + ok(current_format.ddpfPixelFormat.u1.dwRGBBitCount == 8, + "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desired_format.ddpfPixelFormat.u1.dwRGBBitCount == 8, + "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.u1.dwRGBBitCount); format = rgb555_format; format.dwFlags = 0; @@ -5312,10 +5313,10 @@ static void test_ddrawstream_set_format(void) "Got subtype %s.\n", wine_dbgstr_guid(&source.source.pin.mt.subtype)); hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, NULL, &desired_format, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(current_format.ddpfPixelFormat.dwRGBBitCount == 16, - "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.dwRGBBitCount); - ok(desired_format.ddpfPixelFormat.dwRGBBitCount == 16, - "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.dwRGBBitCount); + ok(current_format.ddpfPixelFormat.u1.dwRGBBitCount == 16, + "Got rgb bit count %u.\n", current_format.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desired_format.ddpfPixelFormat.u1.dwRGBBitCount == 16, + "Got rgb bit count %u.\n", desired_format.ddpfPixelFormat.u1.dwRGBBitCount); video_info = rgb555_video_info; video_info.bmiHeader.biWidth = 222; @@ -7189,7 +7190,7 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Expected width 100, got %d.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Expected height 100, got %d.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Expected format flags DDPF_RGB, got %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount, "Expected non-zero RGB bit count.\n"); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount, "Expected non-zero RGB bit count.\n"); IDirectDrawSurface_Release(surface); IDirectDrawStreamSample_Release(sample); EXPECT_REF(stream, 3); @@ -7233,11 +7234,11 @@ static void test_ddrawstream_create_sample(void) desc.dwHeight = 400; desc.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); desc.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; - desc.ddpfPixelFormat.dwRGBBitCount = 32; - desc.ddpfPixelFormat.dwRBitMask = 0xff0000; - desc.ddpfPixelFormat.dwGBitMask = 0x00ff00; - desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; - desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0xff000000; + desc.ddpfPixelFormat.u1.dwRGBBitCount = 32; + desc.ddpfPixelFormat.u2.dwRBitMask = 0xff0000; + desc.ddpfPixelFormat.u3.dwGBitMask = 0x00ff00; + desc.ddpfPixelFormat.u4.dwBBitMask = 0x0000ff; + desc.ddpfPixelFormat.u5.dwRGBAlphaBitMask = 0xff000000; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7278,7 +7279,7 @@ static void test_ddrawstream_create_sample(void) desc.dwHeight = 400; desc.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); desc.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED4; - desc.ddpfPixelFormat.dwRGBBitCount = 4; + desc.ddpfPixelFormat.u1.dwRGBBitCount = 4; desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7304,10 +7305,10 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); format1 = rgb8_format; format1.dwFlags |= DDSD_WIDTH; @@ -7333,30 +7334,30 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 333, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 444, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); get_ddrawstream_create_sample_desc(&rgb565_format, NULL, NULL, &desc); ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xf800, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x07e0, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x001f, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 16, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xf800, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x07e0, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x001f, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); get_ddrawstream_create_sample_desc(&argb32_format, NULL, NULL, &desc); ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == (DDPF_RGB | DDPF_ALPHAPIXELS), "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); - ok(desc.ddpfPixelFormat.dwRGBAlphaBitMask == 0xff000000, - "Got alpha bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); + ok(desc.ddpfPixelFormat.u5.dwRGBAlphaBitMask == 0xff000000, + "Got alpha bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); format1 = rgb32_format; format1.dwFlags |= DDSD_CAPS; @@ -7368,10 +7369,10 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); format1 = rgb32_format; format1.dwFlags |= DDSD_CKSRCBLT; @@ -7382,10 +7383,10 @@ static void test_ddrawstream_create_sample(void) ok(desc.dwWidth == 100, "Got width %u.\n", desc.dwWidth); ok(desc.dwHeight == 100, "Got height %u.\n", desc.dwHeight); ok(desc.ddpfPixelFormat.dwFlags == DDPF_RGB, "Got flags %#x.\n", desc.ddpfPixelFormat.dwFlags); - ok(desc.ddpfPixelFormat.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); - ok(desc.ddpfPixelFormat.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.dwRBitMask); - ok(desc.ddpfPixelFormat.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.dwGBitMask); - ok(desc.ddpfPixelFormat.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.dwBBitMask); + ok(desc.ddpfPixelFormat.u1.dwRGBBitCount == 32, "Got rgb bit count %u.\n", desc.ddpfPixelFormat.u1.dwRGBBitCount); + ok(desc.ddpfPixelFormat.u2.dwRBitMask == 0xff0000, "Got r bit mask %#x.\n", desc.ddpfPixelFormat.u2.dwRBitMask); + ok(desc.ddpfPixelFormat.u3.dwGBitMask == 0x00ff00, "Got g bit mask %#x.\n", desc.ddpfPixelFormat.u3.dwGBitMask); + ok(desc.ddpfPixelFormat.u4.dwBBitMask == 0x0000ff, "Got b bit mask %#x.\n", desc.ddpfPixelFormat.u4.dwBBitMask); ok(desc.ddckCKSrcBlt.dwColorSpaceLowValue == 0, "Got color key low value %#x.\n", desc.ddckCKSrcBlt.dwColorSpaceLowValue); ok(desc.ddckCKSrcBlt.dwColorSpaceHighValue == 0, "Got color key high value %#x.\n", @@ -7557,7 +7558,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7574,11 +7575,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7605,7 +7606,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7622,11 +7623,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7658,7 +7659,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7674,11 +7675,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7707,7 +7708,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7723,11 +7724,11 @@ static void test_ddrawstreamsample_update(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7743,7 +7744,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7755,18 +7756,18 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7778,11 +7779,11 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7811,7 +7812,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - memcpy((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12); + memcpy((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7837,7 +7838,7 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); for (i = 0; i < 5; ++i) - ok(memcmp((BYTE *)desc.lpSurface + i * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + i * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -7848,11 +7849,11 @@ static void test_ddrawstreamsample_update(void) hr = IDirectDrawSurface_Lock(surface, NULL, &desc, 0, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); - ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 0 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 1 * desc.u1.lPitch, &test_data[12], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 2 * desc.u1.lPitch, &test_data[0], 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 3 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); + ok(memcmp((BYTE *)desc.lpSurface + 4 * desc.u1.lPitch, initial_data, 12) == 0, "Sample data didn't match.\n"); hr = IDirectDrawSurface_Unlock(surface, desc.lpSurface); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.29.2

1 0

[PATCH 2/2] include: Add IAMCameraControl definition in axextend.idl.
by Biswapriyo Nath 21 Dec '20

21 Dec '20

2 1

[PATCH 1/2] include: Add more Media Foundation error codes.
by Biswapriyo Nath 21 Dec '20

21 Dec '20

1 0

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 21 Dec '20

21 Dec '20

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH v2 2/4] gdi32: Avoid best fit chars when mapping unicode character to a glyph index.
by Dmitry Timoshkov 21 Dec '20

21 Dec '20

This part fixes GetGlyphIndices. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 00bbeb0a11..9380d3efbe 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3223,7 +3223,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun if (str[i] >= 0xf020 && str[i] <= 0xf100) glyph = str[i] - 0xf000; else if (str[i] < 0x100) glyph = str[i]; } - else if (WideCharToMultiByte( physdev->font->codepage, 0, &str[i], 1, + else if (WideCharToMultiByte( physdev->font->codepage, WC_NO_BEST_FIT_CHARS, &str[i], 1, &ch, 1, NULL, &used ) && !used) glyph = (unsigned char)ch; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c630b65e5e..5eb069bf31 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1690,14 +1690,12 @@ static void test_GetGlyphIndices(void) charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == 0x001f || glyphs[1] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); glyphs[0] = glyphs[1] = 0; charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); ok(glyphs[0] == textm.tmDefaultChar || glyphs[0] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[0]); -todo_wine ok(glyphs[1] == textm.tmDefaultChar || glyphs[1] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[1]); DeleteObject(SelectObject(hdc, hOldFont)); -- 2.29.2

2 3

[PATCH v2 4/4] fonts: Correct default glyph index for MS Sans Serif font to match Windows.
by Dmitry Timoshkov 21 Dec '20

21 Dec '20

This one doesn't depend on previous patches in the sequence. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- fonts/ms_sans_serif.sfd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index 751b35d064..e8c720b528 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -4,7 +4,7 @@ FullName: MS Sans Serif FamilyName: MS Sans Serif Weight: Medium Copyright: Copyright (C) 2004 Huw D M Davies, Dmitry Timoshkov -UComments: "#pragma makedep font ssee1255.fon -d 129 13,1255,5 16,1255,7 20,1255,8+AAoA#pragma makedep font ssee1256.fon -d 129 13,1256,5 16,1256,7 20,1256,8+AAoA#pragma makedep font ssee1257.fon -d 129 13,1257,5 16,1257,7 20,1257,8+AAoA#pragma makedep font ssee874.fon -d 129 13,874,5 16,874,7 20,874,8+AAoA#pragma makedep font ssef1255.fon -d 129 -r 120 16,1255,7 20,1255,8+AAoA#pragma makedep font ssef1256.fon -d 129 -r 120 16,1256,7 20,1256,8+AAoA#pragma makedep font ssef1257.fon -d 129 -r 120 16,1257,7 20,1257,8+AAoA#pragma makedep font ssef874.fon -d 129 -r 120 16,874,7 20,874,8+AAoA#pragma makedep font sserife.fon -d 129 13,1252,5 16,1252,7 20,1252,8+AAoA#pragma makedep font sserifee.fon -d 129 13,1250,5 16,1250,7+AAoA#pragma makedep font sserifeg.fon -d 129 13,1253,5 16,1253,7 20,1253,8 +AAoA#pragma makedep font sserifer.fon -d 129 13,1251,5 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifet.fon -d 129 13,1254,5 16,1254,7 20,1254,8+AAoA#pragma makedep font sseriff.fon -d 129 -r 120 16,1252,7 20,1252,8+AAoA#pragma makedep font sseriffe.fon -d 129 -r 120 16,1250,7+AAoA#pragma makedep font sseriffg.fon -d 129 -r 120 16,1253,7 20,1253,8 +AAoA#pragma makedep font sseriffr.fon -d 129 -r 120 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifft.fon -d 129 -r 120 16,1254,7 20,1254,8" +UComments: "#pragma makedep font ssee1255.fon -d 129 13,1255,5 16,1255,7 20,1255,8+AAoA#pragma makedep font ssee1256.fon -d 129 13,1256,5 16,1256,7 20,1256,8+AAoA#pragma makedep font ssee1257.fon -d 128 13,1257,5 16,1257,7 20,1257,8+AAoA#pragma makedep font ssee874.fon -d 129 13,874,5 16,874,7 20,874,8+AAoA#pragma makedep font ssef1255.fon -d 129 -r 120 16,1255,7 20,1255,8+AAoA#pragma makedep font ssef1256.fon -d 129 -r 120 16,1256,7 20,1256,8+AAoA#pragma makedep font ssef1257.fon -d 128 -r 120 16,1257,7 20,1257,8+AAoA#pragma makedep font ssef874.fon -d 129 -r 120 16,874,7 20,874,8+AAoA#pragma makedep font sserife.fon -d 129 13,1252,5 16,1252,7 20,1252,8+AAoA#pragma makedep font sserifee.fon -d 128 13,1250,5 16,1250,7+AAoA#pragma makedep font sserifeg.fon -d 129 13,1253,5 16,1253,7 20,1253,8 +AAoA#pragma makedep font sserifer.fon -d 127 13,1251,5 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifet.fon -d 129 13,1254,5 16,1254,7 20,1254,8+AAoA#pragma makedep font sseriff.fon -d 129 -r 120 16,1252,7 20,1252,8+AAoA#pragma makedep font sseriffe.fon -d 128 -r 120 16,1250,7+AAoA#pragma makedep font sseriffg.fon -d 129 -r 120 16,1253,7 20,1253,8 +AAoA#pragma makedep font sseriffr.fon -d 127 -r 120 16,1251,7 20,1251,8+AAoA#pragma makedep font sserifft.fon -d 129 -r 120 16,1254,7 20,1254,8" Version: 001.000 ItalicAngle: 0 UnderlinePosition: -15753.8 -- 2.29.2

2 1

[PATCH v3] gdi32/tests: Add some tests to show that GetGlyphIndices() should avoid best fit chars.
by Huw Davies 21 Dec '20

21 Dec '20

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ad7408f5620..da5fdf2238e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1632,6 +1632,7 @@ static void test_GetGlyphIndices(void) LOGFONTA lf; DWORD flags = 0; WCHAR testtext[] = L"Test\xffff"; + WCHAR c[] = { 0x25bc /* Black Down-Pointing Triangle */, 0x212a /* Kelvin Sign */ }; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; @@ -1653,8 +1654,9 @@ static void test_GetGlyphIndices(void) lf.lfCharSet = ANSI_CHARSET; hfont = CreateFontIndirectA(&lf); - ok(hfont != 0, "CreateFontIndirectEx failed\n"); - ok(GetTextMetricsA(hdc, &textm), "GetTextMetric failed\n"); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); if (textm.tmCharSet == ANSI_CHARSET) { flags |= GGI_MARK_NONEXISTING_GLYPHS; @@ -1664,16 +1666,44 @@ static void test_GetGlyphIndices(void) flags = 0; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + ok(glyphs[4] == textm.tmDefaultChar || glyphs[4] == 0x20 /* CJK Windows */, + "GetGlyphIndicesW should have returned a %04x not %04x\n", textm.tmDefaultChar, glyphs[4]); } else /* FIXME: Write tests for non-ANSI charsets. */ skip("GetGlyphIndices System font tests only for ANSI_CHARSET\n"); + DeleteObject(SelectObject(hdc, hOldFont)); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "MS Sans Serif"); + lf.lfHeight = -13; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == 0x001f || glyphs[1] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == textm.tmDefaultChar || glyphs[0] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == textm.tmDefaultChar || glyphs[1] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[1]); + + DeleteObject(SelectObject(hdc, hOldFont)); + if(!is_font_installed("Tahoma")) { skip("Tahoma is not installed so skipping this test\n"); + ReleaseDC(0, hdc); return; } memset(&lf, 0, sizeof(lf)); @@ -1718,12 +1748,13 @@ static void test_GetGlyphIndices(void) ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); + ReleaseDC(0, hdc); + ret = pRemoveFontMemResourceEx(rsrc); ok(ret, "RemoveFontMemResourceEx error %d\n", GetLastError()); free_font(font); ret = DeleteFileA(ttf_name); ok(ret, "Failed to delete font file, %d.\n", GetLastError()); - } static void test_GetKerningPairs(void) -- 2.23.0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel