- Wine-Devel - list.winehq.org

[PATCH 05/10] user32: Use NtUserMessageCall for SendMessageTimeoutA implementation.
by Jacek Caban April 5, 2022

April 5, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-)

3 2

[PATCH 04/10] win32u: Move SendMessageW implementation from user32.
by Jacek Caban April 5, 2022

April 5, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 14 +------------- dlls/user32/user_main.c | 2 -- dlls/win32u/message.c | 19 ++++++++++++++----- dlls/win32u/ntuser_private.h | 2 -- 4 files changed, 15 insertions(+), 22 deletions(-)

3 2

[PATCH 03/10] win32u: Move SendMessageTimeoutW implementation from user32.
by Jacek Caban April 5, 2022

April 5, 2022

3 2

[PATCH 02/10] win32u: Use public declaration for NtUserPostMessage.
by Jacek Caban April 5, 2022

April 5, 2022

2 1

[PATCH 01/10] win32u: Return LRESULT from NtUserMessageCall.
by Jacek Caban April 5, 2022

April 5, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 3 +- dlls/user32/winproc.c | 4 +- dlls/win32u/message.c | 20 +++----- dlls/win32u/tests/win32u.c | 97 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 4 +- dlls/win32u/window.c | 8 ++- dlls/win32u/wrappers.c | 4 +- include/ntuser.h | 29 ++++++++--- 8 files changed, 138 insertions(+), 31 deletions(-)

3 2

[PATCH v2 1/3] kernel32/tests: Add some GlobalMemoryStatusEx tests.
by Rémi Bernon April 5, 2022

April 5, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Relax ullAvailPageFile check a bit, it's not always synced. dlls/kernel32/tests/heap.c | 62 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index c597ff9590b..fc4ece81e00 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1264,6 +1264,67 @@ static void test_GlobalMemoryStatus(void) wine_dbgstr_longlong(mem.dwAvailVirtual), wine_dbgstr_longlong(memex.ullAvailVirtual)); } +static void test_GlobalMemoryStatusEx(void) +{ + char buffer[sizeof(SYSTEM_PERFORMANCE_INFORMATION) + 16]; /* some Win 7 versions need a larger info */ + SYSTEM_PERFORMANCE_INFORMATION *perf_info = (void *)buffer; + SYSTEM_BASIC_INFORMATION basic_info; + MEMORYSTATUSEX memex = {0}, expect; + VM_COUNTERS_EX vmc; + NTSTATUS status; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = GlobalMemoryStatusEx( &memex ); + ok( !ret, "GlobalMemoryStatusEx succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() ); + + do + { + status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); + ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); + memex.dwLength = sizeof(MEMORYSTATUSEX); + ret = GlobalMemoryStatusEx( &memex ); + ok( ret, "GlobalMemoryStatusEx succeeded\n" ); + } while (memex.ullAvailPhys != (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize); + + ok( basic_info.PageSize, "got 0 PageSize\n" ); + ok( basic_info.MmNumberOfPhysicalPages, "got 0 MmNumberOfPhysicalPages\n" ); + ok( !!basic_info.HighestUserAddress, "got 0 HighestUserAddress\n" ); + ok( !!basic_info.LowestUserAddress, "got 0 LowestUserAddress\n" ); + ok( perf_info->TotalCommittedPages, "got 0 TotalCommittedPages\n" ); + ok( perf_info->TotalCommitLimit, "got 0 TotalCommitLimit\n" ); + ok( perf_info->AvailablePages, "got 0 AvailablePages\n" ); + + expect.dwMemoryLoad = (memex.ullTotalPhys - memex.ullAvailPhys) / (memex.ullTotalPhys / 100); + expect.ullTotalPhys = (ULONGLONG)basic_info.MmNumberOfPhysicalPages * basic_info.PageSize; + expect.ullAvailPhys = (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize; + expect.ullTotalPageFile = (ULONGLONG)perf_info->TotalCommitLimit * basic_info.PageSize; + expect.ullAvailPageFile = (ULONGLONG)(perf_info->TotalCommitLimit - perf_info->TotalCommittedPages) * basic_info.PageSize; + expect.ullTotalVirtual = (ULONG_PTR)basic_info.HighestUserAddress - (ULONG_PTR)basic_info.LowestUserAddress + 1; + expect.ullAvailVirtual = expect.ullTotalVirtual - (ULONGLONG)vmc.WorkingSetSize /* approximate */; + expect.ullAvailExtendedVirtual = 0; + + ok( memex.dwMemoryLoad == expect.dwMemoryLoad, "got dwMemoryLoad %lu\n", memex.dwMemoryLoad ); + todo_wine + ok( memex.ullTotalPhys == expect.ullTotalPhys, "got ullTotalPhys %#I64x\n", memex.ullTotalPhys ); + ok( memex.ullAvailPhys == expect.ullAvailPhys, "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); + todo_wine + ok( memex.ullTotalPageFile == expect.ullTotalPageFile, "got ullTotalPageFile %#I64x\n", memex.ullTotalPageFile ); + /* allow some variability, page file is not always in sync on Windows */ + ok( memex.ullAvailPageFile - expect.ullAvailPageFile + 32 * basic_info.PageSize <= 64 * basic_info.PageSize, + "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); + todo_wine + ok( memex.ullTotalVirtual == expect.ullTotalVirtual, "got ullTotalVirtual %#I64x\n", memex.ullTotalVirtual ); + todo_wine + ok( memex.ullAvailVirtual <= expect.ullAvailVirtual, "got ullAvailVirtual %#I64x\n", memex.ullAvailVirtual ); + ok( memex.ullAvailExtendedVirtual == 0, "got ullAvailExtendedVirtual %#I64x\n", memex.ullAvailExtendedVirtual ); +} + START_TEST(heap) { int argc; @@ -1298,6 +1359,7 @@ START_TEST(heap) test_HeapQueryInformation(); test_GetPhysicallyInstalledSystemMemory(); test_GlobalMemoryStatus(); + test_GlobalMemoryStatusEx(); if (pRtlGetNtGlobalFlags) { -- 2.35.1

2 4

[PATCH 1/6] include: Add CWMAEncMediaObject class declaration to wmcodecdsp.idl.
by Rémi Bernon April 5, 2022

April 5, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/wmcodecdsp.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index ae2a42419b4..4ad965ab3d9 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -45,6 +45,11 @@ coclass CMSH264DecoderMFT {} ] coclass CWMADecMediaObject {}; +[ + uuid(70f598e9-f4ab-495a-99e2-a7c4d3d89abf) +] +coclass CWMAEncMediaObject {}; + [ uuid(93af0c51-2275-45d2-a35b-f2ba21caed00) ] -- 2.35.1

3 12

[PATCH] dlls/mciavi32: use I width modifier instead of casting to DWORD
by Eric Pouech April 5, 2022

April 5, 2022

--- dlls/mciavi32/mciavi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 64a1a0fbd7d0..dcd07032fecb 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -1063,11 +1063,11 @@ LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SAVE: case MCI_UNDO: case MCI_UNFREEZE: - TRACE("Unsupported function [0x%x] flags=%08lx\n", wMsg, (DWORD)dwParam1); + TRACE("Unsupported function [0x%x] flags=%08Ix\n", wMsg, dwParam1); return MCIERR_UNSUPPORTED_FUNCTION; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [0x%x] %08lx\n", wMsg, (DWORD)dwParam1); + WARN("Unsupported command [0x%x] %08Ix\n", wMsg, dwParam1); break; case MCI_OPEN: case MCI_CLOSE:

1 0

[PATCH] dlls/comdlg32: use I width modifier instead of casting to LONG
by Eric Pouech April 5, 2022

April 5, 2022

--- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 03c712c6bc2e..4bf041e85b3c 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -937,7 +937,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO } } - TRACE("WM_COMMAND wParam=%08lX lParam=%08IX\n", (LONG)wParam, lParam); + TRACE("WM_COMMAND wParam=%08IX lParam=%08IX\n", wParam, lParam); switch (LOWORD(wParam)) { case cmb1:

1 0

[v4 PATCH] dwrite/tests: Add some fallback tests for Segoe UI Symbol.
by Nikolay Sivov April 5, 2022

April 5, 2022

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v4: removed parts that are not relevant for tested functionality, fixed compilation warnings. dlls/dwrite/tests/layout.c | 81 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77c6ff2034..43b6efa107b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4747,6 +4747,86 @@ if (font) { IDWriteFactory2_Release(factory2); } +static void get_font_name(IDWriteFont *font, WCHAR *name, UINT32 size) +{ + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 index; + BOOL exists; + HRESULT hr; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(index != UINT_MAX && exists, "Name was not found.\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_system_fallback(void) +{ + static const struct fallback_test + { + const WCHAR text[2]; + const WCHAR *name; + } + tests[] = + { + { { 0x25d4, 0}, L"Segoe UI Symbol" }, + }; + IDWriteFontFallback *fallback; + IDWriteFactory2 *factory; + IDWriteFont *font; + UINT32 i, length; + WCHAR name[256]; + BOOL exists; + float scale; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory2))) + { + win_skip("System font fallback API is not supported.\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + g_source = tests[i].text; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; + ok(length == 1, "Unexpected length %u\n", length); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); + todo_wine + ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine + ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFactory2_Release(factory); +} + static void test_FontFallbackBuilder(void) { IDWriteFontFallback *fallback, *fallback2; @@ -6529,6 +6609,7 @@ START_TEST(layout) test_pixelsnapping(); test_SetWordWrapping(); test_MapCharacters(); + test_system_fallback(); test_FontFallbackBuilder(); test_SetTypography(); test_SetLastLineWrapping(); -- 2.35.1

1 0