February 2023 - Wine-Commits

Zhiyi Zhang : include: Add dcompanimation.idl.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: c10568fc31445ba310e6067fb29e0b8fd9f1ea0e URL: https://gitlab.winehq.org/wine/wine/-/commit/c10568fc31445ba310e6067fb29e0b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 20 16:48:00 2023 +0800 include: Add dcompanimation.idl. --- include/Makefile.in | 1 + include/dcompanimation.idl | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 07917b4923d..2284a902b5f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -182,6 +182,7 @@ SOURCES = \ dciddi.h \ dciman.h \ dcommon.idl \ + dcompanimation.idl \ dcomptypes.idl \ dde.h \ dde.rh \ diff --git a/include/dcompanimation.idl b/include/dcompanimation.idl new file mode 100644 index 00000000000..dac6a2615ed --- /dev/null +++ b/include/dcompanimation.idl @@ -0,0 +1,36 @@ +/* + * Copyright 2023 Zhiyi Zhang 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 + */ + +import "wtypes.idl"; +import "unknwn.idl"; + +[ + local, + object, + uuid(cbfd91d9-51b2-45e4-b3de-d19ccfb863c5), + pointer_default(unique) +] +interface IDCompositionAnimation : IUnknown +{ + HRESULT Reset(); + HRESULT SetAbsoluteBeginTime([in] LARGE_INTEGER time); + HRESULT AddCubic([in] double offset, [in] float constant_coefficient, [in] float linear_coefficient, [in] float quadratic_coefficient, [in] float cubic_coefficient); + HRESULT AddSinusoidal([in] double offset, [in] float bias, [in] float amplitude, [in] float frequency, [in] float phase); + HRESULT AddRepeat([in] double offset, [in] double duration); + HRESULT End([in] double offset, [in] float value); +};

1 0

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

Feb. 20, 2023

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

Feb. 20, 2023

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

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

Feb. 20, 2023

Module: wine Branch: master Commit: 297f7cb37e937ddeb3b50a999af27dc3ac484fe6 URL: https://gitlab.winehq.org/wine/wine/-/commit/297f7cb37e937ddeb3b50a999af27d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:40:27 2023 +0100 winefile: Use standard va_list instead of __ms_va_list. --- programs/winefile/winefile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 8ad785b924a..6d18954e05a 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2405,8 +2405,7 @@ static void set_space_status(void) args[1] = (DWORD_PTR)StrFormatByteSizeW(ulTotalBytes.QuadPart, b2, ARRAY_SIZE(b2)); FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, ARRAY_SIZE(buffer), - (__ms_va_list*)args); + RS(fmt,IDS_FREE_SPACE_FMT), 0, 0, buffer, ARRAY_SIZE(buffer), (va_list *)args); } else lstrcpyW(buffer, sQMarks);

1 0

Alexandre Julliard : include: Move __builtin_ms_va_list definitions to vadefs.h.
by Alexandre Julliard Feb. 20, 2023

Feb. 20, 2023

Module: wine Branch: master Commit: f4c3801495f4fe17a10e2f21339de3b511c78339 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4c3801495f4fe17a10e2f21339de3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 20 08:41:45 2023 +0100 include: Move __builtin_ms_va_list definitions to vadefs.h. --- include/msvcrt/corecrt.h | 12 ------------ include/msvcrt/vadefs.h | 10 +++++++++- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h index 4dc2ca53208..bec9c8911c2 100644 --- a/include/msvcrt/corecrt.h +++ b/include/msvcrt/corecrt.h @@ -122,18 +122,6 @@ # endif #endif -#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__) -# include <stdarg.h> -# undef va_list -# undef va_start -# undef va_end -# undef va_copy -# define va_list __builtin_ms_va_list -# define va_start(list,arg) __builtin_ms_va_start(list,arg) -# define va_end(list) __builtin_ms_va_end(list) -# define va_copy(dest,src) __builtin_ms_va_copy(dest,src) -#endif - #ifndef WINAPIV # if defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) && !defined(__MINGW32__) && !defined(__CYGWIN__) # define WINAPIV __attribute__((pcs("aapcs"))) diff --git a/include/msvcrt/vadefs.h b/include/msvcrt/vadefs.h index 2a612fc055c..462c2d6815f 100644 --- a/include/msvcrt/vadefs.h +++ b/include/msvcrt/vadefs.h @@ -27,7 +27,15 @@ #define _ADDRESSOF(v) (&(v)) #endif -#if defined(__GNUC__) || defined(__clang__) +#if defined (__GNUC__) && (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) + +typedef __builtin_ms_va_list va_list; +#define _crt_va_start(v,l) __builtin_ms_va_start(v,l) +#define _crt_va_arg(v,l) __builtin_va_arg(v,l) +#define _crt_va_end(v) __builtin_ms_va_end(v) +#define _crt_va_copy(d,s) __builtin_ms_va_copy(d,s) + +#elif defined(__GNUC__) || defined(__clang__) typedef __builtin_va_list va_list; #define _crt_va_start(v,l) __builtin_va_start(v,l)

1 0

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

Feb. 20, 2023

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 : 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