wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Nikolay Sivov : wbemdisp: Implement GetObjectText_().
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 67f32df2ba7772f6379749eeb183e012682f92a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67f32df2ba7772f6379749ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 3 09:04:26 2021 +0300 wbemdisp: Implement GetObjectText_(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 0ef73bdbd56..dcec47faa6e 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1534,11 +1534,14 @@ static HRESULT WINAPI object_Clone_( static HRESULT WINAPI object_GetObjectText_( ISWbemObject *iface, - LONG iFlags, - BSTR *strObjectText ) + LONG flags, + BSTR *text ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p, %#x, %p\n", object, flags, text ); + + return IWbemClassObject_GetObjectText( object->object, flags, text ); } static HRESULT WINAPI object_SpawnDerivedClass_(

1 0

Alexandre Julliard : configure: Don't override the specified TARGETFLAGS.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: c08ffc6537727c3f8d0f0ddea803f5406f7b1d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c08ffc6537727c3f8d0f0dde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 15:38:44 2021 +0100 configure: Don't override the specified TARGETFLAGS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 9 ++++----- configure.ac | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 2b20133cd65..13eecaf05d7 100755 --- a/configure +++ b/configure @@ -5647,7 +5647,6 @@ case $host in ;; esac -TARGETFLAGS="" case $host in x86_64*|amd64*) @@ -5685,7 +5684,7 @@ $as_echo "$wine_cv_cc_m32" >&6; } test $wine_cv_cc_m32 != no || as_fn_error $? "Cannot build a 32-bit program, you need to install 32-bit development libraries." "$LINENO" 5 host_cpu="i386" notice_platform="32-bit " - TARGETFLAGS="-m32" + TARGETFLAGS="$TARGETFLAGS -m32" PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -5724,7 +5723,7 @@ $as_echo "$wine_cv_builtin_ms_va_list" >&6; } CXX="$CXX -m64" host_cpu="x86_64" notice_platform="64-bit " - TARGETFLAGS="-m64" + TARGETFLAGS="$TARGETFLAGS -m64" enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -5758,10 +5757,10 @@ $as_echo "$wine_cv_thumb2" >&6; } if test x"$wine_cv_thumb2" = xyes then CFLAGS="$CFLAGS -mthumb" - TARGETFLAGS="-mthumb" + TARGETFLAGS="$TARGETFLAGS -mthumb" else CFLAGS="$CFLAGS -marm" - TARGETFLAGS="-marm" + TARGETFLAGS="$TARGETFLAGS -marm" fi case $with_float_abi in soft|softfp|hard) diff --git a/configure.ac b/configure.ac index 24f5c8847d6..6a4e9568c40 100644 --- a/configure.ac +++ b/configure.ac @@ -140,7 +140,7 @@ case $host in ;; esac -AC_SUBST(TARGETFLAGS,"") +AC_SUBST(TARGETFLAGS) case $host in x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" @@ -152,7 +152,7 @@ case $host in test $wine_cv_cc_m32 != no || AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.]) host_cpu="i386" notice_platform="32-bit " - TARGETFLAGS="-m32" + TARGETFLAGS="$TARGETFLAGS -m32" PKG_CONFIG_PATH=${PKG_CONFIG_PATH:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_PATH enable_win16=${enable_win16:-yes} @@ -169,7 +169,7 @@ case $host in CXX="$CXX -m64" host_cpu="x86_64" notice_platform="64-bit " - TARGETFLAGS="-m64" + TARGETFLAGS="$TARGETFLAGS -m64" enable_wow64cpu=${enable_wow64cpu:-yes} fi ;; @@ -180,10 +180,10 @@ case $host in if test x"$wine_cv_thumb2" = xyes then CFLAGS="$CFLAGS -mthumb" - TARGETFLAGS="-mthumb" + TARGETFLAGS="$TARGETFLAGS -mthumb" else CFLAGS="$CFLAGS -marm" - TARGETFLAGS="-marm" + TARGETFLAGS="$TARGETFLAGS -marm" fi case $with_float_abi in soft|softfp|hard)

1 0

Alexandre Julliard : ntdll: Fetch locale information from the Unix side in resource loading.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 46fd718ec7f330793a7f142f326eabe311c8d70b URL: https://source.winehq.org/git/wine.git/?a=commit;h=46fd718ec7f330793a7f142f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 3 16:13:09 2021 +0100 ntdll: Fetch locale information from the Unix side in resource loading. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50769 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 -- dlls/ntdll/ntdll_misc.h | 3 --- dlls/ntdll/resource.c | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 19626a48b72..b3a225a30c3 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -100,8 +100,6 @@ struct norm_table /* WORD[] composition character sequences */ }; -LCID user_lcid = 0, system_lcid = 0; - static NLSTABLEINFO nls_info; static HMODULE kernel32_handle; static struct norm_table *norm_tables[16]; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 72340a171c9..b69ad762300 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -85,9 +85,6 @@ extern const struct unix_funcs *unix_funcs DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; -/* locale */ -extern LCID user_lcid, system_lcid; - extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, __ms_va_list args ) DECLSPEC_HIDDEN; extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, __ms_va_list args ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 981c538a8e0..58a0fc7d2e2 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -175,6 +175,7 @@ static const IMAGE_RESOURCE_DIRECTORY *find_entry_by_name( const IMAGE_RESOURCE_ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, ULONG level, const void **ret, int want_dir ) { + static LCID user_lcid, system_lcid; ULONG size; const void *root; const IMAGE_RESOURCE_DIRECTORY *resdirptr; @@ -212,6 +213,8 @@ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, /* user defaults, unless SYS_DEFAULT sublanguage specified */ if (SUBLANGID(info->Language) != SUBLANG_SYS_DEFAULT) { + if (!user_lcid) NtQueryDefaultLocale( TRUE, &user_lcid ); + /* 4. current thread locale language */ pos = push_language( list, pos, LANGIDFROMLCID(NtCurrentTeb()->CurrentLocale) ); @@ -223,6 +226,7 @@ static NTSTATUS find_entry( HMODULE hmod, const LDR_RESOURCE_INFO *info, } /* now system defaults */ + if (!system_lcid) NtQueryDefaultLocale( FALSE, &system_lcid ); /* 7. system locale language */ pos = push_language( list, pos, LANGIDFROMLCID( system_lcid ) );

1 0

Alexandre Julliard : kernelbase: Use the correct machine type for ARM.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: 40e1000fc5cfdb002173e9380e791e4cbb8e6d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e1000fc5cfdb002173e938… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 12:04:34 2021 +0100 kernelbase: Use the correct machine type for ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 4 ++-- dlls/kernelbase/process.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index ea9cde5facc..0c514f816c1 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2187,9 +2187,9 @@ static void test_IsWow64Process2(void) #elif defined __x86_64__ USHORT expect_native = IMAGE_FILE_MACHINE_AMD64; #elif defined __arm__ - USHORT expect_native = IMAGE_FILE_MACHINE_ARM; + USHORT expect_native = IMAGE_FILE_MACHINE_ARMNT; #elif defined __aarch64__ - USHORT expect_native = IMAGE_FILE_MACHINE_ARM; + USHORT expect_native = IMAGE_FILE_MACHINE_ARM64; #else USHORT expect_native = 0; #endif diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 98cefc717da..44bf0606c7a 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1002,7 +1002,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsWow64Process2( HANDLE process, USHORT *machine, *native_machine = IMAGE_FILE_MACHINE_I386; break; case PROCESSOR_ARCHITECTURE_ARM: - *native_machine = IMAGE_FILE_MACHINE_ARM; + *native_machine = IMAGE_FILE_MACHINE_ARMNT; break; case PROCESSOR_ARCHITECTURE_AMD64: *native_machine = IMAGE_FILE_MACHINE_AMD64;

1 0

Alexandre Julliard : dbgeng: Use the correct machine type for ARM.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: wine Branch: master Commit: fa23ffd26a91d62bd44c49ea39aa8cb15a8ab1a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa23ffd26a91d62bd44c49ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 2 12:04:19 2021 +0100 dbgeng: Use the correct machine type for ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbgeng/dbgeng.c b/dlls/dbgeng/dbgeng.c index f24b04d0864..c857456b51c 100644 --- a/dlls/dbgeng/dbgeng.c +++ b/dlls/dbgeng/dbgeng.c @@ -3035,7 +3035,7 @@ static HRESULT STDMETHODCALLTYPE debugcontrol_IsPointer64Bit(IDebugControl2 *ifa switch (target->cpu_type) { case IMAGE_FILE_MACHINE_I386: - case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_ARMNT: hr = S_FALSE; break; case IMAGE_FILE_MACHINE_IA64:

1 0

Hugh McMaster : winetest: Ensure sticky table header doesn't cover anchor-link target.
by Alexandre Julliard 03 Mar '21

03 Mar '21

Module: tools Branch: master Commit: e9ca45c7f90e6baa5dec6f84a7d4a8e4c414ec02 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e9ca45c7f90e6baa5dec6f8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 3 19:57:10 2021 +1100 winetest: Ensure sticky table header doesn't cover anchor-link target. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/summary.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/winetest/summary.css b/winetest/summary.css index d01a227..2bc9b44 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -36,6 +36,12 @@ div.main, div.group { width: 100%; border: 1px solid #601919; } +div.main table.report td.test a { + scroll-margin-top: 4.25ex; +} +div.group table.report td.test a { + scroll-margin-top: 7.75ex; +} div.navbar { padding: 0; width: 100%;

1 0

Gijs Vermeulen : wmvcore: Upgrade to IWMSyncReader2.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 7fa74fa78e2f8fedeea6fa3c796f0f2eb202825e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa74fa78e2f8fedeea6fa3c… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 1 12:15:28 2021 +0100 wmvcore: Upgrade to IWMSyncReader2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50740 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/reader.c | 168 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 111 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7fa74fa78e2f8fedeea6…

1 0

Gijs Vermeulen : include: Fix IWMSyncReader2 uuid.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 6170749eab344feb469fcc13e0febf02d511aef5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6170749eab344feb469fcc13… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 1 12:15:27 2021 +0100 include: Fix IWMSyncReader2 uuid. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index d1e0445470d..716abe056db 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1093,7 +1093,7 @@ interface IWMReaderAllocatorEx : IUnknown [ object, - uuid(faed3d21-1b6b-4af7-8bc6-3e189bbc187b), + uuid(faed3d21-1b6b-4af7-8cb6-3e189bbc187b), pointer_default( unique ), local ]

1 0

Francois Gouget : winevulkan: Add a trailing linefeed to FIXME() messages.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: 949e4e764b40111560b9a2785d0b2e7863e1f946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=949e4e764b40111560b9a278… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:18:44 2021 +0100 winevulkan: Add a trailing linefeed to FIXME() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a7f5462c432..dc3c9688df7 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1507,7 +1507,7 @@ static inline VkTimeDomainEXT get_performance_counter_time_domain(void) return VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT; # endif #else - FIXME("No mapping for VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT on this platform."); + FIXME("No mapping for VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT on this platform.\n"); return VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT; #endif } @@ -1536,7 +1536,7 @@ static inline uint64_t convert_timestamp(VkTimeDomainEXT host_domain, VkTimeDoma && target_domain == VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT) return convert_monotonic_timestamp(value); - FIXME("Couldn't translate between host domain %d and target domain %d", host_domain, target_domain); + FIXME("Couldn't translate between host domain %d and target domain %d\n", host_domain, target_domain); return value; } @@ -1609,7 +1609,7 @@ VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe else if (host_time_domains[i] == VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT) supports_monotonic_raw = TRUE; else - FIXME("Unknown time domain %d", host_time_domains[i]); + FIXME("Unknown time domain %d\n", host_time_domains[i]); } heap_free(host_time_domains); @@ -1622,7 +1622,7 @@ VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe else if (supports_monotonic && performance_counter_domain == VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT) out_time_domains[out_time_domain_count++] = VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT; else - FIXME("VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT not supported on this platform."); + FIXME("VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT not supported on this platform.\n"); /* Forward the device domain time */ if (supports_device)

1 0

Francois Gouget : xactengine3_7: Add a trailing linefeed to ERR() messages.
by Alexandre Julliard 02 Mar '21

02 Mar '21

Module: wine Branch: master Commit: f8983ea419bcc326b54aaa0f5869c92a7070e7d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8983ea419bcc326b54aaa0f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 2 20:18:31 2021 +0100 xactengine3_7: Add a trailing linefeed to ERR() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 8b9ee33ab5c..3fbb4875930 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -253,7 +253,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Prepare(IXACT3SoundBank *iface, if (!cue) { FACTCue_Destroy(fcue); - ERR("Failed to allocate XACT3CueImpl!"); + ERR("Failed to allocate XACT3CueImpl!\n"); return E_OUTOFMEMORY; } @@ -295,7 +295,7 @@ static HRESULT WINAPI IXACT3SoundBankImpl_Play(IXACT3SoundBank *iface, if (!cue) { FACTCue_Destroy(fcue); - ERR("Failed to allocate XACT3CueImpl!"); + ERR("Failed to allocate XACT3CueImpl!\n"); return E_OUTOFMEMORY; } @@ -543,7 +543,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Prepare(IXACT3WaveBank *iface, if (!wave) { FACTWave_Destroy(fwave); - ERR("Failed to allocate XACT3WaveImpl!"); + ERR("Failed to allocate XACT3WaveImpl!\n"); return E_OUTOFMEMORY; } @@ -585,7 +585,7 @@ static HRESULT WINAPI IXACT3WaveBankImpl_Play(IXACT3WaveBank *iface, if (!wave) { FACTWave_Destroy(fwave); - ERR("Failed to allocate XACT3WaveImpl!"); + ERR("Failed to allocate XACT3WaveImpl!\n"); return E_OUTOFMEMORY; } @@ -870,7 +870,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateSoundBank(IXACT3Engine *iface, if (!sb) { FACTSoundBank_Destroy(fsb); - ERR("Failed to allocate XACT3SoundBankImpl!"); + ERR("Failed to allocate XACT3SoundBankImpl!\n"); return E_OUTOFMEMORY; } @@ -907,7 +907,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateInMemoryWaveBank(IXACT3Engine *ifac if (!wb) { FACTWaveBank_Destroy(fwb); - ERR("Failed to allocate XACT3WaveBankImpl!"); + ERR("Failed to allocate XACT3WaveBankImpl!\n"); return E_OUTOFMEMORY; } @@ -955,7 +955,7 @@ static HRESULT WINAPI IXACT3EngineImpl_CreateStreamingWaveBank(IXACT3Engine *ifa if (!wb) { FACTWaveBank_Destroy(fwb); - ERR("Failed to allocate XACT3WaveBankImpl!"); + ERR("Failed to allocate XACT3WaveBankImpl!\n"); return E_OUTOFMEMORY; }

1 0

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 March 2021