- Wine-Commits - list.winehq.org

Francois Gouget : user32/tests: Use wine_dbgstr_an() to trace malformed Unicode strings.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 47d492742477e5d0e94b2efda91ef7b405d34300 URL: https://gitlab.winehq.org/wine/wine/-/commit/47d492742477e5d0e94b2efda91ef7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 21 16:11:31 2022 +0100 user32/tests: Use wine_dbgstr_an() to trace malformed Unicode strings. Using wine_dbgstr_wn() causes out-of-bounds memory accesses when given Unicode strings with odd sizes, most obviously 1 byte strings. Also trace the expected Ansi string for round-trip tests. --- dlls/user32/tests/clipboard.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 7414af996fb..09f01b7481a 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -2269,7 +2269,7 @@ static void test_string_data(void) memcpy( bufferW, test_data[i].strW, test_data[i].len ); bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; ok( !memcmp( data, bufferW, test_data[i].len ), - "wrong data %s\n", wine_dbgstr_wn( data, (test_data[i].len + 1) / sizeof(WCHAR) )); + "wrong data %s\n", wine_dbgstr_an( data, test_data[i].len )); } r = CloseClipboard(); ok( r, "gle %ld\n", GetLastError() ); @@ -2314,8 +2314,7 @@ static void test_string_data_process( int i ) ok( len == test_data[i].len, "wrong size %u / %u\n", len, test_data[i].len ); memcpy( bufferW, test_data[i].strW, test_data[i].len ); bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; - ok( !memcmp( data, bufferW, len ), - "wrong data %s\n", wine_dbgstr_wn( data, (len + 1) / sizeof(WCHAR) )); + ok( !memcmp( data, bufferW, len ), "wrong data %s\n", wine_dbgstr_an( data, len )); data = GetClipboardData( CF_TEXT ); if (test_data[i].len >= sizeof(WCHAR)) { @@ -2325,7 +2324,8 @@ static void test_string_data_process( int i ) bufferA, ARRAY_SIZE(bufferA), NULL, NULL ); bufferA[len2 - 1] = 0; ok( len == len2, "wrong size %u / %u\n", len, len2 ); - ok( !memcmp( data, bufferA, len ), "wrong data %.*s\n", len, (char *)data ); + ok( !memcmp( data, bufferA, len ), "wrong data %s, expected %s\n", + wine_dbgstr_an( data, len ), wine_dbgstr_an( bufferA, len2 )); } else {

1 0

Francois Gouget : user32: Fix a SetClipboardData() buffer overflow.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 605ecafa67a4e034328b69396581e2f9b60d7af3 URL: https://gitlab.winehq.org/wine/wine/-/commit/605ecafa67a4e034328b69396581e2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 21 18:48:29 2022 +0100 user32: Fix a SetClipboardData() buffer overflow. Wine would append a correctly aligned NUL Unicode character to terminate the string but overflow the buffer by one byte for odd-sized strings. Windows instead overwrites the last two buffer bytes with a NUL Unicode character which ends up being misaligned for odd-sized strings. The clipboard data has a size field anyway so match the Windows behavior. Tweak the tests to show that SetClipboardData() can overwrite half of the Unicode string's last character. --- dlls/user32/clipboard.c | 5 +++-- dlls/user32/tests/clipboard.c | 14 +++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index f006e205e05..72c7720dc17 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -157,12 +157,13 @@ static HANDLE marshal_data( UINT format, HANDLE handle, size_t *ret_size ) } case CF_UNICODETEXT: { - WCHAR *ptr; + char *ptr; if (!(size = GlobalSize( handle ))) return 0; if ((data_size_t)size != size) return 0; if (size < sizeof(WCHAR)) return 0; if (!(ptr = GlobalLock( handle ))) return 0; - ptr[(size + 1) / sizeof(WCHAR) - 1] = 0; /* enforce null-termination */ + /* enforce nul-termination the Windows way: ignoring alignment */ + *((WCHAR *)(ptr + size) - 1) = 0; GlobalUnlock( handle ); *ret_size = size; return handle; diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 38249c24ea0..87df06b6621 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -2224,11 +2224,11 @@ static const struct { "", {}, 0 }, { "", {'f'}, 1 }, /* 5 */ { "", {'f'}, 2 }, - { "", {'f','o','o'}, 5 }, - { "", {'f','o','o'}, 6 }, - { "", {'f','o','o',0}, 7 }, /* 10 */ - { "", {'f','o','o',0}, 8 }, - { "", {'f','o','o',0,'b'}, 9 }, + { "", {0x3b1,0x3b2,0x3b3}, 5 }, /* Alpha, beta, ... */ + { "", {0x3b1,0x3b2,0x3b3}, 6 }, + { "", {0x3b1,0x3b2,0x3b3,0}, 7 }, /* 10 */ + { "", {0x3b1,0x3b2,0x3b3,0}, 8 }, + { "", {0x3b1,0x3b2,0x3b3,0,0x3b4}, 9 }, { "", {'f','o','o',0,'b','a','r'}, 7 * sizeof(WCHAR) }, { "", {'f','o','o',0,'b','a','r',0}, 8 * sizeof(WCHAR) }, }; @@ -2274,7 +2274,7 @@ static void test_string_data(void) { ok( clip == data, "SetClipboardData() returned %p != %p\n", clip, data ); memcpy( bufferW, test_data[i].strW, test_data[i].len ); - bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; + *((WCHAR *)((char *)bufferW + test_data[i].len) - 1) = 0; ok( !memcmp( data, bufferW, test_data[i].len ), "wrong data %s\n", wine_dbgstr_an( data, test_data[i].len )); } @@ -2336,7 +2336,7 @@ static void test_string_data_process( int i ) len = GlobalSize( data ); ok( len == test_data[i].len, "wrong size %u / %u\n", len, test_data[i].len ); memcpy( bufferW, test_data[i].strW, test_data[i].len ); - bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; + *((WCHAR *)((char *)bufferW + test_data[i].len) - 1) = 0; ok( !memcmp( data, bufferW, len ), "wrong data %s\n", wine_dbgstr_an( data, len )); }

1 0

Paul Gofman : ntdll: Use MemAvailable field for free RAM estimation if available.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: e41135a4a532524684a6c85141ac2c08d7fe17a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e41135a4a532524684a6c85141ac2c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sun Jan 22 17:36:44 2023 -0600 ntdll: Use MemAvailable field for free RAM estimation if available. --- dlls/ntdll/unix/system.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index b9762fd278f..33e93bbdf32 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1885,7 +1885,7 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) if ((fp = fopen("/proc/meminfo", "r"))) { - unsigned long long value; + unsigned long long value, mem_available = 0; char line[64]; while (fgets(line, sizeof(line), fp)) @@ -1902,8 +1902,11 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) freeram += value * 1024; else if (sscanf(line, "Cached: %llu", &value)) freeram += value * 1024; + else if (sscanf(line, "MemAvailable: %llu", &value)) + mem_available = value * 1024; } fclose(fp); + if (mem_available) freeram = mem_available; } } #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || \

1 0

Francois Gouget : user32: Fix a SetClipboardData() underflow and improve the tests.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: ee4f8cbb2066bf7ff2721fb081c1ab091ed8840e URL: https://gitlab.winehq.org/wine/wine/-/commit/ee4f8cbb2066bf7ff2721fb081c1ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 21 18:31:41 2022 +0100 user32: Fix a SetClipboardData() underflow and improve the tests. A 0 or 1 byte Unicode string cannot be NUL terminated. That does stop Windows 10 and older from doing so which is why the 1 byte test must be skipped to avoid a crash in the 64-bit case. But in such cases SetClipboardData() fails on Windows 11 and so should Wine (instead of underflowing the buffer like Windows). Reorganize the test data by increasing size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54192 --- dlls/user32/clipboard.c | 1 + dlls/user32/tests/clipboard.c | 73 +++++++++++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 23 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index dd33bd7df82..f006e205e05 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -160,6 +160,7 @@ static HANDLE marshal_data( UINT format, HANDLE handle, size_t *ret_size ) WCHAR *ptr; if (!(size = GlobalSize( handle ))) return 0; if ((data_size_t)size != size) return 0; + if (size < sizeof(WCHAR)) return 0; if (!(ptr = GlobalLock( handle ))) return 0; ptr[(size + 1) / sizeof(WCHAR) - 1] = 0; /* enforce null-termination */ GlobalUnlock( handle ); diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 09f01b7481a..38249c24ea0 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -2217,35 +2217,39 @@ static const struct UINT len; } test_data[] = { - { "foo", {}, 3 }, /* 0 */ + { "foo", {}, 3 }, /* 0 */ { "foo", {}, 4 }, { "foo\0bar", {}, 7 }, { "foo\0bar", {}, 8 }, - { "", {'f','o','o'}, 3 * sizeof(WCHAR) }, - { "", {'f','o','o',0}, 4 * sizeof(WCHAR) }, /* 5 */ + { "", {}, 0 }, + { "", {'f'}, 1 }, /* 5 */ + { "", {'f'}, 2 }, + { "", {'f','o','o'}, 5 }, + { "", {'f','o','o'}, 6 }, + { "", {'f','o','o',0}, 7 }, /* 10 */ + { "", {'f','o','o',0}, 8 }, + { "", {'f','o','o',0,'b'}, 9 }, { "", {'f','o','o',0,'b','a','r'}, 7 * sizeof(WCHAR) }, { "", {'f','o','o',0,'b','a','r',0}, 8 * sizeof(WCHAR) }, - { "", {'f','o','o'}, 1 }, - { "", {'f','o','o'}, 2 }, - { "", {'f','o','o'}, 5 }, /* 10 */ - { "", {'f','o','o',0}, 7 }, - { "", {'f','o','o',0}, 9 }, }; static void test_string_data(void) { UINT i; BOOL r; - HANDLE data; + HANDLE data, clip; char cmd[16]; char bufferA[12]; WCHAR bufferW[12]; for (i = 0; i < ARRAY_SIZE(test_data); i++) { - /* 1-byte Unicode strings crash on Win64 */ #ifdef _WIN64 - if (!test_data[i].strA[0] && test_data[i].len < sizeof(WCHAR)) continue; + /* Before Windows 11 1-byte Unicode strings crash on Win64 + * because it underflows when 'appending' a 2 bytes NUL character! + */ + if (!test_data[i].strA[0] && test_data[i].len < sizeof(WCHAR) && + strcmp(winetest_platform, "windows") == 0) continue; #endif winetest_push_context("%d", i); r = open_clipboard( 0 ); @@ -2265,11 +2269,17 @@ static void test_string_data(void) else { memcpy( data, test_data[i].strW, test_data[i].len ); - SetClipboardData( CF_UNICODETEXT, data ); - memcpy( bufferW, test_data[i].strW, test_data[i].len ); - bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; - ok( !memcmp( data, bufferW, test_data[i].len ), - "wrong data %s\n", wine_dbgstr_an( data, test_data[i].len )); + clip = SetClipboardData( CF_UNICODETEXT, data ); + if (test_data[i].len >= sizeof(WCHAR)) + { + ok( clip == data, "SetClipboardData() returned %p != %p\n", clip, data ); + memcpy( bufferW, test_data[i].strW, test_data[i].len ); + bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; + ok( !memcmp( data, bufferW, test_data[i].len ), + "wrong data %s\n", wine_dbgstr_an( data, test_data[i].len )); + } + else + ok( !clip || broken(clip != NULL), "expected SetClipboardData() to fail\n" ); } r = CloseClipboard(); ok( r, "gle %ld\n", GetLastError() ); @@ -2309,12 +2319,27 @@ static void test_string_data_process( int i ) else { data = GetClipboardData( CF_UNICODETEXT ); - ok( data != 0, "could not get data\n" ); - len = GlobalSize( data ); - ok( len == test_data[i].len, "wrong size %u / %u\n", len, test_data[i].len ); - memcpy( bufferW, test_data[i].strW, test_data[i].len ); - bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; - ok( !memcmp( data, bufferW, len ), "wrong data %s\n", wine_dbgstr_an( data, len )); + if (!data) + { + ok( test_data[i].len < sizeof(WCHAR), "got no data for len=%d\n", test_data[i].len ); + ok( !IsClipboardFormatAvailable( CF_UNICODETEXT ), "unicode available\n" ); + } + else if (test_data[i].len == 0) + { + /* 0-byte string handling is broken on Windows <= 10 */ + len = GlobalSize( data ); + ok( broken(len == 1), "wrong size %u / 0\n", len ); + ok( broken(*((char*)data) == 0), "wrong data %s\n", wine_dbgstr_an( data, len )); + } + else + { + len = GlobalSize( data ); + ok( len == test_data[i].len, "wrong size %u / %u\n", len, test_data[i].len ); + memcpy( bufferW, test_data[i].strW, test_data[i].len ); + bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; + ok( !memcmp( data, bufferW, len ), "wrong data %s\n", wine_dbgstr_an( data, len )); + } + data = GetClipboardData( CF_TEXT ); if (test_data[i].len >= sizeof(WCHAR)) { @@ -2329,8 +2354,10 @@ static void test_string_data_process( int i ) } else { + BOOL available = IsClipboardFormatAvailable( CF_TEXT ); + ok( !available || broken(available /* win10 */), + "available text %d\n", available ); ok( !data, "got data for empty string\n" ); - ok( IsClipboardFormatAvailable( CF_TEXT ), "text not available\n" ); } } r = CloseClipboard();

1 0

Eric Pouech : conhost.exe: Handle ctrl-\ in Wine.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: e8c79209190c124567027f527497625ac9145618 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8c79209190c124567027f52749762… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 21 10:48:29 2022 +0100 conhost.exe: Handle ctrl-\ in Wine. Let conhost handle ctrl-\ instead of Unix tty, and pretend it's a ctrl-pause/break key stroke. This allows CUI application in processed input mode not to close upon ctrl-\. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54141 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/conhost.c | 6 ++++++ server/console.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 0bc6abe657c..1bed7b8a03c 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1778,6 +1778,12 @@ static DWORD WINAPI tty_input( void *param ) case 0x1b: i += process_input_escape( console, buf + i + 1, count - i - 1 ); break; + case 0x1c: /* map ctrl-\ unix-ism into ctrl-break/pause windows-ism for unix consoles */ + if (console->is_unix) + key_press( console, 0, VK_CANCEL, LEFT_CTRL_PRESSED ); + else + char_key_press( console, ch, 0 ); + break; case 0x7f: key_press( console, '\b', VK_BACK, 0 ); break; diff --git a/server/console.c b/server/console.c index 34f8d09408f..b64283baf4a 100644 --- a/server/console.c +++ b/server/console.c @@ -1183,7 +1183,7 @@ static void console_server_ioctl( struct fd *fd, ioctl_code_t code, struct async return; } term = server->termios; - term.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN); + term.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN | ISIG); term.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); term.c_cflag &= ~(CSIZE | PARENB); term.c_cflag |= CS8;

1 0

Eric Pouech : conhost.exe: Handle ctrl-pause/break key strokes.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: fda954dfd4f1a0d07ca151324b9eaedc1f09964d URL: https://gitlab.winehq.org/wine/wine/-/commit/fda954dfd4f1a0d07ca151324b9eae… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 21 10:48:28 2022 +0100 conhost.exe: Handle ctrl-pause/break key strokes. Note: this patch should be extended by adding insertion of the CTRL_BREAK_EVENT into processes' crtl handler (as it's done for CTRL_C_EVENT). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/conhost.c | 31 +++++++++++++++++++++++++++---- server/console.c | 8 +++++--- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 800e8bab822..0bc6abe657c 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1463,6 +1463,29 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ return process_console_input( console ); } +static BOOL map_to_ctrlevent( struct console *console, const INPUT_RECORD *record, + unsigned int* event) +{ + if (record->EventType == KEY_EVENT) + { + if (record->Event.KeyEvent.uChar.UnicodeChar == 'C' - 64 && + !(record->Event.KeyEvent.dwControlKeyState & ENHANCED_KEY)) + { + *event = CTRL_C_EVENT; + return TRUE; + } + /* we want to get ctrl-pause/break, but it's already translated by user32 into VK_CANCEL */ + if (record->Event.KeyEvent.uChar.UnicodeChar == 0 && + record->Event.KeyEvent.wVirtualKeyCode == VK_CANCEL && + record->Event.KeyEvent.dwControlKeyState == LEFT_CTRL_PRESSED) + { + *event = CTRL_BREAK_EVENT; + return TRUE; + } + } + return FALSE; +} + /* add input events to a console input queue */ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count, BOOL flush ) @@ -1485,9 +1508,9 @@ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *recor unsigned int i = 0; while (i < count) { - if (records[i].EventType == KEY_EVENT && - records[i].Event.KeyEvent.uChar.UnicodeChar == 'C' - 64 && - !(records[i].Event.KeyEvent.dwControlKeyState & ENHANCED_KEY)) + unsigned int event; + + if (map_to_ctrlevent(console, &records[i], &event)) { if (i != count - 1) memcpy( &console->records[console->record_count + i], @@ -1499,7 +1522,7 @@ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *recor struct condrv_ctrl_event ctrl_event; IO_STATUS_BLOCK io; - ctrl_event.event = CTRL_C_EVENT; + ctrl_event.event = event; ctrl_event.group_id = 0; NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_CTRL_EVENT, &ctrl_event, sizeof(ctrl_event), NULL, 0 ); diff --git a/server/console.c b/server/console.c index 5f3f50d006f..34f8d09408f 100644 --- a/server/console.c +++ b/server/console.c @@ -694,14 +694,16 @@ static void propagate_console_signal( struct console *console, set_error( STATUS_INVALID_PARAMETER ); return; } - /* FIXME: should support the other events (like CTRL_BREAK) */ - if (sig != CTRL_C_EVENT) + switch (sig) { + case CTRL_C_EVENT: csi.signal = SIGINT; break; + case CTRL_BREAK_EVENT: csi.signal = SIGQUIT; break; + default: + /* FIXME: should support the other events */ set_error( STATUS_NOT_IMPLEMENTED ); return; } csi.console = console; - csi.signal = SIGINT; csi.group = group_id; enum_processes(propagate_console_signal_cb, &csi);

1 0

Alexandre Julliard : krnl386: Remove a trace that causes compiler warnings.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: cf3d58e4dc0a59b8b3ac75ceae64fe594c681a50 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf3d58e4dc0a59b8b3ac75ceae64fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 22:18:34 2023 +0100 krnl386: Remove a trace that causes compiler warnings. --- dlls/krnl386.exe16/thunk.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 6b289eac65e..27fc14b5810 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -989,15 +989,7 @@ DWORD WINAPIV SSCall( FARPROC fun, /* [in] function to call */ ... /* [in/out] arguments */ ) { - DWORD i,ret; - DWORD *args = ((DWORD *)&fun) + 1; - - TRACE("(%ld,0x%08lx,%p,[",nr,flags,fun); - for (i = 0; i < nr/4; i++) TRACE("0x%08lx,",args[i]); - TRACE("])\n"); - ret = call_entry_point( fun, nr / sizeof(DWORD), args ); - TRACE(" returning %ld ...\n",ret); - return ret; + return call_entry_point( fun, nr / sizeof(DWORD), (DWORD *)&fun + 1 ); } /**********************************************************************

1 0

Alexandre Julliard : krnl386: Make MapLS argument non-const to avoid some compiler warnings.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 6e43f873c3f554f8166abdce8bbd265b66aad548 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e43f873c3f554f8166abdce8bbd26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 22:17:14 2023 +0100 krnl386: Make MapLS argument non-const to avoid some compiler warnings. --- dlls/commdlg.dll16/filedlg.c | 4 ++-- dlls/krnl386.exe16/selector.c | 2 +- dlls/shell.dll16/shell.c | 2 +- dlls/user.exe16/dialog.c | 2 +- dlls/user.exe16/hook.c | 4 ++-- dlls/user.exe16/message.c | 12 ++++++------ dlls/user.exe16/window.c | 2 +- include/wine/winbase16.h | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 2631febb6ae..b292561b077 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -249,8 +249,8 @@ static UINT_PTR CALLBACK call_hook_proc( WNDPROC16 hook, HWND hwnd, UINT msg, WP CREATESTRUCT16 cs; CREATESTRUCT32Ato16( cs32, &cs ); - cs.lpszName = MapLS( cs32->lpszName ); - cs.lpszClass = MapLS( cs32->lpszClass ); + cs.lpszName = MapLS( (void *)cs32->lpszName ); + cs.lpszClass = MapLS( (void *)cs32->lpszClass ); lp = MapLS( &cs ); ret = call_hook16( hook, hwnd, msg, wp, lp ); UnMapLS( lp ); diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 7d2984cf777..f0c29c8b10d 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -515,7 +515,7 @@ static struct mapls_entry *first_entry; * * Maps linear pointer to segmented. */ -SEGPTR WINAPI MapLS( LPCVOID ptr ) +SEGPTR WINAPI MapLS( void *ptr ) { struct mapls_entry *entry, *free = NULL; const void *base; diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index bc3cfdfc97d..342adeb9a4a 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -670,7 +670,7 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation, * Only exported from shell32 on Windows, probably imported * from shell through the 16/32 thunks. */ -void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ) +void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPSTR cmdline, INT cmdshow ) { WORD args[5]; SEGPTR cmdline_seg; diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index b61ae5cd519..2b6731e4aaf 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -186,7 +186,7 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template, SEGPTR segptr; template = DIALOG_GetControl16( template, &info ); - segptr = MapLS( info.data ); + segptr = MapLS( (void *)info.data ); caption = (char *)info.windowName; if (caption && IS_INTRESOURCE(caption)) diff --git a/dlls/user.exe16/hook.c b/dlls/user.exe16/hook.c index d140e16e426..6d40982297c 100644 --- a/dlls/user.exe16/hook.c +++ b/dlls/user.exe16/hook.c @@ -290,8 +290,8 @@ static LRESULT CALLBACK call_WH_CBT( INT code, WPARAM wp, LPARAM lp ) cs16.y = cbtcw32->lpcs->y; cs16.x = cbtcw32->lpcs->x; cs16.style = cbtcw32->lpcs->style; - cs16.lpszName = MapLS( cbtcw32->lpcs->lpszName ); - cs16.lpszClass = MapLS( cbtcw32->lpcs->lpszClass ); + cs16.lpszName = MapLS( (void *)cbtcw32->lpcs->lpszName ); + cs16.lpszClass = MapLS( (void *)cbtcw32->lpcs->lpszClass ); cs16.dwExStyle = cbtcw32->lpcs->dwExStyle; cbtcw16.lpcs = (CREATESTRUCT16 *)MapLS( &cs16 ); diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 59c58ed9bd9..203d543ce90 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -945,15 +945,15 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT BOOL mdi_child = (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD); CREATESTRUCT32Ato16( cs32, &cs ); - cs.lpszName = MapLS( cs32->lpszName ); - cs.lpszClass = MapLS( cs32->lpszClass ); + cs.lpszName = MapLS( (void *)cs32->lpszName ); + cs.lpszClass = MapLS( (void *)cs32->lpszClass ); if (mdi_child) { MDICREATESTRUCTA *mdi_cs = cs32->lpCreateParams; MDICREATESTRUCT32Ato16( mdi_cs, &mdi_cs16 ); - mdi_cs16.szTitle = MapLS( mdi_cs->szTitle ); - mdi_cs16.szClass = MapLS( mdi_cs->szClass ); + mdi_cs16.szTitle = MapLS( (void *)mdi_cs->szTitle ); + mdi_cs16.szClass = MapLS( (void *)mdi_cs->szClass ); cs.lpCreateParams = MapLS( &mdi_cs16 ); } lParam = MapLS( &cs ); @@ -975,8 +975,8 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT MDICREATESTRUCT16 cs; MDICREATESTRUCT32Ato16( cs32, &cs ); - cs.szTitle = MapLS( cs32->szTitle ); - cs.szClass = MapLS( cs32->szClass ); + cs.szTitle = MapLS( (void *)cs32->szTitle ); + cs.szClass = MapLS( (void *)cs32->szClass ); lParam = MapLS( &cs ); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); UnMapLS( lParam ); diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 69d178e31b0..eac3468a6e0 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -1671,7 +1671,7 @@ BOOL16 WINAPI GetClassInfoEx16( HINSTANCE16 hInst16, SEGPTR name, WNDCLASSEX16 * wc->hCursor = get_icon_16( wc32.hCursor ); wc->hbrBackground = HBRUSH_16(wc32.hbrBackground); wc->lpszClassName = 0; - wc->lpszMenuName = MapLS(wc32.lpszMenuName); /* FIXME: leak */ + wc->lpszMenuName = MapLS((void *)wc32.lpszMenuName); /* FIXME: leak */ } return ret; } diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 1d052130e33..28cde59f9b3 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -402,8 +402,8 @@ WORD WINAPI LocalHeapSize16(void); BOOL16 WINAPI LocalInit16(HANDLE16,WORD,WORD); FARPROC16 WINAPI LocalNotify16(FARPROC16); HTASK16 WINAPI LockCurrentTask16(BOOL16); -DWORD WINAPI MapLS(LPCVOID); -LPVOID WINAPI MapSL(DWORD); +SEGPTR WINAPI MapLS(void*); +LPVOID WINAPI MapSL(SEGPTR); VOID WINAPI OldYield16(void); VOID WINAPI WIN32_OldYield16(void); VOID WINAPI PostEvent16(HTASK16);

1 0

Alexandre Julliard : shell32: Allocate a full SHITEMID to avoid a compiler warning.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: c844ebdb0ae8994ee4f3d1d3c1697ece06f52a4e URL: https://gitlab.winehq.org/wine/wine/-/commit/c844ebdb0ae8994ee4f3d1d3c1697e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 22:22:52 2023 +0100 shell32: Allocate a full SHITEMID to avoid a compiler warning. --- dlls/shell32/shfldr_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 662d8b52d5b..d47911dbef7 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -347,7 +347,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, /* Special case for the root folder. */ if (!wcsicmp( szPath, L"\\\\?\\unix\\" )) { - *ppidl = SHAlloc(sizeof(USHORT)); + *ppidl = SHAlloc(sizeof(*ppidl)); if (!*ppidl) return E_FAIL; (*ppidl)->mkid.cb = 0; /* Terminate the ITEMIDLIST */ return S_OK;

1 0

Fabian Maurer : d3dx10core: Don't redefine ID3D10Device1 (gcc 4.3).
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: ae84e423c5d0e7d9d8c083b1f64029ef41e6e1fe URL: https://gitlab.winehq.org/wine/wine/-/commit/ae84e423c5d0e7d9d8c083b1f64029… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 12 18:56:34 2022 +0100 d3dx10core: Don't redefine ID3D10Device1 (gcc 4.3). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- include/d3dx10core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dx10core.h b/include/d3dx10core.h index cca9052cc13..c8c5e97505f 100644 --- a/include/d3dx10core.h +++ b/include/d3dx10core.h @@ -287,8 +287,8 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain, ID3D10Device **device); -typedef interface ID3D10Device1 ID3D10Device1; -HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1); +interface ID3D10Device1; +HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, interface ID3D10Device1 **device1); HRESULT WINAPI D3DX10CreateFontIndirectA(ID3D10Device *device, const D3DX10_FONT_DESCA *desc, ID3DX10Font **font); HRESULT WINAPI D3DX10CreateFontIndirectW(ID3D10Device *device, const D3DX10_FONT_DESCW *desc, ID3DX10Font **font); HRESULT WINAPI D3DX10CreateFontA(ID3D10Device *device, INT height, UINT width, UINT weight,

1 0