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

[PATCH] wbemprox: Implement Win32_SoundDevice.Status.
by Haoyang Chen 22 Oct '20

22 Oct '20

1 0

[PATCH 1/2] winegstreamer: Respect integer promotion rules when clamping timestamp + diff.
by Zebediah Figura 21 Oct '20

21 Oct '20

Fixes: 5ca1d28e8df7e3e87e5b9f3ff51445b07dfcc2fb Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ff41af1205b..ed65a0a598d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2089,7 +2089,7 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil /* The documentation specifies that timestamp + diff must be nonnegative. */ diff = qm.Late * 100; - if (timestamp < -diff) + if (diff < 0 && timestamp < (GstClockTime)-diff) diff = -timestamp; evt = gst_event_new_qos(type, qm.Proportion / 1000.0, diff, timestamp); -- 2.28.0

2 2

[PATCH] ntdll: Fix xmm registers copy offset in call_consolidate_callback() on x86_64.
by Paul Gofman 21 Oct '20

21 Oct '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50010 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 6fbb612825b..a332f961908 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1086,7 +1086,7 @@ __ASM_GLOBAL_FUNC( call_consolidate_callback, "pushq %rsi\n\t" "pushq %rdi\n\t" "leaq 0x200(%rcx),%rsi\n\t" - "leaq 0x60(%rsp),%rdi\n\t" + "leaq 0x70(%rsp),%rdi\n\t" "movq $0x14,%rcx\n\t" "cld\n\t" "rep; movsq\n\t" -- 2.26.2

1 0

[PATCH 1/2] winex11.drv: Keep the window's own restored state when unminimized, if it was fullscreen before.
by Gabriel Ivăncescu 21 Oct '20

21 Oct '20

Fixes a regression introduced by commit 82c6ec3a32f44e8b3e0cc88b7f10e0c0d7fa1b89, which caused the WM_ACTIVATEAPP to be sent while the window is minimized, if it has been clicked on in the taskbar to be restored. According to the Extended Window Manager Hints spec, WMs remove the NET_WM_STATE_FULLSCREEN state when minimized and then, when restored, use the previous size of the window (not the fullscreen) to restore to. This caused the WM_SYSCOMMAND SC_RESTORE message's ShowWindow to revert the window back to its original (non-fullscreen) size, instead of being restored to fullscreen, breaking some apps like Heroes of Might and Magic V. We have to override the X server's window state here to match Windows behavior and restore it back to fullscreen. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes patches 193752-193754. update_net_wm_states is when Wine does a change and needs to inform the X server about it (i.e. Wine->X11 state change). So, that's good as it is. read_net_wm_states is when X11 changes some state from outside Wine and sends it a notification that it did; then Wine has to update its own wm states to match the X server (so it's properly integrated). However, in this case, since the WM clears the fullscreen state on minimization, we must not do that, because Windows doesn't—and more, when the window is restored from minimized, we must ignore the X11 state changes and force it back to what Wine had (usually fullscreen unless it gets hooked by the app, then we keep what the app changed). This is to match Windows behavior, which differs from X11, and apps rely on. dlls/winex11.drv/event.c | 13 +++++++++++++ dlls/winex11.drv/window.c | 9 ++++++++- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 07f7a1a..350d533 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1296,6 +1296,8 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat if (data->iconic && data->wm_state == NormalState) /* restore window */ { + DWORD old_state = data->net_wm_state; + data->iconic = FALSE; read_net_wm_states( event->display, data ); if ((style & WS_CAPTION) == WS_CAPTION && (data->net_wm_state & (1 << NET_WM_STATE_MAXIMIZED))) @@ -1313,11 +1315,22 @@ static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL updat { if (style & (WS_MINIMIZE | WS_MAXIMIZE)) { + /* if the window was fullscreen before minimized, we have to keep its + restored state and restore it to its fullscreen state, because WMs + remove the fullscreen state when minimized, so don't use their state. */ + if (old_state & (1 << NET_WM_STATE_FULLSCREEN)) + data->keep_restored_state = TRUE; + TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); release_win_data( data ); if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE)) SetActiveWindow( hwnd ); SendMessageW( hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + if ((data = get_win_data( hwnd ))) + { + data->keep_restored_state = FALSE; + release_win_data( data ); + } return; } TRACE( "not restoring win %p/%lx style %08x\n", data->hwnd, data->whole_window, style ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4571739..d9d207c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1076,6 +1076,8 @@ void read_net_wm_states( Display* display, struct x11drv_win_data *data ) if (!maximized_horz) new_state &= ~(1 << NET_WM_STATE_MAXIMIZED); + if ((data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) && data->iconic) + new_state |= 1 << NET_WM_STATE_FULLSCREEN; data->net_wm_state = new_state; } @@ -2450,6 +2452,11 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (event_type != ConfigureNotify && event_type != PropertyNotify && event_type != GravityNotify && event_type != ReparentNotify) event_type = 0; /* ignore other events */ + + /* if we keep the Wine window's restored state, we pretend it's + not an event, so that it's synced properly with the X server. */ + if (data->keep_restored_state && !(new_style & WS_MINIMIZE)) + event_type = 0; } if (data->mapped && event_type != ReparentNotify) @@ -2545,7 +2552,7 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) } goto done; } - if (!data->managed || !data->mapped || data->iconic) goto done; + if (!data->managed || !data->mapped || data->iconic || data->keep_restored_state) goto done; /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 173d94b..de725d9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -574,6 +574,7 @@ struct x11drv_win_data BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ + BOOL keep_restored_state : 1; /* don't override the window state when restoring from an event */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ -- 2.21.0

3 7

[PATCH] dxgi/tests: Fix a window leak in test_inexact_modes().
by Zhiyi Zhang 21 Oct '20

21 Oct '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index bf798508a6d..43c4247dc2a 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3630,6 +3630,7 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); } static void test_create_factory(void) -- 2.25.1

2 1

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

21 Oct '20

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 21 Oct '20

21 Oct '20

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 21 Oct '20

21 Oct '20

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 21 Oct '20

21 Oct '20

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 21 Oct '20

21 Oct '20

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