wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Jacek Caban : conhost: Import font selection support from wineconsole.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 7d48e0c564ef9a65608c01cc55657734f7d5004e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d48e0c564ef9a65608c01cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:30:27 2020 +0200 conhost: Import font selection support from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 356 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 356 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7d48e0c564ef9a65608c…

1 0

Jacek Caban : conhost: Import loading console config from wineconsole.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 5c45ec90ffa8ee2f9472a9149258dd174309e203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c45ec90ffa8ee2f9472a914… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:30:12 2020 +0200 conhost: Import loading console config from wineconsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/Makefile.in | 2 +- programs/conhost/conhost.c | 2 +- programs/conhost/conhost.h | 1 + programs/conhost/window.c | 276 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 279 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5c45ec90ffa8ee2f9472…

1 0

Jacek Caban : conhost: Pump window messages when we have a window.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 3d51714ce4d40506f9935e17e635f6d35be3057e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d51714ce4d40506f9935e17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:30:00 2020 +0200 conhost: Pump window messages when we have a window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index f7db09b7da..70079e841e 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2596,6 +2596,7 @@ static int main_loop( struct console *console, HANDLE signal ) unsigned short signal_id; IO_STATUS_BLOCK signal_io; NTSTATUS status; + BOOL pump_msgs; DWORD res; if (signal) @@ -2611,10 +2612,25 @@ static int main_loop( struct console *console, HANDLE signal ) wait_handles[wait_cnt++] = console->server; if (signal) wait_handles[wait_cnt++] = signal_event; if (console->input_thread) wait_handles[wait_cnt++] = console->input_thread; + pump_msgs = console->win != NULL; for (;;) { - res = WaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE ); + if (pump_msgs) + res = MsgWaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE, QS_ALLEVENTS ); + else + res = WaitForMultipleObjects( wait_cnt, wait_handles, FALSE, INFINITE ); + + if (res == WAIT_OBJECT_0 + wait_cnt) + { + MSG msg; + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) + { + if (msg.message == WM_QUIT) return 0; + DispatchMessageW(&msg); + } + continue; + } switch (res) {

1 0

Jacek Caban : conhost: Initial support for creating console window.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: bbd4196814e9aa262112b338bfa976a575e64e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbd4196814e9aa262112b338… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 17:29:51 2020 +0200 conhost: Initial support for creating console window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/Makefile.in | 6 +- programs/conhost/conhost.c | 121 +++----------------------------------- programs/conhost/conhost.h | 135 +++++++++++++++++++++++++++++++++++++++++++ programs/conhost/window.c | 101 ++++++++++++++++++++++++++++++++ 4 files changed, 248 insertions(+), 115 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bbd4196814e9aa262112…

1 0

Hirofumi Katayama : comctl32/ipaddress: Focus first field on WM_SETFOCUS.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 3c291085235b57bb1f2ef92ccde4ca8035928a1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c291085235b57bb1f2ef92c… Author: Hirofumi Katayama <katayama.hirofumi.mz(a)gmail.com> Date: Thu Oct 8 17:03:27 2020 +0300 comctl32/ipaddress: Focus first field on WM_SETFOCUS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49924 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 4 ++++ dlls/comctl32/tests/ipaddress.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index d08a2be3fd..32816561e3 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -632,6 +632,10 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IPM_ISBLANK: return IPADDRESS_IsBlank (infoPtr); + case WM_SETFOCUS: + IPADDRESS_SetFocusToField (infoPtr, 0); + break; + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR("unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 939bfe7540..c87d0f5664 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -113,6 +113,37 @@ static void test_IPM_SETFOCUS(void) DestroyWindow(hwnd); } +static void test_WM_SETFOCUS(void) +{ + struct child_enum child_enum = {{ 0 }}; + unsigned int ret, from, to, i; + HWND hwnd; + + hwnd = create_ipaddress_control(); + ok(!!hwnd, "Failed to create control.\n"); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3)); + ok(ret, "Unexpected return value %u.\n", ret); + + EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); + ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); + + SetFocus(child_enum.fields[3]); + + for (i = 0; i < 3; ++i) + SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 0, "Unexpected selection %u x %u.\n", from, to); + + SetFocus(hwnd); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 1, "Unexpected selection %u x %u.\n", from, to); + + DestroyWindow(hwnd); +} + START_TEST(ipaddress) { ULONG_PTR cookie; @@ -120,12 +151,14 @@ START_TEST(ipaddress) test_get_set_text(); test_IPM_SETFOCUS(); + test_WM_SETFOCUS(); if (!load_v6_module(&cookie, &ctxt)) return; test_get_set_text(); test_IPM_SETFOCUS(); + test_WM_SETFOCUS(); unload_v6_module(cookie, ctxt); }

1 0

Nikolay Sivov : comctl32/ipaddress: Fix IPM_SETFOCUS return value.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 6cfc5df3f5896e4fd5a6dd03db80faa48477c045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cfc5df3f5896e4fd5a6dd03… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 17:03:26 2020 +0300 comctl32/ipaddress: Fix IPM_SETFOCUS return value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 11 ++++++----- dlls/comctl32/tests/ipaddress.c | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index d415a96fb7..d08a2be3fd 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -387,14 +387,16 @@ static LRESULT IPADDRESS_SetAddress (const IPADDRESS_INFO *infoPtr, DWORD ip_add } -static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) +static LRESULT IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) { - TRACE("(index=%d)\n", index); + TRACE("%d\n", index); if (index > 3 || index < 0) index=0; SendMessageW (infoPtr->Part[index].EditHwnd, EM_SETSEL, 0, -1); SetFocus (infoPtr->Part[index].EditHwnd); + + return 1; } @@ -624,9 +626,8 @@ IPADDRESS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IPM_SETRANGE: return IPADDRESS_SetRange (infoPtr, (int)wParam, (WORD)lParam); - case IPM_SETFOCUS: - IPADDRESS_SetFocusToField (infoPtr, (int)wParam); - break; + case IPM_SETFOCUS: + return IPADDRESS_SetFocusToField (infoPtr, (int)wParam); case IPM_ISBLANK: return IPADDRESS_IsBlank (infoPtr); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 5a5aafe7aa..939bfe7540 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -105,7 +105,6 @@ static void test_IPM_SETFOCUS(void) ok(from == 0 && to == 0, "Unexpected selection %u x %u.\n", from, to); ret = SendMessageA(hwnd, IPM_SETFOCUS, 0, 0); -todo_wine ok(ret, "Unexpected return value %u.\n", ret); SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to);

1 0

Nikolay Sivov : comctl32/ipaddress: Select field contents on IPM_SETFOCUS.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 6f8957156e4207cbce33be76eef7291c70075810 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8957156e4207cbce33be76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 17:03:25 2020 +0300 comctl32/ipaddress: Select field contents on IPM_SETFOCUS. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/ipaddress.c | 1 + dlls/comctl32/tests/ipaddress.c | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index c75a108565..d415a96fb7 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -393,6 +393,7 @@ static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index) if (index > 3 || index < 0) index=0; + SendMessageW (infoPtr->Part[index].EditHwnd, EM_SETSEL, 0, -1); SetFocus (infoPtr->Part[index].EditHwnd); } diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index cc79b7bf11..5a5aafe7aa 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -62,17 +62,71 @@ static void test_get_set_text(void) DestroyWindow(hwnd); } +struct child_enum +{ + HWND fields[4]; + unsigned int count; +}; + +static BOOL CALLBACK test_child_enum_proc(HWND hwnd, LPARAM param) +{ + struct child_enum *child_enum = (struct child_enum *)param; + char buff[16] = { 0 }; + unsigned int index; + + GetWindowTextA(hwnd, buff, ARRAY_SIZE(buff)); + index = atoi(buff); + ok(index < 4, "Unexpected index.\n"); + if (index < 4) + child_enum->fields[index] = hwnd; + + return ++child_enum->count < 4; +} + +static void test_IPM_SETFOCUS(void) +{ + struct child_enum child_enum = {{ 0 }}; + unsigned int ret, from, to, i; + HWND hwnd; + + hwnd = create_ipaddress_control(); + ok(!!hwnd, "Failed to create control.\n"); + + ret = SendMessageA(hwnd, IPM_SETADDRESS, 0, MAKEIPADDRESS(0, 1, 2, 3)); + ok(ret, "Unexpected return value %u.\n", ret); + + EnumChildWindows(hwnd, test_child_enum_proc, (LPARAM)&child_enum); + ok(child_enum.count == 4, "Unexpected child count %u.\n", child_enum.count); + + for (i = 0; i < 3; ++i) + SendMessageA(child_enum.fields[i], EM_SETSEL, -1, 0); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 0, "Unexpected selection %u x %u.\n", from, to); + + ret = SendMessageA(hwnd, IPM_SETFOCUS, 0, 0); +todo_wine + ok(ret, "Unexpected return value %u.\n", ret); + + SendMessageA(child_enum.fields[0], EM_GETSEL, (WPARAM)&from, (LPARAM)&to); + ok(from == 0 && to == 1, "Unexpected selection %u x %u.\n", from, to); + + DestroyWindow(hwnd); +} + START_TEST(ipaddress) { ULONG_PTR cookie; HANDLE ctxt; test_get_set_text(); + test_IPM_SETFOCUS(); if (!load_v6_module(&cookie, &ctxt)) return; test_get_set_text(); + test_IPM_SETFOCUS(); unload_v6_module(cookie, ctxt); }

1 0

Alistair Leslie-Hughes : msado15: Implement _Connection get/put Mode.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: f3508490390adc5c4b9b0bb9d67ec69f90c572d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3508490390adc5c4b9b0bb9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 8 14:00:36 2020 +0200 msado15: Implement _Connection get/put Mode. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 18 ++++++++++++++---- dlls/msado15/tests/msado15.c | 17 +++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 499f8b2256..357834a95f 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -54,6 +54,7 @@ struct connection LONG timeout; WCHAR *datasource; WCHAR *provider; + ConnectModeEnum mode; struct connection_point cp_connev; }; @@ -336,14 +337,22 @@ static HRESULT WINAPI connection_put_CursorLocation( _Connection *iface, CursorL static HRESULT WINAPI connection_get_Mode( _Connection *iface, ConnectModeEnum *mode ) { - FIXME( "%p, %p\n", iface, mode ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %p\n", iface, mode ); + + *mode = connection->mode; + return S_OK; } static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum mode ) { - FIXME( "%p, %u\n", iface, mode ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + + TRACE( "%p, %u\n", iface, mode ); + + connection->mode = mode; + return S_OK; } static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str ) @@ -664,6 +673,7 @@ HRESULT Connection_create( void **obj ) connection->timeout = 30; connection->datasource = NULL; connection->provider = SysAllocString(L"MSDASQL"); + connection->mode = adModeUnknown; 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 bedca96368..8e8553c3b8 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -675,6 +675,7 @@ static void test_Connection(void) IConnectionPointContainer *pointcontainer; LONG state, timeout; BSTR str, str2, str3; + ConnectModeEnum mode; hr = CoCreateInstance(&CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, &IID__Connection, (void**)&connection); ok( hr == S_OK, "got %08x\n", hr ); @@ -718,6 +719,22 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + mode = 0xdeadbeef; + hr = _Connection_get_Mode(connection, &mode); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(mode == adModeUnknown, "Unexpected mode value %d\n", mode); + + hr = _Connection_put_Mode(connection, adModeShareDenyNone); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + + mode = adModeUnknown; + hr = _Connection_get_Mode(connection, &mode); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + ok(mode == adModeShareDenyNone, "Unexpected mode value %d\n", mode); + + hr = _Connection_put_Mode(connection, adModeUnknown); + ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); + /* Default */ str = (BSTR)0xdeadbeef; hr = _Connection_get_Provider(connection, &str);

1 0

Alistair Leslie-Hughes : msado15: Implement _Connection Get/Put Provider.
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: 2262e048270061eb148453d3d25bd3b1282ef9f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2262e048270061eb148453d3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 8 14:00:35 2020 +0200 msado15: Implement _Connection Get/Put Provider. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 26 ++++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 5d8f78f53e..499f8b2256 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -53,6 +53,7 @@ struct connection ObjectStateEnum state; LONG timeout; WCHAR *datasource; + WCHAR *provider; struct connection_point cp_connev; }; @@ -96,6 +97,7 @@ static ULONG WINAPI connection_Release( _Connection *iface ) IUnknown_Release( connection->cp_connev.sinks[i] ); } heap_free( connection->cp_connev.sinks ); + heap_free( connection->provider ); heap_free( connection->datasource ); heap_free( connection ); } @@ -346,14 +348,29 @@ static HRESULT WINAPI connection_put_Mode( _Connection *iface, ConnectModeEnum m static HRESULT WINAPI connection_get_Provider( _Connection *iface, BSTR *str ) { - FIXME( "%p, %p\n", iface, str ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + BSTR provider = NULL; + + TRACE( "%p, %p\n", iface, str ); + + if (connection->provider && !(provider = SysAllocString( connection->provider ))) return E_OUTOFMEMORY; + *str = provider; + return S_OK; } static HRESULT WINAPI connection_put_Provider( _Connection *iface, BSTR str ) { - FIXME( "%p, %s\n", iface, debugstr_w(str) ); - return E_NOTIMPL; + struct connection *connection = impl_from_Connection( iface ); + WCHAR *provider = NULL; + + TRACE( "%p, %s\n", iface, debugstr_w(str) ); + + if (!str) return MAKE_ADO_HRESULT(adErrInvalidArgument); + + if (!(provider = strdupW( str ))) return E_OUTOFMEMORY; + heap_free( connection->provider ); + connection->provider = provider; + return S_OK; } static HRESULT WINAPI connection_get_State( _Connection *iface, LONG *state ) @@ -646,6 +663,7 @@ HRESULT Connection_create( void **obj ) connection->state = adStateClosed; connection->timeout = 30; connection->datasource = NULL; + connection->provider = SysAllocString(L"MSDASQL"); 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 1629fe15be..bedca96368 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -718,15 +718,50 @@ if (0) /* Crashes on windows */ ok(hr == S_OK, "Failed to get state, hr 0x%08x\n", hr); ok(timeout == 300, "Unexpected timeout value %d\n", timeout); + /* Default */ str = (BSTR)0xdeadbeef; - hr = _Connection_get_ConnectionString(connection, &str); + hr = _Connection_get_Provider(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, L"MSDASQL"), "wrong string %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = SysAllocString(L"MSDASQL.1"); + hr = _Connection_put_Provider(connection, str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + SysFreeString(str); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_Provider(connection, &str); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(!wcscmp(str, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str)); + + /* Restore default */ + str = SysAllocString(L"MSDASQL"); + hr = _Connection_put_Provider(connection, str); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + SysFreeString(str); + + hr = _Connection_put_Provider(connection, NULL); + ok(hr == MAKE_ADO_HRESULT(adErrInvalidArgument), "got 0x%08x\n", hr); + SysFreeString(str); + + str = (BSTR)0xdeadbeef; + hr = _Connection_get_ConnectionString(connection, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(str == NULL, "got %p\n", str); str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); hr = _Connection_put_ConnectionString(connection, str); ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + /* Show put_ConnectionString effects Provider */ + str3 = (BSTR)0xdeadbeef; + hr = _Connection_get_Provider(connection, &str3); + ok(hr == S_OK, "Failed, hr 0x%08x\n", hr); + ok(str3 != NULL, "Expected value got NULL\n"); + todo_wine ok(!wcscmp(str3, L"MSDASQL.1"), "wrong string %s\n", wine_dbgstr_w(str3)); + SysFreeString(str3); + if (0) /* Crashes on windows */ { hr = _Connection_get_ConnectionString(connection, NULL);

1 0

Nikolay Sivov : evr/allocator: Implement GetFreeSampleCount().
by Alexandre Julliard 08 Oct '20

08 Oct '20

Module: wine Branch: master Commit: d136c7554cc5f78bfefb5da9559bcec78030247d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d136c7554cc5f78bfefb5da9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 14:44:18 2020 +0300 evr/allocator: Implement GetFreeSampleCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 12 ++++++++++-- dlls/evr/tests/evr.c | 14 ++++++++------ dlls/mf/tests/mf.c | 1 - 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 31e3ff4333..2887a37e8d 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -32,6 +32,7 @@ struct sample_allocator LONG refcount; IMFVideoSampleAllocatorNotify *callback; + unsigned int free_samples; CRITICAL_SECTION cs; }; @@ -180,9 +181,16 @@ static HRESULT WINAPI sample_allocator_callback_SetCallback(IMFVideoSampleAlloca static HRESULT WINAPI sample_allocator_callback_GetFreeSampleCount(IMFVideoSampleAllocatorCallback *iface, LONG *count) { - FIXME("%p, %p.\n", iface, count); + struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorCallback(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, count); + + EnterCriticalSection(&allocator->cs); + if (count) + *count = allocator->free_samples; + LeaveCriticalSection(&allocator->cs); + + return S_OK; } static const IMFVideoSampleAllocatorCallbackVtbl sample_allocator_callback_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 3951b813a0..7ad011d2a0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1219,12 +1219,14 @@ static void test_MFCreateVideoSampleAllocator(void) hr = IMFVideoSampleAllocatorCallback_SetCallback(allocator_cb, NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + count = 10; hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!count, "Unexpected count %d.\n", count); -} + hr = IMFVideoSampleAllocator_UninitializeSampleAllocator(allocator); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1256,10 +1258,10 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine ok(count == 1, "Unexpected count %d.\n", count); -} + sample = NULL; hr = IMFVideoSampleAllocator_AllocateSample(allocator, &sample); todo_wine @@ -1279,10 +1281,10 @@ todo_wine ok(get_refcount(sample) == 3, "Unexpected refcount %u.\n", get_refcount(sample)); hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_cb, &count); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine ok(count == 4, "Unexpected count %d.\n", count); -} + if (sample) { hr = IMFSample_QueryInterface(sample, &IID_IMFDesiredSample, (void **)&unk); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index bd6e66a513..a63c353a4b 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3308,7 +3308,6 @@ static void test_evr(void) sample_count = 0; hr = IMFVideoSampleAllocatorCallback_GetFreeSampleCount(allocator_callback, &sample_count); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!sample_count, "Unexpected sample count %d.\n", sample_count);

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020