wine-commits July 2020

wine-commits@winehq.org

1 participants
826 discussions

Alexandre Julliard : ntdll: Update the TEB and PEB structures for newer Windows versions.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 0bf52b09f2913b2f718fb32ccd0b1300bdada679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bf52b09f2913b2f718fb32c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 23 20:35:00 2020 +0200 ntdll: Update the TEB and PEB structures for newer Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/kernel16_private.h | 3 +- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_i386.c | 7 +-- dlls/ntdll/unix/signal_arm.c | 4 +- dlls/ntdll/unix/signal_arm64.c | 16 +++---- dlls/ntdll/unix/signal_i386.c | 17 +++---- dlls/ntdll/unix/signal_x86_64.c | 14 +++--- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 2 + include/winternl.h | 87 ++++++++++++++++++++++++++--------- 10 files changed, 102 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0bf52b09f2913b2f718f…

1 0

Alexandre Julliard : winegc: Support overriding the default PE file alignment.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 0e4d22bd8dcfd9af8ddd0e0e9f9c3873f91f13ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4d22bd8dcfd9af8ddd0e0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 23 20:33:16 2020 +0200 winegc: Support overriding the default PE file alignment. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 274f93f40f..90ef16aa1f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -223,6 +223,7 @@ struct options const char* output_name; const char* image_base; const char* section_align; + const char* file_align; const char* sysroot; const char* isysroot; const char* lib_suffix; @@ -522,7 +523,8 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add(link_args, strmake("-Wl,-pdb,%s", opts->debug_file)); if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment,0x1000" )) - strarray_add( link_args, "-Wl,--file-alignment,0x1000" ); + strarray_add( link_args, strmake( "-Wl,--file-alignment,%s", + opts->file_align ? opts->file_align : "0x1000" )); strarray_addall( link_args, flags ); return link_args; @@ -1918,6 +1920,11 @@ int main(int argc, char **argv) opts.section_align = strdup( Wl->base[++j] ); continue; } + if (!strcmp(Wl->base[j], "--file-alignment") && j < Wl->size - 1) + { + opts.file_align = strdup( Wl->base[++j] ); + continue; + } if (!strcmp(Wl->base[j], "--large-address-aware")) { opts.large_address_aware = 1;

1 0

Rémi Bernon : winegcc: Align sections in PE files to page size.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: e36bed4f37de27d38494ece999c5a63adf4eb996 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36bed4f37de27d38494ece9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 13 19:49:22 2020 +0200 winegcc: Align sections in PE files to page size. This makes sure it will be possible to mmap the section directly instead of having to copy them. It then also makes perf able to figure the code origin for Wine modules. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 25 ++++++++++++------------- tools/winegcc/winegcc.c | 3 +++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index da7524dd60..c92423ee19 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -791,7 +791,7 @@ free_page: } static void check_QueryWorkingSetEx(PVOID addr, const char *desc, DWORD expected_valid, - DWORD expected_protection, DWORD expected_shared, BOOL todo, BOOL todo_shared) + DWORD expected_protection, DWORD expected_shared, BOOL todo) { PSAPI_WORKING_SET_EX_INFORMATION info; BOOL ret; @@ -814,7 +814,6 @@ static void check_QueryWorkingSetEx(PVOID addr, const char *desc, DWORD expected ok(info.VirtualAttributes.LargePage == 0, "%s expected LargePage=0 but got %u\n", desc, info.VirtualAttributes.LargePage); - todo_wine_if(todo_shared) ok(info.VirtualAttributes.Shared == expected_shared || broken(!info.VirtualAttributes.Valid) /* w2003 */, "%s expected Shared=%u but got %u\n", desc, expected_shared, info.VirtualAttributes.Shared); if (info.VirtualAttributes.Valid && info.VirtualAttributes.Shared) @@ -838,44 +837,44 @@ static void test_QueryWorkingSetEx(void) } addr = GetModuleHandleA(NULL); - check_QueryWorkingSetEx(addr, "exe", 1, PAGE_READONLY, 1, FALSE, TRUE); + check_QueryWorkingSetEx(addr, "exe", 1, PAGE_READONLY, 1, FALSE); ret = VirtualProtect(addr, 0x1000, PAGE_NOACCESS, &prot); ok(ret, "VirtualProtect failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "exe,noaccess", 0, 0, 1, FALSE, TRUE); + check_QueryWorkingSetEx(addr, "exe,noaccess", 0, 0, 1, FALSE); ret = VirtualProtect(addr, 0x1000, prot, &prot); ok(ret, "VirtualProtect failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "exe,readonly1", 0, 0, 1, TRUE, TRUE); + check_QueryWorkingSetEx(addr, "exe,readonly1", 0, 0, 1, TRUE); *(volatile char *)addr; ok(ret, "VirtualProtect failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "exe,readonly2", 1, PAGE_READONLY, 1, FALSE, TRUE); + check_QueryWorkingSetEx(addr, "exe,readonly2", 1, PAGE_READONLY, 1, FALSE); addr = VirtualAlloc(NULL, 0x1000, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE); ok(addr != NULL, "VirtualAlloc failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "valloc", 0, 0, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc", 0, 0, 0, FALSE); *(volatile char *)addr; - check_QueryWorkingSetEx(addr, "valloc,read", 1, PAGE_READWRITE, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,read", 1, PAGE_READWRITE, 0, FALSE); *(volatile char *)addr = 0x42; - check_QueryWorkingSetEx(addr, "valloc,write", 1, PAGE_READWRITE, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,write", 1, PAGE_READWRITE, 0, FALSE); ret = VirtualProtect(addr, 0x1000, PAGE_NOACCESS, &prot); ok(ret, "VirtualProtect failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "valloc,noaccess", 0, 0, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,noaccess", 0, 0, 0, FALSE); ret = VirtualProtect(addr, 0x1000, prot, &prot); ok(ret, "VirtualProtect failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "valloc,readwrite1", 0, 0, 0, TRUE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,readwrite1", 0, 0, 0, TRUE); *(volatile char *)addr; - check_QueryWorkingSetEx(addr, "valloc,readwrite2", 1, PAGE_READWRITE, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,readwrite2", 1, PAGE_READWRITE, 0, FALSE); ret = VirtualFree(addr, 0, MEM_RELEASE); ok(ret, "VirtualFree failed with %d\n", GetLastError()); - check_QueryWorkingSetEx(addr, "valloc,free", FALSE, 0, 0, FALSE, FALSE); + check_QueryWorkingSetEx(addr, "valloc,free", FALSE, 0, 0, FALSE); } START_TEST(psapi_main) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 29c1b0549d..274f93f40f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -521,6 +521,9 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) if (opts->debug_file && strendswith(opts->debug_file, ".pdb")) strarray_add(link_args, strmake("-Wl,-pdb,%s", opts->debug_file)); + if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment,0x1000" )) + strarray_add( link_args, "-Wl,--file-alignment,0x1000" ); + strarray_addall( link_args, flags ); return link_args;

1 0

Jacek Caban : kernel32/tests: Add more console output tests.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 716bdfcbfa9563f8dd72dc32076344c04b46e26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=716bdfcbfa9563f8dd72dc32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:32:23 2020 +0200 kernel32/tests: Add more console output tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 158 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index dd8cc2c188..6e05fbd4fa 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -640,7 +640,8 @@ static void testScroll(HANDLE hCon, COORD sbSize) clip.Top = H / 2; clip.Bottom = min(H + H / 2, sbSize.Y - 1); - ok(ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci), "Scrolling SB\n"); + ret = ScrollConsoleScreenBufferA(hCon, &scroll, &clip, dst, &ci); + ok(ret, "ScrollConsoleScreenBufferA failed: %u\n", GetLastError()); for (c.Y = 0; c.Y < sbSize.Y; c.Y++) { @@ -2046,6 +2047,12 @@ static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) ret = WriteConsoleOutputCharacterA(output_handle, output, 1, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); ok(count == 1, "Expected count to be 1, got %u\n", count); + + count = 0xdeadbeef; + origin.X = 200; + ret = WriteConsoleOutputCharacterA(output_handle, output, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); } static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) @@ -2130,6 +2137,13 @@ static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) ret = WriteConsoleOutputCharacterW(output_handle, outputW, 1, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); ok(count == 1, "Expected count to be 1, got %u\n", count); + + count = 0xdeadbeef; + origin.X = 200; + ret = WriteConsoleOutputCharacterW(output_handle, outputW, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + } static void test_WriteConsoleOutputAttribute(HANDLE output_handle) @@ -2213,6 +2227,147 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle) ret = WriteConsoleOutputAttribute(output_handle, &attr, 1, origin, &count); ok(ret == TRUE, "Expected WriteConsoleOutputAttribute to return TRUE, got %d\n", ret); ok(count == 1, "Expected count to be 1, got %u\n", count); + + count = 0xdeadbeef; + origin.X = 200; + ret = WriteConsoleOutputAttribute(output_handle, &attr, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputAttribute to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); +} + +static void set_region(SMALL_RECT *region, unsigned int left, unsigned int top, unsigned int right, unsigned int bottom) +{ + region->Left = left; + region->Top = top; + region->Right = right; + region->Bottom = bottom; +} + +#define check_region(a,b,c,d,e) check_region_(__LINE__,a,b,c,d,e) +static void check_region_(unsigned int line, const SMALL_RECT *region, unsigned int left, unsigned int top, unsigned int right, unsigned int bottom) +{ + ok_(__FILE__,line)(region->Left == left, "Left = %u, expected %u\n", region->Left, left); + ok_(__FILE__,line)(region->Top == top, "Top = %u, expected %u\n", region->Top, top); + ok_(__FILE__,line)(region->Right == right, "Right = %u, expected %u\n", region->Right, right); + ok_(__FILE__,line)(region->Bottom == bottom, "Bottom = %u, expected %u\n", region->Bottom, bottom); +} + +static void test_WriteConsoleOutput(HANDLE console) +{ + CONSOLE_SCREEN_BUFFER_INFO info; + CHAR_INFO char_info_buf[2048]; + SMALL_RECT region; + COORD size, coord; + unsigned int i; + BOOL ret; + + for (i = 0; i < ARRAY_SIZE(char_info_buf); i++) + { + char_info_buf[i].Char.UnicodeChar = '0' + i % 10; + char_info_buf[i].Attributes = 0; + } + + ret = GetConsoleScreenBufferInfo(console, &info); + ok(ret, "GetConsoleScreenBufferInfo failed: %u\n", GetLastError()); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 10, 7, 15, 11); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 200, 7, 15, 211); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 200, 7, 15, 211); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 200, 7, 211, 8); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 200, 7, 211, 8); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 9, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 9, 11); + + size.X = 23; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 11, 6); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 11, 6); + + size.X = 2; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 15, 11); + + size.X = 23; + size.Y = 3; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + check_region(&region, 10, 7, 15, 11); + + size.X = 6; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 10, 7, 13, 11); + + size.X = 6; + size.Y = 17; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW((HANDLE)0xdeadbeef, char_info_buf, size, coord, &region); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, "WriteConsoleOutputW returned: %x(%u)\n", ret, GetLastError()); + if (!skip_nt) check_region(&region, 10, 7, 13, 11); + + size.X = 16; + size.Y = 7; + coord.X = 2; + coord.Y = 3; + set_region(&region, 10, 7, 15, 11); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, 10, 7, 15, 10); + + size.X = 16; + size.Y = 7; + coord.X = 2; + coord.Y = 3; + set_region(&region, info.dwSize.X - 2, 7, info.dwSize.X + 2, 7); + ret = WriteConsoleOutputW(console, char_info_buf, size, coord, &region); + ok(ret, "WriteConsoleOutputW failed: %u\n", GetLastError()); + check_region(&region, info.dwSize.X - 2, 7, info.dwSize.X - 1, 7); } static void test_FillConsoleOutputCharacterA(HANDLE output_handle) @@ -3597,6 +3752,7 @@ START_TEST(console) test_WriteConsoleOutputCharacterA(hConOut); test_WriteConsoleOutputCharacterW(hConOut); test_WriteConsoleOutputAttribute(hConOut); + test_WriteConsoleOutput(hConOut); test_FillConsoleOutputCharacterA(hConOut); test_FillConsoleOutputCharacterW(hConOut); test_FillConsoleOutputAttribute(hConOut);

1 0

Jacek Caban : server: Remove no longer used write_console_output request.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 9f3e9d464da8806acd185783f4d2350dd675fd2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f3e9d464da8806acd185783… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:32:12 2020 +0200 server: Remove no longer used write_console_output request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 8 ++++ include/wine/server_protocol.h | 33 +---------------- server/console.c | 84 ------------------------------------------ server/protocol.def | 22 ----------- server/request.h | 12 ------ server/trace.c | 20 ---------- 6 files changed, 9 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f3e9d464da8806acd18…

1 0

Jacek Caban : kernel32: Use IOCTL_CONDRV_WRITE_OUTPUT in CONSOLE_WriteChars.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 98bee7881a30eb01fb3d633f008957919a4aa71b URL: https://source.winehq.org/git/wine.git/?a=commit;h=98bee7881a30eb01fb3d633f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:56 2020 +0200 kernel32: Use IOCTL_CONDRV_WRITE_OUTPUT in CONSOLE_WriteChars. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f75a894717..8fc158ac22 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -689,25 +689,24 @@ LONG CALLBACK CONSOLE_HandleCtrlC( EXCEPTION_POINTERS *eptr ) * WriteConsoleOutput helper: hides server call semantics * writes a string at a given pos with standard attribute */ -static int CONSOLE_WriteChars(HANDLE hCon, LPCWSTR lpBuffer, int nc, COORD* pos) -{ - int written = -1; - - if (!nc) return 0; - - SERVER_START_REQ( write_console_output ) - { - req->handle = console_handle_unmap(hCon); - req->x = pos->X; - req->y = pos->Y; - req->mode = CHAR_INFO_MODE_TEXTSTDATTR; - req->wrap = FALSE; - wine_server_add_data( req, lpBuffer, nc * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) written = reply->written; - } - SERVER_END_REQ; - - if (written > 0) pos->X += written; +static int CONSOLE_WriteChars(HANDLE handle, const WCHAR *str, size_t length, COORD *coord) +{ + struct condrv_write_output_params *params; + DWORD written = 0, size; + + if (!length) return 0; + + size = sizeof(*params) + length * sizeof(WCHAR); + if (!(params = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; + params->mode = CHAR_INFO_MODE_TEXTSTDATTR; + params->x = coord->X; + params->y = coord->Y; + params->width = 0; + memcpy( params + 1, str, length * sizeof(*str) ); + if (DeviceIoControl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, size, + &written, sizeof(written), NULL, NULL )) + coord->X += written; + HeapFree( GetProcessHeap(), 0, params ); return written; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputCharacterW.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: db886f09236759141a95183be83c666cac5f9a64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db886f09236759141a95183b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:47 2020 +0200 kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputCharacterW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 01f326cb81..b7443ce9ae 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1600,6 +1600,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterA( HANDLE handle, LPCST BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWSTR str, DWORD length, COORD coord, DWORD *written ) { + struct condrv_write_output_params *params; + size_t size; BOOL ret; TRACE( "(%p,%s,%d,%dx%d,%p)\n", handle, debugstr_wn(str, length), length, coord.X, coord.Y, written ); @@ -1611,16 +1613,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWS } *written = 0; - SERVER_START_REQ( write_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = coord.X; - req->y = coord.Y; - req->mode = CHAR_INFO_MODE_TEXT; - req->wrap = TRUE; - wine_server_add_data( req, str, length * sizeof(WCHAR) ); - if ((ret = !wine_server_call_err( req ))) *written = reply->written; - } - SERVER_END_REQ; + size = sizeof(*params) + length * sizeof(WCHAR); + if (!(params = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; + params->mode = CHAR_INFO_MODE_TEXT; + params->x = coord.X; + params->y = coord.Y; + params->width = 0; + memcpy( params + 1, str, length * sizeof(*str) ); + ret = console_ioctl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, size, written, sizeof(*written), NULL ); + HeapFree( GetProcessHeap(), 0, params ); return ret; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputAttribute.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 30453f0acf8bdca4dec5de38d08a776b933256c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30453f0acf8bdca4dec5de38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:39 2020 +0200 kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputAttribute. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a79644723a..01f326cb81 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1533,6 +1533,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputW( HANDLE handle, const CHAR_INF BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputAttribute( HANDLE handle, const WORD *attr, DWORD length, COORD coord, DWORD *written ) { + struct condrv_write_output_params *params; + size_t size; BOOL ret; TRACE( "(%p,%p,%d,%dx%d,%p)\n", handle, attr, length, coord.X, coord.Y, written ); @@ -1544,17 +1546,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputAttribute( HANDLE handle, const } *written = 0; - SERVER_START_REQ( write_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = coord.X; - req->y = coord.Y; - req->mode = CHAR_INFO_MODE_ATTR; - req->wrap = TRUE; - wine_server_add_data( req, attr, length * sizeof(WORD) ); - if ((ret = !wine_server_call_err( req ))) *written = reply->written; - } - SERVER_END_REQ; + size = sizeof(*params) + length * sizeof(WORD); + if (!(params = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; + params->mode = CHAR_INFO_MODE_ATTR; + params->x = coord.X; + params->y = coord.Y; + params->width = 0; + memcpy( params + 1, attr, length * sizeof(*attr) ); + ret = console_ioctl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, size, written, sizeof(*written), NULL ); + HeapFree( GetProcessHeap(), 0, params ); return ret; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputW.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 09ab7e8a0c9c96624e4597b6e91cb202a8086ef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09ab7e8a0c9c96624e4597b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:28 2020 +0200 kernelbase: Use IOCTL_CONDRV_WRITE_OUTPUT in WriteConsoleOutputW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 54 ++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 262db40003..a79644723a 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1486,41 +1486,43 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputA( HANDLE handle, const CHAR_INF BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputW( HANDLE handle, const CHAR_INFO *buffer, COORD size, COORD coord, SMALL_RECT *region ) { - int width, height, y; - BOOL ret = TRUE; + struct condrv_write_output_params *params; + unsigned int width, height, y; + size_t params_size; + BOOL ret; TRACE( "(%p,%p,(%d,%d),(%d,%d),(%d,%dx%d,%d)\n", handle, buffer, size.X, size.Y, coord.X, coord.Y, region->Left, region->Top, region->Right, region->Bottom ); - width = min( region->Right - region->Left + 1, size.X - coord.X ); + if (region->Left > region->Right || region->Top > region->Bottom || size.X <= coord.X || size.Y <= coord.Y) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + width = min( region->Right - region->Left + 1, size.X - coord.X ); height = min( region->Bottom - region->Top + 1, size.Y - coord.Y ); + region->Right = region->Left + width - 1; + region->Bottom = region->Top + height - 1; - if (width > 0 && height > 0) + params_size = sizeof(*params) + width * height * sizeof(*buffer); + if (!(params = HeapAlloc( GetProcessHeap(), 0, params_size ))) { - for (y = 0; y < height; y++) - { - SERVER_START_REQ( write_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = region->Left; - req->y = region->Top + y; - req->mode = CHAR_INFO_MODE_TEXTATTR; - req->wrap = FALSE; - wine_server_add_data( req, &buffer[(y + coord.Y) * size.X + coord.X], - width * sizeof(CHAR_INFO)); - if ((ret = !wine_server_call_err( req ))) - { - width = min( width, reply->width - region->Left ); - height = min( height, reply->height - region->Top ); - } - } - SERVER_END_REQ; - if (!ret) break; - } + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; } - region->Bottom = region->Top + height - 1; - region->Right = region->Left + width - 1; + + params->mode = CHAR_INFO_MODE_TEXTATTR; + params->x = region->Left; + params->y = region->Top; + params->width = width; + + for (y = 0; y < height; y++) + memcpy( &((CHAR_INFO *)(params + 1))[y * width], &buffer[(y + coord.Y) * size.X + coord.X], width * sizeof(CHAR_INFO) ); + + ret = console_ioctl( handle, IOCTL_CONDRV_WRITE_OUTPUT, params, params_size, region, sizeof(*region), NULL ); + HeapFree( GetProcessHeap(), 0, params ); return ret; }

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_WRITE_OUTPUT ioctl.
by Alexandre Julliard 23 Jul '20

23 Jul '20

Module: wine Branch: master Commit: 5b795b658d14bd85ba6783131c6f42a37cfcce27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b795b658d14bd85ba678313… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 23 17:31:12 2020 +0200 server: Introduce IOCTL_CONDRV_WRITE_OUTPUT ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 11 ++++++ server/console.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++++-- server/trace.c | 1 + 3 files changed, 108 insertions(+), 3 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 42ca77d382..add88d8885 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -37,6 +37,7 @@ #define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console output ioctls */ +#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_DATA) #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_DATA) @@ -82,6 +83,16 @@ struct condrv_input_info_params struct condrv_input_info info; /* input_info */ }; +/* IOCTL_CONDRV_WRITE_OUTPUT */ +struct condrv_write_output_params +{ + unsigned int x; /* destination position */ + unsigned int y; + unsigned int mode; /* char info mode */ + unsigned int width; /* width of output rectangle, 0 for wrapped mode */ + /* followed by an array of data with type depending on mode */ +}; + /* IOCTL_CONDRV_GET_OUTPUT_INFO result */ struct condrv_output_info { diff --git a/server/console.c b/server/console.c index 9f102968a1..9e61987e33 100644 --- a/server/console.c +++ b/server/console.c @@ -1249,7 +1249,85 @@ static struct fd *screen_buffer_get_fd( struct object *obj ) } /* write data into a screen buffer */ -static int write_console_output( struct screen_buffer *screen_buffer, data_size_t size, +static void write_console_output( struct screen_buffer *screen_buffer, const struct condrv_write_output_params *params, + data_size_t size ) +{ + unsigned int i, entry_size, entry_cnt, x, y; + char_info_t *dest; + char *src; + + entry_size = params->mode == CHAR_INFO_MODE_TEXTATTR ? sizeof(char_info_t) : sizeof(WCHAR); + if (size % entry_size) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + if (params->x >= screen_buffer->width) return; + entry_cnt = size / entry_size; + + for (i = 0, src = (char *)(params + 1); i < entry_cnt; i++, src += entry_size) + { + if (params->width) + { + x = params->x + i % params->width; + y = params->y + i / params->width; + if (x >= screen_buffer->width) continue; + } + else + { + x = (params->x + i) % screen_buffer->width; + y = params->y + (params->x + i) / screen_buffer->width; + } + if (y >= screen_buffer->height) break; + + dest = &screen_buffer->data[y * screen_buffer->width + x]; + switch(params->mode) + { + case CHAR_INFO_MODE_TEXT: + dest->ch = *(const WCHAR *)src; + break; + case CHAR_INFO_MODE_ATTR: + dest->attr = *(const unsigned short *)src; + break; + case CHAR_INFO_MODE_TEXTATTR: + *dest = *(const char_info_t *)src; + break; + case CHAR_INFO_MODE_TEXTSTDATTR: + dest->ch = *(const WCHAR *)src; + dest->attr = screen_buffer->attr; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + return; + } + } + + if (i && screen_buffer == screen_buffer->input->active) + { + struct condrv_renderer_event evt; + evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); + evt.u.update.top = params->y; + evt.u.update.bottom = params->width + ? min( params->y + entry_cnt / params->width, screen_buffer->height ) - 1 + : params->y + (params->x + i - 1) / screen_buffer->width; + console_input_events_append( screen_buffer->input, &evt ); + } + + if (get_reply_max_size() == sizeof(SMALL_RECT)) + { + SMALL_RECT region; + region.Left = params->x; + region.Top = params->y; + region.Right = min( params->x + params->width, screen_buffer->width ) - 1; + region.Bottom = min( params->y + entry_cnt / params->width, screen_buffer->height ) - 1; + set_reply_data( &region, sizeof(region) ); + } + else set_reply_data( &i, sizeof(i) ); +} + +/* write data into a screen buffer */ +static int write_console_output_req( struct screen_buffer *screen_buffer, data_size_t size, const void* data, enum char_info_mode mode, int x, int y, int wrap ) { @@ -1660,6 +1738,21 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * screen_buffer->mode = *(unsigned int *)get_req_data(); return 1; + case IOCTL_CONDRV_WRITE_OUTPUT: + if (get_req_data_size() < sizeof(struct condrv_write_output_params) || + (get_reply_max_size() != sizeof(SMALL_RECT) && get_reply_max_size() != sizeof(unsigned int))) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (console_input_is_bare( screen_buffer->input )) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return 0; + } + write_console_output( screen_buffer, get_req_data(), get_req_data_size() - sizeof(struct condrv_write_output_params) ); + return !get_error(); + case IOCTL_CONDRV_GET_OUTPUT_INFO: { struct condrv_output_info *info; @@ -2140,8 +2233,8 @@ DECL_HANDLER(write_console_output) release_object( screen_buffer ); return; } - reply->written = write_console_output( screen_buffer, get_req_data_size(), get_req_data(), - req->mode, req->x, req->y, req->wrap ); + reply->written = write_console_output_req( screen_buffer, get_req_data_size(), get_req_data(), + req->mode, req->x, req->y, req->wrap ); reply->width = screen_buffer->width; reply->height = screen_buffer->height; release_object( screen_buffer ); diff --git a/server/trace.c b/server/trace.c index 21468abd73..16bcc616a5 100644 --- a/server/trace.c +++ b/server/trace.c @@ -127,6 +127,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(IOCTL_CONDRV_SET_MODE); CASE(IOCTL_CONDRV_SET_OUTPUT_INFO); CASE(IOCTL_CONDRV_WRITE_INPUT); + CASE(IOCTL_CONDRV_WRITE_OUTPUT); CASE(FSCTL_DISMOUNT_VOLUME); CASE(FSCTL_PIPE_DISCONNECT); CASE(FSCTL_PIPE_LISTEN);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
83
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 July 2020