wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Bernhard Übelacker : server: Return ReadDataAvailable value for FilePipeLocalInformation.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: c488f29122cb871b3b61d80656f537cc0ba66a77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c488f29122cb871b3b61d806… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Fri Nov 26 22:32:09 2021 +0100 server: Return ReadDataAvailable value for FilePipeLocalInformation. Makes Cygwin mintty.exe or script.exe show output, if the stack issues got worked around. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47808 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 8 ++++++++ server/named_pipe.c | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 1118f41f81f..6940e0020b7 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1888,8 +1888,16 @@ static void test_pipe_with_data_state(HANDLE pipe, BOOL is_server, DWORD state) "NtQueryInformationFile(FilePipeLocalInformation) failed in %s state %u: %x\n", is_server ? "server" : "client", state, status); if (!status) + { ok(local_info.NamedPipeState == state, "%s NamedPipeState = %u, expected %u\n", is_server ? "server" : "client", local_info.NamedPipeState, state); + if (state != FILE_PIPE_DISCONNECTED_STATE && state != FILE_PIPE_LISTENING_STATE) + ok(local_info.ReadDataAvailable != 0, "ReadDataAvailable, expected non-zero, in %s state %u\n", + is_server ? "server" : "client", state); + else + ok(local_info.ReadDataAvailable == 0, "ReadDataAvailable, expected zero, in %s state %u\n", + is_server ? "server" : "client", state); + } status = pNtQueryInformationFile(pipe, &io, &pipe_info, sizeof(pipe_info), FilePipeInformation); if (!is_server && state == FILE_PIPE_DISCONNECTED_STATE) diff --git a/server/named_pipe.c b/server/named_pipe.c index 1bbf7f17a3a..3e6cf09d4f2 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -670,6 +670,8 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned case FilePipeLocalInformation: { FILE_PIPE_LOCAL_INFORMATION *pipe_info; + struct pipe_message *message; + data_size_t avail = 0; if (!(get_handle_access( current->process, handle) & FILE_READ_ATTRIBUTES)) { @@ -706,7 +708,11 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned pipe_info->MaximumInstances = pipe->maxinstances; pipe_info->CurrentInstances = pipe->instances; pipe_info->InboundQuota = pipe->insize; - pipe_info->ReadDataAvailable = 0; /* FIXME */ + + LIST_FOR_EACH_ENTRY( message, &pipe_end->message_queue, struct pipe_message, entry ) + avail += message->iosb->in_size - message->read_pos; + pipe_info->ReadDataAvailable = avail; + pipe_info->OutboundQuota = pipe->outsize; pipe_info->WriteQuotaAvailable = 0; /* FIXME */ pipe_info->NamedPipeState = pipe_end->state;

1 0

Eric Pouech : examine-relay: DLLs can have underscore in their names (like ws2_32).
by Alexandre Julliard 06 Dec '21

06 Dec '21

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 : ntdll: Fix compilation for ARM64 Apple platform.
by Alexandre Julliard 06 Dec '21

06 Dec '21

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

Nikolay Sivov : dwrite: Move glyph advances cache to PE side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: eef8a44db73787a0908f876c8d553fdeb73ecc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eef8a44db73787a0908f876c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 6 16:17:50 2021 +0300 dwrite: Move glyph advances cache to PE side. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 12 +++- dlls/dwrite/font.c | 132 ++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/freetype.c | 37 ++++++------ 3 files changed, 150 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eef8a44db73787a0908f…

1 0

Robert Wilhelm : scrrun/tests: Use more context for MultiByteToWideChar in Read test.
by Alexandre Julliard 06 Dec '21

06 Dec '21

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

Robert Wilhelm : scrrun/tests: Use more context for MultiByteToWideChar in ReadAll test.
by Alexandre Julliard 06 Dec '21

06 Dec '21

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 06 Dec '21

06 Dec '21

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 06 Dec '21

06 Dec '21

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

Alex Henrie : shell32: Provide 4-bit icons that are actually limited to 16 colors.
by Alexandre Julliard 06 Dec '21

06 Dec '21

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

Derek Lesho : kernelbase: Fix parameter order of FindResourceExW call for non-localized path.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 472763c5237febcb8745835c96f8b49b000564de URL: https://source.winehq.org/git/wine.git/?a=commit;h=472763c5237febcb8745835c… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Dec 6 10:58:18 2021 +0100 kernelbase: Fix parameter order of FindResourceExW call for non-localized path. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/version.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index d670df27690..7ca3ecdc712 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -781,8 +781,8 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r if (!(flags & FILE_VER_GET_LOCALISED)) { LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); - hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO, english ); + hRsrc = FindResourceExW( hModule, (LPWSTR)VS_FILE_INFO, + MAKEINTRESOURCEW(VS_VERSION_INFO), english ); } if (!hRsrc) hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), @@ -887,8 +887,8 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored, if (!(flags & FILE_VER_GET_LOCALISED)) { LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); - hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO, english ); + hRsrc = FindResourceExW( hModule, (LPWSTR)VS_FILE_INFO, + MAKEINTRESOURCEW(VS_VERSION_INFO), english ); } if (!hRsrc) hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO),

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021