May 2023 - Wine-commits - list.winehq.org

Eric Pouech : winedump: Fix copy & paste error.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 5900418781066d6cd37a4af6dcb1900ef38ae78f URL: https://gitlab.winehq.org/wine/wine/-/commit/5900418781066d6cd37a4af6dcb190… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue May 9 12:48:32 2023 +0200 winedump: Fix copy & paste error. (Thanks to Andrey for point it out). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/pdb.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index d12150ab3a2..552fa4d8da8 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -585,8 +585,6 @@ static void pdb_dump_symbols(struct pdb_reader* reader) (symbols->sectcontrib_size - sizeof(unsigned)) / size, size, (symbols->sectcontrib_size - sizeof(unsigned)) % size); - if ((symbols->sectcontrib_size - sizeof(unsigned)) % size) - if ((symbols->sectcontrib_size - sizeof(unsigned)) % size) src += sizeof(unsigned); while (src + size <= last) {

1 0

Zebediah Figura : quartz: Check whether the pin is connected in IVideoWindow::put_Owner().
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 9d6f8a6a3cc568e6888270c34683c20ee9e927f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d6f8a6a3cc568e6888270c34683c2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 13:06:38 2023 -0500 quartz: Check whether the pin is connected in IVideoWindow::put_Owner(). Ferro CCTV calls this. --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ dlls/quartz/window.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 7771c467a13..4b8bd4e7c2c 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2396,6 +2396,9 @@ static void test_video_window(void) hr = IVideoWindow_put_AutoShow(window, OAFALSE); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_Owner(window, (OAHWND)our_hwnd); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index cbab6eb077d..73e7ff5ffe9 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2395,6 +2395,9 @@ static void test_video_window(void) hr = IVideoWindow_put_AutoShow(window, OAFALSE); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_Owner(window, (OAHWND)our_hwnd); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 9c5ec2129a3..27117db9f02 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2621,6 +2621,9 @@ static void test_video_window(void) hr = IVideoWindow_put_AutoShow(window, OAFALSE); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_Owner(window, (OAHWND)our_hwnd); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 617d45b74e0..f09dd5aea56 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -482,6 +482,9 @@ HRESULT WINAPI BaseControlWindowImpl_put_Owner(IVideoWindow *iface, OAHWND owner TRACE("window %p, owner %#Ix.\n", window, owner); + if (!window->pPin->peer) + return VFW_E_NOT_CONNECTED; + /* Make sure we are marked as WS_CHILD before reparenting ourselves, so that * we do not steal focus. LEGO Island depends on this. */

1 0

Zebediah Figura : quartz: Check whether the pin is connected in IVideoWindow::put_MessageDrain().
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: e4ec04bf26abe1e56a36ac32574614d0997da3db URL: https://gitlab.winehq.org/wine/wine/-/commit/e4ec04bf26abe1e56a36ac32574614… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 13:13:08 2023 -0500 quartz: Check whether the pin is connected in IVideoWindow::put_MessageDrain(). Ferro CCTV calls this. --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ dlls/quartz/window.c | 9 ++++++--- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 4b8bd4e7c2c..76088534924 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2399,6 +2399,9 @@ static void test_video_window(void) hr = IVideoWindow_put_Owner(window, (OAHWND)our_hwnd); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_MessageDrain(window, (OAHWND)our_hwnd); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 73e7ff5ffe9..04bf7c1ba1b 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2398,6 +2398,9 @@ static void test_video_window(void) hr = IVideoWindow_put_Owner(window, (OAHWND)our_hwnd); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_MessageDrain(window, (OAHWND)our_hwnd); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 27117db9f02..299b0de22d5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2624,6 +2624,9 @@ static void test_video_window(void) hr = IVideoWindow_put_Owner(window, (OAHWND)our_hwnd); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_MessageDrain(window, (OAHWND)our_hwnd); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index f09dd5aea56..1b6d2664a10 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -511,11 +511,14 @@ HRESULT WINAPI BaseControlWindowImpl_get_Owner(IVideoWindow *iface, OAHWND *Owne HRESULT WINAPI BaseControlWindowImpl_put_MessageDrain(IVideoWindow *iface, OAHWND Drain) { - struct video_window *This = impl_from_IVideoWindow(iface); + struct video_window *window = impl_from_IVideoWindow(iface); + + TRACE("window %p, drain %#Ix.\n", window, Drain); - TRACE("window %p, drain %#Ix.\n", This, Drain); + if (!window->pPin->peer) + return VFW_E_NOT_CONNECTED; - This->hwndDrain = (HWND)Drain; + window->hwndDrain = (HWND)Drain; return S_OK; }

1 0

Zebediah Figura : quartz: Check whether the pin is connected in IVideoWindow::put_Visible().
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 8be62e8e307728b38b3de2936f6adef84ae31404 URL: https://gitlab.winehq.org/wine/wine/-/commit/8be62e8e307728b38b3de2936f6ade… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 13:19:12 2023 -0500 quartz: Check whether the pin is connected in IVideoWindow::put_Visible(). Ferro CCTV calls this. --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ dlls/quartz/window.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 76088534924..edc4d40f19d 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2402,6 +2402,9 @@ static void test_video_window(void) hr = IVideoWindow_put_MessageDrain(window, (OAHWND)our_hwnd); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_Visible(window, OATRUE); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 04bf7c1ba1b..7282458dc33 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2401,6 +2401,9 @@ static void test_video_window(void) hr = IVideoWindow_put_MessageDrain(window, (OAHWND)our_hwnd); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_Visible(window, OATRUE); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 299b0de22d5..c201d316bab 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2627,6 +2627,9 @@ static void test_video_window(void) hr = IVideoWindow_put_MessageDrain(window, (OAHWND)our_hwnd); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_put_Visible(window, OATRUE); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 1b6d2664a10..130194bcc29 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -350,6 +350,9 @@ HRESULT WINAPI BaseControlWindowImpl_put_Visible(IVideoWindow *iface, LONG visib TRACE("window %p, visible %ld.\n", window, visible); + if (!window->pPin->peer) + return VFW_E_NOT_CONNECTED; + ShowWindow(window->hwnd, visible ? SW_SHOW : SW_HIDE); return S_OK; }

1 0

Zebediah Figura : quartz: Check whether the pin is connected in IVideoWindow::SetWindowPosition().
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 298ffd8f804038cdfcb255f8661eff311655fb51 URL: https://gitlab.winehq.org/wine/wine/-/commit/298ffd8f804038cdfcb255f8661eff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 3 13:19:35 2023 -0500 quartz: Check whether the pin is connected in IVideoWindow::SetWindowPosition(). Ferro CCTV calls this. --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ dlls/quartz/window.c | 3 +++ 4 files changed, 12 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index edc4d40f19d..ea54ec87a8e 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2405,6 +2405,9 @@ static void test_video_window(void) hr = IVideoWindow_put_Visible(window, OATRUE); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_SetWindowPosition(window, 100, 200, 300, 400); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 7282458dc33..c30fefbd3ab 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2404,6 +2404,9 @@ static void test_video_window(void) hr = IVideoWindow_put_Visible(window, OATRUE); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_SetWindowPosition(window, 100, 200, 300, 400); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index c201d316bab..9d88afb295d 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2630,6 +2630,9 @@ static void test_video_window(void) hr = IVideoWindow_put_Visible(window, OATRUE); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + hr = IVideoWindow_SetWindowPosition(window, 100, 200, 300, 400); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr); + testfilter_init(&source); IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, filter, NULL); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 130194bcc29..4a9c4aed8f7 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -598,6 +598,9 @@ HRESULT WINAPI BaseControlWindowImpl_SetWindowPosition(IVideoWindow *iface, TRACE("window %p, left %ld, top %ld, width %ld, height %ld.\n", window, left, top, width, height); + if (!window->pPin->peer) + return VFW_E_NOT_CONNECTED; + if (!SetWindowPos(window->hwnd, NULL, left, top, width, height, SWP_NOACTIVATE | SWP_NOZORDER)) return E_FAIL; return S_OK;

1 0

Zhiyi Zhang : oledb32/tests: Test initial catalog property.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: e00dfd2064f84359a8c0404b700f9db7a8b86cab URL: https://gitlab.winehq.org/wine/wine/-/commit/e00dfd2064f84359a8c0404b700f9d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 9 16:05:51 2023 +0800 oledb32/tests: Test initial catalog property. --- dlls/oledb32/tests/database.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 26e3ebf2186..d5bea2a67d7 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -158,10 +158,24 @@ if (propsets->cProperties == 2) { ok(propsets->rgProperties[0].dwStatus == 0, "got status[0] %lu\n", propsets->rgProperties[0].dwStatus); ok(V_VT(&propsets->rgProperties[0].vValue) == VT_BSTR, "got vartype[0] %u\n", V_VT(&propsets->rgProperties[0].vValue)); - ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_PROVIDERSTRING, "got propid[1] %lu\n", propsets->rgProperties[1].dwPropertyID); - ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %lu\n", propsets->rgProperties[1].dwOptions); - ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %lu\n", propsets->rgProperties[1].dwStatus); - ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue)); + if (!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"dummy")) + { + ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_PROVIDERSTRING, "got propid[1] %lu\n", propsets->rgProperties[1].dwPropertyID); + ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %lu\n", propsets->rgProperties[1].dwOptions); + ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %lu\n", propsets->rgProperties[1].dwStatus); + ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue)); + } + else if (!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"initial_catalog_test")) + { + todo_wine + ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_CATALOG, "got propid[1] %lu\n", propsets->rgProperties[1].dwPropertyID); + todo_wine + ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %lu\n", propsets->rgProperties[1].dwOptions); + ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %lu\n", propsets->rgProperties[1].dwStatus); + ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue)); + ok(!wcscmp(V_BSTR(&propsets->rgProperties[1].vValue), L"dummy_catalog"), "got initial catalog %s\n", + wine_dbgstr_variant(&propsets->rgProperties[1].vValue)); + } } return S_OK; } @@ -293,6 +307,9 @@ static void test_database(void) static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; static WCHAR customprop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', 'c','u','s','t','o','m','p','r','o','p','=','1','2','3','.','4',';',0}; + static WCHAR initial_catalog_prop[] = {'D','a','t','a',' ','S','o','u','r','c','e','=', + 'i','n','i','t','i','a','l','_','c','a','t','a','l','o','g','_','t','e','s','t',';', + 'I','n','i','t','i','a','l',' ','C','a','t','a','l','o','g','=','d','u','m','m','y','_','c','a','t','a','l','o','g',0}; static WCHAR extended_prop[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';', 'E','x','t','e','n','d','e','d',' ','P','r','o','p','e','r','t','i','e','s','=','\"','D','R','I','V','E','R','=','A', ' ','W','i','n','e',' ','O','D','B','C',' ','d','r','i','v','e','r',';','U','I','D','=','w','i','n','e',';','\"',';',0}; @@ -314,6 +331,7 @@ static void test_database(void) test_GetDataSource(initstring_default); test_GetDataSource(initstring_lower); test_GetDataSource2(customprop); + test_GetDataSource2(initial_catalog_prop); test_GetDataSource2(extended_prop); test_GetDataSource2(extended_prop2); }

1 0

Zhiyi Zhang : oledb32: Use the correct property for initial catalog.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: e9c8de2300b88a1a0f64154217ef1f47e7f6c346 URL: https://gitlab.winehq.org/wine/wine/-/commit/e9c8de2300b88a1a0f64154217ef1f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 8 17:33:30 2023 +0800 oledb32: Use the correct property for initial catalog. "Initial Catalog" should use property DBPROP_INIT_CATALOG instead of DBPROP_CATALOGLOCATION. Fix PowerPivot for Excel not able to query embedded data sources. --- dlls/oledb32/datainit.c | 2 +- dlls/oledb32/tests/database.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 4281e5f9e1c..87a05638ffe 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -360,7 +360,7 @@ static const struct dbproperty dbproperties[] = { L"Encrypt Password", DBPROP_AUTH_ENCRYPT_PASSWORD, DBPROPOPTIONS_REQUIRED, VT_BOOL }, { L"General Timeout", DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { L"Impersonation Level", DBPROP_INIT_IMPERSONATION_LEVEL, DBPROPOPTIONS_OPTIONAL, VT_I4 }, - { L"Initial Catalog", DBPROP_CATALOGLOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, + { L"Initial Catalog", DBPROP_INIT_CATALOG, DBPROPOPTIONS_REQUIRED, VT_BSTR }, { L"Integrated Security", DBPROP_AUTH_INTEGRATED, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { L"Locale Identifier", DBPROP_INIT_LCID, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { L"Location", DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index d5bea2a67d7..12b11dd1bdc 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -167,9 +167,7 @@ if (propsets->cProperties == 2) { } else if (!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"initial_catalog_test")) { - todo_wine ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_CATALOG, "got propid[1] %lu\n", propsets->rgProperties[1].dwPropertyID); - todo_wine ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %lu\n", propsets->rgProperties[1].dwOptions); ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %lu\n", propsets->rgProperties[1].dwStatus); ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue));

1 0

Zhiyi Zhang : oledb32/tests: Test provider string with multiple provider specific properties.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 4085cca75046d54c8952a855ea3b52e96af4c825 URL: https://gitlab.winehq.org/wine/wine/-/commit/4085cca75046d54c8952a855ea3b52… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 9 15:40:45 2023 +0800 oledb32/tests: Test provider string with multiple provider specific properties. --- dlls/oledb32/tests/database.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 12b11dd1bdc..1da4e41ab54 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -150,6 +150,7 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG set_coun ok(set_count == 1, "got %lu\n", set_count); ok(IsEqualIID(&propsets->guidPropertySet, &DBPROPSET_DBINIT), "set guid %s\n", wine_dbgstr_guid(&propsets->guidPropertySet)); + todo_wine_if(!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"provider_prop_test")) ok(propsets->cProperties == 2, "got propcount %lu\n", propsets->cProperties); if (propsets->cProperties == 2) { @@ -174,6 +175,15 @@ if (propsets->cProperties == 2) { ok(!wcscmp(V_BSTR(&propsets->rgProperties[1].vValue), L"dummy_catalog"), "got initial catalog %s\n", wine_dbgstr_variant(&propsets->rgProperties[1].vValue)); } + else if (!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"provider_prop_test")) + { + ok(propsets->rgProperties[1].dwPropertyID == DBPROP_INIT_PROVIDERSTRING, "got propid[1] %lu\n", propsets->rgProperties[1].dwPropertyID); + ok(propsets->rgProperties[1].dwOptions == DBPROPOPTIONS_REQUIRED, "got options[1] %lu\n", propsets->rgProperties[1].dwOptions); + ok(propsets->rgProperties[1].dwStatus == 0, "got status[1] %lu\n", propsets->rgProperties[1].dwStatus); + ok(V_VT(&propsets->rgProperties[1].vValue) == VT_BSTR, "got vartype[1] %u\n", V_VT(&propsets->rgProperties[1].vValue)); + ok(!wcscmp(V_BSTR(&propsets->rgProperties[1].vValue), L"a=1;b=2;c=3"), "got provider string %s\n", + wine_dbgstr_variant(&propsets->rgProperties[1].vValue)); + } } return S_OK; } @@ -313,6 +323,9 @@ static void test_database(void) ' ','W','i','n','e',' ','O','D','B','C',' ','d','r','i','v','e','r',';','U','I','D','=','w','i','n','e',';','\"',';',0}; static WCHAR extended_prop2[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','\'','d','u','m','m','y','\'',';', 'c','u','s','t','o','m','p','r','o','p','=','\'','1','2','3','.','4','\'',';',0}; + static WCHAR multi_provider_prop_test[] = {'D','a','t','a',' ','S','o','u','r','c','e','=', + 'p','r','o','v','i','d','e','r','_','p','r','o','p','_','t','e','s','t',';', + 'a','=','1',';','b','=','2',';','c','=','3',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -332,6 +345,7 @@ static void test_database(void) test_GetDataSource2(initial_catalog_prop); test_GetDataSource2(extended_prop); test_GetDataSource2(extended_prop2); + test_GetDataSource2(multi_provider_prop_test); } static void free_dispparams(DISPPARAMS *params)

1 0

Zhiyi Zhang : oledb32: Put provider initialization properties in a single DBPROP_INIT_PROVIDERSTRING.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: 3d514933b9810004a0891c24dd65b2e974a884b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d514933b9810004a0891c24dd65b2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 8 22:15:10 2023 +0800 oledb32: Put provider initialization properties in a single DBPROP_INIT_PROVIDERSTRING. Put provider initialization properties in a single DBPROP_INIT_PROVIDERSTRING for IDBProperties::SetProperties(). Otherwise, according to MSDN for IDBProperties::SetProperties(), if the same property is specified more than once, the value used is provider-specific. So it won't be consider as an initialization property. Fix PowerPivot for Excel not connecting to embedded data sources. --- dlls/oledb32/datainit.c | 52 ++++++++++++++++++++++++++++--------------- dlls/oledb32/tests/database.c | 1 - 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 87a05638ffe..325de558584 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -518,6 +518,7 @@ static const struct dbproperty *get_known_dprop_descr(BSTR name) static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **propset) { + BSTR provider_string = NULL; struct dbprop_pair *pair; int i = 0; HRESULT hr; @@ -535,6 +536,7 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr } (*propset)->cProperties = 0; + (*propset)->guidPropertySet = DBPROPSET_DBINIT; LIST_FOR_EACH_ENTRY(pair, &props->props, struct dbprop_pair, entry) { const struct dbproperty *descr = get_known_dprop_descr(pair->name); @@ -542,25 +544,26 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr if (!descr) { - BSTR str; int len; - /* provider specific property is always VT_BSTR */ - len = SysStringLen(pair->name) + SysStringLen(pair->value) + 1 /* for '=' */; - str = SysAllocStringLen(NULL, len); - lstrcpyW(str, pair->name); - lstrcatW(str, L"="); - lstrcatW(str, pair->value); - - (*propset)->cProperties++; - (*propset)->guidPropertySet = DBPROPSET_DBINIT; - (*propset)->rgProperties[i].dwPropertyID = DBPROP_INIT_PROVIDERSTRING; - (*propset)->rgProperties[i].dwOptions = DBPROPOPTIONS_REQUIRED; - (*propset)->rgProperties[i].dwStatus = 0; - memset(&(*propset)->rgProperties[i].colid, 0, sizeof(DBID)); - V_VT(&(*propset)->rgProperties[i].vValue) = VT_BSTR; - V_BSTR(&(*propset)->rgProperties[i].vValue) = str; - i++; + len = SysStringLen(pair->name) + SysStringLen(pair->value) + 1; /* for '=' */ + if (!provider_string) + { + provider_string = SysAllocStringLen(NULL, len); + } + else + { + BSTR old_string = provider_string; + + len += SysStringLen(provider_string) + 1; /* for ';' separator */ + provider_string = SysAllocStringLen(NULL, len); + lstrcpyW(provider_string, old_string); + lstrcatW(provider_string, L";"); + SysFreeString(old_string); + } + lstrcatW(provider_string, pair->name); + lstrcatW(provider_string, L"="); + lstrcatW(provider_string, pair->value); continue; } @@ -581,7 +584,6 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr } (*propset)->cProperties++; - (*propset)->guidPropertySet = DBPROPSET_DBINIT; (*propset)->rgProperties[i].dwPropertyID = descr->id; (*propset)->rgProperties[i].dwOptions = descr->options; (*propset)->rgProperties[i].dwStatus = 0; @@ -590,6 +592,20 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr i++; } + /* Provider specific property is always VT_BSTR */ + /* DBPROP_INIT_PROVIDERSTRING should be specified only once. Otherwise, it will be considered as + * provider-specific rather than an initialization property */ + if (provider_string) + { + (*propset)->cProperties++; + (*propset)->rgProperties[i].dwPropertyID = DBPROP_INIT_PROVIDERSTRING; + (*propset)->rgProperties[i].dwOptions = DBPROPOPTIONS_REQUIRED; + (*propset)->rgProperties[i].dwStatus = 0; + memset(&(*propset)->rgProperties[i].colid, 0, sizeof(DBID)); + V_VT(&(*propset)->rgProperties[i].vValue) = VT_BSTR; + V_BSTR(&(*propset)->rgProperties[i].vValue) = provider_string; + } + return S_OK; } diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 1da4e41ab54..c0a4fbd4005 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -150,7 +150,6 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG set_coun ok(set_count == 1, "got %lu\n", set_count); ok(IsEqualIID(&propsets->guidPropertySet, &DBPROPSET_DBINIT), "set guid %s\n", wine_dbgstr_guid(&propsets->guidPropertySet)); - todo_wine_if(!wcscmp(V_BSTR(&propsets->rgProperties[0].vValue), L"provider_prop_test")) ok(propsets->cProperties == 2, "got propcount %lu\n", propsets->cProperties); if (propsets->cProperties == 2) {

1 0

Rémi Bernon : winegstreamer: Return a IUnknown pointer from source_create_async_op.
by Alexandre Julliard 09 May '23

09 May '23

Module: wine Branch: master Commit: e2c6a5405418c15870509d3f8c4fed086f944f77 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2c6a5405418c15870509d3f8c4fed… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Apr 17 12:20:25 2023 +0200 winegstreamer: Return a IUnknown pointer from source_create_async_op. --- dlls/winegstreamer/media_source.c | 41 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 63147d64b32..4501e60fa65 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -191,7 +191,7 @@ static const IUnknownVtbl source_async_command_vtbl = source_async_command_Release, }; -static HRESULT source_create_async_op(enum source_async_op op, struct source_async_command **ret) +static HRESULT source_create_async_op(enum source_async_op op, IUnknown **out) { struct source_async_command *command; @@ -201,8 +201,7 @@ static HRESULT source_create_async_op(enum source_async_op op, struct source_asy command->IUnknown_iface.lpVtbl = &source_async_command_vtbl; command->op = op; - *ret = command; - + *out = &command->IUnknown_iface; return S_OK; } @@ -293,15 +292,16 @@ static void flush_token_queue(struct media_stream *stream, BOOL send) { if (send) { + IUnknown *op; HRESULT hr; - struct source_async_command *command; - if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_REQUEST_SAMPLE, &command))) + + if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_REQUEST_SAMPLE, &op))) { + struct source_async_command *command = impl_from_async_command_IUnknown(op); command->u.request_sample.stream = stream; command->u.request_sample.token = stream->token_queue[i]; - hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, - &command->IUnknown_iface); + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, op); } if (FAILED(hr)) WARN("Could not enqueue sample request, hr %#lx\n", hr); @@ -795,7 +795,7 @@ static HRESULT WINAPI media_stream_RequestSample(IMFMediaStream *iface, IUnknown { struct media_stream *stream = impl_from_IMFMediaStream(iface); struct media_source *source = impl_from_IMFMediaSource(stream->media_source); - struct source_async_command *command; + IUnknown *op; HRESULT hr; TRACE("%p, %p.\n", iface, token); @@ -808,14 +808,15 @@ static HRESULT WINAPI media_stream_RequestSample(IMFMediaStream *iface, IUnknown hr = MF_E_MEDIA_SOURCE_WRONGSTATE; else if (stream->eos) hr = MF_E_END_OF_STREAM; - else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_REQUEST_SAMPLE, &command))) + else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_REQUEST_SAMPLE, &op))) { + struct source_async_command *command = impl_from_async_command_IUnknown(op); command->u.request_sample.stream = stream; if (token) IUnknown_AddRef(token); command->u.request_sample.token = token; - hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, op); } LeaveCriticalSection(&source->cs); @@ -1314,7 +1315,7 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD const GUID *time_format, const PROPVARIANT *position) { struct media_source *source = impl_from_IMFMediaSource(iface); - struct source_async_command *command; + IUnknown *op; HRESULT hr; TRACE("%p, %p, %p, %p.\n", iface, descriptor, time_format, position); @@ -1325,13 +1326,14 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD hr = MF_E_SHUTDOWN; else if (!(IsEqualIID(time_format, &GUID_NULL))) hr = MF_E_UNSUPPORTED_TIME_FORMAT; - else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_START, &command))) + else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_START, &op))) { + struct source_async_command *command = impl_from_async_command_IUnknown(op); command->u.start.descriptor = descriptor; command->u.start.format = *time_format; PropVariantCopy(&command->u.start.position, position); - hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, op); } LeaveCriticalSection(&source->cs); @@ -1342,7 +1344,7 @@ static HRESULT WINAPI media_source_Start(IMFMediaSource *iface, IMFPresentationD static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); - struct source_async_command *command; + IUnknown *op; HRESULT hr; TRACE("%p.\n", iface); @@ -1351,8 +1353,8 @@ static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) if (source->state == SOURCE_SHUTDOWN) hr = MF_E_SHUTDOWN; - else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_STOP, &command))) - hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, &command->IUnknown_iface); + else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_STOP, &op))) + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, op); LeaveCriticalSection(&source->cs); @@ -1362,7 +1364,7 @@ static HRESULT WINAPI media_source_Stop(IMFMediaSource *iface) static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) { struct media_source *source = impl_from_IMFMediaSource(iface); - struct source_async_command *command; + IUnknown *op; HRESULT hr; TRACE("%p.\n", iface); @@ -1373,9 +1375,8 @@ static HRESULT WINAPI media_source_Pause(IMFMediaSource *iface) hr = MF_E_SHUTDOWN; else if (source->state != SOURCE_RUNNING) hr = MF_E_INVALID_STATE_TRANSITION; - else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_PAUSE, &command))) - hr = MFPutWorkItem(source->async_commands_queue, - &source->async_commands_callback, &command->IUnknown_iface); + else if (SUCCEEDED(hr = source_create_async_op(SOURCE_ASYNC_PAUSE, &op))) + hr = MFPutWorkItem(source->async_commands_queue, &source->async_commands_callback, op); LeaveCriticalSection(&source->cs);

1 0