wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

Michael Stefaniuc : spoolss: Use wide-char string literals.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 6873f8f1d07bf4569436f84d180a3789ee594600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6873f8f1d07bf4569436f84d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:22:00 2020 +0200 spoolss: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/router.c | 2 +- dlls/spoolss/spoolss_main.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 764721b202c..24314b1f23a 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -151,7 +151,7 @@ static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 }; /* ################################ */ -static WCHAR localsplW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0}; +static WCHAR localsplW[] = L"localspl.dll"; /****************************************************************** * strdupW [internal] diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 61c565d2faa..bee58755eee 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -38,8 +38,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolss); static HMODULE hwinspool; -static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0}; - /****************************************************************************** * */ @@ -232,7 +230,7 @@ BOOL WINAPI SplInitializeWinSpoolDrv(LPVOID * table) TRACE("(%p)\n", table); - hwinspool = LoadLibraryW(winspooldrvW); + hwinspool = LoadLibraryW(L"winspool.drv"); if (!hwinspool) return FALSE; table[0] = (void *) GetProcAddress(hwinspool, "OpenPrinterW");

1 0

Michael Stefaniuc : msisip: Use wide-char string literals.
by Alexandre Julliard 15 Oct '20

15 Oct '20

Module: wine Branch: master Commit: 0e8c432051b09d3bc3558ba2dc94392724c80d14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e8c432051b09d3bc3558ba2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 14 23:21:59 2020 +0200 msisip: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msisip/main.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index aabea78ae62..11893f149c3 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -52,21 +52,13 @@ static GUID mySubject = { 0x000c10f1, 0x0000, 0x0000, */ HRESULT WINAPI DllRegisterServer(void) { - static WCHAR msisip[] = { 'M','S','I','S','I','P','.','D','L','L',0 }; - static WCHAR getSignedDataMsg[] = { 'M','s','i','S','I','P','G','e','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR putSignedDataMsg[] = { 'M','s','i','S','I','P','P','u','t', - 'S','i','g','n','e','d','D','a','t','a','M','s','g',0 }; - static WCHAR createIndirectData[] = { 'M','s','i','S','I','P', - 'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR verifyIndirectData[] = { 'M','s','i','S','I','P', - 'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a', - 0 }; - static WCHAR removeSignedDataMsg[] = { 'M','s','i','S','I','P','R','e','m', - 'o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g', 0 }; - static WCHAR isMyTypeOfFile[] = { 'M','s','i','S','I','P', - 'I','s','M','y','T','y','p','e','O','f','F','i','l','e',0 }; + static WCHAR msisip[] = L"MSISIP.DLL"; + static WCHAR getSignedDataMsg[] = L"MsiSIPGetSignedDataMsg"; + static WCHAR putSignedDataMsg[] = L"MsiSIPPutSignedDataMsg"; + static WCHAR createIndirectData[] = L"MsiSIPCreateIndirectData"; + static WCHAR verifyIndirectData[] = L"MsiSIPVerifyIndirectData"; + static WCHAR removeSignedDataMsg[] = L"MsiSIPRemoveSignedDataMsg"; + static WCHAR isMyTypeOfFile[] = L"MsiSIPIsMyTypeOfFile"; SIP_ADD_NEWPROVIDER prov; @@ -100,8 +92,6 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg, BYTE *pbSignedDataMsg) { - static const WCHAR digitalSig[] = { 5,'D','i','g','i','t','a','l', - 'S','i','g','n','a','t','u','r','e',0 }; BOOL ret = FALSE; IStorage *stg = NULL; HRESULT r; @@ -120,7 +110,7 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo, goto end; } - r = IStorage_OpenStream(stg, digitalSig, 0, + r = IStorage_OpenStream(stg, L"\5DigitalSignature", 0, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stm); if (FAILED(r)) {

1 0

Jacek Caban : conhost: Remove no longer needed condrv_input_info fields.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: e909986e6ea5ecd49b2b847f321ad89b2ae4f6f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e909986e6ea5ecd49b2b847f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:39 2020 +0200 conhost: Remove no longer needed condrv_input_info fields. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 4 ---- programs/conhost/conhost.c | 12 ++++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index f4ed77a69b..eed8bc5bfc 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -82,10 +82,6 @@ struct condrv_input_info { unsigned int input_cp; /* console input codepage */ unsigned int output_cp; /* console output codepage */ - unsigned int history_mode; /* whether we duplicate lines in history */ - unsigned int history_size; /* number of lines in history */ - unsigned int history_index; /* number of used lines in history */ - unsigned int edition_mode; /* index to the edition mode flavors */ unsigned int input_count; /* number of available input records */ condrv_handle_t win; /* renderer window handle */ }; diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index b8f954acb5..a93f9be73b 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2396,14 +2396,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, TRACE( "get info\n" ); if (in_size || *out_size != sizeof(*info)) return STATUS_INVALID_PARAMETER; if (!(info = alloc_ioctl_buffer( sizeof(*info )))) return STATUS_NO_MEMORY; - info->history_mode = console->history_mode; - info->history_size = console->history_size; - info->history_index = console->history_index; - info->edition_mode = console->edition_mode; - info->input_cp = console->input_cp; - info->output_cp = console->output_cp; - info->win = condrv_handle( console->win ); - info->input_count = console->record_count; + info->input_cp = console->input_cp; + info->output_cp = console->output_cp; + info->win = condrv_handle( console->win ); + info->input_count = console->record_count; return STATUS_SUCCESS; }

1 0

Jacek Caban : conhost: Remove no longer needed SET_CONSOLE_OUTPUT_INFO flags.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: ef2e281dc26c4eb4fb4bc09deb3b3dbf5f2e73fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef2e281dc26c4eb4fb4bc09d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:25 2020 +0200 conhost: Remove no longer needed SET_CONSOLE_OUTPUT_INFO flags. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 4 +--- programs/conhost/conhost.c | 25 ------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 72aecedd38..f4ed77a69b 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -154,9 +154,7 @@ struct condrv_output_info_params #define SET_CONSOLE_OUTPUT_INFO_ATTR 0x0008 #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x0010 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x0020 -#define SET_CONSOLE_OUTPUT_INFO_FONT 0x0040 -#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x0080 -#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0100 +#define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0040 /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9b082dffc2..b8f954acb5 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1731,7 +1731,6 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, const struct condrv_output_info_params *params, size_t extra_size ) { const struct condrv_output_info *info = &params->info; - WCHAR *font_name; NTSTATUS status; TRACE( "%p\n", screen_buffer ); @@ -1825,30 +1824,6 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, screen_buffer->max_width = info->max_width; screen_buffer->max_height = info->max_height; } - if (params->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) - { - memcpy( screen_buffer->color_map, info->color_map, sizeof(screen_buffer->color_map) ); - } - if (params->mask & SET_CONSOLE_OUTPUT_INFO_FONT) - { - screen_buffer->font.width = info->font_width; - screen_buffer->font.height = info->font_height; - screen_buffer->font.weight = info->font_weight; - screen_buffer->font.pitch_family = info->font_pitch_family; - if (extra_size) - { - const WCHAR *params_font = (const WCHAR *)(params + 1); - extra_size = extra_size / sizeof(WCHAR) * sizeof(WCHAR); - font_name = malloc( extra_size ); - if (font_name) - { - memcpy( font_name, params_font, extra_size ); - free( screen_buffer->font.face_name ); - screen_buffer->font.face_name = font_name; - screen_buffer->font.face_len = extra_size; - } - } - } if (is_active( screen_buffer )) {

1 0

Jacek Caban : conhost: Remove no longer needed CHAR_INFO_MODE_TEXTSTDATTR.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: d7e831c1123cca7785a6b8813f4991b42f9473e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e831c1123cca7785a6b881… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:17 2020 +0200 conhost: Remove no longer needed CHAR_INFO_MODE_TEXTSTDATTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 - programs/conhost/conhost.c | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 602b499114..72aecedd38 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -115,7 +115,6 @@ enum char_info_mode CHAR_INFO_MODE_TEXT, /* characters only */ CHAR_INFO_MODE_ATTR, /* attributes only */ CHAR_INFO_MODE_TEXTATTR, /* both characters and attributes */ - CHAR_INFO_MODE_TEXTSTDATTR, /* characters but use standard attributes */ }; /* IOCTL_CONDRV_GET_OUTPUT_INFO result */ diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 9c780d4951..9b082dffc2 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1963,10 +1963,6 @@ static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct 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: return STATUS_INVALID_PARAMETER; } @@ -2131,13 +2127,6 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c dest[i].attr = params->attr; } break; - case CHAR_INFO_MODE_TEXTSTDATTR: - for (i = 0; i < count; i++) - { - dest[i].ch = params->ch; - dest[i].attr = screen_buffer->attr; - } - break; default: return STATUS_INVALID_PARAMETER; }

1 0

Jacek Caban : conhost: Remove no longer needed SET_CONSOLE_INPUT_INFO flags.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: bed3b61b498af5339f53ecc23937ff3b81b196d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bed3b61b498af5339f53ecc2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:58:10 2020 +0200 conhost: Remove no longer needed SET_CONSOLE_INPUT_INFO flags. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 8 ++------ programs/conhost/conhost.c | 45 --------------------------------------------- 2 files changed, 2 insertions(+), 51 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index efcfc1a5b9..602b499114 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -97,12 +97,8 @@ struct condrv_input_info_params struct condrv_input_info info; /* input_info */ }; -#define SET_CONSOLE_INPUT_INFO_EDITION_MODE 0x01 -#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x02 -#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x04 -#define SET_CONSOLE_INPUT_INFO_WIN 0x08 -#define SET_CONSOLE_INPUT_INFO_HISTORY_MODE 0x10 -#define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE 0x20 +#define SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE 0x01 +#define SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE 0x02 /* IOCTL_CONDRV_WRITE_OUTPUT and IOCTL_CONDRV_READ_OUTPUT params */ struct condrv_output_params diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index dc508a2fd7..9c780d4951 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2448,55 +2448,10 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, const struct condrv_input_info_params *params = in_data; TRACE( "set info\n" ); if (in_size != sizeof(*params) || *out_size) return STATUS_INVALID_PARAMETER; - if (params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) - { - console->history_mode = params->info.history_mode; - } - if ((params->mask & SET_CONSOLE_INPUT_INFO_HISTORY_SIZE) && - console->history_size != params->info.history_size) - { - struct history_line **mem = NULL; - int i, delta; - - if (params->info.history_size) - { - if (!(mem = malloc( params->info.history_size * sizeof(*mem) ))) - return STATUS_NO_MEMORY; - memset( mem, 0, params->info.history_size * sizeof(*mem) ); - } - - delta = (console->history_index > params->info.history_size) - ? (console->history_index - params->info.history_size) : 0; - - for (i = delta; i < console->history_index; i++) - { - mem[i - delta] = console->history[i]; - console->history[i] = NULL; - } - console->history_index -= delta; - - for (i = 0; i < console->history_size; i++) - free( console->history[i] ); - free( console->history ); - console->history = mem; - console->history_size = params->info.history_size; - } - if (params->mask & SET_CONSOLE_INPUT_INFO_EDITION_MODE) - { - console->edition_mode = params->info.edition_mode; - } if (params->mask & SET_CONSOLE_INPUT_INFO_INPUT_CODEPAGE) - { console->input_cp = params->info.input_cp; - } if (params->mask & SET_CONSOLE_INPUT_INFO_OUTPUT_CODEPAGE) - { console->output_cp = params->info.output_cp; - } - if (params->mask & SET_CONSOLE_INPUT_INFO_WIN) - { - console->win = wine_server_ptr_handle( params->info.win ); - } return STATUS_SUCCESS; }

1 0

Jacek Caban : conhost: Fix check for the last history index in edit_line_find_history.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: a7066c66a646a828c16c33e67174ea1918053eac URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7066c66a646a828c16c33e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:57:58 2020 +0200 conhost: Fix check for the last history index in edit_line_find_history. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50000 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 3ff6363017..dc508a2fd7 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -659,7 +659,7 @@ static void edit_line_find_in_history( struct console *console ) unsigned int len, oldoffset; WCHAR *line; - if (ctx->history_index && ctx->history_index == console->history_index + 1) + if (ctx->history_index && ctx->history_index == console->history_index) { start_pos--; ctx->history_index--;

1 0

Jacek Caban : console: Don't allow blocking read ioctls on screen buffer object.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: d3f09b862a3f6b19bbfeba7183c2ced06c030f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3f09b862a3f6b19bbfeba71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:57:51 2020 +0200 console: Don't allow blocking read ioctls on screen buffer object. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49997 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 18 ++++++++++++++++++ server/console.c | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index da62fd3eb2..ddd5bfcb4c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2981,6 +2981,7 @@ static void test_ReadConsole(HANDLE input) { DWORD ret, bytes; char buf[1024]; + HANDLE output; SetLastError(0xdeadbeef); ret = GetFileSize(input, NULL); @@ -3015,6 +3016,23 @@ static void test_ReadConsole(HANDLE input) GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); + + output = CreateFileA("CONOUT$", GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(output != INVALID_HANDLE_VALUE, "Could not open console\n"); + + ret = ReadConsoleW(output, buf, sizeof(buf) / sizeof(WCHAR), &bytes, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadConsoleW returned %x(%u)\n", ret, GetLastError()); + + ret = ReadConsoleA(output, buf, sizeof(buf), &bytes, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadConsoleA returned %x(%u)\n", ret, GetLastError()); + + ret = ReadFile(output, buf, sizeof(buf), &bytes, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, + "ReadFile returned %x(%u)\n", ret, GetLastError()); + + CloseHandle(output); } static void test_GetCurrentConsoleFont(HANDLE std_output) diff --git a/server/console.c b/server/console.c index 184d98d166..8ac3a08abc 100644 --- a/server/console.c +++ b/server/console.c @@ -848,7 +848,8 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return 1; default: - if (!screen_buffer->input || !screen_buffer->input->server || code >> 16 != FILE_DEVICE_CONSOLE) + if (!screen_buffer->input || !screen_buffer->input->server || code >> 16 != FILE_DEVICE_CONSOLE || + is_blocking_read_ioctl( code )) { set_error( STATUS_INVALID_HANDLE ); return 0;

1 0

Jacek Caban : kernel32/tests: Use current console input in test_ReadConsole.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: 1668db80abe44a833ab3de888d235be53a02f0dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1668db80abe44a833ab3de88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:57:37 2020 +0200 kernel32/tests: Use current console input in test_ReadConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b5878fe8a2..da62fd3eb2 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2977,21 +2977,13 @@ static void test_ReadConsoleOutput(HANDLE console) ok(ch == 'z', "unexpected char %c/%x\n", ch, ch); } -static void test_ReadConsole(void) +static void test_ReadConsole(HANDLE input) { - HANDLE std_input; DWORD ret, bytes; char buf[1024]; - std_input = GetStdHandle(STD_INPUT_HANDLE); - SetLastError(0xdeadbeef); - ret = GetFileSize(std_input, NULL); - if (GetLastError() == 0xdeadbeef) - { - skip("stdin is redirected\n"); - return; - } + ret = GetFileSize(input, NULL); ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_INVALID_FUNCTION, /* Win 8, 10 */ @@ -2999,7 +2991,7 @@ static void test_ReadConsole(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = ReadFile(std_input, buf, -128, &bytes, NULL); + ret = ReadFile(input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ @@ -3008,7 +3000,7 @@ static void test_ReadConsole(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = ReadConsoleA(std_input, buf, -128, &bytes, NULL); + ret = ReadConsoleA(input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ @@ -3017,7 +3009,7 @@ static void test_ReadConsole(void) bytes = 0xdeadbeef; SetLastError(0xdeadbeef); - ret = ReadConsoleW(std_input, buf, -128, &bytes, NULL); + ret = ReadConsoleW(input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || GetLastError() == ERROR_NOACCESS, /* Win 8, 10 */ @@ -4213,7 +4205,7 @@ START_TEST(console) ok(sbi.dwSize.Y == size, "Unexpected buffer size: %d instead of %d\n", sbi.dwSize.Y, size); if (!ret) return; - test_ReadConsole(); + test_ReadConsole(hConIn); /* Non interactive tests */ testCursor(hConOut, sbi.dwSize); /* test parameters (FIXME: test functionality) */

1 0

Jacek Caban : server: Remove no longer used console renderer object.
by Alexandre Julliard 14 Oct '20

14 Oct '20

Module: wine Branch: master Commit: 70c1d4fcaa846a8f69ef21d0a5b2c070c668b589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c1d4fcaa846a8f69ef21d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 14 19:57:24 2020 +0200 server: Remove no longer used console renderer object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 52 ----------- programs/conhost/conhost.c | 5 +- server/console.c | 213 +-------------------------------------------- server/trace.c | 3 +- 4 files changed, 4 insertions(+), 269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=70c1d4fcaa846a8f69ef…

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
80
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 October 2020