- Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : msscript.ocx: Fake success in OnAmbientPropertyChange.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 36f16df2f30eda970dff4d98188de3973e2fe268 URL: https://gitlab.winehq.org/wine/wine/-/commit/36f16df2f30eda970dff4d98188de3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 2 16:30:33 2023 +1000 msscript.ocx: Fake success in OnAmbientPropertyChange. --- dlls/msscript.ocx/msscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index b5731a6e622..c8a07ddbd1a 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -3471,7 +3471,7 @@ static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DIS FIXME("(%p)->(%#lx)\n", This, dispid); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL freeze)

1 0

Alexandre Julliard : png: Import upstream release 1.6.40.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 49e12082c0b87184a4e3fc392ac0e93fe20fdd98 URL: https://gitlab.winehq.org/wine/wine/-/commit/49e12082c0b87184a4e3fc392ac0e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 11:21:56 2023 +0200 png: Import upstream release 1.6.40. --- libs/png/AUTHORS | 2 ++ libs/png/LICENSE | 4 ++-- libs/png/png.c | 8 +++---- libs/png/png.h | 22 ++++++++++---------- libs/png/pngconf.h | 2 +- libs/png/pngget.c | 13 +++++++++++- libs/png/pngpriv.h | 6 +++--- libs/png/pngset.c | 60 +++++++++++++++++++++-------------------------------- libs/png/pngwrite.c | 10 ++++++--- 9 files changed, 66 insertions(+), 61 deletions(-)

1 0

Alexandre Julliard : tiff: Import upstream release 4.5.1.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 85d6b7674407534e7fdab83511304f249b783568 URL: https://gitlab.winehq.org/wine/wine/-/commit/85d6b7674407534e7fdab83511304f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 11:29:09 2023 +0200 tiff: Import upstream release 4.5.1. --- libs/tiff/libtiff/tif_close.c | 32 +- libs/tiff/libtiff/tif_config.h | 6 +- libs/tiff/libtiff/tif_dir.c | 125 ++++- libs/tiff/libtiff/tif_dir.h | 12 +- libs/tiff/libtiff/tif_dirinfo.c | 983 +++++++++++++++--------------------- libs/tiff/libtiff/tif_dirread.c | 194 ++++++- libs/tiff/libtiff/tif_dirwrite.c | 12 +- libs/tiff/libtiff/tif_fax3.c | 2 +- libs/tiff/libtiff/tif_hash_set.c | 4 +- libs/tiff/libtiff/tif_hash_set.h | 4 +- libs/tiff/libtiff/tif_luv.c | 7 + libs/tiff/libtiff/tif_lzw.c | 5 + libs/tiff/libtiff/tif_open.c | 8 +- libs/tiff/libtiff/tif_win32.c | 4 +- libs/tiff/libtiff/tiff.h | 1034 ++++++++++++++++++-------------------- libs/tiff/libtiff/tiffconf.h | 3 - libs/tiff/libtiff/tiffio.h | 6 + libs/tiff/libtiff/tiffiop.h | 15 +- libs/tiff/libtiff/tiffvers.h | 6 +- 19 files changed, 1247 insertions(+), 1215 deletions(-)

1 0

Alexandre Julliard : faudio: Import upstream release 23.07.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 681f04c30906c499924663b6ec4409dc58c9a9c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/681f04c30906c499924663b6ec4409… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 11:13:24 2023 +0200 faudio: Import upstream release 23.07. --- libs/faudio/include/FAudio.h | 63 ++++++++++++++++++++++- libs/faudio/src/FACT.c | 2 + libs/faudio/src/FACT_internal.c | 77 ++++++++++++++++------------ libs/faudio/src/FACT_internal.h | 3 +- libs/faudio/src/FAudio.c | 95 +++++++++++++++++++++++++++++------ libs/faudio/src/FAudio_internal.c | 4 +- libs/faudio/src/FAudio_internal.h | 8 +-- libs/faudio/src/FAudio_operationset.c | 16 +++--- 8 files changed, 207 insertions(+), 61 deletions(-)

1 0

Alexandre Julliard : ntdll: Implement RtlIsCurrentProcess/Thread.
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: 959dea0c09201683582cda47b666edc1d5eb9c57 URL: https://gitlab.winehq.org/wine/wine/-/commit/959dea0c09201683582cda47b666ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 22:14:51 2023 +0200 ntdll: Implement RtlIsCurrentProcess/Thread. --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/process.c | 9 +++++++++ dlls/ntdll/thread.c | 9 +++++++++ include/winternl.h | 2 ++ 4 files changed, 22 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4471a5e59d4..2be318b128a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -835,6 +835,8 @@ @ stdcall RtlIsActivationContextActive(ptr) @ stdcall RtlIsCriticalSectionLocked(ptr) @ stdcall RtlIsCriticalSectionLockedByThread(ptr) +@ stdcall RtlIsCurrentProcess(long) +@ stdcall RtlIsCurrentThread(long) @ stdcall RtlIsDosDeviceName_U(wstr) @ stdcall -arch=x86_64 -norelay RtlIsEcCode(ptr) @ stub RtlIsGenericTableEmpty diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 0b4245fdd42..3f78559d8df 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -49,6 +49,15 @@ PEB * WINAPI RtlGetCurrentPeb(void) } +/****************************************************************************** + * RtlIsCurrentProcess (NTDLL.@) + */ +BOOLEAN WINAPI RtlIsCurrentProcess( HANDLE handle ) +{ + return handle == NtCurrentProcess() || !NtCompareObjects( handle, NtCurrentProcess() ); +} + + /****************************************************************** * RtlWow64EnableFsRedirection (NTDLL.@) */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 15a686738ff..01733585a75 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -463,6 +463,15 @@ TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) } +/****************************************************************************** + * RtlIsCurrentThread (NTDLL.@) + */ +BOOLEAN WINAPI RtlIsCurrentThread( HANDLE handle ) +{ + return handle == NtCurrentThread() || !NtCompareObjects( handle, NtCurrentThread() ); +} + + /*********************************************************************** * _errno (NTDLL.@) */ diff --git a/include/winternl.h b/include/winternl.h index 8a8af8fd002..16829442982 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4650,6 +4650,8 @@ NTSYSAPI NTSTATUS WINAPI RtlIntegerToUnicodeString(ULONG,ULONG,UNICODE_STRING * NTSYSAPI BOOLEAN WINAPI RtlIsActivationContextActive(HANDLE); NTSYSAPI BOOL WINAPI RtlIsCriticalSectionLocked(RTL_CRITICAL_SECTION *); NTSYSAPI BOOL WINAPI RtlIsCriticalSectionLockedByThread(RTL_CRITICAL_SECTION *); +NTSYSAPI BOOLEAN WINAPI RtlIsCurrentProcess(HANDLE); +NTSYSAPI BOOLEAN WINAPI RtlIsCurrentThread(HANDLE); NTSYSAPI ULONG WINAPI RtlIsDosDeviceName_U(PCWSTR); #ifdef __x86_64__ NTSYSAPI BOOLEAN WINAPI RtlIsEcCode(const void*);

1 0

Alexandre Julliard : ntdll: Implement NtQueryVirtualMemory(MemoryImageInformation).
by Alexandre Julliard July 3, 2023

July 3, 2023

Module: wine Branch: master Commit: a5ff427acbcb051c98a606401e55428e1289048a URL: https://gitlab.winehq.org/wine/wine/-/commit/a5ff427acbcb051c98a606401e5542… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 3 10:58:47 2023 +0200 ntdll: Implement NtQueryVirtualMemory(MemoryImageInformation). --- dlls/ntdll/tests/virtual.c | 5 ++++- dlls/ntdll/unix/virtual.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/wow64/struct32.h | 17 +++++++++++++++++ dlls/wow64/virtual.c | 23 ++++++++++++++++++++++- include/wine/server_protocol.h | 20 +++++++++++++++++++- server/mapping.c | 17 +++++++++++++++++ server/protocol.def | 10 ++++++++++ server/request.h | 8 ++++++++ server/trace.c | 15 +++++++++++++++ 9 files changed, 149 insertions(+), 3 deletions(-)

1 0

Zhiyi Zhang : kernelbase: Check if locale is NULL before using it in Internal_EnumDateFormats().
by Alexandre Julliard June 30, 2023

June 30, 2023

Module: wine Branch: master Commit: 884cff821481b4819f9bdba455217bd5a3f97744 URL: https://gitlab.winehq.org/wine/wine/-/commit/884cff821481b4819f9bdba455217b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 29 10:31:34 2023 +0800 kernelbase: Check if locale is NULL before using it in Internal_EnumDateFormats(). Initialize the calendars variable after checking if locale is NULL before using it to avoid NULL pointer references. Fix a Excel 2016 crash when formatting dates with the custom format 'ddd'. It calls EnumDateFormatsExEx() with the 'yi-Hebr' locale, which is added in Win10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55099 --- dlls/kernel32/tests/locale.c | 33 +++++++++++++++++++++++++++++++++ dlls/kernelbase/locale.c | 4 +++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 5c99e644f15..bebd857dfa4 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -8402,6 +8402,36 @@ static void dump_sortkeys( char *argv[] ) fclose( f ); } +static BOOL CALLBACK EnumDateFormatsExEx_proc(LPWSTR date_format_string, CALID calendar_id, LPARAM lp) +{ + return TRUE; +} + +static void test_EnumDateFormatsExEx(void) +{ + DWORD error; + BOOL ret; + + /* Invalid locale name */ + ret = EnumDateFormatsExEx(EnumDateFormatsExEx_proc, L"deadbeef", DATE_SHORTDATE, 0); + error = GetLastError(); + ok(!ret, "EnumDateFormatsExEx succeeded.\n"); + ok(error == ERROR_INVALID_PARAMETER, "Got unexpected error %#lx.\n", error); + + /* yi-Hebr is missing on versions < Win10 */ + /* Running the following tests will cause other tests that use LOCALE_CUSTOM_UNSPECIFIED to + * report yi-Hebr instead the default locale on Windows 10. So run them at the end */ + ret = EnumDateFormatsExEx(EnumDateFormatsExEx_proc, L"yi-Hebr", DATE_SHORTDATE, 0); + error = GetLastError(); + ok(ret || (!ret && error == ERROR_INVALID_PARAMETER), /* < Win10 */ + "EnumDateFormatsExEx failed, error %#lx.\n", error); + + ret = EnumDateFormatsExEx(EnumDateFormatsExEx_proc, L"yi-Hebr", DATE_LONGDATE, 0); + error = GetLastError(); + ok(ret || (!ret && error == ERROR_INVALID_PARAMETER), /* < Win10 */ + "EnumDateFormatsExEx failed, error %#lx.\n", error); +} + START_TEST(locale) { char **argv; @@ -8473,4 +8503,7 @@ START_TEST(locale) test_EnumCalendarInfoW(); test_EnumCalendarInfoExA(); test_EnumCalendarInfoExW(); + + /* Run this test at the end */ + test_EnumDateFormatsExEx(); } diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 45180f4bb8a..e8060fe9205 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4390,7 +4390,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumDateFormats( DATEFMT_ENUMPROCW proc, INT i, j, ret; DWORD pos; const struct calendar *cal; - const USHORT *calendars = locale_strings + locale->scalendartype; + const USHORT *calendars; const DWORD *array; if (!proc || !locale) @@ -4399,6 +4399,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH Internal_EnumDateFormats( DATEFMT_ENUMPROCW proc, return FALSE; } + calendars = locale_strings + locale->scalendartype; + switch (flags & ~LOCALE_USE_CP_ACP) { case 0:

1 0

Alistair Leslie-Hughes : oleaut32: Changed default return value to match prefix default.
by Alexandre Julliard June 30, 2023

June 30, 2023

Module: wine Branch: master Commit: d8cd320db690d58932e847ac5ef8c1e28547f657 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8cd320db690d58932e847ac5ef8c1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 18:17:38 2023 +1000 oleaut32: Changed default return value to match prefix default. --- dlls/oleaut32/oleaut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index ed3fe841416..46bb9d6b2cf 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -666,7 +666,7 @@ ULONG WINAPI OaBuildVersion(void) return MAKELONG(0xffff, 50); default: FIXME("Version value not known yet. Please investigate it !\n"); - return MAKELONG(0xffff, 40); /* for now return the same value as for w2k */ + return MAKELONG(0xffff, 50); /* for now return the same value as for Win10 */ } }

1 0

Alistair Leslie-Hughes : oleaut32: Fix OaBuildVersion return for available windows versions.
by Alexandre Julliard June 30, 2023

June 30, 2023

Module: wine Branch: master Commit: a6415ba85e0b05e348a7e1937574ea88210236ad URL: https://gitlab.winehq.org/wine/wine/-/commit/a6415ba85e0b05e348a7e1937574ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 18:17:38 2023 +1000 oleaut32: Fix OaBuildVersion return for available windows versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54257 --- dlls/oleaut32/oleaut.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 92a9f12661b..ed3fe841416 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -661,6 +661,8 @@ ULONG WINAPI OaBuildVersion(void) case 0x00000105: /* WinXP */ case 0x00000006: /* Vista */ case 0x00000106: /* Win7 */ + case 0x00000205: /* W2K3 */ + case 0x00000206: /* Win8, Win10, Win11 */ return MAKELONG(0xffff, 50); default: FIXME("Version value not known yet. Please investigate it !\n");

1 0

Eric Pouech : dbghelp/tests: Use indirect call for SymSetExtendedOption.
by Alexandre Julliard June 30, 2023

June 30, 2023

Module: wine Branch: master Commit: f93d7114c77c7ae2a4fbbc744ab89102f8ed3e01 URL: https://gitlab.winehq.org/wine/wine/-/commit/f93d7114c77c7ae2a4fbbc744ab891… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jun 30 14:14:46 2023 +0200 dbghelp/tests: Use indirect call for SymSetExtendedOption. (sigh 1d281c62 was incomplete). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55128 Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index c456a99d370..9e8b308b4af 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -331,7 +331,7 @@ static unsigned get_native_module_count(HANDLE proc) old = pSymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); ret = SymEnumerateModules64(proc, count_native_module_cb, &count); ok(ret, "SymEnumerateModules64 failed: %lu\n", GetLastError()); - SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, old); + pSymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, old); return count; }

1 0