December 2021 - Wine-Commits

Robert Wilhelm : scrrun/tests: Use more context for MultiByteToWideChar in ReadAll test.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: a818801b369bd0e2e54556355179df7f940edb0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a818801b369bd0e2e5455635… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Dec 2 22:32:39 2021 +0100 scrrun/tests: Use more context for MultiByteToWideChar in ReadAll test. Second byte of BOM (0xfe) is LeadByte in Asian locales. Therefore chars after BOM matter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39244 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 0fb332ff963..65bb83dfd7e 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1684,9 +1684,11 @@ static void test_WriteLine(void) static void test_ReadAll(void) { + static const WCHAR firstlineW[] = L"first"; static const WCHAR secondlineW[] = L"second"; static const WCHAR aW[] = L"A"; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; + char buffA[MAX_PATH]; ITextStream *stream; BSTR nameW; HRESULT hr; @@ -1703,8 +1705,10 @@ static void test_ReadAll(void) hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITextStream_WriteLine(stream, nameW); + str = SysAllocString(firstlineW); + hr = ITextStream_WriteLine(stream, str); ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); str = SysAllocString(secondlineW); hr = ITextStream_WriteLine(stream, str); @@ -1732,7 +1736,9 @@ static void test_ReadAll(void) hr = ITextStream_ReadAll(stream, &str); ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + lstrcpyA(buffA, utf16bom); + lstrcatA(buffA, "first"); + MultiByteToWideChar(CP_ACP, 0, buffA, -1, buffW, ARRAY_SIZE(buffW)); ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, %d\n", wine_dbgstr_w(str), SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1741,7 +1747,7 @@ static void test_ReadAll(void) hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - lstrcpyW(buffW, nameW); + lstrcpyW(buffW, firstlineW); lstrcatW(buffW, L"\r\n"); lstrcatW(buffW, secondlineW); lstrcatW(buffW, L"\r\n"); @@ -1772,7 +1778,7 @@ static void test_ReadAll(void) hr = ITextStream_ReadLine(stream, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(str != NULL, "got %p\n", str); - ok(!wcscmp(str, nameW), "got %s\n", wine_dbgstr_w(str)); + ok(!wcscmp(str, firstlineW), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); lstrcpyW(buffW, secondlineW);

1 0

Robert Wilhelm : scrrun/tests: Check file contents using ReadFile in CreateTextFile test.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: ed8048b9e70bde0b89bc4fef2cac825c5b70bdff URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed8048b9e70bde0b89bc4fef… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Dec 2 22:32:24 2021 +0100 scrrun/tests: Check file contents using ReadFile in CreateTextFile test. This is less fragile then former MultiByteToWideChar method because second byte of BOM (0xfe) is LeadByte in Asian locales. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39244 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 91729bb047f..0fb332ff963 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1468,6 +1468,7 @@ static void test_CreateTextFile(void) HANDLE file; HRESULT hr; BOOL ret; + DWORD r; get_temp_filepath(testfileW, pathW, dirW); @@ -1517,18 +1518,15 @@ static void test_CreateTextFile(void) ok(hr == S_OK, "got 0x%08x\n", hr); ITextStream_Release(stream); - /* File was created in Unicode mode, it contains 0xfffe BOM. Opening it in non-Unicode mode - treats BOM like a valuable data with appropriate CP_ACP -> WCHAR conversion. */ - buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); + /* check contents */ + file = CreateFileW(pathW, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + r = 0; + ret = ReadFile(file, buffW, sizeof(buffW), &r, NULL); + ok(ret && r == 2, "read %d, got %d, %d\n", r, ret, GetLastError()); - hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITextStream_ReadAll(stream, &str); - ok(hr == S_FALSE || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); - SysFreeString(str); - ITextStream_Release(stream); + ok( buffW[0] == 0xfeff, "got %04x\n", buffW[0] ); + CloseHandle(file); DeleteFileW(nameW); RemoveDirectoryW(dirW);

1 0

Paul Gofman : ntdll: Support THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER thread creation flag.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: c338a6ff99101d3344477297354e64e63b00e438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c338a6ff99101d3344477297… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Dec 3 20:28:34 2021 +0300 ntdll: Support THREAD_CREATE_FLAGS_HIDE_FROM_DEBUGGER thread creation flag. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/thread.c | 126 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 12 +++- dlls/ntdll/unix/thread.c | 6 +- include/wine/server_protocol.h | 4 +- server/protocol.def | 2 +- server/request.h | 2 +- server/thread.c | 3 +- server/trace.c | 2 +- 9 files changed, 150 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c338a6ff99101d334447…

1 0

Eric Pouech : examine-relay: DLLs can have underscore in their names (like ws2_32).
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 4be47ac4a36a3a52e4a35516706509d9472fb020 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4be47ac4a36a3a52e4a35516… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Dec 6 15:55:28 2021 +0100 examine-relay: DLLs can have underscore in their names (like ws2_32). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/examine-relay | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/examine-relay b/tools/examine-relay index d82110c570a..48782e4728d 100755 --- a/tools/examine-relay +++ b/tools/examine-relay @@ -44,7 +44,7 @@ LINE: while (<IN>) { - if (/^([0-9a-f]+):Call ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$(.*$) .*/) { + if (/^([0-9a-f]+):Call ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$(.*$) .*/) { my $tid = $1; my $func = $2; if (defined $fullformat) { @@ -96,10 +96,10 @@ while (<IN>) { push @{$tid_callstack{$tid}}, [$func, $retaddr, $segreg]; } - elsif (/^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........)$/ || - /^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(....:....) (ds=....)$/ || - /^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........) fs=....$/ || - /^([0-9a-f]+):RET ([A-Za-z0-9]+\.[A-Za-z0-9_.]+: [A-Za-z0-9]+)$.*$ .* ret=(........)$/ || + elsif (/^([0-9a-f]+):Ret ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........)$/ || + /^([0-9a-f]+):Ret ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(....:....) (ds=....)$/ || + /^([0-9a-f]+):Ret ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........) fs=....$/ || + /^([0-9a-f]+):RET ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+: [A-Za-z0-9]+)$.*$ .* ret=(........)$/ || /^([0-9a-f]+):Ret (window proc) ([0-9a-fx]+) .*/) { my $tid = $1; my $func = $2;

1 0

Jactry Zeng : include: Add some COM+ error codes.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 17a0f2c53a93d00c98860a0d38c89364c141e6ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=17a0f2c53a93d00c98860a0d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Dec 2 02:38:46 2021 -0600 include: Add some COM+ error codes. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winerror.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/winerror.h b/include/winerror.h index 377c61e724b..f412989a6a4 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3040,6 +3040,21 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define CO_E_DECODEFAILED _HRESULT_TYPEDEF_(0x8004021A) #define CO_E_ACNOTINITIALIZED _HRESULT_TYPEDEF_(0x8004021B) +#define CONTEXT_S_FIRST _HRESULT_TYPEDEF_(0x0004e000) +#define CONTEXT_S_LAST _HRESULT_TYPEDEF_(0x0004e02f) +#define CONTEXT_E_FIRST _HRESULT_TYPEDEF_(0x8004e000) +#define CONTEXT_E_ABORTED _HRESULT_TYPEDEF_(0x8004e002) +#define CONTEXT_E_ABORTING _HRESULT_TYPEDEF_(0x8004e003) +#define CONTEXT_E_NOCONTEXT _HRESULT_TYPEDEF_(0x8004e004) +#define CONTEXT_E_WOULD_DEADLOCK _HRESULT_TYPEDEF_(0x8004e005) +#define CONTEXT_E_SYNCH_TIMEOUT _HRESULT_TYPEDEF_(0x8004e006) +#define CONTEXT_E_OLDREF _HRESULT_TYPEDEF_(0x8004e007) +#define CONTEXT_E_ROLENOTFOUND _HRESULT_TYPEDEF_(0x8004e00c) +#define CONTEXT_E_TMNOTAVAILABLE _HRESULT_TYPEDEF_(0x8004e00f) +#define CONTEXT_E_NOJIT _HRESULT_TYPEDEF_(0x8004e026) +#define CONTEXT_E_NOTRANSACTION _HRESULT_TYPEDEF_(0x8004e027) +#define CONTEXT_E_LAST _HRESULT_TYPEDEF_(0x8004e02f) + /* Task Scheduler Service Error Codes */ #define SCHED_S_TASK_READY _HRESULT_TYPEDEF_(0x00041300) #define SCHED_S_TASK_RUNNING _HRESULT_TYPEDEF_(0x00041301)

1 0

Alex Henrie : shell32: Provide 4-bit icons that are actually limited to 16 colors.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 4f5f15c206db718fa46a15c37d6f16af2bba8d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f5f15c206db718fa46a15c3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 5 23:15:04 2021 -0700 shell32: Provide 4-bit icons that are actually limited to 16 colors. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/audio.ico | Bin 48131 -> 39758 bytes dlls/shell32/resources/audio.svg | 311 ++++++++++++++------------------ dlls/shell32/resources/eject.ico | Bin 41496 -> 36707 bytes dlls/shell32/resources/eject.svg | 98 +++------- dlls/shell32/resources/favorites.ico | Bin 49876 -> 41503 bytes dlls/shell32/resources/favorites.svg | 124 ++++--------- dlls/shell32/resources/help.ico | Bin 71467 -> 62072 bytes dlls/shell32/resources/help.svg | 185 ++++--------------- dlls/shell32/resources/image.ico | Bin 48807 -> 39430 bytes dlls/shell32/resources/image.svg | 113 ++++-------- dlls/shell32/resources/internet.ico | Bin 76974 -> 67610 bytes dlls/shell32/resources/internet.svg | 179 ++++-------------- dlls/shell32/resources/log_off.ico | Bin 48648 -> 39438 bytes dlls/shell32/resources/log_off.svg | 142 ++++----------- dlls/shell32/resources/menu.ico | Bin 34002 -> 29172 bytes dlls/shell32/resources/menu.svg | 184 +++++++++---------- dlls/shell32/resources/move.ico | Bin 39515 -> 34726 bytes dlls/shell32/resources/move.svg | 107 ++++------- dlls/shell32/resources/network.ico | Bin 43624 -> 38828 bytes dlls/shell32/resources/network.svg | 93 ++++------ dlls/shell32/resources/optical_disc.ico | Bin 50691 -> 41297 bytes dlls/shell32/resources/optical_disc.svg | 167 ++++------------- dlls/shell32/resources/play.ico | Bin 37047 -> 32258 bytes dlls/shell32/resources/play.svg | 96 +++------- dlls/shell32/resources/rename.ico | Bin 30995 -> 26206 bytes dlls/shell32/resources/rename.svg | 220 +++++++++++++--------- dlls/shell32/resources/restricted.ico | Bin 54521 -> 45124 bytes dlls/shell32/resources/restricted.svg | 126 ++++--------- dlls/shell32/resources/search.ico | Bin 78154 -> 69627 bytes dlls/shell32/resources/search.svg | 180 ++++-------------- dlls/shell32/resources/security.ico | Bin 32810 -> 28021 bytes dlls/shell32/resources/security.svg | 91 +++------- dlls/shell32/resources/shut_down.ico | Bin 38405 -> 33627 bytes dlls/shell32/resources/shut_down.svg | 82 +++------ dlls/shell32/resources/sleep.ico | Bin 65140 -> 55754 bytes dlls/shell32/resources/sleep.svg | 146 ++++----------- dlls/shell32/resources/trash_full.ico | Bin 73668 -> 64254 bytes dlls/shell32/resources/trash_full.svg | 185 ++++--------------- dlls/shell32/resources/update.ico | Bin 47370 -> 38997 bytes dlls/shell32/resources/update.svg | 299 ++++++++++++++---------------- dlls/shell32/resources/users.ico | Bin 57595 -> 48207 bytes dlls/shell32/resources/users.svg | 155 ++++------------ dlls/shell32/resources/video.ico | Bin 64272 -> 54890 bytes dlls/shell32/resources/video.svg | 153 ++++------------ 44 files changed, 1123 insertions(+), 2313 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f5f15c206db718fa46a…

1 0

Robert Wilhelm : scrrun/tests: Use more context for MultiByteToWideChar in Read test.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: b167df37776c12c6ec999973a6b23484b06cb0f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b167df37776c12c6ec999973… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Dec 2 22:32:46 2021 +0100 scrrun/tests: Use more context for MultiByteToWideChar in Read test. Second byte of BOM (0xfe) is LeadByte in Asian locales. Therefore chars after BOM matter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39244 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 65bb83dfd7e..8b06dbb883d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1817,8 +1817,10 @@ static void test_ReadAll(void) static void test_Read(void) { + static const WCHAR firstlineW[] = L"first"; static const WCHAR secondlineW[] = L"second"; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; + char buffA[MAX_PATH]; ITextStream *stream; BSTR nameW; HRESULT hr; @@ -1835,8 +1837,10 @@ static void test_Read(void) hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ITextStream_WriteLine(stream, nameW); + str = SysAllocString(firstlineW); + hr = ITextStream_WriteLine(stream, str); ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); str = SysAllocString(secondlineW); hr = ITextStream_WriteLine(stream, str); @@ -1881,9 +1885,10 @@ static void test_Read(void) ok(hr == S_OK, "got 0x%08x\n", hr); buffW[0] = 0; - MultiByteToWideChar(CP_ACP, 0, utf16bom, -1, buffW, ARRAY_SIZE(buffW)); - - ok(!lstrcmpW(str, buffW), "got %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW)); + lstrcpyA(buffA, utf16bom); + lstrcatA(buffA, "first"); + MultiByteToWideChar(CP_ACP, 0, buffA, -1, buffW, ARRAY_SIZE(buffW)); + ok(str[0] == buffW[0] && str[1] == buffW[1], "got %s, expected %s, %d\n", wine_dbgstr_w(str), wine_dbgstr_w(buffW), SysStringLen(str)); ok(SysStringLen(str) == 2, "got %d\n", SysStringLen(str)); SysFreeString(str); ITextStream_Release(stream); @@ -1892,7 +1897,7 @@ static void test_Read(void) hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - lstrcpyW(buffW, nameW); + lstrcpyW(buffW, firstlineW); lstrcatW(buffW, L"\r\n"); lstrcatW(buffW, secondlineW); lstrcatW(buffW, L"\r\n"); @@ -1938,7 +1943,7 @@ static void test_Read(void) hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateUseDefault, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - lstrcpyW(buffW, nameW); + lstrcpyW(buffW, firstlineW); lstrcatW(buffW, L"\r\n"); lstrcatW(buffW, secondlineW); lstrcatW(buffW, L"\r\n");

1 0

Jactry Zeng : ntdll: Fix compilation for ARM64 Apple platform.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 03649e5fb4654bb072571eb4fefba057a3c45f49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03649e5fb4654bb072571eb4… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Mon Dec 6 23:47:10 2021 +0900 ntdll: Fix compilation for ARM64 Apple platform. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 680a14223c6..f2612412366 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -365,7 +365,7 @@ static void restore_fpu( const CONTEXT *context, ucontext_t *sigcontext ) #elif defined(__APPLE__) sigcontext->uc_mcontext->__ns.__fpcr = context->Fpcr; sigcontext->uc_mcontext->__ns.__fpsr = context->Fpsr; - memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->v) ); + memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->V) ); #endif } @@ -1068,9 +1068,9 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) } } #elif defined(__APPLE__) - sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; - sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; - memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); + context->uc_mcontext->__ns.__fpcr = frame->fpcr; + context->uc_mcontext->__ns.__fpsr = frame->fpsr; + memcpy( context->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); #endif }

1 0

Florian Will : dsound: Skip resampling/mixing inaudible buffers.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: 835dfaab023175028161974c5cd8585b77df101c URL: https://source.winehq.org/git/wine.git/?a=commit;h=835dfaab023175028161974c… Author: Florian Will <florian.will(a)gmail.com> Date: Mon Dec 6 13:08:24 2021 -0600 dsound: Skip resampling/mixing inaudible buffers. In some situations, "ZUSI 3" has a lot of secondary buffers in the PLAYING state, but most of these buffers have a really low volume, so these buffers are multiplied by 0 before mixing (and possibly after resampling). There can be hundreds of inaudible buffers at the same time. In these situations, the dsound mixthread is unable to mix fast enough, resulting in sound stuttering and generally poor performance. To resolve this performance issue, skip the mixing (and possibly resampling) step for all inaudible secondary buffers. Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 11 +++++++++++ dlls/dsound/dsound_private.h | 1 + dlls/dsound/mixer.c | 18 +++++++++++++----- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index c595b19dd63..9084ccd9928 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1197,6 +1197,17 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) TRACE("(%p) released\n", This); } +BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) +{ + UINT i; + for (i = 0; i < This->device->pwfx->nChannels; i++) { + if (This->volpan.dwTotalAmpFactor[i] != 0) + return TRUE; + } + + return FALSE; +} + HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 9ec96504a50..18dc369db5c 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -193,6 +193,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( IDirectSoundBufferImpl **ppdsb, IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN; void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; +BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; extern const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; extern const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; extern const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index e9d8a6e3cdd..d28cc8dc5aa 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -290,6 +290,9 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count) UINT committed_samples = 0; DWORD channel, i; + if (!secondarybuffer_is_audible(dsb)) + return count; + if(dsb->use_committed) { committed_samples = (dsb->writelead - dsb->committed_mixpos) / istride; committed_samples = committed_samples <= count ? committed_samples : count; @@ -329,6 +332,11 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * len += fir_cachesize; len *= sizeof(float); + *freqAccNum = freqAcc_end % dsb->freqAdjustDen; + + if (!secondarybuffer_is_audible(dsb)) + return max_ipos; + if (!dsb->device->cp_buffer) { dsb->device->cp_buffer = HeapAlloc(GetProcessHeap(), 0, len); dsb->device->cp_buffer_len = len; @@ -386,8 +394,6 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * } } - *freqAccNum = freqAcc_end % dsb->freqAdjustDen; - return max_ipos; } @@ -535,10 +541,12 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, DSOUND_MixToTemporary(dsb, frames); ibuf = dsb->device->tmp_buffer; - /* Apply volume if needed */ - DSOUND_MixerVol(dsb, frames); + if (secondarybuffer_is_audible(dsb)) { + /* Apply volume if needed */ + DSOUND_MixerVol(dsb, frames); - mixieee32(ibuf, mix_buffer, frames * dsb->device->pwfx->nChannels); + mixieee32(ibuf, mix_buffer, frames * dsb->device->pwfx->nChannels); + } /* check for notification positions */ if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY &&

1 0

Jacek Caban : win32u: Implement NtUserGetSystemDpiForProcess.
by Alexandre Julliard Dec. 6, 2021

Dec. 6, 2021

Module: wine Branch: master Commit: d08808d8f3fefc3e558e9b3d349428719a5ada47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08808d8f3fefc3e558e9b3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 6 03:08:45 2021 +0100 win32u: Implement NtUserGetSystemDpiForProcess. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 15 +-- dlls/win32u/font.c | 6 +- dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 306 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 + include/ntuser.h | 1 + 9 files changed, 319 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d08808d8f3fefc3e558e…

1 0