- Wine-Commits - list.winehq.org

Etaash Mathamsetty : kernel32: Add semi-stub for RemoveDirectoryTransactedA/W().
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: 2a069e4a914cbe7d2b82bdc23dbdde5e675dae59 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a069e4a914cbe7d2b82bdc23dbdde… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Feb 12 12:14:17 2023 -0500 kernel32: Add semi-stub for RemoveDirectoryTransactedA/W(). --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/path.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3958294c48a..16ce6ffa41e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1294,8 +1294,8 @@ @ stdcall -import ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @ stdcall -import ReplaceFileW(wstr wstr wstr long ptr ptr) -# @ stub RemoveDirectoryTransactedA -# @ stub RemoveDirectoryTransactedW +@ stdcall RemoveDirectoryTransactedA(str ptr) +@ stdcall RemoveDirectoryTransactedW(wstr ptr) @ stdcall -import RemoveDllDirectory(ptr) # @ stub RemoveSecureMemoryCacheCallback # @ stub ReplacePartitionUnit diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 615744eb4ba..724f7288bc5 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -262,6 +262,24 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetFileAttributesTransactedW(LPCWSTR name, GET_FI return GetFileAttributesExW(name, level, ptr); } +/*********************************************************************** + * RemoveDirectoryTransactedA (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH RemoveDirectoryTransactedA(LPCSTR path, HANDLE transaction) +{ + FIXME("(%s %p): semi-stub\n", debugstr_a(path), transaction); + return RemoveDirectoryA(path); +} + +/*********************************************************************** + * RemoveDirectoryTransactedW (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH RemoveDirectoryTransactedW(LPCWSTR path, HANDLE transaction) +{ + FIXME("(%s %p): semi-stub\n", debugstr_w(path), transaction); + return RemoveDirectoryW(path); +} + /************************************************************************** * MoveFileWithProgressA (KERNEL32.@) */

1 0

Etaash Mathamsetty : kernel32: Add semi-stub for GetFileAttributesTransactedA/W().
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: 121ab8bf83f3923aa36c10b86f0adf3b663dcce1 URL: https://gitlab.winehq.org/wine/wine/-/commit/121ab8bf83f3923aa36c10b86f0adf… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Feb 12 12:12:07 2023 -0500 kernel32: Add semi-stub for GetFileAttributesTransactedA/W(). --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/path.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 25a5a32561d..3958294c48a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -679,8 +679,8 @@ @ stdcall -import GetFileAttributesA(str) @ stdcall -import GetFileAttributesExA(str long ptr) @ stdcall -import GetFileAttributesExW(wstr long ptr) -# @ stub GetFileAttributesTransactedA -# @ stub GetFileAttributesTransactedW +@ stdcall GetFileAttributesTransactedA(str long ptr ptr) +@ stdcall GetFileAttributesTransactedW(wstr long ptr ptr) @ stdcall -import GetFileAttributesW(wstr) # @ stub GetFileBandwidthReservation @ stdcall -import GetFileInformationByHandle(long ptr) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 852b81d9d5a..615744eb4ba 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -243,6 +243,25 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileTransactedW( LPCWSTR filename, FIND return FindFirstFileExW(filename, level, data, search_op, filter, flags); } + +/************************************************************************** + * GetFileAttributesTransactedA (KERNEL32.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetFileAttributesTransactedA(LPCSTR name, GET_FILEEX_INFO_LEVELS level, void *ptr, HANDLE transaction) +{ + FIXME("(%s %p): semi-stub\n", debugstr_a(name), transaction); + return GetFileAttributesExA(name, level, ptr); +} + +/************************************************************************** + * GetFileAttributesTransactedW (KERNEL32.@) + */ +DWORD WINAPI DECLSPEC_HOTPATCH GetFileAttributesTransactedW(LPCWSTR name, GET_FILEEX_INFO_LEVELS level, void *ptr, HANDLE transaction) +{ + FIXME("(%s %p): semi-stub\n", debugstr_w(name), transaction); + return GetFileAttributesExW(name, level, ptr); +} + /************************************************************************** * MoveFileWithProgressA (KERNEL32.@) */

1 0

Etaash Mathamsetty : kernel32: Add semi-stub for CreateFileTransactedA/W().
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: dc938571d60c6fb6cff386594f938780597d930e URL: https://gitlab.winehq.org/wine/wine/-/commit/dc938571d60c6fb6cff386594f9387… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Feb 12 11:56:16 2023 -0500 kernel32: Add semi-stub for CreateFileTransactedA/W(). --- dlls/kernel32/kernel32.spec | 2 ++ dlls/kernel32/path.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8da6321e8d0..a11870bd09f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -283,12 +283,14 @@ @ stdcall -import CreateFiberEx(long long long ptr ptr) @ stdcall -import CreateFile2(wstr long long long ptr) @ stdcall -import CreateFileA(str long long ptr long long long) +@ stdcall CreateFileTransactedA(str long long ptr long long long ptr ptr ptr) @ stdcall CreateFileMappingA(long ptr long long long str) # @ stub CreateFileMappingNumaA @ stdcall CreateFileMappingFromApp(long ptr long int64 wstr) kernelbase.CreateFileMappingFromApp @ stdcall -import CreateFileMappingNumaW(long ptr long long long wstr long) @ stdcall -import CreateFileMappingW(long ptr long long long wstr) @ stdcall -import CreateFileW(wstr long long ptr long long long) +@ stdcall CreateFileTransactedW(wstr long long ptr long long long ptr ptr ptr) @ stdcall -import CreateHardLinkA(str str ptr) @ stdcall CreateHardLinkTransactedA(str str ptr ptr) @ stdcall CreateHardLinkTransactedW(wstr wstr ptr ptr) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 028cf96d8cc..1c85e4b26d9 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -158,6 +158,33 @@ BOOL WINAPI MoveFileTransactedW(const WCHAR *source, const WCHAR *dest, LPPROGRE return MoveFileWithProgressW(source, dest, progress, data, flags); } +/************************************************************************* + * CreateFileTransactedA (KERNEL32.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileTransactedA( LPCSTR name, DWORD access, DWORD sharing, + LPSECURITY_ATTRIBUTES sa, DWORD creation, + DWORD attributes, HANDLE template, + HANDLE transaction, PUSHORT version, + PVOID param ) +{ + FIXME("(%s %lx %lx %p %lx %lx %p %p %p %p): semi-stub\n", debugstr_a(name), access, sharing, sa, + creation, attributes, template, transaction, version, param); + return CreateFileA(name, access, sharing, sa, creation, attributes, template); +} + +/************************************************************************* + * CreateFileTransactedW (KERNEL32.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileTransactedW( LPCWSTR name, DWORD access, DWORD sharing, + LPSECURITY_ATTRIBUTES sa, DWORD creation, + DWORD attributes, HANDLE template, HANDLE transaction, + PUSHORT version, PVOID param ) +{ + FIXME("(%s %lx %lx %p %lx %lx %p %p %p %p): semi-stub\n", debugstr_w(name), access, sharing, sa, + creation, attributes, template, transaction, version, param); + return CreateFileW(name, access, sharing, sa, creation, attributes, template); +} + /************************************************************************** * MoveFileWithProgressA (KERNEL32.@) */

1 0

Etaash Mathamsetty : kernel32: Add semi-stub for CreateDirectoryTransactedA/W().
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: 960526dad142a079b632c30448d3e7e139f98ea8 URL: https://gitlab.winehq.org/wine/wine/-/commit/960526dad142a079b632c30448d3e7… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Feb 12 11:58:23 2023 -0500 kernel32: Add semi-stub for CreateDirectoryTransactedA/W(). --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/path.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a11870bd09f..e2fe57b5224 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -272,8 +272,8 @@ @ stdcall -import CreateDirectoryA(str ptr) @ stdcall CreateDirectoryExA(str str ptr) @ stdcall -import CreateDirectoryExW(wstr wstr ptr) -# @ stub CreateDirectoryTransactedA -# @ stub CreateDirectoryTransactedW +@ stdcall CreateDirectoryTransactedA(str str ptr ptr) +@ stdcall CreateDirectoryTransactedW(wstr wstr ptr ptr) @ stdcall -import CreateDirectoryW(wstr ptr) @ stdcall -import CreateEventA(ptr long long str) @ stdcall -import CreateEventExA(ptr str long long) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 1c85e4b26d9..cdb46cc2e99 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -185,6 +185,24 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateFileTransactedW( LPCWSTR name, DWORD acces return CreateFileW(name, access, sharing, sa, creation, attributes, template); } +/*********************************************************************** + * CreateDirectoryTransactedA (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CreateDirectoryTransactedA(LPCSTR template, LPCSTR path, LPSECURITY_ATTRIBUTES sa, HANDLE transaction) +{ + FIXME("(%s %s %p %p): semi-stub\n", debugstr_a(template), debugstr_a(path), sa, transaction); + return CreateDirectoryExA(template, path, sa); +} + +/*********************************************************************** + * CreateDirectoryTransactedW (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CreateDirectoryTransactedW(LPCWSTR template, LPCWSTR path, LPSECURITY_ATTRIBUTES sa, HANDLE transaction) +{ + FIXME("(%s %s %p %p): semi-stub\n", debugstr_w(template), debugstr_w(path), sa, transaction); + return CreateDirectoryExW(template, path, sa); +} + /************************************************************************** * MoveFileWithProgressA (KERNEL32.@) */

1 0

Etaash Mathamsetty : kernel32: Add semi-stub for FindFirstFileTransactedA/W().
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: e89ee645b39d5647d440783a5e472b9d42bb3a4e URL: https://gitlab.winehq.org/wine/wine/-/commit/e89ee645b39d5647d440783a5e472b… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Feb 12 12:06:18 2023 -0500 kernel32: Add semi-stub for FindFirstFileTransactedA/W(). --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/path.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index aed200a13c7..25a5a32561d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -490,8 +490,8 @@ @ stdcall -import FindFirstFileExW(wstr long ptr long ptr long) # @ stub FindFirstFileNameTransactedW # @ stub FindFirstFileNameW -# @ stub FindFirstFileTransactedA -# @ stub FindFirstFileTransactedW +@ stdcall FindFirstFileTransactedA(str long ptr long ptr long ptr) +@ stdcall FindFirstFileTransactedW(wstr long ptr long ptr long ptr) @ stdcall -import FindFirstFileW(wstr ptr) # @ stub FindFirstStreamTransactedW @ stdcall -import FindFirstStreamW(wstr long ptr long) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index e959882730f..852b81d9d5a 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -221,6 +221,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeleteFileTransactedW(LPCWSTR path, HANDLE transac return DeleteFileW(path); } +/****************************************************************************** + * FindFirstFileTransactedA (KERNEL32.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileTransactedA( LPCSTR filename, FINDEX_INFO_LEVELS level, + LPVOID data, FINDEX_SEARCH_OPS search_op, + LPVOID filter, DWORD flags, HANDLE transaction ) +{ + FIXME("(%s %d %p %d %p %lx %p): semi-stub\n", debugstr_a(filename), level, data, search_op, filter, flags, transaction); + return FindFirstFileExA(filename, level, data, search_op, filter, flags); +} + +/****************************************************************************** + * FindFirstFileTransactedW (KERNEL32.@) + */ +HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileTransactedW( LPCWSTR filename, FINDEX_INFO_LEVELS level, + LPVOID data, FINDEX_SEARCH_OPS search_op, + LPVOID filter, DWORD flags, HANDLE transaction ) +{ + FIXME("(%s %d %p %d %p %lx %p): semi-stub\n", debugstr_w(filename), level, data, search_op, filter, flags, transaction); + return FindFirstFileExW(filename, level, data, search_op, filter, flags); +} + /************************************************************************** * MoveFileWithProgressA (KERNEL32.@) */

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.246.
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: 36f5da51d0f6205ad8f03010e7fc9fe9eaf4e8d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/36f5da51d0f6205ad8f03010e7fc9f… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 31 15:50:26 2023 +0200 winevulkan: Update to VK spec version 1.3.246. --- dlls/winevulkan/loader_thunks.c | 52 ++++++ dlls/winevulkan/loader_thunks.h | 38 ++++ dlls/winevulkan/make_vulkan | 3 +- dlls/winevulkan/vulkan_thunks.c | 371 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 8 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 109 +++++++++++- 7 files changed, 573 insertions(+), 10 deletions(-)

1 0

Etaash Mathamsetty : kernel32: Add semi-stub for DeleteFileTransactedA/W().
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: 4de32bc9809c309de6aec2d6a49c2160140d0c30 URL: https://gitlab.winehq.org/wine/wine/-/commit/4de32bc9809c309de6aec2d6a49c21… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sun Feb 12 12:03:28 2023 -0500 kernel32: Add semi-stub for DeleteFileTransactedA/W(). --- dlls/kernel32/kernel32.spec | 4 ++-- dlls/kernel32/path.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e2fe57b5224..aed200a13c7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -367,8 +367,8 @@ @ stdcall DeleteCriticalSection(ptr) NTDLL.RtlDeleteCriticalSection @ stdcall -import DeleteFiber(ptr) @ stdcall -import DeleteFileA(str) -# @ stub DeleteFileTransactedA -# @ stub DeleteFileTransactedW +@ stdcall DeleteFileTransactedA(str ptr) +@ stdcall DeleteFileTransactedW(wstr ptr) @ stdcall -import DeleteFileW(wstr) @ stdcall -import DeleteProcThreadAttributeList(ptr) # @ stub DisableThreadProfiling diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index cdb46cc2e99..e959882730f 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -203,6 +203,24 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateDirectoryTransactedW(LPCWSTR template, LPCWS return CreateDirectoryExW(template, path, sa); } +/*********************************************************************** + * DeleteFileTransactedA (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH DeleteFileTransactedA(LPCSTR path, HANDLE transaction) +{ + FIXME("(%s %p): semi-stub\n", debugstr_a(path), transaction); + return DeleteFileA(path); +} + +/*********************************************************************** + * DeleteFileTransactedW (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH DeleteFileTransactedW(LPCWSTR path, HANDLE transaction) +{ + FIXME("(%s %p): semi-stub\n", debugstr_w(path), transaction); + return DeleteFileW(path); +} + /************************************************************************** * MoveFileWithProgressA (KERNEL32.@) */

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: c1a40a9c3145adb52f4bf1a8c160f6591a462a0f URL: https://gitlab.winehq.org/wine/wine/-/commit/c1a40a9c3145adb52f4bf1a8c160f6… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri Mar 31 12:28:08 2023 +0200 po: Update Dutch translation. --- po/nl.po | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/po/nl.po b/po/nl.po index c5c625743ad..34a5bce65ac 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-12-28 23:15+0100\n" +"PO-Revision-Date: 2023-03-31 12:05+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -3721,16 +3721,12 @@ msgid "High" msgstr "Hoog" #: dlls/ir50_32/ir50_32.rc:28 -#, fuzzy -#| msgid "Index" msgid "Indeo5" -msgstr "Index" +msgstr "Indeo5" #: dlls/ir50_32/ir50_32.rc:29 -#, fuzzy -#| msgid "Wine Video 1 video codec" msgid "Indeo Video Interactive version 5 video codec" -msgstr "Wine Video 1 video codec" +msgstr "Indeo Video Interactive versie 5 video codec" #: dlls/joy.cpl/joy.rc:37 msgid "Joysticks" @@ -17333,17 +17329,16 @@ msgid "Error: Process self-termination is not permitted.\n" msgstr "Fout: Zelf-beëindiging van een proces is niet toegestaan.\n" #: programs/taskkill/taskkill.rc:44 -#, fuzzy -#| msgid "Process with PID %1!u! was forcibly terminated.\n" msgid "" "The process with PID %1!u! (child process of PID %2!u!) has been " "terminated.\n" -msgstr "Proces met PID %1!u! is geforceerd beëindigd.\n" +msgstr "Het proces met PID %1!u! (onderdeel van PID %2!u!) is beëindigd.\n" #: programs/taskkill/taskkill.rc:45 msgid "" "Sent termination signal to process with PID %1!u!, child of PID %2!u!.\n" msgstr "" +"Signaal verzonden om PID %1!u!, onderdeel van PID %2!u!, af te sluiten.\n" #: programs/taskmgr/taskmgr.rc:37 programs/taskmgr/taskmgr.rc:108 msgid "&New Task (Run...)" @@ -18144,7 +18139,7 @@ msgstr "Reageert niet" #: programs/taskmgr/taskmgr.rc:324 msgid "Running" -msgstr "Geactiveerd" +msgstr "Actief" #: programs/taskmgr/taskmgr.rc:325 msgid "Task" @@ -18261,8 +18256,8 @@ msgstr "" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." msgstr "" -"De Wine configuratie in %s wordt bijgewerkt.\n" -"Even geduld alstublieft..." +"Even geduld...\n" +"De Wine configuratie in %s wordt bijgewerkt." #: programs/winecfg/winecfg.rc:146 msgid "" @@ -18495,7 +18490,7 @@ msgstr "Thema:" #: programs/winecfg/winecfg.rc:295 msgid "&WinRT app theme:" -msgstr "" +msgstr "Thema voor &WinRT programma's:" #: programs/winecfg/winecfg.rc:297 msgid "&Install theme..." @@ -18618,14 +18613,12 @@ msgid "Mono" msgstr "Mono" #: programs/winecfg/winecfg.rc:98 -#, fuzzy -#| msgid "Right" msgid "Light" -msgstr "Rechts" +msgstr "Licht" #: programs/winecfg/winecfg.rc:99 msgid "Dark" -msgstr "" +msgstr "Donker" #: programs/winecfg/winecfg.rc:53 msgid ""

1 0

Michael Stefaniuc : mfplat/tests: Remove duplicated ok() call.
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: e4512287a004582607f492aa95beb61e5e7ce03c URL: https://gitlab.winehq.org/wine/wine/-/commit/e4512287a004582607f492aa95beb6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 30 19:31:30 2023 +0200 mfplat/tests: Remove duplicated ok() call. --- dlls/mfplat/tests/mfplat.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 540001676bf..1e5dc190944 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -8341,7 +8341,6 @@ static void test_MFInitMediaTypeFromVideoInfoHeader(void) hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value32); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(value32 == MFVideoInterlace_Progressive, "Unexpected value %#x.\n", value32); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_DEFAULT_STRIDE, &value32); ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr);

1 0

Zhiyi Zhang : dwrite: Use cache when font transform matrix contains only translation offsets.
by Alexandre Julliard March 31, 2023

March 31, 2023

Module: wine Branch: master Commit: f2df5a6c5dcc7551fc2d273bb6fbb8ea6d132c2e URL: https://gitlab.winehq.org/wine/wine/-/commit/f2df5a6c5dcc7551fc2d273bb6fbb8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 22 17:14:24 2023 +0800 dwrite: Use cache when font transform matrix contains only translation offsets. Word 2016 queries a lot of font glyph bounding boxes and bitmaps with translation matrices. The result of these queries is not cached because the transform matrix is not the identity matrix. However, the translation offsets don't affect FreeType font operations at all, which can be verified in ft_matrix_from_dwrite_matrix() called by get_glyph_transform(). So these results with translation matrices can be cached as well. With this patch, Word 2016 stuttering is reduced significantly. --- dlls/dwrite/dwrite_private.h | 19 +++++++++++++++++++ dlls/dwrite/font.c | 17 +++++++++++++---- dlls/dwrite/freetype.c | 12 ++++++------ dlls/dwrite/unixlib.h | 5 +++-- 4 files changed, 41 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index d0ed1db97ef..e87e747d295 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_DWRITE_PRIVATE_H +#define __WINE_DWRITE_PRIVATE_H + #include "dwrite_3.h" #include "d2d1.h" #include "winternl.h" @@ -27,6 +30,14 @@ #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') #define MS_GPOS_TAG DWRITE_MAKE_OPENTYPE_TAG('G','P','O','S') +typedef struct MATRIX_2X2 +{ + float m11; + float m12; + float m21; + float m22; +} MATRIX_2X2; + static const DWRITE_MATRIX identity = { 1.0f, 0.0f, @@ -34,6 +45,12 @@ static const DWRITE_MATRIX identity = 0.0f, 0.0f }; +static const MATRIX_2X2 identity_2x2 = +{ + 1.0f, 0.0f, + 0.0f, 1.0f, +}; + static inline LPWSTR heap_strdupnW(const WCHAR *str, UINT32 len) { WCHAR *ret = NULL; @@ -820,3 +837,5 @@ struct font_data_context; extern HMODULE dwrite_module DECLSPEC_HIDDEN; extern void dwrite_fontface_get_glyph_bbox(IDWriteFontFace *fontface, struct dwrite_glyphbitmap *bitmap) DECLSPEC_HIDDEN; + +#endif /* __WINE_DWRITE_PRIVATE_H */ diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9dce26a17c2..a73f8239587 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -69,6 +69,15 @@ struct cache_entry unsigned int has_bitmap : 1; }; +/* Ignore dx and dy because FreeType doesn't actually use it */ +static inline void matrix_2x2_from_dwrite_matrix(MATRIX_2X2 *m1, const DWRITE_MATRIX *m2) +{ + m1->m11 = m2->m11; + m1->m12 = m2->m12; + m1->m21 = m2->m21; + m1->m22 = m2->m22; +} + static void fontface_release_cache_entry(struct cache_entry *entry) { free(entry->bitmap); @@ -157,11 +166,11 @@ void dwrite_fontface_get_glyph_bbox(IDWriteFontFace *iface, struct dwrite_glyphb params.simulations = bitmap->simulations; params.glyph = bitmap->glyph; params.emsize = bitmap->emsize; - params.m = bitmap->m ? *bitmap->m : identity; + matrix_2x2_from_dwrite_matrix(&params.m, bitmap->m ? bitmap->m : &identity); EnterCriticalSection(&fontface->cs); /* For now bypass cache for transformed cases. */ - if (bitmap->m && memcmp(bitmap->m, &identity, sizeof(*bitmap->m))) + if (bitmap->m && memcmp(&params.m, &identity_2x2, sizeof(params.m))) { params.bbox = &bitmap->bbox; UNIX_CALL(get_glyph_bbox, &params); @@ -202,15 +211,15 @@ static HRESULT dwrite_fontface_get_glyph_bitmap(struct dwrite_fontface *fontface params.glyph = bitmap->glyph; params.mode = rendering_mode; params.emsize = bitmap->emsize; - params.m = bitmap->m ? *bitmap->m : identity; params.bbox = bitmap->bbox; params.pitch = bitmap->pitch; params.bitmap = bitmap->buf; params.is_1bpp = is_1bpp; + matrix_2x2_from_dwrite_matrix(&params.m, bitmap->m ? bitmap->m : &identity); EnterCriticalSection(&fontface->cs); /* For now bypass cache for transformed cases. */ - if (memcmp(&params.m, &identity, sizeof(params.m))) + if (bitmap->m && memcmp(&params.m, &identity_2x2, sizeof(params.m))) { UNIX_CALL(get_glyph_bitmap, &params); } diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 0caf2b03696..f50cf36fc18 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -496,7 +496,7 @@ static NTSTATUS get_glyph_count(void *args) return STATUS_SUCCESS; } -static inline void ft_matrix_from_dwrite_matrix(const DWRITE_MATRIX *m, FT_Matrix *ft_matrix) +static inline void ft_matrix_from_matrix_2x2(const MATRIX_2X2 *m, FT_Matrix *ft_matrix) { ft_matrix->xx = m->m11 * 0x10000; ft_matrix->xy = -m->m21 * 0x10000; @@ -504,7 +504,7 @@ static inline void ft_matrix_from_dwrite_matrix(const DWRITE_MATRIX *m, FT_Matri ft_matrix->yy = m->m22 * 0x10000; } -static BOOL get_glyph_transform(unsigned int simulations, const DWRITE_MATRIX *m, FT_Matrix *ret) +static BOOL get_glyph_transform(unsigned int simulations, const MATRIX_2X2 *m, FT_Matrix *ret) { FT_Matrix ftm; @@ -515,7 +515,7 @@ static BOOL get_glyph_transform(unsigned int simulations, const DWRITE_MATRIX *m /* Some fonts provide mostly bitmaps and very few outlines, for example for .notdef. Disable transform if that's the case. */ - if (!memcmp(m, &identity, sizeof(*m)) && !simulations) + if (!memcmp(m, &identity_2x2, sizeof(*m)) && !simulations) return FALSE; if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) @@ -527,7 +527,7 @@ static BOOL get_glyph_transform(unsigned int simulations, const DWRITE_MATRIX *m pFT_Matrix_Multiply(&ftm, ret); } - ft_matrix_from_dwrite_matrix(m, &ftm); + ft_matrix_from_matrix_2x2(m, &ftm); pFT_Matrix_Multiply(&ftm, ret); return TRUE; @@ -955,7 +955,7 @@ static NTSTATUS wow64_get_glyph_bbox(void *args) ULONG simulations; ULONG glyph; float emsize; - DWRITE_MATRIX m; + MATRIX_2X2 m; PTR32 bbox; } const *params32 = args; struct get_glyph_bbox_params params = @@ -980,7 +980,7 @@ static NTSTATUS wow64_get_glyph_bitmap(void *args) ULONG glyph; ULONG mode; float emsize; - DWRITE_MATRIX m; + MATRIX_2X2 m; RECT bbox; int pitch; PTR32 bitmap; diff --git a/dlls/dwrite/unixlib.h b/dlls/dwrite/unixlib.h index c63d5bea722..33a9690b160 100644 --- a/dlls/dwrite/unixlib.h +++ b/dlls/dwrite/unixlib.h @@ -20,6 +20,7 @@ #include "windef.h" #include "winternl.h" #include "dwrite.h" +#include "dwrite_private.h" #include "wine/unixlib.h" struct create_font_object_params @@ -66,7 +67,7 @@ struct get_glyph_bbox_params unsigned int simulations; unsigned int glyph; float emsize; - DWRITE_MATRIX m; + MATRIX_2X2 m; RECT *bbox; }; @@ -77,7 +78,7 @@ struct get_glyph_bitmap_params unsigned int glyph; unsigned int mode; float emsize; - DWRITE_MATRIX m; + MATRIX_2X2 m; RECT bbox; int pitch; BYTE *bitmap;

1 0