April 2024 - Wine-Commits - list.winehq.org

Alexandre Julliard : dispex: Use fully interpreted IDL stubs.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: cfa1deb541c138f8cfaaf82a766c9ba68f87e701 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfa1deb541c138f8cfaaf82a766c9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:31:38 2024 +0200 dispex: Use fully interpreted IDL stubs. --- dlls/dispex/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in index d8a542acb71..1fbdc7bc226 100644 --- a/dlls/dispex/Makefile.in +++ b/dlls/dispex/Makefile.in @@ -1,6 +1,8 @@ MODULE = dispex.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ disp_ex.idl \ usrmarshal.c

1 0

Alexandre Julliard : avifil32: Use fully interpreted IDL stubs.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: 767d21fe5f6475e24b2c08ab1a5f57aa1148adb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/767d21fe5f6475e24b2c08ab1a5f57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:31:08 2024 +0200 avifil32: Use fully interpreted IDL stubs. --- dlls/avifil32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in index fd19511712c..7a08f06717b 100644 --- a/dlls/avifil32/Makefile.in +++ b/dlls/avifil32/Makefile.in @@ -2,6 +2,8 @@ MODULE = avifil32.dll IMPORTLIB = avifil32 IMPORTS = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4 +EXTRAIDLFLAGS = -Oicf + SOURCES = \ acmstream.c \ api.c \

1 0

Alexandre Julliard : systeminfo: Pass proper Unicode strings to fwprintf.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: 4679ceb7ed8b643a5dc001ae3cbdb6faaf0dc7c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4679ceb7ed8b643a5dc001ae3cbdb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 16:35:55 2024 +0200 systeminfo: Pass proper Unicode strings to fwprintf. --- programs/systeminfo/main.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/programs/systeminfo/main.c b/programs/systeminfo/main.c index fefb2f1a1a7..81df549bb0e 100644 --- a/programs/systeminfo/main.c +++ b/programs/systeminfo/main.c @@ -60,7 +60,7 @@ static void output_processors( IWbemServices *services, enum format_flags flags, while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) num_cpus++; - fwprintf( stdout, L"Processor(s):%*s %u Processor(s) Installed.\n", width - wcslen(L"Processor(s)"), " ", num_cpus ); + fwprintf( stdout, L"Processor(s):%*s %u Processor(s) Installed.\n", width - wcslen(L"Processor(s)"), L" ", num_cpus ); IEnumWbemClassObject_Reset( iter ); for (i = 0; i < num_cpus; i++) @@ -74,7 +74,7 @@ static void output_processors( IWbemServices *services, enum format_flags flags, IWbemClassObject_Release( obj ); goto done; } - fwprintf( stdout, L"%*s[%02u]: %s", width + 2, " ", i + 1, V_BSTR(&value) ); + fwprintf( stdout, L"%*s[%02u]: %s", width + 2, L" ", i + 1, V_BSTR(&value) ); VariantClear( &value ); hr = IWbemClassObject_Get( obj, L"Manufacturer", 0, &value, NULL, NULL ); @@ -117,7 +117,7 @@ static void output_hotfixes( IWbemServices *services, enum format_flags flags, U while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) num_hotfixes++; - fwprintf( stdout, L"Hotfix(es):%*s %u Hotfix(es) Installed.\n", width - wcslen(L"Hotfix(es)"), " ", num_hotfixes ); + fwprintf( stdout, L"Hotfix(es):%*s %u Hotfix(es) Installed.\n", width - wcslen(L"Hotfix(es)"), L" ", num_hotfixes ); IEnumWbemClassObject_Reset( iter ); for (i = 0; i < num_hotfixes; i++) @@ -131,7 +131,7 @@ static void output_hotfixes( IWbemServices *services, enum format_flags flags, U IWbemClassObject_Release( obj ); goto done; } - fwprintf( stdout, L"%*s[%02u]: %s\n", width + 2, " ", i + 1, V_BSTR(&value) ); + fwprintf( stdout, L"%*s[%02u]: %s\n", width + 2, L" ", i + 1, V_BSTR(&value) ); VariantClear( &value ); IWbemClassObject_Release( obj ); @@ -159,7 +159,7 @@ static void output_nics( IWbemServices *services, enum format_flags flags, UINT3 while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) num_nics++; - fwprintf( stdout, L"Network Card(s):%*s %u NICs(s) Installed.\n", width - wcslen(L"Network Card(s)"), " ", num_nics ); + fwprintf( stdout, L"Network Card(s):%*s %u NICs(s) Installed.\n", width - wcslen(L"Network Card(s)"), L" ", num_nics ); IEnumWbemClassObject_Reset( iter ); for (i = 0; i < num_nics; i++) @@ -173,7 +173,7 @@ static void output_nics( IWbemServices *services, enum format_flags flags, UINT3 IWbemClassObject_Release( obj ); goto done; } - fwprintf( stdout, L"%*s[%02u]: %s\n", width + 2, " ", i + 1, V_BSTR(&value) ); + fwprintf( stdout, L"%*s[%02u]: %s\n", width + 2, L" ", i + 1, V_BSTR(&value) ); VariantClear( &value ); /* FIXME: Connection Name, DHCP Server */ @@ -184,7 +184,7 @@ static void output_nics( IWbemServices *services, enum format_flags flags, UINT3 IWbemClassObject_Release( obj ); goto done; } - fwprintf( stdout, L"%*s DHCP Enabled: %s\n", width + 2, " ", V_BOOL(&value) ? L"Yes" : L"No" ); + fwprintf( stdout, L"%*s DHCP Enabled: %s\n", width + 2, L" ", V_BOOL(&value) ? L"Yes" : L"No" ); hr = IWbemClassObject_Get( obj, L"IPAddress", 0, &value, NULL, NULL ); if (FAILED( hr )) @@ -198,11 +198,11 @@ static void output_nics( IWbemServices *services, enum format_flags flags, UINT3 SafeArrayGetUBound( sa, 1, &bound ); if (bound >= 0) { - fwprintf( stdout, L"%*s IP Addresse(es)\n", width + 2, " " ); + fwprintf( stdout, L"%*s IP Addresse(es)\n", width + 2, L" " ); for (j = 0; j <= bound; j++) { SafeArrayGetElement( sa, &j, &str ); - fwprintf( stdout, L"%*s [%02u]: %s\n", width + 2, " ", j + 1, str ); + fwprintf( stdout, L"%*s [%02u]: %s\n", width + 2, L" ", j + 1, str ); SysFreeString( str ); } } @@ -231,7 +231,7 @@ static void output_timezone( IWbemServices *services, enum format_flags flags, U RegQueryValueExW( key_name, L"Display", NULL, NULL, (BYTE *)timezone, &count ); done: - fwprintf( stdout, L"Time Zone:%*s %s\n", width - wcslen(L"Time Zone"), " ", timezone ); + fwprintf( stdout, L"Time Zone:%*s %s\n", width - wcslen(L"Time Zone"), L" ", timezone ); RegCloseKey( key_name ); RegCloseKey( key_timezones ); RegCloseKey( key_current ); @@ -284,7 +284,7 @@ static void output_item( IWbemServices *services, const struct sysinfo *info, UI if (!info->class) { if (info->property) - fwprintf( stdout, L"%s:%*s %s\n", info->item, width - wcslen(info->item), " ", info->property ); + fwprintf( stdout, L"%s:%*s %s\n", info->item, width - wcslen(info->item), L" ", info->property ); else info->callback( services, info->flags, width ); return; @@ -315,7 +315,7 @@ static void output_item( IWbemServices *services, const struct sysinfo *info, UI &st.wYear, &st.wMonth, &st.wDay, &st.wHour, &st.wMinute, &st.wSecond ); GetDateFormatW( LOCALE_SYSTEM_DEFAULT, 0, &st, NULL, date, ARRAY_SIZE(date) ); GetTimeFormatW( LOCALE_SYSTEM_DEFAULT, 0, &st, NULL, time, ARRAY_SIZE(time) ); - fwprintf( stdout, L"%s:%*s %s, %s\n", info->item, width - wcslen(info->item), " ", date, time ); + fwprintf( stdout, L"%s:%*s %s, %s\n", info->item, width - wcslen(info->item), L" ", date, time ); break; } case FORMAT_LOCALE: @@ -326,18 +326,18 @@ static void output_item( IWbemServices *services, const struct sysinfo *info, UI swscanf( V_BSTR(&value), L"%x", &lcid ); LCIDToLocaleName( lcid, name, ARRAY_SIZE(name), 0 ); GetLocaleInfoW( lcid, LOCALE_SENGLISHDISPLAYNAME, displayname, ARRAY_SIZE(displayname) ); - fwprintf( stdout, L"%s:%*s %s;%s\n", info->item, width - wcslen(info->item), " ", name, displayname ); + fwprintf( stdout, L"%s:%*s %s;%s\n", info->item, width - wcslen(info->item), L" ", name, displayname ); break; } case FORMAT_SIZE: { UINT64 size = 0; swscanf( V_BSTR(&value), L"%I64u", &size ); - fwprintf( stdout, L"%s:%*s %I64u MB\n", info->item, width - wcslen(info->item), " ", size / 1024 ); + fwprintf( stdout, L"%s:%*s %I64u MB\n", info->item, width - wcslen(info->item), L" ", size / 1024 ); break; } default: - fwprintf( stdout, L"%s:%*s %s\n", info->item, width - wcslen(info->item), " ", V_BSTR(&value) ); + fwprintf( stdout, L"%s:%*s %s\n", info->item, width - wcslen(info->item), L" ", V_BSTR(&value) ); break; } VariantClear( &value );

1 0

Alexandre Julliard : dbghelp: Ignore a couple of Dwarf-3 opcodes.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: 754f11a4adc2b7431837a92448b93bb845d99d61 URL: https://gitlab.winehq.org/wine/wine/-/commit/754f11a4adc2b7431837a92448b93b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 28 16:06:54 2024 +0200 dbghelp: Ignore a couple of Dwarf-3 opcodes. --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 332c3da1059..34c924f3cda 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2784,6 +2784,9 @@ static BOOL dwarf2_parse_line_numbers(dwarf2_parse_context_t* ctx, case DW_LNS_fixed_advance_pc: address += dwarf2_parse_u2(&traverse); break; + case DW_LNS_set_prologue_end: + case DW_LNS_set_epilogue_begin: + break; case DW_LNS_extended_op: dwarf2_leb128_as_unsigned(&traverse); extopcode = dwarf2_parse_byte(&traverse);

1 0

Alexandre Julliard : oleaut32: Fix IDispatch::Invoke for vararg functions with empty varargs.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: fbba581cf2aeeda169f6cc229c1a80da3eb40532 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbba581cf2aeeda169f6cc229c1a80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Apr 28 22:06:29 2024 +0200 oleaut32: Fix IDispatch::Invoke for vararg functions with empty varargs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56598 --- dlls/oleaut32/tests/tmarshal.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 11 +++++++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 5ffc103c7eb..4bcc15628f7 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -932,6 +932,10 @@ static HRESULT WINAPI Widget_VarArg( trace("VarArg(%p)\n", values); + ok( values->cDims == 1, "wrong cDims %u\n", values->cDims ); + ok( values->cbElements == (numexpect ? sizeof(VARIANT) : 0), + "wrong cbElements %lu\n", values->cbElements ); + hr = SafeArrayGetLBound(values, 1, &lbound); ok(hr == S_OK, "SafeArrayGetLBound failed with %lx\n", hr); ok(lbound == 0, "SafeArrayGetLBound returned %ld\n", lbound); @@ -1058,6 +1062,16 @@ static HRESULT WINAPI Widget_VarArg_Run( ok(!lstrcmpW(name, catW), "got %s\n", wine_dbgstr_w(name)); + if (!params->cbElements) /* no varargs */ + { + hr = SafeArrayGetUBound(params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetUBound error %#lx\n", hr); + ok(bound == -1, "expected -1, got %ld\n", bound); + return S_OK; + } + + ok( params->cbElements == sizeof(VARIANT), "wrong cbElements %lu\n", params->cbElements ); + hr = SafeArrayGetLBound(params, 1, &bound); ok(hr == S_OK, "SafeArrayGetLBound error %#lx\n", hr); ok(bound == 0, "expected 0, got %ld\n", bound); @@ -1093,6 +1107,16 @@ static HRESULT WINAPI Widget_VarArg_Ref_Run( ok(!lstrcmpW(name, catW), "got %s\n", wine_dbgstr_w(name)); + if (!(*params)->cbElements) /* no varargs */ + { + hr = SafeArrayGetUBound(*params, 1, &bound); + ok(hr == S_OK, "SafeArrayGetUBound error %#lx\n", hr); + ok(bound == -1, "expected -1, got %ld\n", bound); + return S_OK; + } + + ok( (*params)->cbElements == sizeof(VARIANT), "wrong cbElements %lu\n", (*params)->cbElements ); + hr = SafeArrayGetLBound(*params, 1, &bound); ok(hr == S_OK, "SafeArrayGetLBound error %#lx\n", hr); ok(bound == 0, "expected 0, got %ld\n", bound); @@ -3231,6 +3255,12 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); ok_ole_success(hr, IDispatch_Invoke); + /* without any varargs */ + dispparams.cArgs = 1; + V_I4(&vararg[0]) = 0; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok_ole_success(hr, IDispatch_Invoke); + /* call VarArg, even one (non-optional, non-safearray) named argument is not allowed */ dispidNamed = 0; dispparams.cNamedArgs = 1; @@ -3252,6 +3282,11 @@ static void test_typelibmarshal(void) dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); ok_ole_success(hr, IDispatch_Invoke); + /* without any varargs */ + dispparams.cArgs = 1; + dispparams.rgvarg = vararg + 1; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok_ole_success(hr, IDispatch_Invoke); SysFreeString(V_BSTR(&vararg[1])); SysFreeString(V_BSTR(&vararg[0])); @@ -3268,6 +3303,11 @@ static void test_typelibmarshal(void) dispparams.rgvarg = vararg; hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_REF_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); ok_ole_success(hr, IDispatch_Invoke); + /* without any varargs */ + dispparams.cArgs = 1; + dispparams.rgvarg = vararg + 1; + hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_REF_RUN, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL); + ok_ole_success(hr, IDispatch_Invoke); SysFreeString(V_BSTR(&vararg[1])); SysFreeString(V_BSTR(&vararg[0])); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 670938fb81c..6b4842b7e1a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7483,6 +7483,17 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( } } } + else if (func_desc->cParamsOpt < 0 && ((rgvt[i] & ~VT_BYREF) == (VT_VARIANT | VT_ARRAY))) + { + hres = SafeArrayAllocDescriptorEx( VT_EMPTY, 1, &a ); + if (FAILED(hres)) break; + if (rgvt[i] & VT_BYREF) + V_BYREF(&rgvarg[i]) = &a; + else + V_ARRAY(&rgvarg[i]) = a; + V_VT(&rgvarg[i]) = rgvt[i]; + prgpvarg[i] = &rgvarg[i]; + } else { hres = DISP_E_BADPARAMCOUNT;

1 0

Dmitry Timoshkov : include: Move InterlockedExchangeAdd64() definition before its first usage.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: a113adedeaefb09dec4af25f007d2cfad1c10b3b URL: https://gitlab.winehq.org/wine/wine/-/commit/a113adedeaefb09dec4af25f007d2c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 26 20:30:12 2024 +0300 include: Move InterlockedExchangeAdd64() definition before its first usage. This fixes Wine tests compilation with Visual Studio 10.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/winnt.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 1bf38616b87..b18d255a79c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6958,16 +6958,6 @@ static FORCEINLINE __int64 InterlockedAnd64( __int64 volatile *dest, __int64 val } #endif -#if !defined(__i386__) || __has_builtin(_InterlockedDecrement64) -#pragma intrinsic(_InterlockedDecrement64) -__int64 _InterlockedDecrement64(__int64 volatile *); -#else -static FORCEINLINE __int64 InterlockedDecrement64( __int64 volatile *dest ) -{ - return InterlockedExchangeAdd64( dest, -1 ) - 1; -} -#endif - #if !defined(__i386__) || __has_builtin(_InterlockedExchangeAdd64) #pragma intrinsic(_InterlockedExchangeAdd64) __int64 _InterlockedExchangeAdd64(__int64 volatile *, __int64); @@ -6980,6 +6970,16 @@ static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __i } #endif +#if !defined(__i386__) || __has_builtin(_InterlockedDecrement64) +#pragma intrinsic(_InterlockedDecrement64) +__int64 _InterlockedDecrement64(__int64 volatile *); +#else +static FORCEINLINE __int64 InterlockedDecrement64( __int64 volatile *dest ) +{ + return InterlockedExchangeAdd64( dest, -1 ) - 1; +} +#endif + #if !defined(__i386__) || __has_builtin(_InterlockedIncrement64) #pragma intrinsic(_InterlockedIncrement64) __int64 _InterlockedIncrement64(__int64 volatile *);

1 0

Dmitry Timoshkov : include: Add _Inout_cap_c_(count) macro.
by Alexandre Julliard April 29, 2024

April 29, 2024

Module: wine Branch: master Commit: 86b26a9eef5ad6b3b8c3184d9a558eb132aba1a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/86b26a9eef5ad6b3b8c3184d9a558e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 26 20:25:44 2024 +0300 include: Add _Inout_cap_c_(count) macro. This fixes Wine tests compilation with Visual Studio 10.0 CRT headers. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index 72803a1be39..d49f6308327 100644 --- a/include/sal.h +++ b/include/sal.h @@ -89,6 +89,7 @@ #define _Inout_ #define _Inout_bytecap_x_(count) #define _Inout_cap_(count) +#define _Inout_cap_c_(count) #define _Inout_opt_ #define _Inout_opt_cap_c_(count) #define _Inout_opt_z_

1 0

Paul Gofman : winex11.drv: Support _SHIFT_ARB attributes in X11DRV_wglGetPixelFormatAttribivARB().
by Alexandre Julliard April 26, 2024

April 26, 2024

Module: wine Branch: master Commit: 25c58e6887647a223aa74f7e7d0402abb4a2a2b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/25c58e6887647a223aa74f7e7d0402… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 25 14:38:39 2024 -0600 winex11.drv: Support _SHIFT_ARB attributes in X11DRV_wglGetPixelFormatAttribivARB(). --- dlls/opengl32/tests/opengl.c | 8 +++++++- dlls/winex11.drv/opengl.c | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index ebeefffb72c..070229254a1 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -750,7 +750,8 @@ static void test_makecurrent(HDC winhdc) static void test_colorbits(HDC hdc) { const int iAttribList[] = { WGL_COLOR_BITS_ARB, WGL_RED_BITS_ARB, WGL_GREEN_BITS_ARB, - WGL_BLUE_BITS_ARB, WGL_ALPHA_BITS_ARB }; + WGL_BLUE_BITS_ARB, WGL_ALPHA_BITS_ARB, WGL_BLUE_SHIFT_ARB, WGL_GREEN_SHIFT_ARB, + WGL_RED_SHIFT_ARB, WGL_ALPHA_SHIFT_ARB, }; int iAttribRet[ARRAY_SIZE(iAttribList)]; const int iAttribs[] = { WGL_ALPHA_BITS_ARB, 1, 0 }; unsigned int nFormats; @@ -778,6 +779,11 @@ static void test_colorbits(HDC hdc) skip("wglGetPixelFormatAttribivARB failed\n"); return; } + ok(!iAttribRet[5], "got %d.\n", iAttribRet[5]); + ok(iAttribRet[6] == iAttribRet[3], "got %d.\n", iAttribRet[6]); + ok(iAttribRet[7] == iAttribRet[6] + iAttribRet[2], "got %d.\n", iAttribRet[7]); + ok(iAttribRet[8] == iAttribRet[7] + iAttribRet[1], "got %d.\n", iAttribRet[8]); + iAttribRet[1] += iAttribRet[2]+iAttribRet[3]+iAttribRet[4]; ok(iAttribRet[0] == iAttribRet[1], "WGL_COLOR_BITS_ARB (%d) does not equal R+G+B+A (%d)!\n", iAttribRet[0], iAttribRet[1]); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index cd132f059df..02a7980d911 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2691,6 +2691,7 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int int hTest; int tmp; int curGLXAttr = 0; + PIXELFORMATDESCRIPTOR pfd; TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, piValues); @@ -2707,6 +2708,12 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int WARN("Unable to convert iPixelFormat %d to a GLX one!\n", iPixelFormat); } + if (!describe_pixel_format(iPixelFormat, &pfd)) + { + WARN("describe_pixel_format failed.\n"); + memset(&pfd, 0, sizeof(pfd)); + } + for (i = 0; i < nAttributes; ++i) { const int curWGLAttr = piAttributes[i]; TRACE("pAttr[%d] = %x\n", i, curWGLAttr); @@ -2808,6 +2815,23 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int curGLXAttr = GLX_AUX_BUFFERS; break; + case WGL_RED_SHIFT_ARB: + if (!pfd.nSize) goto pix_error; + piValues[i] = pfd.cRedShift; + continue; + case WGL_GREEN_SHIFT_ARB: + if (!pfd.nSize) goto pix_error; + piValues[i] = pfd.cGreenShift; + continue; + case WGL_BLUE_SHIFT_ARB: + if (!pfd.nSize) goto pix_error; + piValues[i] = pfd.cBlueShift; + continue; + case WGL_ALPHA_SHIFT_ARB: + if (!pfd.nSize) goto pix_error; + piValues[i] = pfd.cAlphaShift; + continue; + case WGL_SUPPORT_GDI_ARB: if (!fmt) goto pix_error; piValues[i] = (fmt->dwFlags & PFD_SUPPORT_GDI) != 0;

1 0

Esme Povirk : user32/tests: Remove a no-longer needed optional flag.
by Alexandre Julliard April 26, 2024

April 26, 2024

Module: wine Branch: master Commit: a82b3eb0b51bf266af1e44391b0efe7e99814983 URL: https://gitlab.winehq.org/wine/wine/-/commit/a82b3eb0b51bf266af1e44391b0efe… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Apr 22 16:05:29 2024 -0500 user32/tests: Remove a no-longer needed optional flag. --- dlls/user32/tests/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 21a72c6c9fd..f7d89b2420f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14904,7 +14904,7 @@ static const struct message WmSetWindowRgn_clear[] = { { WM_NCCALCSIZE, sent|wparam, 1 }, { WM_NCPAINT, sent|optional }, { WM_GETTEXT, sent|defwinproc|optional }, - { WM_ERASEBKGND, sent|optional }, /* FIXME: remove optional once Wine is fixed */ + { WM_ERASEBKGND, sent }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE }, { WM_NCCALCSIZE, sent|wparam|optional, 1 }, { WM_NCPAINT, sent|optional },

1 0

Esme Povirk : user32/tests: Add a flag for messages incorrectly sent by Wine.
by Alexandre Julliard April 26, 2024

April 26, 2024

Module: wine Branch: master Commit: ad22b0102f9a87d98919f65c2b556e6525d71201 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad22b0102f9a87d98919f65c2b556e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Apr 22 16:04:42 2024 -0500 user32/tests: Add a flag for messages incorrectly sent by Wine. --- dlls/user32/tests/msg.c | 65 ++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8ed608c5d3b..21a72c6c9fd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -148,7 +148,8 @@ typedef enum { hook=0x100, winevent_hook=0x200, kbd_hook=0x400, - winevent_hook_todo=0x800 + winevent_hook_todo=0x800, + wine_only=0x1000 } msg_flags_t; struct message { @@ -1314,15 +1315,14 @@ static const struct message WmFirstDrawSetWindowPosSeq3[] = { { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, 0, 0 }, { WM_SIZE, sent|wparam, SIZE_RESTORED }, { WM_MOVE, sent }, - /* These happen only on Wine: */ - { EVENT_OBJECT_SHOW, winevent_hook|optional }, - { HCBT_ACTIVATE, hook|optional }, - { WM_QUERYNEWPALETTE, sent|optional }, - { WM_ACTIVATEAPP, sent|optional }, - { WM_NCACTIVATE, sent|optional }, - { WM_ACTIVATE, sent|optional }, - { HCBT_SETFOCUS, hook|optional }, - { WM_SETFOCUS, sent|defwinproc|optional }, + { EVENT_OBJECT_SHOW, winevent_hook|wine_only }, + { HCBT_ACTIVATE, hook|wine_only }, + { WM_QUERYNEWPALETTE, sent|wine_only }, + { WM_ACTIVATEAPP, sent|wine_only }, + { WM_NCACTIVATE, sent|wine_only }, + { WM_ACTIVATE, sent|wine_only }, + { HCBT_SETFOCUS, hook|wine_only }, + { WM_SETFOCUS, sent|defwinproc|wine_only }, { 0 } }; static const struct message WmFirstDrawSetWindowPosSeq4[] = { @@ -1515,8 +1515,6 @@ static const struct message WmShowChildInvisibleParentSeq_1[] = { { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, - /* FIXME: Wine creates an icon/title window while Windows doesn't */ - { WM_PARENTNOTIFY, sent|parent|wparam|optional, WM_CREATE }, { WM_GETTEXT, sent|optional }, { 0 } }; @@ -1555,8 +1553,6 @@ static const struct message WmShowChildInvisibleParentSeq_3[] = { { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, - /* FIXME: Wine creates an icon/title window while Windows doesn't */ - { WM_PARENTNOTIFY, sent|parent|wparam|optional, WM_CREATE }, { WM_GETTEXT, sent|optional }, { 0 } }; @@ -1577,7 +1573,6 @@ static const struct message WmShowChildInvisibleParentSeq_4[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* FIXME: Wine creates an icon/title window while Windows doesn't */ - { WM_PARENTNOTIFY, sent|parent|wparam|optional, WM_CREATE }, { WM_GETTEXT, sent|optional }, { 0 } }; @@ -2655,16 +2650,23 @@ static BOOL messages_equal(const struct message *expected, const struct recvd_me BOOL expect_equal, const char* file, int line) { int todo = (expected->flags & winevent_hook_todo) != 0; + int msg_wine_only = (expected->flags & wine_only) != 0; const int message_type_flags = hook|winevent_hook|kbd_hook; static int todo_reported; if (!todo && can_skip_message(expected)) expect_equal = FALSE; + if (msg_wine_only && strcmp(winetest_platform, "wine")) + { + /* Ignore Wine-only message records on Windows. */ + return FALSE; + } + if (!expected->message || !actual->message) { if (expect_equal && (!todo || !todo_reported++)) - todo_wine_if(todo) - ok_( file, line) (FALSE, "the msg sequence is not complete: expected %s %04x - actual %s %04x\n", + todo_wine_if(todo || msg_wine_only) + ok_( file, line) (msg_wine_only, "the msg sequence is not complete: expected %s %04x - actual %s %04x\n", message_type_name(expected->flags), expected->message, message_type_name(actual->flags), actual->message); return FALSE; } @@ -2673,8 +2675,8 @@ static BOOL messages_equal(const struct message *expected, const struct recvd_me (expected->flags & message_type_flags) != (actual->flags & message_type_flags)) { if (expect_equal && (!todo || !todo_reported++)) - todo_wine_if(todo) - ok_( file, line) (FALSE, "the %s 0x%04x was expected, but got %s 0x%04x instead\n", + todo_wine_if(todo || msg_wine_only) + ok_( file, line) (msg_wine_only, "the %s 0x%04x was expected, but got %s 0x%04x instead\n", message_type_name(expected->flags), expected->message, message_type_name(actual->flags), actual->message); return FALSE; } @@ -2690,8 +2692,8 @@ static BOOL messages_equal(const struct message *expected, const struct recvd_me } if (expect_equal) - todo_wine_if(todo) - ok_( file, line) (TRUE, "got %s 0x%04x as expected\n", + todo_wine_if(todo || msg_wine_only) + ok_( file, line) (!msg_wine_only, "got %s 0x%04x as expected\n", message_type_name(expected->flags), expected->message); return TRUE; @@ -3245,8 +3247,6 @@ static const struct message WmDestroyMDIchildInvisibleSeq[] = { { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, - /* FIXME: Wine destroys an icon/title window while Windows doesn't */ - { WM_PARENTNOTIFY, sent|wparam|optional, WM_DESTROY }, /* MDI client */ { 0 } }; /* CreateWindow for the 1st MDI child window, initially visible and maximized */ @@ -3984,8 +3984,6 @@ static const struct message WmMinimizeMDIchildVisibleSeq[] = { { WM_CHILDACTIVATE, sent|wparam|lparam|defwinproc, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* MDI child */ { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* MDI child */ - /* FIXME: Wine creates an icon/title window while Windows doesn't */ - { WM_PARENTNOTIFY, sent|parent|wparam|optional, WM_CREATE }, /* MDI client */ { 0 } }; /* ShowWindow(SW_RESTORE) for a not visible MDI child window */ @@ -6514,7 +6512,15 @@ static const struct message WmSetFontButtonSeq[] = { WM_PAINT, sent }, { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_CTLCOLORBTN, sent|defwinproc }, - { WM_CTLCOLORBTN, sent|defwinproc|optional }, /* FIXME: Wine sends it twice for BS_OWNERDRAW */ + { 0 } +}; +static const struct message WmSetFontOwnerdrawSeq[] = +{ + { WM_SETFONT, sent }, + { WM_PAINT, sent }, + { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_CTLCOLORBTN, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|defwinproc|wine_only }, /* FIXME: Wine sends it twice for BS_OWNERDRAW */ { 0 } }; static const struct message WmSetFontStaticSeq[] = @@ -6564,7 +6570,6 @@ static const struct message WmSetStyleButtonSeq[] = { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, { 0 } @@ -6575,7 +6580,6 @@ static const struct message WmSetStyleStaticSeq[] = { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORSTATIC, sent|parent }, { 0 } @@ -6586,7 +6590,7 @@ static const struct message WmSetStyleUserSeq[] = { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ + { WM_NCPAINT, sent|defwinproc|wine_only }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_PAINT) }, @@ -6598,7 +6602,6 @@ static const struct message WmSetStyleOwnerdrawSeq[] = { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, - { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, { WM_CTLCOLORBTN, sent|parent|optional }, /* Win9x doesn't send it */ @@ -6833,7 +6836,7 @@ static void test_button_messages(void) { BS_OWNERDRAW, DLGC_BUTTON, WmSetFocusOwnerdrawSeq, WmKillFocusOwnerdrawSeq, WmSetStyleOwnerdrawSeq, WmSetStateOwnerdrawSeq, WmClearStateOwnerdrawSeq, WmSetCheckIgnoredSeq, - WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontButtonSeq, + WmLButtonDownSeq, WmLButtonUpSeq, WmSetFontOwnerdrawSeq, WmSetTextButtonSeq }, }; LOGFONTA logfont = { 0 };

1 0