- Wine-Devel - list.winehq.org

[PATCH 1/2] ddraw/tests: Use the correct version of DirectDraw calls.
by Zhiyi Zhang Oct. 21, 2020

Oct. 21, 2020

These are typos cumulated over the years. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/tests/d3d.c | 4 +-- dlls/ddraw/tests/ddraw1.c | 8 +++--- dlls/ddraw/tests/ddraw2.c | 14 +++++------ dlls/ddraw/tests/ddraw4.c | 12 ++++----- dlls/ddraw/tests/ddraw7.c | 8 +++--- dlls/ddraw/tests/dsurface.c | 50 ++++++++++++++++++------------------- dlls/ddraw/tests/refcount.c | 6 ++--- dlls/ddraw/tests/visual.c | 6 ++--- 8 files changed, 54 insertions(+), 54 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 13c925e970f..93ff6e296cc 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -105,7 +105,7 @@ static BOOL CreateDirect3D(void) return FALSE; } - rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL); + rc = IDirectDraw7_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL); ok(rc==DD_OK, "SetCooperativeLevel returned: %x\n", rc); rc = IDirectDraw7_QueryInterface(lpDD, &IID_IDirect3D7, (void**) &lpD3D); @@ -196,7 +196,7 @@ static void ReleaseDirect3D(void) if (lpDD != NULL) { - IDirectDraw_Release(lpDD); + IDirectDraw7_Release(lpDD); lpDD = NULL; } } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2fac4d4b0ba..63791c5b606 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2012,7 +2012,7 @@ static void test_ck_complex(void) { skip("Failed to create a 3D device, skipping test.\n"); DestroyWindow(window); - IDirectDraw2_Release(ddraw); + IDirectDraw_Release(ddraw); return; } IDirect3DDevice_Release(device); @@ -11205,7 +11205,7 @@ static void test_surface_desc_size(void) } } - refcount = IDirectDraw7_Release(ddraw); + refcount = IDirectDraw_Release(ddraw); ok(!refcount, "DirectDraw has %u references left.\n", refcount); } @@ -11529,9 +11529,9 @@ static void test_ck_operation(void) U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; U5(surface_desc.ddpfPixelFormat).dwRGBAlphaBitMask = 0xff000000; - hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst, NULL); + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); - hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src, NULL); + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &src, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); ckey.dwColorSpaceLowValue = 0x0000ff00; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 6b584798539..4b83230de1f 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1492,7 +1492,7 @@ static void test_viewport_object(void) if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a 3D device, skipping test.\n"); - IDirectDraw_Release(ddraw); + IDirectDraw2_Release(ddraw); DestroyWindow(window); return; } @@ -3138,7 +3138,7 @@ static void test_coop_level_mode_set(void) hr = IDirectDrawSurface_IsLost(primary); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirectDraw_RestoreDisplayMode(ddraw); + hr = IDirectDraw2_RestoreDisplayMode(ddraw); ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); hr = IDirectDrawSurface_IsLost(primary); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); @@ -6069,7 +6069,7 @@ static void test_surface_attachment(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -6584,7 +6584,7 @@ static void test_create_surface_pitch(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((63 * 4) + 8) * 63); @@ -7833,7 +7833,7 @@ static void test_palette_gdi(void) surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); surface_desc.ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 8; - hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); /* Avoid colors from the Windows default palette. */ @@ -10070,7 +10070,7 @@ static void test_shademode(void) IDirectDrawSurface_Release(rt); refcount = IDirect3DDevice2_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - IDirectDraw_Release(ddraw); + IDirectDraw2_Release(ddraw); DestroyWindow(window); } @@ -13914,7 +13914,7 @@ static void test_killfocus(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS; surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL); + hr = IDirectDraw2_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); SetForegroundWindow(GetDesktopWindow()); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index d438132764f..72aad35b1e1 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7779,7 +7779,7 @@ static void test_surface_attachment(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -8099,7 +8099,7 @@ static void test_private_data(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); reset_ddsd(&surface_desc); @@ -8214,7 +8214,7 @@ static void test_private_data(void) memset(&hal_caps, 0, sizeof(hal_caps)); hal_caps.dwSize = sizeof(hal_caps); - hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, NULL); + hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, NULL); ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); if ((hal_caps.ddsCaps.dwCaps & (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) == (DDSCAPS_TEXTURE | DDSCAPS_MIPMAP)) { @@ -8515,7 +8515,7 @@ static void test_create_surface_pitch(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((63 * 4) + 8) * 63); @@ -11468,7 +11468,7 @@ static void test_texcoordindex(void) destroy_viewport(device, viewport); IDirectDrawSurface4_Release(rt); - IDirectDraw_Release(ddraw); + IDirectDraw4_Release(ddraw); refcount = IDirect3DDevice3_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window); @@ -16531,7 +16531,7 @@ static void test_killfocus(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS; surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - hr = IDirectDraw7_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL); + hr = IDirectDraw4_CreateSurface(killfocus_ddraw, &surface_desc, &killfocus_surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); SetForegroundWindow(GetDesktopWindow()); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 288624728f2..e85b7d76369 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7645,7 +7645,7 @@ static void test_surface_attachment(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); memset(&surface_desc, 0, sizeof(surface_desc)); @@ -7947,7 +7947,7 @@ static void test_private_data(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); reset_ddsd(&surface_desc); @@ -8364,7 +8364,7 @@ static void test_create_surface_pitch(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); mem = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((63 * 4) + 8) * 63); @@ -11470,7 +11470,7 @@ static void test_texcoordindex(void) IDirectDrawSurface7_Release(texture2); IDirectDrawSurface7_Release(rt); - IDirectDraw_Release(ddraw); + IDirectDraw7_Release(ddraw); refcount = IDirect3DDevice7_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window); diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 90de8b00b26..af18fc217b1 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -99,11 +99,11 @@ static void GetDDInterface_1(void) ret = IDirectDrawSurface_QueryInterface(dsurface, &IID_IDirectDrawSurface2, (void **) &dsurface2); ok(ret == DD_OK, "IDirectDrawSurface_QueryInterface returned %08x\n", ret); ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); ref1 = getref((IUnknown *) lpDD); ok(ref1 == 1, "IDirectDraw refcount is %d\n", ref1); @@ -129,9 +129,9 @@ static void GetDDInterface_1(void) ret = IDirectDrawSurface2_GetDDInterface(dsurface2, NULL); ok(ret == DDERR_INVALIDPARAMS, "IDirectDrawSurface7_GetDDInterface returned %08x\n", ret); - IDirectDraw_Release(dd2); - IDirectDraw_Release(dd4); - IDirectDraw_Release(dd7); + IDirectDraw2_Release(dd2); + IDirectDraw4_Release(dd4); + IDirectDraw7_Release(dd7); IDirectDrawSurface2_Release(dsurface2); IDirectDrawSurface_Release(dsurface); } @@ -149,11 +149,11 @@ static void GetDDInterface_2(void) void *dd; ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); /* Create a surface */ ZeroMemory(&surface, sizeof(surface)); @@ -190,9 +190,9 @@ static void GetDDInterface_2(void) ok(dd == dd2, "Returned interface pointer is not equal to the creation interface\n"); IUnknown_Release((IUnknown *) dd); - IDirectDraw_Release(dd2); - IDirectDraw_Release(dd4); - IDirectDraw_Release(dd7); + IDirectDraw2_Release(dd2); + IDirectDraw4_Release(dd4); + IDirectDraw7_Release(dd7); IDirectDrawSurface2_Release(dsurface2); IDirectDrawSurface_Release(dsurface); } @@ -210,11 +210,11 @@ static void GetDDInterface_4(void) void *dd; ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); /* Create a surface */ ZeroMemory(&surface, sizeof(surface)); @@ -261,9 +261,9 @@ static void GetDDInterface_4(void) ok(dd == dd4, "Returned interface pointer is not equal to the creation interface\n"); IUnknown_Release((IUnknown *) dd); - IDirectDraw_Release(dd2); - IDirectDraw_Release(dd4); - IDirectDraw_Release(dd7); + IDirectDraw2_Release(dd2); + IDirectDraw4_Release(dd4); + IDirectDraw7_Release(dd7); IDirectDrawSurface4_Release(dsurface4); IDirectDrawSurface2_Release(dsurface2); } @@ -281,11 +281,11 @@ static void GetDDInterface_7(void) void *dd; ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw2, (void **) &dd2); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw4, (void **) &dd4); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); ret = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); - ok(ret == DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", ret); + ok(ret == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", ret); /* Create a surface */ ZeroMemory(&surface, sizeof(surface)); @@ -332,9 +332,9 @@ static void GetDDInterface_7(void) ok(dd == dd7, "Returned interface pointer is not equal to the creation interface\n"); IUnknown_Release((IUnknown *) dd); - IDirectDraw_Release(dd2); - IDirectDraw_Release(dd4); - IDirectDraw_Release(dd7); + IDirectDraw2_Release(dd2); + IDirectDraw4_Release(dd4); + IDirectDraw7_Release(dd7); IDirectDrawSurface4_Release(dsurface4); IDirectDrawSurface7_Release(dsurface7); } @@ -2494,7 +2494,7 @@ START_TEST(dsurface) ReleaseDirectDraw(); return; } - IDirectDraw_Release(dd4); + IDirectDraw4_Release(dd4); if(!can_create_primary_surface()) { diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index c8c474face0..447e6a99c67 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -379,7 +379,7 @@ static void test_d3d_ifaces(void) IDirect3D_Release(D3D1); hr = IDirectDraw2_QueryInterface(DDraw2, &IID_IDirect3D2, (void **) &D3D2); - ok(hr == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", hr); + ok(hr == DD_OK, "IDirectDraw2_QueryInterface returned %08x\n", hr); ref = getRefcount( (IUnknown *) DDraw4); ok(ref == 1, "IDirectDraw4 reference count is %ld\n", ref); ref = getRefcount( (IUnknown *) DDraw2); @@ -389,7 +389,7 @@ static void test_d3d_ifaces(void) IDirect3D2_Release(D3D2); hr = IDirectDraw4_QueryInterface(DDraw4, &IID_IDirect3D3, (void **) &D3D3); - ok(hr == DD_OK, "IDirectDraw_QueryInterface returned %08x\n", hr); + ok(hr == DD_OK, "IDirectDraw4_QueryInterface returned %08x\n", hr); ref = getRefcount( (IUnknown *) DDraw4); ok(ref == 1, "IDirectDraw4 reference count is %ld\n", ref); ref = getRefcount( (IUnknown *) DDraw2); @@ -418,7 +418,7 @@ static void test_d3d_ifaces(void) /* It is possible to query any IDirect3D interfaces from any IDirectDraw interface, * Except IDirect3D7, it can only be returned by IDirectDraw7(which can't return older ifaces) */ - hr = IDirectDraw_QueryInterface(DDraw2, &IID_IDirect3D, (void **) &D3D1); + hr = IDirectDraw2_QueryInterface(DDraw2, &IID_IDirect3D, (void **) &D3D1); ok(hr == DD_OK, "IDirectDraw2_QueryInterface returned %08x\n", hr); IDirect3D_Release(D3D1); hr = IDirectDraw4_QueryInterface(DDraw4, &IID_IDirect3D, (void **) &D3D1); diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index e2a0c7a2a74..4d6b198e323 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -890,7 +890,7 @@ static DWORD D3D3_getPixelColor(IDirectDraw4 *DirectDraw, IDirectDrawSurface4 *S ddsd.dwHeight = 480; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; hr = IDirectDraw4_CreateSurface(DirectDraw, &ddsd, &surf, NULL); - ok(hr == DD_OK, "IDirectDraw_CreateSurface failed with %08x\n", hr); + ok(hr == DD_OK, "IDirectDraw4_CreateSurface failed with %08x\n", hr); if(!surf) { trace("cannot create helper surface\n"); @@ -1002,8 +1002,8 @@ static void D3D3_ViewportClearTest(void) ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE; - hr = IDirectDraw_CreateSurface(DirectDraw4, &ddsd, &Primary, NULL); - ok(hr==DD_OK, "IDirectDraw_CreateSurface returned: %08x\n", hr); + hr = IDirectDraw4_CreateSurface(DirectDraw4, &ddsd, &Primary, NULL); + ok(hr==DD_OK, "IDirectDraw4_CreateSurface returned: %08x\n", hr); if(FAILED(hr)) goto out; hr = IDirectDraw4_QueryInterface(DirectDraw4, &IID_IDirect3D3, (void**)&Direct3D3); -- 2.25.1

3 2

[PATCH 2/2] ddraw/tests: Fix possible memory leaks.
by Zhiyi Zhang Oct. 21, 2020

Oct. 21, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/tests/d3d.c | 21 ++++++++++++++++++++- dlls/ddraw/tests/dsurface.c | 9 +++++++++ dlls/ddraw/tests/refcount.c | 3 +++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 93ff6e296cc..d8f3618200b 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -109,7 +109,11 @@ static BOOL CreateDirect3D(void) ok(rc==DD_OK, "SetCooperativeLevel returned: %x\n", rc); rc = IDirectDraw7_QueryInterface(lpDD, &IID_IDirect3D7, (void**) &lpD3D); - if (rc == E_NOINTERFACE) return FALSE; + if (rc == E_NOINTERFACE) + { + IDirectDraw7_Release(lpDD); + return FALSE; + } ok(rc==DD_OK, "QueryInterface returned: %x\n", rc); memset(&ddsd, 0, sizeof(ddsd)); @@ -120,7 +124,11 @@ static BOOL CreateDirect3D(void) ddsd.dwHeight = 256; rc = IDirectDraw7_CreateSurface(lpDD, &ddsd, &lpDDS, NULL); if (FAILED(rc)) + { + IDirect3D7_Release(lpD3D); + IDirectDraw7_Release(lpDD); return FALSE; + } num = 0; IDirectDraw7_EnumSurfaces(lpDD, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, NULL, &num, SurfaceCounter); @@ -144,7 +152,13 @@ static BOOL CreateDirect3D(void) rc = IDirectDrawSurface_AddAttachedSurface(lpDDS, lpDDSdepth); ok(rc == DD_OK, "IDirectDrawSurface_AddAttachedSurface returned %x\n", rc); if (FAILED(rc)) + { + IDirectDrawSurface7_Release(lpDDSdepth); + IDirectDrawSurface7_Release(lpDDS); + IDirect3D7_Release(lpD3D); + IDirectDraw7_Release(lpDD); return FALSE; + } } rc = IDirect3D7_CreateDevice(lpD3D, &IID_IDirect3DTnLHalDevice, lpDDS, @@ -160,6 +174,11 @@ static BOOL CreateDirect3D(void) &lpD3DDevice); if (!lpD3DDevice) { trace("IDirect3D7::CreateDevice() for a RGB device failed with an error %x, giving up\n", rc); + if (lpDDSdepth) + IDirectDrawSurface7_Release(lpDDSdepth); + IDirectDrawSurface7_Release(lpDDS); + IDirect3D7_Release(lpD3D); + IDirectDraw7_Release(lpDD); return FALSE; } } diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index af18fc217b1..478fb5d4a27 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -165,6 +165,9 @@ static void GetDDInterface_2(void) if(ret != DD_OK) { ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret); + IDirectDraw2_Release(dd2); + IDirectDraw4_Release(dd4); + IDirectDraw7_Release(dd7); return; } ret = IDirectDrawSurface_QueryInterface(dsurface, &IID_IDirectDrawSurface2, (void **) &dsurface2); @@ -226,6 +229,9 @@ static void GetDDInterface_4(void) if(ret != DD_OK) { ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret); + IDirectDraw2_Release(dd2); + IDirectDraw4_Release(dd4); + IDirectDraw7_Release(dd7); return; } ret = IDirectDrawSurface4_QueryInterface(dsurface4, &IID_IDirectDrawSurface2, (void **) &dsurface2); @@ -297,6 +303,9 @@ static void GetDDInterface_7(void) if(ret != DD_OK) { ok(FALSE, "IDirectDraw::CreateSurface failed with error %x\n", ret); + IDirectDraw2_Release(dd2); + IDirectDraw4_Release(dd4); + IDirectDraw7_Release(dd7); return; } ret = IDirectDrawSurface7_QueryInterface(dsurface7, &IID_IDirectDrawSurface4, (void **) &dsurface4); diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index 447e6a99c67..07673ab66e9 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -97,6 +97,9 @@ static void test_ddraw_objects(void) if (!surface) { win_skip("Could not create surface : %08x\n", hr); + IDirectDraw_Release(DDraw1); + IDirectDraw2_Release(DDraw2); + IDirectDraw4_Release(DDraw4); IDirectDraw7_Release(DDraw7); return; } -- 2.25.1

2 1

[PATCH] mf/sar: Use advertised type in IsMediaTypeSupported().
by Nikolay Sivov Oct. 21, 2020

Oct. 21, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/sar.c | 5 ++-- dlls/mf/tests/mf.c | 62 +++++++++++++++++----------------------------- 2 files changed, 25 insertions(+), 42 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 6f1f1bd834e..e318576e80e 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1479,11 +1479,10 @@ static HRESULT WINAPI audio_renderer_stream_type_handler_IsMediaTypeSupported(IM TRACE("%p, %p, %p.\n", iface, in_type, out_type); EnterCriticalSection(&renderer->cs); - hr = renderer->current_media_type && IMFMediaType_IsEqual(renderer->current_media_type, in_type, &flags) == S_OK ? - S_OK : MF_E_INVALIDMEDIATYPE; + hr = IMFMediaType_IsEqual(renderer->media_type, in_type, &flags); LeaveCriticalSection(&renderer->cs); - return hr; + return hr != S_OK ? MF_E_INVALIDMEDIATYPE : hr; } static HRESULT WINAPI audio_renderer_stream_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 7dc325424a6..6699c1ca9d1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2831,7 +2831,7 @@ static void test_sar(void) IMFMediaSink *sink, *sink2; IMFStreamSink *stream_sink; IMFAttributes *attributes; - DWORD id, flags, count; + DWORD i, id, flags, count; IMFActivate *activate; MFCLOCK_STATE state; IMFClock *clock; @@ -2839,6 +2839,7 @@ static void test_sar(void) HRESULT hr; GUID guid; BOOL mute; + int found; hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); @@ -2988,6 +2989,22 @@ todo_wine ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); ok(!!count, "Unexpected type count %u.\n", count); + /* A number of same major/subtype entries are returned, with different degrees of finer format + details. Some incomplete types are not accepted, check that at least one of them is considered supported. */ + + for (i = 0, found = -1; i < count; ++i) + { + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, i, &mediatype); + ok(hr == S_OK, "Failed to get media type, hr %#x.\n", hr); + + if (SUCCEEDED(IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype, NULL))) + found = i; + IMFMediaType_Release(mediatype); + + if (found != -1) break; + } + ok(found != -1, "Haven't found a supported type.\n"); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype); ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); @@ -3005,16 +3022,16 @@ todo_wine hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype); ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &mediatype2); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, found, &mediatype2); ok(hr == S_OK, "Failed to get media type, hr %#x.\n", hr); - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &mediatype3); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, found, &mediatype3); ok(hr == S_OK, "Failed to get media type, hr %#x.\n", hr); ok(mediatype2 == mediatype3, "Unexpected instance.\n"); IMFMediaType_Release(mediatype3); hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype2, NULL); - ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); IMFMediaType_Release(mediatype); @@ -3026,39 +3043,8 @@ todo_wine ok(mediatype == mediatype2, "Unexpected instance.\n"); IMFMediaType_Release(mediatype); - /* Type is validated against current type. */ - hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, mediatype2, NULL); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IMFMediaType_Release(mediatype2); - /* Set partial type. */ - hr = MFCreateMediaType(&mediatype); - ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); - - hr = IMFMediaType_GetGUID(mediatype2, &MF_MT_SUBTYPE, &guid); - ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr); - - hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - - hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &guid); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - - hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, mediatype); - ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); - - hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &mediatype2); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(mediatype == mediatype2, "Unexpected instance.\n"); - IMFMediaType_Release(mediatype2); - - hr = IMFMediaType_GetCount(mediatype, &count); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(count == 2, "Unexpected attribute count %u.\n", count); - - IMFMediaType_Release(mediatype); - /* Reset back to uninitialized state. */ hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); @@ -3121,10 +3107,8 @@ todo_wine IMFAudioStreamVolume_Release(stream_volume); hr = MFGetService((IUnknown *)sink, &MR_AUDIO_POLICY_SERVICE, &IID_IMFAudioPolicy, (void **)&unk); -todo_wine - ok(hr == MF_E_NOT_INITIALIZED, "Failed to get interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - IUnknown_Release(unk); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IUnknown_Release(unk); /* Shutdown */ EXPECT_REF(present_clock, 2); -- 2.28.0

1 0

[PATCH 3/3] msado15: Implement _Connection Open.
by Hans Leidekker Oct. 21, 2020

Oct. 21, 2020

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v3: Remove unused define and dsn field, style fixes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/Makefile.in | 2 +- dlls/msado15/connection.c | 55 +++++++++++++++++++++++++++++++++--- dlls/msado15/tests/msado15.c | 4 +-- 3 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/msado15/Makefile.in b/dlls/msado15/Makefile.in index 9852e0863dd..e64da605473 100644 --- a/dlls/msado15/Makefile.in +++ b/dlls/msado15/Makefile.in @@ -1,5 +1,5 @@ MODULE = msado15.dll -IMPORTS = oleaut32 +IMPORTS = oleaut32 ole32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 3f1a87aa5b3..fd15d5a443f 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "ocidl.h" #include "objbase.h" +#include "msdasc.h" #include "olectl.h" #include "msado15_backcompat.h" @@ -56,6 +57,7 @@ struct connection WCHAR *provider; ConnectModeEnum mode; CursorLocationEnum location; + IUnknown *session; struct connection_point cp_connev; }; @@ -98,6 +100,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) if (connection->cp_connev.sinks[i]) IUnknown_Release( connection->cp_connev.sinks[i] ); } + if (connection->session) IUnknown_Release( connection->session ); heap_free( connection->cp_connev.sinks ); heap_free( connection->provider ); heap_free( connection->datasource ); @@ -240,6 +243,12 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + if (connection->session) + { + IUnknown_Release( connection->session ); + connection->session = NULL; + } + connection->state = adStateClosed; return S_OK; } @@ -273,13 +282,50 @@ static HRESULT WINAPI connection_Open( _Connection *iface, BSTR connect_str, BST LONG options ) { struct connection *connection = impl_from_Connection( iface ); - FIXME( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), - password, options ); + IDBProperties *props; + IDBInitialize *dbinit = NULL; + IDataInitialize *datainit; + IDBCreateSession *session = NULL; + HRESULT hr; + + TRACE( "%p, %s, %s, %p, %08x\n", iface, debugstr_w(connect_str), debugstr_w(userid), password, options ); if (connection->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + if (!connect_str) return E_FAIL; - connection->state = adStateOpen; - return S_OK; + if ((hr = CoCreateInstance( &CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize, + (void **)&datainit )) != S_OK) return hr; + if ((hr = IDataInitialize_GetDataSource( datainit, NULL, CLSCTX_INPROC_SERVER, connect_str, &IID_IDBInitialize, + (IUnknown **)&dbinit )) != S_OK) goto done; + if ((hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBProperties, (void **)&props )) != S_OK) goto done; + + /* TODO - Update username/password if required. */ + if ((userid && *userid) || (password && *password)) + FIXME("Username/password parameters currently not supported\n"); + + if ((hr = IDBInitialize_Initialize( dbinit )) != S_OK) goto done; + if ((hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBCreateSession, (void **)&session )) != S_OK) goto done; + if ((hr = IDBCreateSession_CreateSession( session, NULL, &IID_IUnknown, &connection->session )) == S_OK) + { + connection->state = adStateOpen; + } + IDBCreateSession_Release( session ); + +done: + if (hr != S_OK && connection->session) + { + IUnknown_Release( connection->session ); + connection->session = NULL; + } + if (dbinit) + { + IDBInitialize_Uninitialize( dbinit ); + IDBInitialize_Release( dbinit ); + } + IDataInitialize_Release( datainit ); + + TRACE("ret 0x%08x\n", hr); + return hr; } static HRESULT WINAPI connection_get_Errors( _Connection *iface, Errors **obj ) @@ -688,6 +734,7 @@ HRESULT Connection_create( void **obj ) } connection->mode = adModeUnknown; connection->location = adUseServer; + connection->session = NULL; connection->cp_connev.conn = connection; connection->cp_connev.riid = &DIID_ConnectionEvents; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 378c2eb918c..adf9fb30bc2 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -808,12 +808,12 @@ if (0) /* Crashes on windows */ ok(!wcscmp(str, str2), "wrong string %s\n", wine_dbgstr_w(str2)); hr = _Connection_Open(connection, NULL, NULL, NULL, 0); - todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); /* Open adds trailing ; if it's missing */ str3 = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test;"); hr = _Connection_Open(connection, NULL, NULL, NULL, adConnectUnspecified); - todo_wine ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); + ok(hr == E_FAIL, "Failed, hr 0x%08x\n", hr); str2 = NULL; hr = _Connection_get_ConnectionString(connection, &str2); -- 2.20.1

1 0

[PATCH 2/3] msado15: Avoid a crash with tracing on.
by Hans Leidekker Oct. 21, 2020

Oct. 21, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index e3222e63b6a..3f1a87aa5b3 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -190,7 +190,7 @@ static HRESULT WINAPI connection_put_ConnectionString( _Connection *iface, BSTR struct connection *connection = impl_from_Connection( iface ); WCHAR *source = NULL; - TRACE( "%p, %s\n", connection, debugstr_w( !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); + TRACE( "%p, %s\n", connection, debugstr_w( str && !wcsstr( str, L"Password" ) ? L"<hidden>" : str ) ); if (str && !(source = strdupW( str ))) return E_OUTOFMEMORY; heap_free( connection->datasource ); -- 2.20.1

1 0

[PATCH 1/3] msado15: Use correct string type for default provider.
by Hans Leidekker Oct. 21, 2020

Oct. 21, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/connection.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 2773850236d..e3222e63b6a 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -681,7 +681,11 @@ HRESULT Connection_create( void **obj ) connection->state = adStateClosed; connection->timeout = 30; connection->datasource = NULL; - connection->provider = SysAllocString(L"MSDASQL"); + if (!(connection->provider = strdupW( L"MSDASQL" ))) + { + heap_free( connection ); + return E_OUTOFMEMORY; + } connection->mode = adModeUnknown; connection->location = adUseServer; -- 2.20.1

1 0

[PATCH 5/5] riched20: Return a paragraph ptr from the table insert helper.
by Huw Davies Oct. 21, 2020

Oct. 21, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/table.c | 46 +++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index a26715a5d80..14fdf6eb73a 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -58,29 +58,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); static const WCHAR cr_lf[] = {'\r', '\n', 0}; -static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, - int nCursor, - const WCHAR *eol_str, int eol_len, - int paraFlags) +static ME_Paragraph* table_insert_end_para( ME_TextEditor *editor, ME_Cursor *cursor, + const WCHAR *eol_str, int eol_len, int para_flags ) { - ME_Style *pStyle = style_get_insert_style( editor, editor->pCursors + nCursor ); - ME_Paragraph *para; - ME_Cursor* cursor = &editor->pCursors[nCursor]; + ME_Style *style = style_get_insert_style( editor, cursor ); + ME_Paragraph *para; - if (cursor->nOffset) run_split( editor, cursor ); + if (cursor->nOffset) run_split( editor, cursor ); - para = para_split( editor, &cursor->pRun->member.run, pStyle, eol_str, eol_len, paraFlags ); - ME_ReleaseStyle(pStyle); - cursor->pPara = para_get_di( para ); - cursor->pRun = run_get_di( para_first_run( para ) ); - return para_get_di( para ); + para = para_split( editor, &cursor->pRun->member.run, style, eol_str, eol_len, para_flags ); + ME_ReleaseStyle( style ); + cursor->pPara = para_get_di( para ); + cursor->pRun = run_get_di( para_first_run( para ) ); + return para; } ME_DisplayItem* ME_InsertTableRowStartFromCursor(ME_TextEditor *editor) { - ME_DisplayItem *para; - para = ME_InsertEndParaFromCursor(editor, 0, cr_lf, 2, MEPF_ROWSTART); - return para->member.para.prev_para; + ME_Paragraph *para; + + para = table_insert_end_para( editor, editor->pCursors, cr_lf, 2, MEPF_ROWSTART ); + return para_get_di( para_prev( para ) ); } ME_DisplayItem* ME_InsertTableRowStartAtParagraph(ME_TextEditor *editor, @@ -120,17 +118,19 @@ ME_DisplayItem* ME_InsertTableRowStartAtParagraph(ME_TextEditor *editor, * Returns the first paragraph of the new cell. */ ME_DisplayItem* ME_InsertTableCellFromCursor(ME_TextEditor *editor) { - ME_DisplayItem *para; - WCHAR tab = '\t'; - para = ME_InsertEndParaFromCursor(editor, 0, &tab, 1, MEPF_CELL); - return para; + ME_Paragraph *para; + WCHAR tab = '\t'; + + para = table_insert_end_para( editor, editor->pCursors, &tab, 1, MEPF_CELL ); + return para_get_di( para ); } ME_DisplayItem* ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) { - ME_DisplayItem *para; - para = ME_InsertEndParaFromCursor(editor, 0, cr_lf, 2, MEPF_ROWEND); - return para->member.para.prev_para; + ME_Paragraph *para; + + para = table_insert_end_para( editor, editor->pCursors, cr_lf, 2, MEPF_ROWEND ); + return para_get_di( para_prev( para ) ); } ME_Paragraph* table_row_end( ME_Paragraph *para ) -- 2.23.0

1 0

[PATCH 4/5] riched20: Pass and return paragraph ptrs in the table append row function.
by Huw Davies Oct. 21, 2020

Oct. 21, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 6 +- dlls/riched20/editor.h | 4 +- dlls/riched20/table.c | 126 +++++++++++++++++++++-------------------- 3 files changed, 70 insertions(+), 66 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index dfb066d5976..5cf1ad35f59 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2504,7 +2504,7 @@ static BOOL handle_enter(ME_TextEditor *editor) if (para->member.para.nFlags & MEPF_ROWEND) { /* Add a new table row after this row. */ - para = ME_AppendTableRow(editor, para); + para = para_get_di( table_append_row( editor, &para->member.para ) ); para = para->member.para.next_para; editor->pCursors[0].pPara = para; editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); @@ -2552,7 +2552,7 @@ static BOOL handle_enter(ME_TextEditor *editor) if (from == to) { ME_ContinueCoalescingTransaction(editor); - para = ME_AppendTableRow(editor, para); + para = para_get_di( table_append_row( editor, &para->member.para ) ); editor->pCursors[0].pPara = para; editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; @@ -2583,7 +2583,7 @@ static BOOL handle_enter(ME_TextEditor *editor) else { editor->pCursors[1] = editor->pCursors[0]; - para = ME_AppendTableRow(editor, para); + para = para_get_di( table_append_row( editor, &para->member.para ) ); editor->pCursors[0].pPara = para; editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index a43a6c2c1ed..b1cd75f2946 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -284,12 +284,12 @@ ME_DisplayItem *ME_InsertTableRowStartAtParagraph(ME_TextEditor *editor, ME_DisplayItem *para) DECLSPEC_HIDDEN; ME_DisplayItem *ME_InsertTableCellFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; ME_DisplayItem *ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) DECLSPEC_HIDDEN; +ME_Paragraph *table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) DECLSPEC_HIDDEN; +ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_end( ME_Paragraph *para ) DECLSPEC_HIDDEN; ME_Paragraph *table_row_start( ME_Paragraph *para ) DECLSPEC_HIDDEN; -ME_Paragraph *table_outer_para( ME_Paragraph *para ) DECLSPEC_HIDDEN; void ME_CheckTablesForCorruption(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nChars) DECLSPEC_HIDDEN; -ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, ME_DisplayItem *table_row) DECLSPEC_HIDDEN; void ME_TabPressedInTable(ME_TextEditor *editor, BOOL bSelectedRow) DECLSPEC_HIDDEN; void ME_MoveCursorFromTableRowStartParagraph(ME_TextEditor *editor) DECLSPEC_HIDDEN; struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 08c8fcb7ebf..a26715a5d80 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -398,98 +398,98 @@ void ME_ProtectPartialTableDeletion(ME_TextEditor *editor, ME_Cursor *c, int *nC } } -ME_DisplayItem* ME_AppendTableRow(ME_TextEditor *editor, - ME_DisplayItem *table_row) +ME_Paragraph* table_append_row( ME_TextEditor *editor, ME_Paragraph *table_row ) { WCHAR endl = '\r', tab = '\t'; - ME_DisplayItem *run; + ME_Run *run; PARAFORMAT2 *pFmt; int i; assert(table_row); - assert(table_row->type == diParagraph); - if (!editor->bEmulateVersion10) { /* v4.1 */ - ME_DisplayItem *insertedCell, *para, *cell, *prevTableEnd; - cell = ME_FindItemFwd( para_get_di( table_row_start( &table_row->member.para ) ), diCell ); - prevTableEnd = para_get_di( table_row_end( &table_row->member.para ) ); - para = prevTableEnd->member.para.next_para; - run = ME_FindItemFwd(para, diRun); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = run; + if (!editor->bEmulateVersion10) /* v4.1 */ + { + ME_DisplayItem *insertedCell, *cell; + ME_Paragraph *para, *prev_table_end; + + cell = ME_FindItemFwd( para_get_di( table_row_start( table_row ) ), diCell ); + prev_table_end = table_row_end( table_row ); + para = para_next( prev_table_end ); + run = para_first_run( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( run ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - para = ME_InsertTableRowStartFromCursor(editor); - insertedCell = ME_FindItemFwd(para, diCell); + para = &ME_InsertTableRowStartFromCursor(editor)->member.para; + insertedCell = ME_FindItemFwd( para_get_di( para ), diCell ); /* Copy cell properties */ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; insertedCell->member.cell.border = cell->member.cell.border; - while (cell->member.cell.next_cell) { + while (cell->member.cell.next_cell) + { cell = cell->member.cell.next_cell; - para = ME_InsertTableCellFromCursor(editor); - insertedCell = ME_FindItemBack(para, diCell); + para = &ME_InsertTableCellFromCursor( editor )->member.para; + insertedCell = ME_FindItemBack( para_get_di( para ), diCell ); /* Copy cell properties */ insertedCell->member.cell.nRightBoundary = cell->member.cell.nRightBoundary; insertedCell->member.cell.border = cell->member.cell.border; }; - para = ME_InsertTableRowEndFromCursor(editor); - para->member.para.fmt = prevTableEnd->member.para.fmt; + para = &ME_InsertTableRowEndFromCursor(editor)->member.para; + para->fmt = prev_table_end->fmt; /* return the table row start for the inserted paragraph */ - return ME_FindItemFwd(cell, diParagraph)->member.para.next_para; - } else { /* v1.0 - 3.0 */ - run = ME_FindItemBack(table_row->member.para.next_para, diRun); - pFmt = &table_row->member.para.fmt; + return para_next( &ME_FindItemFwd( cell, diParagraph )->member.para ); + } + else /* v1.0 - 3.0 */ + { + run = para_end_run( table_row ); + pFmt = &table_row->fmt; assert(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE); - editor->pCursors[0].pPara = table_row; - editor->pCursors[0].pRun = run; + editor->pCursors[0].pPara = para_get_di( table_row ); + editor->pCursors[0].pRun = run_get_di( run ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, run->member.run.style); - run = editor->pCursors[0].pRun; - for (i = 0; i < pFmt->cTabCount; i++) { - ME_InsertTextFromCursor(editor, 0, &tab, 1, run->member.run.style); - } - return table_row->member.para.next_para; + ME_InsertTextFromCursor( editor, 0, &endl, 1, run->style ); + run = &editor->pCursors[0].pRun->member.run; + for (i = 0; i < pFmt->cTabCount; i++) + ME_InsertTextFromCursor(editor, 0, &tab, 1, run->style); + + return para_next( table_row ); } } /* Selects the next table cell or appends a new table row if at end of table */ -static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, - ME_DisplayItem *run) +static void ME_SelectOrInsertNextCell( ME_TextEditor *editor, ME_DisplayItem *run ) { - ME_DisplayItem *para = ME_GetParagraph(run); + ME_Paragraph *para = run->member.run.para; int i; assert(run && run->type == diRun); assert(ME_IsInTable(run)); - if (!editor->bEmulateVersion10) { /* v4.1 */ + if (!editor->bEmulateVersion10) /* v4.1 */ + { ME_DisplayItem *cell; /* Get the initial cell */ - if (para->member.para.nFlags & MEPF_ROWSTART) { - cell = para->member.para.next_para->member.para.pCell; - } else if (para->member.para.nFlags & MEPF_ROWEND) { - cell = para->member.para.prev_para->member.para.pCell; - } else { - cell = para->member.para.pCell; - } + if (para->nFlags & MEPF_ROWSTART) cell = para_next( para )->pCell; + else if (para->nFlags & MEPF_ROWEND) cell = para_prev( para )->pCell; + else cell = para->pCell; assert(cell); + /* Get the next cell. */ if (cell->member.cell.next_cell && cell->member.cell.next_cell->member.cell.next_cell) { cell = cell->member.cell.next_cell; } else { - para = table_row_end( &ME_FindItemFwd( cell, diParagraph )->member.para )->next_para; - assert(para); - if (para->member.para.nFlags & MEPF_ROWSTART) { - cell = para->member.para.next_para->member.para.pCell; - } else { + para = para_next( table_row_end( &ME_FindItemFwd( cell, diParagraph )->member.para ) ); + if (para->nFlags & MEPF_ROWSTART) cell = para_next( para )->pCell; + else + { /* Insert row */ - para = para->member.para.prev_para; - para = ME_AppendTableRow( editor, para_get_di( table_row_start( &para->member.para ) ) ); + para = para_prev( para ); + para = table_append_row( editor, table_row_start( para ) ); /* Put cursor at the start of the new table row */ - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + para = para_next( para ); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_WrapMarkedParagraphs(editor); @@ -506,7 +506,9 @@ static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, editor->pCursors[0].pPara = ME_GetParagraph(editor->pCursors[0].pRun); editor->pCursors[0].nOffset = 0; assert(editor->pCursors[1].pRun); - } else { /* v1.0 - 3.0 */ + } + else /* v1.0 - 3.0 */ + { if (run->member.run.nFlags & MERF_ENDPARA && ME_IsInTable(ME_FindItemFwd(run, diParagraphOrEnd))) { @@ -520,21 +522,23 @@ static void ME_SelectOrInsertNextCell(ME_TextEditor *editor, run = ME_FindItemFwd(run, diRunOrParagraphOrEnd); if (run->type != diRun) { - para = run; - if (ME_IsInTable(para)) + para = &run->member.para; + if (para_in_table( para )) { - run = ME_FindItemFwd(para, diRun); + run = run_get_di( para_first_run( para ) ); assert(run); - editor->pCursors[0].pPara = para; + editor->pCursors[0].pPara = para_get_di( para ); editor->pCursors[0].pRun = run; editor->pCursors[0].nOffset = 0; i = 1; - } else { + } + else + { /* Insert table row */ - para = ME_AppendTableRow(editor, para->member.para.prev_para); + para = table_append_row( editor, para_prev( para ) ); /* Put cursor at the start of the new table row */ - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].pPara = para_get_di( para ); + editor->pCursors[0].pRun = run_get_di( para_first_run( para ) ); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_WrapMarkedParagraphs(editor); -- 2.23.0

1 0

[PATCH 3/5] riched20: Pass a cursor ptr to the insert style retrieval function.
by Huw Davies Oct. 21, 2020

Oct. 21, 2020

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 6 +++--- dlls/riched20/editor.c | 6 +++--- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 2 +- dlls/riched20/run.c | 2 +- dlls/riched20/style.c | 44 +++++++++++++---------------------------- dlls/riched20/table.c | 2 +- 7 files changed, 24 insertions(+), 40 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 97cee3d9b3a..5d49d11bd3b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -473,11 +473,11 @@ static struct re_object* create_re_object(const REOBJECT *reo) void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCursor) { - ME_Style *style = ME_GetInsertStyle( editor, nCursor ); ME_Run *run, *prev; const WCHAR space = ' '; struct re_object *reobj_prev = NULL; ME_Cursor *cursor = editor->pCursors + nCursor; + ME_Style *style = style_get_insert_style( editor, cursor ); /* FIXME no no no */ if (ME_IsSelection(editor)) @@ -508,9 +508,9 @@ void ME_InsertOLEFromCursor(ME_TextEditor *editor, const REOBJECT* reo, int nCur void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor) { - ME_Style *style = ME_GetInsertStyle( editor, nCursor ); const WCHAR space = ' '; ME_Cursor *cursor = editor->pCursors + nCursor; + ME_Style *style = style_get_insert_style( editor, cursor ); /* FIXME no no no */ if (ME_IsSelection(editor)) @@ -1510,7 +1510,7 @@ void ME_DeleteSelection(ME_TextEditor *editor) ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor) { - return ME_GetInsertStyle(editor, 0); + return style_get_insert_style( editor, editor->pCursors ); } void ME_SendSelChange(ME_TextEditor *editor) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c91d47302cf..dfb066d5976 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2596,7 +2596,7 @@ static BOOL handle_enter(ME_TextEditor *editor) } } - style = ME_GetInsertStyle(editor, 0); + style = style_get_insert_style( editor, editor->pCursors ); /* Normally the new eop style is the insert style, however in a list it is copied from the existing eop style (this prevents the list label style changing when the new eop is inserted). @@ -2838,7 +2838,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, /* WM_CHAR is restricted to nTextLimit */ if(editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) { - ME_Style *style = ME_GetInsertStyle(editor, 0); + ME_Style *style = style_get_insert_style( editor, editor->pCursors ); ME_ContinueCoalescingTransaction(editor); ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); @@ -4818,7 +4818,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { HIMC hIMC; - ME_Style *style = ME_GetInsertStyle(editor, 0); + ME_Style *style = style_get_insert_style( editor, editor->pCursors ); hIMC = ITextHost_TxImmGetContext(editor->texthost); ME_DeleteSelection(editor); ME_SaveTempStyle(editor, style); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 1f74a2eb8b4..a43a6c2c1ed 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -47,11 +47,11 @@ static inline const char *debugstr_run( const ME_Run *run ) } /* style.c */ +ME_Style *style_get_insert_style( ME_TextEditor *editor, ME_Cursor *cursor ) DECLSPEC_HIDDEN; ME_Style *ME_MakeStyle(CHARFORMAT2W *style) DECLSPEC_HIDDEN; void ME_AddRefStyle(ME_Style *item) DECLSPEC_HIDDEN; void ME_DestroyStyle(ME_Style *item) DECLSPEC_HIDDEN; void ME_ReleaseStyle(ME_Style *item) DECLSPEC_HIDDEN; -ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor) DECLSPEC_HIDDEN; ME_Style *ME_ApplyStyle(ME_TextEditor *ed, ME_Style *sSrc, CHARFORMAT2W *style) DECLSPEC_HIDDEN; void select_style(ME_Context *c, ME_Style *s) DECLSPEC_HIDDEN; void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 21e92e95cd1..2f2e5e09d1f 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1697,7 +1697,7 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) len = lstrlenW(str); cursor = editor->pCursors[0]; cursor_from_char_ofs( editor, This->start, &editor->pCursors[0] ); - style = ME_GetInsertStyle(editor, 0); + style = style_get_insert_style( editor, editor->pCursors ); ME_InsertTextFromCursor(editor, 0, str, len, style); ME_ReleaseStyle(style); editor->pCursors[0] = cursor; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 22a5db8610b..b1436ad5060 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -716,7 +716,7 @@ void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) { ME_Style *s; if (!editor->pBuffer->pCharStyle) - editor->pBuffer->pCharStyle = ME_GetInsertStyle(editor, 0); + editor->pBuffer->pCharStyle = style_get_insert_style( editor, editor->pCursors ); s = ME_ApplyStyle(editor, editor->pBuffer->pCharStyle, pFmt); ME_ReleaseStyle(editor->pBuffer->pCharStyle); editor->pBuffer->pCharStyle = s; diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 8b9c2126b1b..fbbe29dce14 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -473,42 +473,26 @@ void ME_ReleaseStyle(ME_Style *s) ME_DestroyStyle(s); } -ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor) +ME_Style *style_get_insert_style( ME_TextEditor *editor, ME_Cursor *cursor ) { - if (ME_IsSelection(editor)) - { + ME_Style *style; ME_Cursor *from, *to; + ME_Run *prev; - ME_GetSelection(editor, &from, &to); - ME_AddRefStyle(from->pRun->member.run.style); - return from->pRun->member.run.style; - } - if (editor->pBuffer->pCharStyle) { - ME_AddRefStyle(editor->pBuffer->pCharStyle); - return editor->pBuffer->pCharStyle; - } - else - { - ME_Cursor *pCursor = &editor->pCursors[nCursor]; - ME_DisplayItem *pRunItem = pCursor->pRun; - ME_DisplayItem *pPrevItem = NULL; - if (pCursor->nOffset) { - ME_Run *pRun = &pRunItem->member.run; - ME_AddRefStyle(pRun->style); - return pRun->style; - } - pPrevItem = ME_FindItemBack(pRunItem, diRunOrParagraph); - if (pPrevItem->type == diRun) + if (ME_IsSelection( editor )) { - ME_AddRefStyle(pPrevItem->member.run.style); - return pPrevItem->member.run.style; + ME_GetSelection( editor, &from, &to ); + style = from->pRun->member.run.style; } + else if (editor->pBuffer->pCharStyle) + style = editor->pBuffer->pCharStyle; + else if (!cursor->nOffset && (prev = run_prev( &cursor->pRun->member.run ))) + style = prev->style; else - { - ME_AddRefStyle(pRunItem->member.run.style); - return pRunItem->member.run.style; - } - } + style = cursor->pRun->member.run.style; + + ME_AddRefStyle( style ); + return style; } void ME_SaveTempStyle(ME_TextEditor *editor, ME_Style *style) diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 876244c9706..08c8fcb7ebf 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -63,7 +63,7 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, const WCHAR *eol_str, int eol_len, int paraFlags) { - ME_Style *pStyle = ME_GetInsertStyle(editor, nCursor); + ME_Style *pStyle = style_get_insert_style( editor, editor->pCursors + nCursor ); ME_Paragraph *para; ME_Cursor* cursor = &editor->pCursors[nCursor]; -- 2.23.0

1 0

[PATCH 2/5] riched20: Remove a redundant condition.
by Huw Davies Oct. 21, 2020

Oct. 21, 2020

If the cursor offset is zero, then it is by definition at the beginning of a run. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/caret.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 21dd901088e..97cee3d9b3a 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -327,9 +327,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, { ME_Run *run; cursor_from_char_ofs( editor, nOfs + nChars, &c ); - if (!c.nOffset && - nOfs+nChars == (c.pRun->member.run.nCharOfs - + c.pPara->member.para.nCharOfs)) + if (!c.nOffset) { /* We aren't deleting anything in this run, so we will go back to the * last run we are deleting text in. */ -- 2.23.0

1 0