- Wine-Devel - list.winehq.org

[tools] testbot/reporttest: Add tests for the 'dll versions' block.
by Francois Gouget March 31, 2021

March 31, 2021

Exercise handling of the messages dealing with missing dlls, dll loading errors, and dll version detection errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/src/reporttest/report.template | 20 ++++++++++---------- testbot/src/reporttest/report.testwtbs | 6 +++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 9624c9065..f1dbfd618 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -198,16 +198,16 @@ Dll info: wldap32=5.1.2600.5512 wmiutils=5.1.2600.5512 wmp=11.0.5721.5280 - wpc=dll is missing - ws2_32=5.1.2600.5512 - wscript.exe=5.7.0.18066 - wshom.ocx=5.7.0.18066 - wsnmp32=5.1.2600.5512 - wtsapi32=5.1.2600.5512 - xaudio2_7=dll is missing - xcopy.exe=5.1.2600.5512 - xinput1_3=dll is missing - xmllite=1.0.1018.0 + wpc=dll is native + ws2_32=dll is a stub + wscript.exe=dll is missing + wshom.ocx=dll is missing an ordinal (1.0) + wsnmp32=dll is missing an entrypoint (version not found) + wtsapi32=dll is missing the requested side-by-side version + xaudio2_7=load error 5 + xcopy.exe=version not found + xinput1_3=version error 5 + xmllite=version not present 2 Test output: stub advapi32:cred ----- WTBS Simple test patch diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 104c8ea60..7b56e1310 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,12 +13,16 @@ with: ----- TestWTBS ----- -p tests.TestFailures 68 +p tests.TestFailures 70 p build.HasTask 0 a wine.log.GrepV ^Applying patch a wine.log.GrepV ^Rebuilding the +g 0 tests.report. +n 0 wpc=dll is native +n 0 xaudio2_7=load error 5 + g 0 tests.report.advapi32 n 0 crypt.c:1: Test failed: Something wrong n 0 crypt_lmhash.c:10: Test failed: Something wrong -- 2.20.1

1 0

[tools] testbot/PatchUtils: There is no need to migrate the make_* flags.
by Francois Gouget March 31, 2021

March 31, 2021

They impact the build, and only the build, no matter which patchset part they appear in. This is confirmed by the old code which moved them from $Impacts to $PastImpacts and then back to $Impacts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 796457a21..87e4508ba 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -423,10 +423,7 @@ sub GetPatchImpacts($) $Impacts->{BuildModules} = {}; # Also backup the build-related fields. - foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", - "MakeOpenGL", "MakeRequests", "MakeUnicode", - "MakeVulkan", - "PatchedRoot", "PatchedModules", "PatchedTests") + foreach my $Field ("PatchedRoot", "PatchedModules", "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; $Impacts->{$Field} = undef; @@ -518,12 +515,6 @@ sub GetPatchImpacts($) # ... even if the patch was in previous parts if ($PastImpacts) { - foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", - "MakeOpenGL", "MakeRequests", "MakeUnicode", - "MakeVulkan") - { - $Impacts->{$Field} ||= $PastImpacts->{$Field}; - } $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}}; -- 2.20.1

1 0

[tools] testbot/WineTest: Always return the mission base name in SetupTest().
by Francois Gouget March 31, 2021

March 31, 2021

WineTest runs the tests even if the wineprefix creation failed so developers have as much information as possible. So it needs to know the mission base name either way. The tests will be considered to be failed anyway since the wineprefix creation failure could be caused by the patch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineTest.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index c4a1216b0..ffd665faa 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -71,7 +71,6 @@ sub SetupTest($$) if (defined $ErrMessage) { LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; - return 0; } } -- 2.20.1

1 0

[PATCH v2 1/2] ntdll/tests: Add committed / reserved thread stack sizes tests.
by Rémi Bernon March 31, 2021

March 31, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Clear around 1MB of stack instead of a few pages, and keep setting the stack pointer while doing it. dlls/ntdll/tests/virtual.c | 264 +++++++++++++++++++++++++++++++++++++ 1 file changed, 264 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 546a7d83bbd..112be80c01e 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -237,14 +237,266 @@ static void test_NtAllocateVirtualMemory(void) ok(status == STATUS_INVALID_PARAMETER, "NtAllocateVirtualMemoryEx returned %08x\n", status); } +struct test_stack_size_thread_args +{ + DWORD expect_committed; + DWORD expect_reserved; +}; + +static void force_stack_grow(void) +{ + volatile int buffer[0x2000]; + buffer[0] = 0xdeadbeef; + (void)buffer[0]; +} + +#ifdef _WIN64 +static void force_stack_grow_small(void) +{ + volatile int buffer[0x400]; + buffer[0] = 0xdeadbeef; + (void)buffer[0]; +} +#endif + +static DWORD WINAPI test_stack_size_thread(void *ptr) +{ + struct test_stack_size_thread_args *args = ptr; + MEMORY_BASIC_INFORMATION mbi; + NTSTATUS status; + SIZE_T size, guard_size; + DWORD committed, reserved; + void *addr; +#ifdef _WIN64 + DWORD prot; + void *tmp; +#endif + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + reserved = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack; + todo_wine ok( committed == args->expect_committed || broken(committed == 0x1000), "unexpected stack committed size %x, expected %x\n", committed, args->expect_committed ); + ok( reserved == args->expect_reserved, "unexpected stack reserved size %x, expected %x\n", reserved, args->expect_reserved ); + + addr = (char *)NtCurrentTeb()->DeallocationStack; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + todo_wine ok( mbi.State == MEM_RESERVE, "unexpected State %#x, expected %#x\n", mbi.State, MEM_RESERVE ); + todo_wine ok( mbi.Protect == 0, "unexpected Protect %#x, expected %#x\n", mbi.Protect, 0 ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + + force_stack_grow(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + reserved = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack; + todo_wine ok( committed == 0x9000, "unexpected stack committed size %x, expected 9000\n", committed ); + ok( reserved == args->expect_reserved, "unexpected stack reserved size %x, expected %x\n", reserved, args->expect_reserved ); + + + /* reserved area shrinks whenever stack grows */ + + addr = (char *)NtCurrentTeb()->DeallocationStack; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + todo_wine ok( mbi.State == MEM_RESERVE, "unexpected State %#x, expected %#x\n", mbi.State, MEM_RESERVE ); + todo_wine ok( mbi.Protect == 0, "unexpected Protect %#x, expected %#x\n", mbi.Protect, 0 ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + guard_size = reserved - committed - mbi.RegionSize; + ok( guard_size == 0x1000 || guard_size == 0x2000 || guard_size == 0x3000, "unexpected guard_size %I64x, expected 1000, 2000 or 3000\n", (UINT64)guard_size ); + + /* the commit area is initially preceded by guard pages */ + + addr = (char *)NtCurrentTeb()->DeallocationStack + mbi.RegionSize; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + ok( mbi.RegionSize == guard_size, "unexpected RegionSize %I64x, expected 3000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE|PAGE_GUARD ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.AllocationBase == NtCurrentTeb()->DeallocationStack, "unexpected AllocationBase %p, expected %p\n", mbi.AllocationBase, NtCurrentTeb()->DeallocationStack ); + ok( mbi.AllocationProtect == PAGE_READWRITE, "unexpected AllocationProtect %#x, expected %#x\n", mbi.AllocationProtect, PAGE_READWRITE ); + ok( mbi.BaseAddress == addr, "unexpected BaseAddress %p, expected %p\n", mbi.BaseAddress, addr ); + ok( mbi.RegionSize == committed, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)committed ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#x, expected %#x\n", mbi.Type, MEM_PRIVATE ); + + +#ifdef _WIN64 + /* setting a guard page shrinks stack automatically */ + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; + size = 0x1000; + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + ok( !status, "NtAllocateVirtualMemory returned %08x\n", status ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)addr - 0x2000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x2000, "unexpected RegionSize %I64x, expected 2000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x1000, "unexpected RegionSize %I64x, expected 1000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == 0x6000, "unexpected RegionSize %I64x, expected 6000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + + /* guard pages are restored as the stack grows back */ + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x4000; + tmp = (char *)addr - guard_size - 0x1000; + size = 0x1000; + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + ok( !status, "NtAllocateVirtualMemory returned %08x\n", status ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x1000, "unexpected stack committed size %x, expected 1000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), tmp, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == guard_size + 0x1000, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)(guard_size + 0x1000) ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + force_stack_grow_small(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x2000, "unexpected stack committed size %x, expected 2000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), tmp, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x1000, "unexpected RegionSize %I64x, expected 1000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)tmp + 0x1000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == guard_size, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)guard_size ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + + /* forcing stack limit over guard pages still shrinks the stack on page fault */ + + addr = (char *)tmp + guard_size + 0x1000; + size = 0x1000; + status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_COMMIT, PAGE_READWRITE | PAGE_GUARD ); + ok( !status, "NtAllocateVirtualMemory returned %08x\n", status ); + + NtCurrentTeb()->Tib.StackLimit = (char *)tmp; + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)tmp + 0x1000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == guard_size + 0x1000, "unexpected RegionSize %I64x, expected %I64x\n", (UINT64)mbi.RegionSize, (UINT64)(guard_size + 0x1000) ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + force_stack_grow_small(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x2000, "unexpected stack committed size %x, expected 2000\n", committed ); + + + /* it works with NtProtectVirtualMemory as well */ + + force_stack_grow(); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; + size = 0x1000; + status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE | PAGE_GUARD, &prot ); + ok( !status, "NtProtectVirtualMemory returned %08x\n", status ); + todo_wine ok( prot == PAGE_READWRITE, "unexpected prot %#x, expected %#x\n", prot, PAGE_READWRITE ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), (char *)addr - 0x2000, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == 0x2000, "unexpected RegionSize %I64x, expected 2000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + ok( mbi.RegionSize == 0x1000, "unexpected RegionSize %I64x, expected 1000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + ok( mbi.Protect == (PAGE_READWRITE|PAGE_GUARD), "unexpected Protect %#x, expected %#x\n", mbi.Protect, (PAGE_READWRITE|PAGE_GUARD) ); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08x\n", status ); + todo_wine ok( mbi.RegionSize == 0x6000, "unexpected RegionSize %I64x, expected 6000\n", (UINT64)mbi.RegionSize ); + ok( mbi.State == MEM_COMMIT, "unexpected State %#x, expected %#x\n", mbi.State, MEM_COMMIT ); + todo_wine ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#x, expected %#x\n", mbi.Protect, PAGE_READWRITE ); + + + /* clearing the guard pages doesn't change StackLimit back */ + + force_stack_grow(); + + addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; + size = 0x1000; + status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE | PAGE_GUARD, &prot ); + ok( !status, "NtProtectVirtualMemory returned %08x\n", status ); + todo_wine ok( prot == PAGE_READWRITE, "unexpected prot %#x, expected %#x\n", prot, PAGE_READWRITE ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + status = NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE, &prot ); + ok( !status, "NtProtectVirtualMemory returned %08x\n", status ); + ok( prot == (PAGE_READWRITE | PAGE_GUARD), "unexpected prot %#x, expected %#x\n", prot, (PAGE_READWRITE | PAGE_GUARD) ); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); + + /* and as we messed with it and it now doesn't fault, it doesn't grow back either */ + + force_stack_grow(); + + committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; + todo_wine ok( committed == 0x6000, "unexpected stack committed size %x, expected 6000\n", committed ); +#endif + + return 0; +} + static void test_RtlCreateUserStack(void) { IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + struct test_stack_size_thread_args args; SIZE_T default_commit = nt->OptionalHeader.SizeOfStackCommit; SIZE_T default_reserve = nt->OptionalHeader.SizeOfStackReserve; INITIAL_TEB stack = {0}; unsigned int i; NTSTATUS ret; + HANDLE thread; struct { @@ -298,6 +550,18 @@ static void test_RtlCreateUserStack(void) ret = pRtlCreateUserStack(0x11000, 0x110000, 0, 0, 1, &stack); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + args.expect_committed = 0x4000; + args.expect_reserved = default_reserve; + thread = CreateThread(NULL, 0x3f00, test_stack_size_thread, &args, 0, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + args.expect_committed = default_commit < 0x2000 ? 0x2000 : default_commit; + args.expect_reserved = 0x400000; + thread = CreateThread(NULL, 0x3ff000, test_stack_size_thread, &args, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); } static void test_NtMapViewOfSection(void) -- 2.30.2

1 1

[PATCH] shcore: Added another api-ms-* forwarding dll.
by Nikolay Sivov March 31, 2021

March 31, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in | 1 + .../api-ms-win-shcore-stream-winrt-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) create mode 100644 dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in create mode 100644 dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec diff --git a/configure b/configure index 5d430365ea4..a19bb0b9581 100755 --- a/configure +++ b/configure @@ -1143,6 +1143,7 @@ enable_api_ms_win_service_winsvc_l1_2_0 enable_api_ms_win_shcore_obsolete_l1_1_0 enable_api_ms_win_shcore_scaling_l1_1_1 enable_api_ms_win_shcore_stream_l1_1_0 +enable_api_ms_win_shcore_stream_winrt_l1_1_0 enable_api_ms_win_shcore_thread_l1_1_0 enable_api_ms_win_shell_shellcom_l1_1_0 enable_api_ms_win_shell_shellfolders_l1_1_0 @@ -20349,6 +20350,7 @@ wine_fn_config_makefile dlls/api-ms-win-service-winsvc-l1-2-0 enable_api_ms_win_ wine_fn_config_makefile dlls/api-ms-win-shcore-obsolete-l1-1-0 enable_api_ms_win_shcore_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shcore-scaling-l1-1-1 enable_api_ms_win_shcore_scaling_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-shcore-stream-l1-1-0 enable_api_ms_win_shcore_stream_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-shcore-stream-winrt-l1-1-0 enable_api_ms_win_shcore_stream_winrt_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shcore-thread-l1-1-0 enable_api_ms_win_shcore_thread_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shell-shellcom-l1-1-0 enable_api_ms_win_shell_shellcom_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shell-shellfolders-l1-1-0 enable_api_ms_win_shell_shellfolders_l1_1_0 diff --git a/configure.ac b/configure.ac index afd46b353ea..eb08e8b0f17 100644 --- a/configure.ac +++ b/configure.ac @@ -3025,6 +3025,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-scaling-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-stream-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-stream-winrt-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-thread-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellfolders-l1-1-0) diff --git a/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in new file mode 100644 index 00000000000..7af35b2eed6 --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-stream-winrt-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec new file mode 100644 index 00000000000..e30eb81184d --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-winrt-l1-1-0/api-ms-win-shcore-stream-winrt-l1-1-0.spec @@ -0,0 +1 @@ +@ stub CreateRandomAccessStreamOverStream diff --git a/tools/make_specfiles b/tools/make_specfiles index 3689a856b9f..9ff4974641a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -356,6 +356,7 @@ my @dll_groups = "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-thread-l1-1-0", "api-ms-win-shcore-stream-l1-1-0", + "api-ms-win-shcore-stream-winrt-l1-1-0", ], [ "shell32", -- 2.30.2

1 0

[PATCH] dwrite: Use wide-char literals.
by Nikolay Sivov March 31, 2021

March 31, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 10 +- dlls/dwrite/font.c | 408 ++++++++++++++++++----------------------- dlls/dwrite/main.c | 6 +- dlls/dwrite/opentype.c | 25 +-- 4 files changed, 196 insertions(+), 253 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index e58ec835acc..93d507cf3dc 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -207,9 +207,7 @@ const char *debugstr_sa_script(UINT16 script) } /* system font falback configuration */ -static const WCHAR meiryoW[] = {'M','e','i','r','y','o',0}; - -static const WCHAR *cjk_families[] = { meiryoW }; +static const WCHAR *cjk_families[] = { L"Meiryo" }; static const DWRITE_UNICODE_RANGE cjk_ranges[] = { @@ -1102,12 +1100,12 @@ static void get_number_substitutes(IDWriteNumberSubstitution *substitution, BOOL break; case DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL: case DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL: - if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, ARRAY_SIZE(isolang))) { - static const WCHAR arW[] = {'a','r',0}; + if (GetLocaleInfoEx(numbersubst->locale, LOCALE_SISO639LANGNAME, isolang, ARRAY_SIZE(isolang))) + { static const WCHAR arabicW[] = {0x640,0x641,0x642,0x643,0x644,0x645,0x646,0x647,0x648,0x649,0}; /* For some Arabic locales Latin digits are returned for SNATIVEDIGITS */ - if (!wcscmp(arW, isolang)) + if (!wcscmp(L"ar", isolang)) { wcscpy(digits, arabicW); break; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index adc51d872dc..44a61aba1ef 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -45,24 +45,6 @@ static const FLOAT RECOMMENDED_OUTLINE_AA_THRESHOLD = 100.0f; static const FLOAT RECOMMENDED_OUTLINE_A_THRESHOLD = 350.0f; static const FLOAT RECOMMENDED_NATURAL_PPEM = 20.0f; -static const WCHAR extraW[] = {'e','x','t','r','a',0}; -static const WCHAR ultraW[] = {'u','l','t','r','a',0}; -static const WCHAR semiW[] = {'s','e','m','i',0}; -static const WCHAR extW[] = {'e','x','t',0}; -static const WCHAR thinW[] = {'t','h','i','n',0}; -static const WCHAR lightW[] = {'l','i','g','h','t',0}; -static const WCHAR mediumW[] = {'m','e','d','i','u','m',0}; -static const WCHAR blackW[] = {'b','l','a','c','k',0}; -static const WCHAR condensedW[] = {'c','o','n','d','e','n','s','e','d',0}; -static const WCHAR expandedW[] = {'e','x','p','a','n','d','e','d',0}; -static const WCHAR italicW[] = {'i','t','a','l','i','c',0}; -static const WCHAR boldW[] = {'B','o','l','d',0}; -static const WCHAR obliqueW[] = {'O','b','l','i','q','u','e',0}; -static const WCHAR regularW[] = {'R','e','g','u','l','a','r',0}; -static const WCHAR demiW[] = {'d','e','m','i',0}; -static const WCHAR spaceW[] = {' ',0}; -static const WCHAR enusW[] = {'e','n','-','u','s',0}; - static const struct font_backend_funcs *font_funcs; void dwrite_fontface_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) @@ -3320,7 +3302,7 @@ static void fontstrings_get_en_string(IDWriteLocalizedStrings *strings, WCHAR *b HRESULT hr; buffer[0] = 0; - hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); + hr = IDWriteLocalizedStrings_FindLocaleName(strings, L"en-us", &index, &exists); if (FAILED(hr) || !exists) return; @@ -3453,31 +3435,23 @@ static BOOL match_pattern_list(struct list *tokens, const struct name_pattern *p static DWRITE_FONT_STYLE font_extract_style(struct list *tokens, DWRITE_FONT_STYLE style, struct name_token *match) { - static const WCHAR itaW[] = {'i','t','a',0}; - static const WCHAR italW[] = {'i','t','a','l',0}; - static const WCHAR cursiveW[] = {'c','u','r','s','i','v','e',0}; - static const WCHAR kursivW[] = {'k','u','r','s','i','v',0}; - - static const WCHAR inclinedW[] = {'i','n','c','l','i','n','e','d',0}; - static const WCHAR backslantedW[] = {'b','a','c','k','s','l','a','n','t','e','d',0}; - static const WCHAR backslantW[] = {'b','a','c','k','s','l','a','n','t',0}; - static const WCHAR slantedW[] = {'s','l','a','n','t','e','d',0}; - - static const struct name_pattern italic_patterns[] = { - { itaW }, - { italW }, - { italicW }, - { cursiveW }, - { kursivW }, + static const struct name_pattern italic_patterns[] = + { + { L"ita" }, + { L"ital" }, + { L"italic" }, + { L"cursive" }, + { L"kursiv" }, { NULL } }; - static const struct name_pattern oblique_patterns[] = { - { inclinedW }, - { obliqueW }, - { backslantedW }, - { backslantW }, - { slantedW }, + static const struct name_pattern oblique_patterns[] = + { + { L"inclined" }, + { L"oblique" }, + { L"backslanted" }, + { L"backslant" }, + { L"slanted" }, { NULL } }; @@ -3495,69 +3469,70 @@ static DWRITE_FONT_STYLE font_extract_style(struct list *tokens, DWRITE_FONT_STY static DWRITE_FONT_STRETCH font_extract_stretch(struct list *tokens, DWRITE_FONT_STRETCH stretch, struct name_token *match) { - static const WCHAR compressedW[] = {'c','o','m','p','r','e','s','s','e','d',0}; - static const WCHAR extendedW[] = {'e','x','t','e','n','d','e','d',0}; - static const WCHAR compactW[] = {'c','o','m','p','a','c','t',0}; - static const WCHAR narrowW[] = {'n','a','r','r','o','w',0}; - static const WCHAR wideW[] = {'w','i','d','e',0}; - static const WCHAR condW[] = {'c','o','n','d',0}; - - static const struct name_pattern ultracondensed_patterns[] = { - { extraW, compressedW }, - { extW, compressedW }, - { ultraW, compressedW }, - { ultraW, condensedW }, - { ultraW, condW }, + static const struct name_pattern ultracondensed_patterns[] = + { + { L"extra", L"compressed" }, + { L"ext", L"compressed" }, + { L"ultra", L"compressed" }, + { L"ultra", L"condensed" }, + { L"ultra", L"cond" }, { NULL } }; - static const struct name_pattern extracondensed_patterns[] = { - { compressedW }, - { extraW, condensedW }, - { extW, condensedW }, - { extraW, condW }, - { extW, condW }, + static const struct name_pattern extracondensed_patterns[] = + { + { L"compressed" }, + { L"extra", L"condensed" }, + { L"ext", L"condensed" }, + { L"extra", L"cond" }, + { L"ext", L"cond" }, { NULL } }; - static const struct name_pattern semicondensed_patterns[] = { - { narrowW }, - { compactW }, - { semiW, condensedW }, - { semiW, condW }, + static const struct name_pattern semicondensed_patterns[] = + { + { L"narrow" }, + { L"compact" }, + { L"semi", L"condensed" }, + { L"semi", L"cond" }, { NULL } }; - static const struct name_pattern semiexpanded_patterns[] = { - { wideW }, - { semiW, expandedW }, - { semiW, extendedW }, + static const struct name_pattern semiexpanded_patterns[] = + { + { L"wide" }, + { L"semi", L"expanded" }, + { L"semi", L"extended" }, { NULL } }; - static const struct name_pattern extraexpanded_patterns[] = { - { extraW, expandedW }, - { extW, expandedW }, - { extraW, extendedW }, - { extW, extendedW }, + static const struct name_pattern extraexpanded_patterns[] = + { + { L"extra", L"expanded" }, + { L"ext", L"expanded" }, + { L"extra", L"extended" }, + { L"ext", L"extended" }, { NULL } }; - static const struct name_pattern ultraexpanded_patterns[] = { - { ultraW, expandedW }, - { ultraW, extendedW }, + static const struct name_pattern ultraexpanded_patterns[] = + { + { L"ultra", L"expanded" }, + { L"ultra", L"extended" }, { NULL } }; - static const struct name_pattern condensed_patterns[] = { - { condensedW }, - { condW }, + static const struct name_pattern condensed_patterns[] = + { + { L"condensed" }, + { L"cond" }, { NULL } }; - static const struct name_pattern expanded_patterns[] = { - { expandedW }, - { extendedW }, + static const struct name_pattern expanded_patterns[] = + { + { L"expanded" }, + { L"extended" }, { NULL } }; @@ -3591,82 +3566,92 @@ static DWRITE_FONT_STRETCH font_extract_stretch(struct list *tokens, DWRITE_FONT static DWRITE_FONT_WEIGHT font_extract_weight(struct list *tokens, DWRITE_FONT_WEIGHT weight, struct name_token *match) { - static const WCHAR heavyW[] = {'h','e','a','v','y',0}; - static const WCHAR nordW[] = {'n','o','r','d',0}; - - static const struct name_pattern thin_patterns[] = { - { extraW, thinW }, - { extW, thinW }, - { ultraW, thinW }, + static const struct name_pattern thin_patterns[] = + { + { L"extra", L"thin" }, + { L"ext", L"thin" }, + { L"ultra", L"thin" }, { NULL } }; - static const struct name_pattern extralight_patterns[] = { - { extraW, lightW }, - { extW, lightW }, - { ultraW, lightW }, + static const struct name_pattern extralight_patterns[] = + { + { L"extra", L"light" }, + { L"ext", L"light" }, + { L"ultra", L"light" }, { NULL } }; - static const struct name_pattern semilight_patterns[] = { - { semiW, lightW }, + static const struct name_pattern semilight_patterns[] = + { + { L"semi", L"light" }, { NULL } }; - static const struct name_pattern demibold_patterns[] = { - { semiW, boldW }, - { demiW, boldW }, + static const struct name_pattern demibold_patterns[] = + { + { L"semi", L"bold" }, + { L"demi", L"bold" }, { NULL } }; - static const struct name_pattern extrabold_patterns[] = { - { extraW, boldW }, - { extW, boldW }, - { ultraW, boldW }, + static const struct name_pattern extrabold_patterns[] = + { + { L"extra", L"bold" }, + { L"ext", L"bold" }, + { L"ultra", L"bold" }, { NULL } }; - static const struct name_pattern extrablack_patterns[] = { - { extraW, blackW }, - { extW, blackW }, - { ultraW, blackW }, + static const struct name_pattern extrablack_patterns[] = + { + { L"extra", L"black" }, + { L"ext", L"black" }, + { L"ultra", L"black" }, { NULL } }; - static const struct name_pattern bold_patterns[] = { - { boldW }, + static const struct name_pattern bold_patterns[] = + { + { L"bold" }, { NULL } }; - static const struct name_pattern thin2_patterns[] = { - { thinW }, + static const struct name_pattern thin2_patterns[] = + { + { L"thin" }, { NULL } }; - static const struct name_pattern light_patterns[] = { - { lightW }, + static const struct name_pattern light_patterns[] = + { + { L"light" }, { NULL } }; - static const struct name_pattern medium_patterns[] = { - { mediumW }, + static const struct name_pattern medium_patterns[] = + { + { L"medium" }, { NULL } }; - static const struct name_pattern black_patterns[] = { - { blackW }, - { heavyW }, - { nordW }, + static const struct name_pattern black_patterns[] = + { + { L"black" }, + { L"heavy" }, + { L"nord" }, { NULL } }; - static const struct name_pattern demibold2_patterns[] = { - { demiW }, + static const struct name_pattern demibold2_patterns[] = + { + { L"demi" }, { NULL } }; - static const struct name_pattern extrabold2_patterns[] = { - { ultraW }, + static const struct name_pattern extrabold2_patterns[] = + { + { L"ultra" }, { NULL } }; @@ -3742,31 +3727,22 @@ static int __cdecl compare_knownweights(const void *a, const void* b) static BOOL is_known_weight_value(DWRITE_FONT_WEIGHT weight, WCHAR *nameW) { - static const WCHAR extralightW[] = {'E','x','t','r','a',' ','L','i','g','h','t',0}; - static const WCHAR semilightW[] = {'S','e','m','i',' ','L','i','g','h','t',0}; - static const WCHAR extrablackW[] = {'E','x','t','r','a',' ','B','l','a','c','k',0}; - static const WCHAR extraboldW[] = {'E','x','t','r','a',' ','B','o','l','d',0}; - static const WCHAR demiboldW[] = {'D','e','m','i',' ','B','o','l','d',0}; - static const WCHAR thinW[] = {'T','h','i','n',0}; - static const WCHAR lightW[] = {'L','i','g','h','t',0}; - static const WCHAR mediumW[] = {'M','e','d','i','u','m',0}; - static const WCHAR blackW[] = {'B','l','a','c','k',0}; - const struct knownweight_entry *ptr; - - static const struct knownweight_entry knownweights[] = { - { thinW, DWRITE_FONT_WEIGHT_THIN }, - { extralightW, DWRITE_FONT_WEIGHT_EXTRA_LIGHT }, - { lightW, DWRITE_FONT_WEIGHT_LIGHT }, - { semilightW, DWRITE_FONT_WEIGHT_SEMI_LIGHT }, - { mediumW, DWRITE_FONT_WEIGHT_MEDIUM }, - { demiboldW, DWRITE_FONT_WEIGHT_DEMI_BOLD }, - { boldW, DWRITE_FONT_WEIGHT_BOLD }, - { extraboldW, DWRITE_FONT_WEIGHT_EXTRA_BOLD }, - { blackW, DWRITE_FONT_WEIGHT_BLACK }, - { extrablackW, DWRITE_FONT_WEIGHT_EXTRA_BLACK } + static const struct knownweight_entry knownweights[] = + { + { L"Thin", DWRITE_FONT_WEIGHT_THIN }, + { L"Extra Light", DWRITE_FONT_WEIGHT_EXTRA_LIGHT }, + { L"Light", DWRITE_FONT_WEIGHT_LIGHT }, + { L"Semi Light", DWRITE_FONT_WEIGHT_SEMI_LIGHT }, + { L"Medium", DWRITE_FONT_WEIGHT_MEDIUM }, + { L"Demi Bold", DWRITE_FONT_WEIGHT_DEMI_BOLD }, + { L"Bold", DWRITE_FONT_WEIGHT_BOLD }, + { L"Extra Bold", DWRITE_FONT_WEIGHT_EXTRA_BOLD }, + { L"Black", DWRITE_FONT_WEIGHT_BLACK }, + { L"Extra Black", DWRITE_FONT_WEIGHT_EXTRA_BLACK } }; + const struct knownweight_entry *ptr; - ptr = bsearch(&weight, knownweights, ARRAY_SIZE(knownweights), sizeof(knownweights[0]), + ptr = bsearch(&weight, knownweights, ARRAY_SIZE(knownweights), sizeof(*knownweights), compare_knownweights); if (!ptr) { nameW[0] = 0; @@ -3786,18 +3762,13 @@ static inline void font_name_token_to_str(const struct name_token *name, WCHAR * /* Modifies facenameW string, and returns pointer to regular term that was removed */ static const WCHAR *facename_remove_regular_term(WCHAR *facenameW, INT len) { - static const WCHAR bookW[] = {'B','o','o','k',0}; - static const WCHAR normalW[] = {'N','o','r','m','a','l',0}; - static const WCHAR regularW[] = {'R','e','g','u','l','a','r',0}; - static const WCHAR romanW[] = {'R','o','m','a','n',0}; - static const WCHAR uprightW[] = {'U','p','r','i','g','h','t',0}; - - static const WCHAR *regular_patterns[] = { - bookW, - normalW, - regularW, - romanW, - uprightW, + static const WCHAR *regular_patterns[] = + { + L"Book", + L"Normal", + L"Regular", + L"Roman", + L"Upright", NULL }; @@ -3902,7 +3873,7 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA /* append face name to family name, FIXME check if face name is a substring of family name */ if (*facenameW) { - wcscat(familynameW, spaceW); + wcscat(familynameW, L" "); wcscat(familynameW, facenameW); } @@ -3968,10 +3939,7 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA } /* use Wnnn format as a fallback in case weight is not one of known values */ else - { - static const WCHAR fmtW[] = {'W','%','d',0}; - swprintf(weightW, ARRAY_SIZE(weightW), fmtW, font->weight); - } + swprintf(weightW, ARRAY_SIZE(weightW), L"W%d", font->weight); /* resolved stretch name */ if (stretch_name.ptr) @@ -3980,25 +3948,20 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA else if (font->stretch == DWRITE_FONT_STRETCH_NORMAL) stretchW[0] = 0; /* use predefined stretch names */ - else { - static const WCHAR ultracondensedW[] = {'U','l','t','r','a',' ','C','o','n','d','e','n','s','e','d',0}; - static const WCHAR extracondensedW[] = {'E','x','t','r','a',' ','C','o','n','d','e','n','s','e','d',0}; - static const WCHAR semicondensedW[] = {'S','e','m','i',' ','C','o','n','d','e','n','s','e','d',0}; - static const WCHAR semiexpandedW[] = {'S','e','m','i',' ','E','x','p','a','n','d','e','d',0}; - static const WCHAR extraexpandedW[] = {'E','x','t','r','a',' ','E','x','p','a','n','d','e','d',0}; - static const WCHAR ultraexpandedW[] = {'U','l','t','r','a',' ','E','x','p','a','n','d','e','d',0}; - - static const WCHAR *stretchnamesW[] = { + else + { + static const WCHAR *stretchnamesW[] = + { NULL, /* DWRITE_FONT_STRETCH_UNDEFINED */ - ultracondensedW, - extracondensedW, - condensedW, - semicondensedW, + L"Ultra Condensed", + L"Extra Condensed", + L"Condensed", + L"Semi Condensed", NULL, /* DWRITE_FONT_STRETCH_NORMAL */ - semiexpandedW, - expandedW, - extraexpandedW, - ultraexpandedW + L"Semi Expanded", + L"Expanded", + L"Extra Expanded", + L"Ultra Expanded" }; wcscpy(stretchW, stretchnamesW[font->stretch]); } @@ -4009,16 +3972,12 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA else if (font->style == DWRITE_FONT_STYLE_NORMAL) styleW[0] = 0; /* use predefined names */ - else { - if (font->style == DWRITE_FONT_STYLE_ITALIC) - wcscpy(styleW, italicW); - else - wcscpy(styleW, obliqueW); - } + else + wcscpy(styleW, font->style == DWRITE_FONT_STYLE_ITALIC ? L"Italic" : L"Oblique"); /* use Regular match if it was found initially */ if (!*weightW && !*stretchW && !*styleW) - wcscpy(faceW, regular_ptr ? regular_ptr : regularW); + wcscpy(faceW, regular_ptr ? regular_ptr : L"Regular"); else { faceW[0] = 0; @@ -4027,13 +3986,13 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA if (*weightW) { - if (*faceW) wcscat(faceW, spaceW); + if (*faceW) wcscat(faceW, L" "); wcscat(faceW, weightW); } if (*styleW) { - if (*faceW) wcscat(faceW, spaceW); + if (*faceW) wcscat(faceW, L" "); wcscat(faceW, styleW); } } @@ -4143,7 +4102,7 @@ static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRI IDWriteLocalizedStrings_AddRef(data->family_names); create_localizedstrings(&data->names); - add_localizedstring(data->names, enusW, facenameW); + add_localizedstring(data->names, L"en-us", facenameW); init_font_prop_vec(data->weight, data->stretch, data->style, &data->propvec); @@ -4196,19 +4155,21 @@ static void fontfamily_add_bold_simulated_face(struct dwrite_fontfamily_data *fa } } - if (weight >= DWRITE_FONT_WEIGHT_SEMI_LIGHT && weight <= 550) { - static const struct name_pattern weightsim_patterns[] = { - { extraW, lightW }, - { extW, lightW }, - { ultraW, lightW }, - { semiW, lightW }, - { semiW, boldW }, - { demiW, boldW }, - { boldW }, - { thinW }, - { lightW }, - { mediumW }, - { demiW }, + if (weight >= DWRITE_FONT_WEIGHT_SEMI_LIGHT && weight <= 550) + { + static const struct name_pattern weightsim_patterns[] = + { + { L"extra", L"light" }, + { L"ext", L"light" }, + { L"ultra", L"light" }, + { L"semi", L"light" }, + { L"semi", L"bold" }, + { L"demi", L"bold" }, + { L"bold" }, + { L"thin" }, + { L"light" }, + { L"medium" }, + { L"demi" }, { NULL } }; @@ -4229,8 +4190,8 @@ static void fontfamily_add_bold_simulated_face(struct dwrite_fontfamily_data *fa fontname_tokens_to_str(&tokens, facenameW); /* Bold suffix for new name */ - if (*facenameW) wcscat(facenameW, spaceW); - wcscat(facenameW, boldW); + if (*facenameW) wcscat(facenameW, L" "); + wcscat(facenameW, L"Bold"); if (init_font_data_from_font(family->fonts[heaviest], DWRITE_FONT_SIMULATIONS_BOLD, facenameW, &boldface) == S_OK) { boldface->bold_sim_tested = 1; @@ -4295,8 +4256,8 @@ static void fontfamily_add_oblique_simulated_face(struct dwrite_fontfamily_data fontstrings_get_en_string(family->fonts[regular]->names, facenameW, ARRAY_SIZE(facenameW)); facename_remove_regular_term(facenameW, -1); - if (*facenameW) wcscat(facenameW, spaceW); - wcscat(facenameW, obliqueW); + if (*facenameW) wcscat(facenameW, L" "); + wcscat(facenameW, L"Oblique"); if (init_font_data_from_font(family->fonts[regular], DWRITE_FONT_SIMULATIONS_OBLIQUE, facenameW, &obliqueface) == S_OK) { obliqueface->oblique_sim_tested = 1; @@ -4323,7 +4284,7 @@ static BOOL fontcollection_add_replacement(struct dwrite_fontcollection *collect return FALSE; /* add a new family with target name, reuse font data from replacement */ - add_localizedstring(strings, enusW, target_name); + add_localizedstring(strings, L"en-us", target_name); hr = init_fontfamily_data(strings, &target); if (hr == S_OK) { struct dwrite_fontfamily_data *replacement = collection->family_data[i]; @@ -4612,11 +4573,10 @@ static HRESULT create_local_file_reference(IDWriteFactory7 *factory, const WCHAR /* Fonts installed in 'Fonts' system dir don't get full path in registry font files cache */ if (!wcschr(filename, '\\')) { - static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; WCHAR fullpathW[MAX_PATH]; GetWindowsDirectoryW(fullpathW, ARRAY_SIZE(fullpathW)); - wcscat(fullpathW, fontsW); + wcscat(fullpathW, L"\\fonts\\"); wcscat(fullpathW, filename); hr = IDWriteFactory7_CreateFontFileReference(factory, fullpathW, NULL, file); @@ -4707,11 +4667,6 @@ static const IDWriteFontFileEnumeratorVtbl systemfontfileenumeratorvtbl = static HRESULT create_system_fontfile_enumerator(IDWriteFactory7 *factory, IDWriteFontFileEnumerator **ret) { struct system_fontfile_enumerator *enumerator; - static const WCHAR fontslistW[] = { - 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'F','o','n','t','s',0 - }; *ret = NULL; @@ -4732,7 +4687,8 @@ static HRESULT create_system_fontfile_enumerator(IDWriteFactory7 *factory, IDWri IDWriteFactory7_AddRef(factory); - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, fontslistW, 0, GENERIC_READ, &enumerator->hkey)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts", 0, + GENERIC_READ, &enumerator->hkey)) { ERR("failed to open fonts list key\n"); IDWriteFactory7_Release(factory); @@ -4766,8 +4722,6 @@ HRESULT get_system_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollectio static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrite_fontcollection *collection, const WCHAR *keynameW, const WCHAR *pathW) { - static const WCHAR defaultfontW[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t','E','U','D','C','F','o','n','t',0}; - static const WCHAR emptyW[] = {0}; struct dwrite_fontfamily_data *family_data; IDWriteLocalizedStrings *names; DWRITE_FONT_FACE_TYPE face_type; @@ -4802,10 +4756,10 @@ static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrit /* Family names are added for non-specific locale, represented with empty string. Default family appears with empty family name. */ create_localizedstrings(&names); - if (!wcsicmp(keynameW, defaultfontW)) - add_localizedstring(names, emptyW, emptyW); + if (!wcsicmp(keynameW, L"SystemDefaultEUDCFont")) + add_localizedstring(names, L"", L""); else - add_localizedstring(names, emptyW, keynameW); + add_localizedstring(names, L"", keynameW); hr = init_fontfamily_data(names, &family_data); IDWriteLocalizedStrings_Release(names); @@ -4850,9 +4804,7 @@ static HRESULT eudc_collection_add_family(IDWriteFactory7 *factory, struct dwrit HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 **ret) { - static const WCHAR eudckeyfmtW[] = {'E','U','D','C','\\','%','u',0}; struct dwrite_fontcollection *collection; - static const WCHAR emptyW[] = {0}; WCHAR eudckeypathW[16]; HKEY eudckey; DWORD index; @@ -4879,7 +4831,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 IDWriteFactory7_AddRef(factory); /* return empty collection if EUDC fonts are not configured */ - swprintf(eudckeypathW, ARRAY_SIZE(eudckeypathW), eudckeyfmtW, GetACP()); + swprintf(eudckeypathW, ARRAY_SIZE(eudckeypathW), L"EUDC\\%u", GetACP()); if (RegOpenKeyExW(HKEY_CURRENT_USER, eudckeypathW, 0, GENERIC_READ, &eudckey)) return S_OK; @@ -4903,11 +4855,11 @@ HRESULT get_eudc_fontcollection(IDWriteFactory7 *factory, IDWriteFontCollection3 /* try to add global default if not defined for specific codepage */ exists = FALSE; - hr = IDWriteFontCollection3_FindFamilyName(&collection->IDWriteFontCollection3_iface, emptyW, + hr = IDWriteFontCollection3_FindFamilyName(&collection->IDWriteFontCollection3_iface, L"", &index, &exists); - if (FAILED(hr) || !exists) { - static const WCHAR globaldefaultW[] = {'E','U','D','C','.','T','T','E',0}; - hr = eudc_collection_add_family(factory, collection, emptyW, globaldefaultW); + if (FAILED(hr) || !exists) + { + hr = eudc_collection_add_family(factory, collection, L"", L"EUDC.TTE"); if (hr != S_OK) WARN("failed to add global default EUDC font, 0x%08x\n", hr); } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 274e8be91b3..825e323b468 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -531,13 +531,12 @@ HRESULT clone_localizedstrings(IDWriteLocalizedStrings *iface, IDWriteLocalizedS void set_en_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *string) { - static const WCHAR enusW[] = {'e','n','-','U','S',0}; struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); UINT32 i; for (i = 0; i < strings->count; i++) { - if (!wcsicmp(strings->data[i].locale, enusW)) + if (!wcsicmp(strings->data[i].locale, L"en-US")) { heap_free(strings->data[i].string); strings->data[i].string = heap_strdupW(string); @@ -1573,12 +1572,11 @@ static HRESULT create_system_path_list(WCHAR ***ret, unsigned int *ret_count) { if (!wcschr(value, '\\')) { - static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\\',0}; WCHAR *ptrW; ptrW = heap_alloc((MAX_PATH + wcslen(value)) * sizeof(WCHAR)); GetWindowsDirectoryW(ptrW, MAX_PATH); - wcscat(ptrW, fontsW); + wcscat(ptrW, L"\\fonts\\"); wcscat(ptrW, value); heap_free(value); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 53c0400c25f..717550acf38 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2252,9 +2252,8 @@ static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT lang_id, WCHAR *locale, USHORT locale_len) { - static const WCHAR enusW[] = {'e','n','-','U','S',0}; - - switch (platform) { + switch (platform) + { case OPENTYPE_PLATFORM_MAC: { const char *locale_name = NULL; @@ -2269,18 +2268,18 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la if (locale_name) MultiByteToWideChar(CP_ACP, 0, name_mac_langid_to_locale[lang_id], -1, locale, locale_len); else - wcscpy(locale, enusW); + wcscpy(locale, L"en-US"); break; } case OPENTYPE_PLATFORM_WIN: if (!LCIDToLocaleName(MAKELCID(lang_id, SORT_DEFAULT), locale, locale_len, 0)) { FIXME("failed to get locale name for lcid=0x%08x\n", MAKELCID(lang_id, SORT_DEFAULT)); - wcscpy(locale, enusW); + wcscpy(locale, L"en-US"); } break; case OPENTYPE_PLATFORM_UNICODE: - wcscpy(locale, enusW); + wcscpy(locale, L"en-US"); break; default: FIXME("unknown platform %d\n", platform); @@ -2301,7 +2300,6 @@ static BOOL opentype_is_english_namerecord(const struct dwrite_fonttable *table, static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, unsigned int idx, IDWriteLocalizedStrings *strings) { - static const WCHAR enusW[] = {'e','n','-','U','S',0}; USHORT lang_id, length, offset, encoding, platform; const struct name_header *header = (const struct name_header *)table->data; const struct name_record *record; @@ -2350,7 +2348,7 @@ static BOOL opentype_decode_namerecord(const struct dwrite_fonttable *table, uns add_localizedstring(strings, locale, name_string); heap_free(name_string); - ret = !wcscmp(locale, enusW); + ret = !wcscmp(locale, L"en-US"); } else FIXME("handle NAME format 1\n"); @@ -2443,14 +2441,13 @@ static HRESULT opentype_get_font_strings_from_id(const struct dwrite_fonttable * static WCHAR *meta_get_lng_name(WCHAR *str, WCHAR **ctx) { - static const WCHAR delimW[] = {',',' ',0}; WCHAR *ret; if (!str) str = *ctx; - while (*str && wcschr(delimW, *str)) str++; + while (*str && wcschr(L", ", *str)) str++; if (!*str) return NULL; ret = str++; - while (*str && !wcschr(delimW, *str)) str++; + while (*str && !wcschr(L", ", *str)) str++; if (*str) *str++ = 0; *ctx = str; @@ -2460,7 +2457,6 @@ static WCHAR *meta_get_lng_name(WCHAR *str, WCHAR **ctx) static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc *stream_desc, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **ret) { - static const WCHAR emptyW[] = { 0 }; const struct meta_data_map *maps; IDWriteLocalizedStrings *strings; struct dwrite_fonttable meta; @@ -2528,7 +2524,7 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc while (token) { - add_localizedstring(strings, emptyW, token); + add_localizedstring(strings, L"", token); token = meta_get_lng_name(NULL, &ctx); } @@ -2632,7 +2628,6 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * *lfname = 0; if (SUCCEEDED(opentype_get_font_strings_from_id(&name, OPENTYPE_STRING_FAMILY_NAME, &lfnames))) { - static const WCHAR enusW[] = {'e','n','-','u','s',0}; WCHAR localeW[LOCALE_NAME_MAX_LENGTH]; UINT32 index; BOOL exists; @@ -2642,7 +2637,7 @@ HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, WCHAR * IDWriteLocalizedStrings_FindLocaleName(lfnames, localeW, &index, &exists); if (!exists) - IDWriteLocalizedStrings_FindLocaleName(lfnames, enusW, &index, &exists); + IDWriteLocalizedStrings_FindLocaleName(lfnames, L"en-us", &index, &exists); if (exists) { UINT32 length = 0; -- 2.30.2

1 0

[PATCH v3] gdi32: Fix handling of ModifyWorldTransform( MWT_IDENTITY ) on an emf dc.
by Huw Davies March 31, 2021

March 31, 2021

From: Zhiyi Zhang <zzhang(a)codeweavers.com> When the mode parameter is MWT_IDENTITY, the xform parameter can be NULL because it should be ignored and use the identity matrix. Fix Tally crashing when exporting a JPEG image. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/enhmfdrv/dc.c | 14 +++++++++++++- dlls/gdi32/tests/metafile.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 16251939714..2a749418829 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -362,7 +362,19 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m emr.emr.iType = EMR_MODIFYWORLDTRANSFORM; emr.emr.nSize = sizeof(emr); - emr.xform = *xform; + if (mode == MWT_IDENTITY) + { + emr.xform.eM11 = 1.0f; + emr.xform.eM12 = 0.0f; + emr.xform.eM21 = 0.0f; + emr.xform.eM22 = 1.0f; + emr.xform.eDx = 0.0f; + emr.xform.eDy = 0.0f; + } + else + { + emr.xform = *xform; + } emr.iMode = mode; if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e81cff1ae57..648e9369803 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4158,6 +4158,18 @@ static INT CALLBACK enum_emf_WorldTransform(HDC hdc, HANDLETABLE *ht, CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); } + else if(lpXfrm->iMode == MWT_IDENTITY) + { + /* reset to identity matrix also does discard */ + test_data->stored.eM11 = 1.0f; + test_data->stored.eM12 = 0.0f; + test_data->stored.eM21 = 0.0f; + test_data->stored.eM22 = 1.0f; + test_data->stored.eDx = 0.0f; + test_data->stored.eDy = 0.0f; + + CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); + } /* verify it is updated immediately */ ret = GetWorldTransform(hdc, &xform); @@ -4265,6 +4277,9 @@ static void test_emf_WorldTransform(void) ret = SetWorldTransform(hdcMetafile, &xform); /* EMR_SETWORLDTRANSFORM */ ok(ret == TRUE, "SetWorldTransform failed\n"); + ret = ModifyWorldTransform(hdcMetafile, NULL, MWT_IDENTITY); /* EMR_MODIFYWORLDTRANSFORM */ + ok(ret == TRUE, "ModifyWorldTransform failed\n"); + set_rotation_xform(&xform, M_PI / 2.f, -2, -3); ret = ModifyWorldTransform(hdcMetafile, &xform, MWT_LEFTMULTIPLY); /* EMR_MODIFYWORLDTRANSFORM */ ok(ret == TRUE, "ModifyWorldTransform failed\n"); -- 2.23.0

2 1

[PATCH v2] gdi32: Avoid crash when calling EMFDRV_ModifyWorldTransform() with a NULL xform parameter.
by Zhiyi Zhang March 31, 2021

March 31, 2021

When the mode parameter is MWT_IDENTITY, the xform parameter can be NULL because it should be ignored and use the identity matrix. Fix Tally crashing when exporting a JPEG image. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 202843. Check the mode parameter in EMFDRV_ModifyWorldTransform(). dlls/gdi32/enhmfdrv/dc.c | 14 +++++++++++++- dlls/gdi32/tests/metafile.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 16251939714..2a749418829 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -362,7 +362,19 @@ BOOL CDECL EMFDRV_ModifyWorldTransform( PHYSDEV dev, const XFORM *xform, DWORD m emr.emr.iType = EMR_MODIFYWORLDTRANSFORM; emr.emr.nSize = sizeof(emr); - emr.xform = *xform; + if (mode == MWT_IDENTITY) + { + emr.xform.eM11 = 1.0f; + emr.xform.eM12 = 0.0f; + emr.xform.eM21 = 0.0f; + emr.xform.eM22 = 1.0f; + emr.xform.eDx = 0.0f; + emr.xform.eDy = 0.0f; + } + else + { + emr.xform = *xform; + } emr.iMode = mode; if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e81cff1ae57..648e9369803 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4158,6 +4158,18 @@ static INT CALLBACK enum_emf_WorldTransform(HDC hdc, HANDLETABLE *ht, CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); } + else if(lpXfrm->iMode == MWT_IDENTITY) + { + /* reset to identity matrix also does discard */ + test_data->stored.eM11 = 1.0f; + test_data->stored.eM12 = 0.0f; + test_data->stored.eM21 = 0.0f; + test_data->stored.eM22 = 1.0f; + test_data->stored.eDx = 0.0f; + test_data->stored.eDy = 0.0f; + + CombineTransform(&test_data->expected, &test_data->stored, &test_data->scale); + } /* verify it is updated immediately */ ret = GetWorldTransform(hdc, &xform); @@ -4265,6 +4277,9 @@ static void test_emf_WorldTransform(void) ret = SetWorldTransform(hdcMetafile, &xform); /* EMR_SETWORLDTRANSFORM */ ok(ret == TRUE, "SetWorldTransform failed\n"); + ret = ModifyWorldTransform(hdcMetafile, NULL, MWT_IDENTITY); /* EMR_MODIFYWORLDTRANSFORM */ + ok(ret == TRUE, "ModifyWorldTransform failed\n"); + set_rotation_xform(&xform, M_PI / 2.f, -2, -3); ret = ModifyWorldTransform(hdcMetafile, &xform, MWT_LEFTMULTIPLY); /* EMR_MODIFYWORLDTRANSFORM */ ok(ret == TRUE, "ModifyWorldTransform failed\n"); -- 2.27.0

2 1

[PATCH 1/2] ole32/tests: Add a test for custom ILockBytes on HGlobal implementation.
by Dmitry Timoshkov March 31, 2021

March 31, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ole32/tests/storage32.c | 164 +++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index eea78c6d3fe..da2e411eea4 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3876,6 +3876,9 @@ static void test_custom_lockbytes(void) hr = IStorage_Commit(stg, 0); + ok(lockbytes->contents != NULL, "lockbytes->contents should not be NULL\n"); + ok(*(DWORD *)lockbytes->contents == 0xe011cfd0, "contents: %08x\n", *(DWORD *)lockbytes->contents); + IStorage_Release(stg); ok(!lockbytes->lock_called, "unexpected call to LockRegion\n"); @@ -3904,6 +3907,166 @@ static void test_custom_lockbytes(void) DeleteTestLockBytes(lockbytes); } +struct byte_array_t +{ + ILockBytes ILockBytes_iface; + ILockBytes *lock_bytes; + HGLOBAL mem; + LONG ref; +}; + +static inline struct byte_array_t *byte_array_from_ILockBytes(ILockBytes *iface) +{ + return CONTAINING_RECORD(iface, struct byte_array_t, ILockBytes_iface); +} + +static HRESULT WINAPI byte_array_QueryInterface(ILockBytes *iface, REFIID iid, void **ppv) +{ + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_ILockBytes, iid)) + { + ILockBytes_AddRef(iface); + *ppv = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI byte_array_AddRef(ILockBytes *iface) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI byte_array_Release(ILockBytes *iface) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + ULONG ref = InterlockedDecrement(&This->ref); + if (!ref) + { + ILockBytes_Release(This->lock_bytes); + HeapFree(GetProcessHeap(), 0, This); + } + return ref; +} + +static HRESULT WINAPI byte_array_ReadAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, void *pv, ULONG cb, ULONG *pcbRead) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_ReadAt(This->lock_bytes, ulOffset, pv, cb, pcbRead); +} + +static HRESULT WINAPI byte_array_WriteAt(ILockBytes *iface, + ULARGE_INTEGER ulOffset, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_WriteAt(This->lock_bytes, ulOffset, pv, cb, pcbWritten); +} + +static HRESULT WINAPI byte_array_Flush(ILockBytes *iface) +{ + return S_OK; +} + +static HRESULT WINAPI byte_array_SetSize(ILockBytes *iface, ULARGE_INTEGER cb) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_SetSize(This->lock_bytes, cb); +} + +static HRESULT WINAPI byte_array_LockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_LockRegion(This->lock_bytes, libOffset, cb, dwLockType); +} + +static HRESULT WINAPI byte_array_UnlockRegion(ILockBytes *iface, + ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_UnlockRegion(This->lock_bytes, libOffset, cb, dwLockType); +} + +static HRESULT WINAPI byte_array_Stat(ILockBytes *iface, + STATSTG *pstatstg, DWORD grfStatFlag) +{ + struct byte_array_t *This = byte_array_from_ILockBytes(iface); + return ILockBytes_Stat(This->lock_bytes, pstatstg, grfStatFlag); +} + +static const ILockBytesVtbl byte_array_Vtbl = +{ + byte_array_QueryInterface, + byte_array_AddRef, + byte_array_Release, + byte_array_ReadAt, + byte_array_WriteAt, + byte_array_Flush, + byte_array_SetSize, + byte_array_LockRegion, + byte_array_UnlockRegion, + byte_array_Stat +}; + +static struct byte_array_t *create_byte_array(void) +{ + struct byte_array_t *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (This) + { + HRESULT hr; + + This->ref = 1; + This->ILockBytes_iface.lpVtbl = &byte_array_Vtbl; + This->mem = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, 1024); + hr = CreateILockBytesOnHGlobal(This->mem, TRUE, &This->lock_bytes); + ok(hr == S_OK, "CreateILockBytesOnHGlobal error %#x\n", hr); + } + return This; +} + +static void test_custom_lockbytes_on_hglobal(void) +{ + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + struct byte_array_t *This; + HRESULT hr; + IStorage *stg; + IStream *stm; + DWORD *p; + + This = create_byte_array(); + + hr = StgCreateDocfileOnILockBytes(&This->ILockBytes_iface, STGM_CREATE | STGM_READWRITE | STGM_TRANSACTED | STGM_SHARE_EXCLUSIVE, 0, &stg); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IStorage_CreateStream(stg, stmname, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + ok(hr == S_OK, "got %#x\n", hr); + + IStream_Write(stm, "Hello World!", 12, NULL); + IStream_Release(stm); + + p = GlobalLock(This->mem); +todo_wine + ok(*p == 0, "got %#x\n", *p); + memset(p, 0, 512); + GlobalUnlock(This->mem); + + hr = IStorage_Commit(stg, STGC_DEFAULT); + ok(hr == S_OK, "got %#x\n", hr); + + IStorage_Release(stg); + + p = GlobalLock(This->mem); +todo_wine + ok(*p == 0xe011cfd0, "got %#x\n", *p); + GlobalUnlock(This->mem); + + ILockBytes_Release(&This->ILockBytes_iface); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -3953,4 +4116,5 @@ START_TEST(storage32) test_transacted_shared(); test_overwrite(); test_custom_lockbytes(); + test_custom_lockbytes_on_hglobal(); } -- 2.30.2

2 2

[PATCH 3/4] dsound/tests: Use nameless unions.
by Jacek Caban March 30, 2021

March 30, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/dsound/tests/Makefile.in | 1 - dlls/dsound/tests/dsound8.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)

2 1