- Wine-Commits - list.winehq.org

Alexandre Julliard : conhost: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

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 : oleview: Use standard va_list instead of __ms_va_list.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

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

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

Feb. 20, 2023

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

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

Feb. 20, 2023

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

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

Feb. 20, 2023

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

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

Feb. 20, 2023

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

Connor McAdams : uiautomationcore: Register all UI Automation typelibs.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 88a1e949718cfbffedc46a63a8ad7dad05418dd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/88a1e949718cfbffedc46a63a8ad7d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Dec 27 14:56:21 2022 -0500 uiautomationcore: Register all UI Automation typelibs. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 4 +++- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_classes_client.idl | 21 +++++++++++++++++++++ dlls/uiautomationcore/uia_classes_core.idl | 21 +++++++++++++++++++++ include/uiautomationclient.idl | 1 + include/uiautomationcore.idl | 1 + 6 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 9910e8e336e..a597c580b24 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -11,4 +11,6 @@ C_SRCS = \ uia_provider.c IDL_SRCS = \ - uia_classes.idl + uia_classes.idl \ + uia_classes_client.idl \ + uia_classes_core.idl diff --git a/dlls/uiautomationcore/uia_classes.idl b/dlls/uiautomationcore/uia_classes.idl index f0a20d61579..aee34c0221d 100644 --- a/dlls/uiautomationcore/uia_classes.idl +++ b/dlls/uiautomationcore/uia_classes.idl @@ -43,6 +43,7 @@ struct uia_pattern_info { [ version(1.0), uuid(8a9ca8eb-856b-43d9-abd7-4a590054064f), + id(1), ] library UIA_wine_private { diff --git a/dlls/uiautomationcore/uia_classes_client.idl b/dlls/uiautomationcore/uia_classes_client.idl new file mode 100644 index 00000000000..f6dcb236bea --- /dev/null +++ b/dlls/uiautomationcore/uia_classes_client.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Connor McAdams for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "uiautomationclient.idl" diff --git a/dlls/uiautomationcore/uia_classes_core.idl b/dlls/uiautomationcore/uia_classes_core.idl new file mode 100644 index 00000000000..3cd0a7134ed --- /dev/null +++ b/dlls/uiautomationcore/uia_classes_core.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2022 Connor McAdams for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib + +#include "uiautomationcore.idl" diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index ce0402a5d33..7a0b50288d4 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -69,6 +69,7 @@ typedef void * UIA_HWND; [ uuid(944de083-8fb8-45cf-bcb7-c477acb2f897), lcid(0), + id(2), version(1.0) ] library UIAutomationClient { diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index bd93bd04dff..319bc7be475 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -206,6 +206,7 @@ struct UiaChangeInfo { version(1.0), uuid(930299ce-9965-4dec-b0f4-a54848d4b667), lcid(0), + id(3), hidden ] library UIA

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomation::ElementFromHandle.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 2d8bf67b90ccfbc3d5cfc45bbd68ca666ecd99b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d8bf67b90ccfbc3d5cfc45bbd68ca… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Feb 1 15:26:40 2023 -0500 uiautomationcore: Implement IUIAutomation::ElementFromHandle. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 88 +++ dlls/uiautomationcore/uia_com_client.c | 936 ++++++++++++++++++++++++++++- 2 files changed, 1022 insertions(+), 2 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add stub IUIAutomation implementation.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: e8dd3adae72bbe58a66eda8f55ed8df393a9d1b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8dd3adae72bbe58a66eda8f55ed8d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Feb 1 13:16:28 2023 -0500 uiautomationcore: Add stub IUIAutomation implementation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/tests/uiautomation.c | 55 +++ dlls/uiautomationcore/uia_com_client.c | 702 ++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_main.c | 123 +++++ dlls/uiautomationcore/uia_private.h | 3 + dlls/uiautomationcore/uiautomationcore.spec | 2 +- 6 files changed, 885 insertions(+), 1 deletion(-)

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomationElement::GetCurrentPropertyValueEx.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: 6254f6635cd3b57870e77376df4ff95469e7cf8b URL: https://gitlab.winehq.org/wine/wine/-/commit/6254f6635cd3b57870e77376df4ff9… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Feb 2 13:54:54 2023 -0500 uiautomationcore: Implement IUIAutomationElement::GetCurrentPropertyValueEx. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 157 ++++++++++++++++++++++++----- dlls/uiautomationcore/uia_com_client.c | 39 ++++++- 2 files changed, 170 insertions(+), 26 deletions(-)

1 0