February 2023 - Wine-commits

Zhiyi Zhang : include: Add dcomp.idl.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: 98336958555d653c66385e94a812d3dfdf8b41b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/98336958555d653c66385e94a812d3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 2 21:22:35 2023 +0800 include: Add dcomp.idl. Note that overloaded C++ methods are renamed to avoid conflicts. --- include/Makefile.in | 1 + include/dcomp.idl | 442 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 443 insertions(+)

1 0

Alistair Leslie-Hughes : msado15: Semi-stub _Recordset get/put Filter.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: 669107f6c5e54f520a846caec9649163675784a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/669107f6c5e54f520a846caec96491… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 23 12:09:28 2021 +1000 msado15: Semi-stub _Recordset get/put Filter. --- dlls/msado15/recordset.c | 26 ++++++++++++++++++++++---- dlls/msado15/tests/msado15.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 5 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index aa2db6e2968..ea5c233f95a 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -48,6 +48,7 @@ struct recordset CursorTypeEnum cursor_type; IRowset *row_set; EditModeEnum editmode; + VARIANT filter; }; struct fields @@ -1588,14 +1589,30 @@ static HRESULT WINAPI recordset_get_EditMode( _Recordset *iface, EditModeEnum *m static HRESULT WINAPI recordset_get_Filter( _Recordset *iface, VARIANT *criteria ) { - FIXME( "%p, %p\n", iface, criteria ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %p\n", iface, criteria ); + + if (!criteria) return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + VariantCopy(criteria, &recordset->filter); + return S_OK; } static HRESULT WINAPI recordset_put_Filter( _Recordset *iface, VARIANT criteria ) { - FIXME( "%p, %s\n", iface, debugstr_variant(&criteria) ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + TRACE( "%p, %s\n", recordset, debugstr_variant(&criteria) ); + + if (V_VT(&criteria) != VT_I2 && V_VT(&criteria) != VT_I4 && V_VT(&criteria) != VT_BSTR) + return MAKE_ADO_HRESULT( adErrInvalidArgument ); + + if (V_VT(&criteria) == VT_BSTR && recordset->state == adStateOpen) + { + FIXME("Validating fields not preformed\n"); + } + + VariantCopy(&recordset->filter, &criteria); + return S_OK; } static HRESULT WINAPI recordset_get_PageCount( _Recordset *iface, ADO_LONGPTR *count ) @@ -2131,6 +2148,7 @@ HRESULT Recordset_create( void **obj ) recordset->cursor_type = adOpenForwardOnly; recordset->row_set = NULL; recordset->editmode = adEditNone; + VariantInit( &recordset->filter ); *obj = &recordset->Recordset_iface; TRACE( "returning iface %p\n", *obj ); diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b39adf58b22..724787870e0 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -59,7 +59,7 @@ static void test_Recordset(void) CursorTypeEnum cursor; BSTR name; HRESULT hr; - VARIANT bookmark; + VARIANT bookmark, filter; EditModeEnum editmode; hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); @@ -123,6 +123,26 @@ static void test_Recordset(void) hr = _Recordset_put_Bookmark( recordset, bookmark ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); + VariantInit( &filter ); + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08lx\n", hr ); + + V_VT(&filter) = VT_BSTR; + V_BSTR(&filter) = SysAllocString( L"field1 = 1" ); + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == S_OK, "got %08lx\n", hr ); + VariantClear(&filter); + + V_VT(&filter) = VT_I4; + V_I4(&filter) = 0; + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == S_OK, "got %08lx\n", hr ); + + V_VT(&filter) = VT_I2; + V_I2(&filter) = 0; + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == S_OK, "got %08lx\n", hr ); + VariantInit( &missing ); hr = _Recordset_AddNew( recordset, missing, missing ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08lx\n", hr ); @@ -248,6 +268,23 @@ static void test_Recordset(void) ok( fields2 == fields, "expected same object\n" ); Fields_Release( fields2 ); + V_VT(&filter) = VT_BSTR; + V_BSTR(&filter) = SysAllocString( L"field1 = 1" ); + hr = _Recordset_put_Filter( recordset, filter ); + todo_wine ok( hr == MAKE_ADO_HRESULT( adErrItemNotFound ), "got %08lx\n", hr ); + VariantClear(&filter); + + V_VT(&filter) = VT_BSTR; + V_BSTR(&filter) = SysAllocString( L"field = 1" ); + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == S_OK, "got %08lx\n", hr ); + VariantClear(&filter); + + V_VT(&filter) = VT_I4; + V_I4(&filter) = 0; + hr = _Recordset_put_Filter( recordset, filter ); + ok( hr == S_OK, "got %08lx\n", hr ); + count = -1; hr = Fields_get_Count( fields2, &count ); ok( count == 1, "got %ld\n", count );

1 0

Alistair Leslie-Hughes : msado15: Field ActualSize return a default size.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: 493751197dcf286558623e24f284eac3e7877196 URL: https://gitlab.winehq.org/wine/wine/-/commit/493751197dcf286558623e24f284ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 20 13:21:16 2023 +1100 msado15: Field ActualSize return a default size. --- dlls/msado15/recordset.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index ea5c233f95a..b8c4487d4c9 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -198,8 +198,10 @@ static HRESULT WINAPI field_get_Properties( Field *iface, Properties **obj ) static HRESULT WINAPI field_get_ActualSize( Field *iface, ADO_LONGPTR *size ) { - FIXME( "%p, %p\n", iface, size ); - return E_NOTIMPL; + struct field *field = impl_from_Field( iface ); + FIXME( "%p, %p\n", field, size ); + *size = 0; + return S_OK; } static HRESULT WINAPI field_get_Attributes( Field *iface, LONG *attrs )

1 0

Francois Gouget : jsproxy/tests: InternetInitializeAutoProxyDll() is no longer supported on Windows 11.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: 00b6ce35bf2739ad6c66dd47b41ec754d0387aaa URL: https://gitlab.winehq.org/wine/wine/-/commit/00b6ce35bf2739ad6c66dd47b41ec7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Feb 19 19:32:18 2023 +0100 jsproxy/tests: InternetInitializeAutoProxyDll() is no longer supported on Windows 11. The same goes for InternetGetProxyInfo(). They seem to have been replaced with stubs that fail but don't bother setting the error code. So just skip the tests when that happens. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54531 --- dlls/jsproxy/tests/jsproxy.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c index 59b3c5dfb9e..22a828b7e5a 100644 --- a/dlls/jsproxy/tests/jsproxy.c +++ b/dlls/jsproxy/tests/jsproxy.c @@ -49,6 +49,11 @@ static void test_InternetInitializeAutoProxyDll(void) ret = pInternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buf ); err = GetLastError(); ok( !ret, "unexpected success\n" ); + if (!ret && err == 0xdeadbeef) + { + win_skip("InternetInitializeAutoProxyDll() is not supported on Windows 11\n"); + return; + } ok( err == ERROR_INVALID_PARAMETER, "got %lu\n", err ); buf.dwScriptBufferSize = strlen(script) + 1; @@ -105,6 +110,11 @@ static void test_InternetGetProxyInfo(void) SetLastError( 0xdeadbeef ); ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); err = GetLastError(); + if (!ret && err == 0xdeadbeef) + { + win_skip("InternetGetProxyInfo() is not supported on Windows 11\n"); + return; + } ok( !ret, "unexpected success\n" ); ok( err == ERROR_CAN_NOT_COMPLETE, "got %lu\n", err );

1 0

Francois Gouget : jsproxy/tests: Add more tests for InternetGetProxyInfo()'s length parameter.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: ad30e4f9ba52d8811433abe512aeb12a9b7db1cb URL: https://gitlab.winehq.org/wine/wine/-/commit/ad30e4f9ba52d8811433abe512aeb1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Feb 19 19:39:23 2023 +0100 jsproxy/tests: Add more tests for InternetGetProxyInfo()'s length parameter. --- dlls/jsproxy/tests/jsproxy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c index 22a828b7e5a..505d1a9398a 100644 --- a/dlls/jsproxy/tests/jsproxy.c +++ b/dlls/jsproxy/tests/jsproxy.c @@ -63,6 +63,7 @@ static void test_InternetInitializeAutoProxyDll(void) ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); ok( ret, "got %lu\n", GetLastError() ); ok( !strcmp( proxy, "DIRECT" ), "got \"%s\"\n", proxy ); + ok( len == strlen(proxy) + 1, "got len=%ld for \"%s\"\n", len, proxy ); GlobalFree( proxy ); buf.dwScriptBufferSize = strlen(script2) + 1; @@ -73,6 +74,7 @@ static void test_InternetInitializeAutoProxyDll(void) ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); ok( ret, "got %lu\n", GetLastError() ); ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy ); + ok( len == strlen(proxy) + 1, "got len=%ld for \"%s\"\n", len, proxy ); GlobalFree( proxy ); buf.dwScriptBufferSize = strlen(script2) + 2; @@ -82,6 +84,7 @@ static void test_InternetInitializeAutoProxyDll(void) ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); ok( ret, "got %lu\n", GetLastError() ); ok( !strcmp( proxy, "PROXY 10.0.0.1:8080" ), "got \"%s\"\n", proxy ); + ok( len == strlen(proxy) + 1, "got len=%ld for \"%s\"\n", len, proxy ); GlobalFree( proxy ); buf.lpszScriptBuffer = script3;

1 0

Alexandre Julliard : conhost: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: 9efe1a32a2fd6327b9c150b0da51326c0d084041 URL: https://gitlab.winehq.org/wine/wine/-/commit/9efe1a32a2fd6327b9c150b0da5132… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:39:18 2023 +0100 conhost: Use standard va_list instead of __ms_va_list. --- programs/conhost/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 63bf532fd73..0d6036f07d7 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1549,7 +1549,7 @@ static BOOL select_font( struct dialog_info *di ) args[0] = di->config.cell_width; args[1] = di->config.cell_height; FormatMessageW( FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - fmt, 0, 0, buf, ARRAY_SIZE(buf), (__ms_va_list*)args ); + fmt, 0, 0, buf, ARRAY_SIZE(buf), (va_list *)args ); SendDlgItemMessageW( di->dialog, IDC_FNT_FONT_INFO, WM_SETTEXT, 0, (LPARAM)buf ); return TRUE;

1 0

Alexandre Julliard : notepad: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: e1f18466112790c9f0ddbc48488b227d2556b986 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1f18466112790c9f0ddbc48488b22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:39:31 2023 +0100 notepad: Use standard va_list instead of __ms_va_list. --- programs/notepad/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index c4e99013fe6..d9269b31b93 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -169,7 +169,7 @@ static int AlertUnicodeCharactersLost(LPCWSTR szFileName) load_encoding_name(ENCODING_ANSI, szEnc, ARRAY_SIZE(szEnc)); args[0] = (DWORD_PTR)szFileName; args[1] = (DWORD_PTR)szEnc; - FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY, szMsgFormat, 0, 0, (LPWSTR)&szMsg, 0, (__ms_va_list*)args); + FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY, szMsgFormat, 0, 0, (LPWSTR)&szMsg, 0, (va_list *)args); rc = MessageBoxW(Globals.hMainWnd, szMsg, szCaption, MB_OKCANCEL|MB_ICONEXCLAMATION); LocalFree(szMsg);

1 0

Alexandre Julliard : oleview: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: d244f902b36760c85eef50b322f62167d0e6925a URL: https://gitlab.winehq.org/wine/wine/-/commit/d244f902b36760c85eef50b322f621… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:39:42 2023 +0100 oleview: Use standard va_list instead of __ms_va_list. --- programs/oleview/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 19f902a0659..ce420b0404a 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -1116,7 +1116,7 @@ static int PopulateTree(void) args[0] = (DWORD_PTR)typelib.wszFileName; args[1] = hRes; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - wszError, 0, 0, wszMessage, ARRAY_SIZE(wszMessage), (__ms_va_list*)args); + wszError, 0, 0, wszMessage, ARRAY_SIZE(wszMessage), (va_list *)args); MessageBoxW(globals.hMainWnd, wszMessage, NULL, MB_OK|MB_ICONEXCLAMATION); return 1; }

1 0

Alexandre Julliard : start: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: b19d3e779be2f4d6211c9293a00454154df41276 URL: https://gitlab.winehq.org/wine/wine/-/commit/b19d3e779be2f4d6211c9293a00454… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:40:02 2023 +0100 start: Use standard va_list instead of __ms_va_list. --- programs/start/start.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 62804917941..4fd6cfc4481 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -77,7 +77,7 @@ static void fatal_error(const WCHAR *msg, DWORD error_code, const WCHAR *filenam output(L": "); args[0] = (DWORD_PTR)filename; status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, - NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, (__ms_va_list *)args ); + NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, (va_list *)args ); if (!status) { WINE_ERR("FormatMessage failed\n"); @@ -99,7 +99,7 @@ static void fatal_string_error(int which, DWORD error_code, const WCHAR *filenam fatal_error(msg, error_code, filename); } - + static void fatal_string(int which) { WCHAR msg[2048];

1 0

Alexandre Julliard : taskmgr: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard 20 Feb '23

20 Feb '23

Module: wine Branch: master Commit: dbfeb4b7f4717ac9da8bc6ecf38bb91afa2c424e URL: https://gitlab.winehq.org/wine/wine/-/commit/dbfeb4b7f4717ac9da8bc6ecf38bb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:40:14 2023 +0100 taskmgr: Use standard va_list instead of __ms_va_list. --- programs/taskmgr/perfpage.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c index 4689d4e3312..505846e3b4f 100644 --- a/programs/taskmgr/perfpage.c +++ b/programs/taskmgr/perfpage.c @@ -188,8 +188,7 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) args[0] = CommitChargeTotal; args[1] = CommitChargeLimit; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - wszMemUsage, 0, 0, Text, - ARRAY_SIZE(Text), (__ms_va_list*)args); + wszMemUsage, 0, 0, Text, ARRAY_SIZE(Text), (va_list *)args); SendMessageW(hStatusWnd, SB_SETTEXTW, 2, (LPARAM)Text); /*

1 0