October 2020 - Wine-commits

Jacek Caban : conhost: Don't create tty input thread if we don't have tty_input handle.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 1d2c29dfb0bac8915b8e2ea07ecf20a33ca89527 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d2c29dfb0bac8915b8e2ea0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:53:37 2020 +0200 conhost: Don't create tty input thread if we don't have tty_input handle. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 7d3564a120..8f09ebbb3f 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1719,6 +1719,7 @@ done: static BOOL ensure_tty_input_thread( struct console *console ) { + if (!console->tty_input) return TRUE; if (!console->input_thread) console->input_thread = CreateThread( NULL, 0, tty_input, console, 0, NULL ); return console->input_thread != NULL;

1 0

Jacek Caban : kernel32/tests: Move pseudo console tests before FreeConsole.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: f377ac1f2d0751c9d2d79e061b4e9c378a856bbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=f377ac1f2d0751c9d2d79e06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:53:52 2020 +0200 kernel32/tests: Move pseudo console tests before FreeConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 18dbbb1ff6..97dc9c61ce 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4250,9 +4250,9 @@ START_TEST(console) test_console_title(); if (!test_current) { + test_pseudo_console(); test_AttachConsole(hConOut); test_AllocConsole(); test_FreeConsole(); - test_pseudo_console(); } }

1 0

Jacek Caban : conhost: Use better default values in create_screen_buffer.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 0c25f5ee466b181e9caa6b15257be1db8a66b602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c25f5ee466b181e9caa6b15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:54:03 2020 +0200 conhost: Use better default values in create_screen_buffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 21 +++++++++++++++++++++ programs/conhost/conhost.c | 21 ++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 97dc9c61ce..deb5030553 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3950,6 +3950,8 @@ static void test_AllocConsole(void) static void test_pseudo_console_child(HANDLE input, HANDLE output) { + CONSOLE_SCREEN_BUFFER_INFO sb_info; + CONSOLE_CURSOR_INFO cursor_info; DWORD mode; BOOL ret; @@ -3985,6 +3987,25 @@ static void test_pseudo_console_child(HANDLE input, HANDLE output) ret = SetConsoleMode(output, mode | ENABLE_WRAP_AT_EOL_OUTPUT); ok(ret, "SetConsoleMode failed: %u\n", GetLastError()); + ret = GetConsoleScreenBufferInfo(output, &sb_info); + ok(ret, "GetConsoleScreenBufferInfo failed: %u\n", GetLastError()); + ok(sb_info.dwSize.X == 40, "dwSize.X = %u\n", sb_info.dwSize.X); + ok(sb_info.dwSize.Y == 30, "dwSize.Y = %u\n", sb_info.dwSize.Y); + ok(sb_info.dwCursorPosition.X == 0, "dwCursorPosition.X = %u\n", sb_info.dwCursorPosition.X); + ok(sb_info.dwCursorPosition.Y == 0, "dwCursorPosition.Y = %u\n", sb_info.dwCursorPosition.Y); + ok(sb_info.wAttributes == 7, "wAttributes = %x\n", sb_info.wAttributes); + ok(sb_info.srWindow.Left == 0, "srWindow.Left = %u\n", sb_info.srWindow.Left); + ok(sb_info.srWindow.Top == 0, "srWindow.Top = %u\n", sb_info.srWindow.Top); + ok(sb_info.srWindow.Right == 39, "srWindow.Right = %u\n", sb_info.srWindow.Right); + ok(sb_info.srWindow.Bottom == 29, "srWindow.Bottom = %u\n", sb_info.srWindow.Bottom); + ok(sb_info.dwMaximumWindowSize.X == 40, "dwMaximumWindowSize.X = %u\n", sb_info.dwMaximumWindowSize.X); + ok(sb_info.dwMaximumWindowSize.Y == 30, "dwMaximumWindowSize.Y = %u\n", sb_info.dwMaximumWindowSize.Y); + + ret = GetConsoleCursorInfo(output, &cursor_info); + ok(ret, "GetConsoleCursorInfo failed: %u\n", GetLastError()); + ok(cursor_info.dwSize == 25, "dwSize = %u\n", cursor_info.dwSize); + ok(cursor_info.bVisible == TRUE, "bVisible = %x\n", cursor_info.bVisible); + test_console_title(); test_WriteConsoleInputW(input); } diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 8f09ebbb3f..b91c81a5e5 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -184,19 +184,30 @@ static struct screen_buffer *create_screen_buffer( struct console *console, int screen_buffer->console = console; screen_buffer->id = id; screen_buffer->mode = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; - screen_buffer->cursor_size = 100; + screen_buffer->cursor_size = 25; screen_buffer->cursor_visible = 1; screen_buffer->width = width; screen_buffer->height = height; screen_buffer->attr = 0x07; screen_buffer->popup_attr = 0xf5; - screen_buffer->max_width = 80; - screen_buffer->max_height = 25; - screen_buffer->win.right = min( screen_buffer->max_width - 1, width - 1 ); - screen_buffer->win.bottom = min( screen_buffer->max_height - 1, height - 1); screen_buffer->font.weight = FW_NORMAL; screen_buffer->font.pitch_family = FIXED_PITCH | FF_DONTCARE; + if (console->active) + { + screen_buffer->max_width = console->active->max_width; + screen_buffer->max_height = console->active->max_height; + screen_buffer->win.right = console->active->win.right - console->active->win.left; + screen_buffer->win.bottom = console->active->win.bottom - console->active->win.top; + } + else + { + screen_buffer->max_width = width; + screen_buffer->max_height = height; + screen_buffer->win.right = width - 1; + screen_buffer->win.bottom = height - 1; + } + if (wine_rb_put( &screen_buffer_map, LongToPtr(id), &screen_buffer->entry )) { free( screen_buffer );

1 0

Jacek Caban : kernel32/tests: Improve current console test mode.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 06cbf1992313f4a9ef090a4d01aaab42f74e8549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06cbf1992313f4a9ef090a4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:54:12 2020 +0200 kernel32/tests: Improve current console test mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index deb5030553..b5878fe8a2 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4086,7 +4086,7 @@ static void test_pseudo_console(void) START_TEST(console) { - HANDLE hConIn, hConOut; + HANDLE hConIn, hConOut, revert_output = NULL; BOOL ret, test_current; CONSOLE_SCREEN_BUFFER_INFO sbi; BOOL using_pseudo_console; @@ -4174,6 +4174,16 @@ START_TEST(console) } } + if (test_current) + { + HANDLE sb; + revert_output = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + sb = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(sb != INVALID_HANDLE_VALUE, "Could not allocate screen buffer: %u\n", GetLastError()); + SetConsoleActiveScreenBuffer(sb); + } + hConIn = CreateFileA("CONIN$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); hConOut = CreateFileA("CONOUT$", GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); @@ -4240,7 +4250,7 @@ START_TEST(console) else test_GetSetConsoleInputExeName(); - test_GetConsoleProcessList(); + if (!test_current) test_GetConsoleProcessList(); test_OpenConsoleW(); test_CreateFileW(); test_OpenCON(); @@ -4260,12 +4270,15 @@ START_TEST(console) test_ReadConsoleOutputCharacterW(hConOut); test_ReadConsoleOutputAttribute(hConOut); test_ReadConsoleOutput(hConOut); - test_GetCurrentConsoleFont(hConOut); - test_GetCurrentConsoleFontEx(hConOut); - test_GetConsoleFontSize(hConOut); - test_GetLargestConsoleWindowSize(hConOut); - test_GetConsoleFontInfo(hConOut); - test_SetConsoleFont(hConOut); + if (!test_current) + { + test_GetCurrentConsoleFont(hConOut); + test_GetCurrentConsoleFontEx(hConOut); + test_GetConsoleFontSize(hConOut); + test_GetLargestConsoleWindowSize(hConOut); + test_GetConsoleFontInfo(hConOut); + test_SetConsoleFont(hConOut); + } test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); test_console_title(); @@ -4276,4 +4289,6 @@ START_TEST(console) test_AllocConsole(); test_FreeConsole(); } + else if (revert_output) SetConsoleActiveScreenBuffer(revert_output); + }

1 0

Anton Baskanov : winegstreamer: Use RGB15/16 formats instead of BGR15/16.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: e47b45e2f55ea33790aa60fdf207cafa53c9adb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e47b45e2f55ea33790aa60fd… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 7 01:04:56 2020 +0700 winegstreamer: Use RGB15/16 formats instead of BGR15/16. Gstreamer stores the first component in the most significant bits, same as DirectShow. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index acb15dc923..5b5add409c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -194,11 +194,11 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE amt->subtype = MEDIASUBTYPE_RGB24; bih->biBitCount = 24; break; - case GST_VIDEO_FORMAT_BGR16: + case GST_VIDEO_FORMAT_RGB16: amt->subtype = MEDIASUBTYPE_RGB565; bih->biBitCount = 16; break; - case GST_VIDEO_FORMAT_BGR15: + case GST_VIDEO_FORMAT_RGB15: amt->subtype = MEDIASUBTYPE_RGB555; bih->biBitCount = 16; break; @@ -380,8 +380,8 @@ static GstCaps *amt_to_gst_caps_video(const AM_MEDIA_TYPE *mt) {&MEDIASUBTYPE_ARGB32, GST_VIDEO_FORMAT_BGRA}, {&MEDIASUBTYPE_RGB32, GST_VIDEO_FORMAT_BGRx}, {&MEDIASUBTYPE_RGB24, GST_VIDEO_FORMAT_BGR}, - {&MEDIASUBTYPE_RGB565, GST_VIDEO_FORMAT_BGR16}, - {&MEDIASUBTYPE_RGB555, GST_VIDEO_FORMAT_BGR15}, + {&MEDIASUBTYPE_RGB565, GST_VIDEO_FORMAT_RGB16}, + {&MEDIASUBTYPE_RGB555, GST_VIDEO_FORMAT_RGB15}, }; const VIDEOINFOHEADER *vih = (VIDEOINFOHEADER *)mt->pbFormat;

1 0

Anton Baskanov : winegstreamer: Fix RGB565 conversion in amt_from_gst_video_info().
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 9afc5ed72eaf109726be8f558294a1a21502c496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9afc5ed72eaf109726be8f55… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 7 01:04:57 2020 +0700 winegstreamer: Fix RGB565 conversion in amt_from_gst_video_info(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5b5add409c..e95205ca44 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -158,7 +158,7 @@ static gboolean amt_from_gst_audio_info(const GstAudioInfo *info, AM_MEDIA_TYPE static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE *amt) { - VIDEOINFOHEADER *vih; + VIDEOINFO *vih; BITMAPINFOHEADER *bih; gint32 width, height; @@ -170,7 +170,7 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE amt->formattype = FORMAT_VideoInfo; amt->pbFormat = (BYTE*)vih; - amt->cbFormat = sizeof(*vih); + amt->cbFormat = sizeof(VIDEOINFOHEADER); amt->bFixedSizeSamples = FALSE; amt->bTemporalCompression = TRUE; amt->lSampleSize = 1; @@ -180,6 +180,7 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE if (GST_VIDEO_INFO_IS_RGB(info)) { + bih->biCompression = BI_RGB; switch (GST_VIDEO_INFO_FORMAT(info)) { case GST_VIDEO_FORMAT_BGRA: @@ -196,7 +197,12 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE break; case GST_VIDEO_FORMAT_RGB16: amt->subtype = MEDIASUBTYPE_RGB565; + amt->cbFormat = offsetof(VIDEOINFO, u.dwBitMasks[3]); + vih->u.dwBitMasks[iRED] = 0xf800; + vih->u.dwBitMasks[iGREEN] = 0x07e0; + vih->u.dwBitMasks[iBLUE] = 0x001f; bih->biBitCount = 16; + bih->biCompression = BI_BITFIELDS; break; case GST_VIDEO_FORMAT_RGB15: amt->subtype = MEDIASUBTYPE_RGB555; @@ -207,7 +213,6 @@ static gboolean amt_from_gst_video_info(const GstVideoInfo *info, AM_MEDIA_TYPE CoTaskMemFree(vih); return FALSE; } - bih->biCompression = BI_RGB; } else { amt->subtype = MEDIATYPE_Video; if (!(amt->subtype.Data1 = gst_video_format_to_fourcc(GST_VIDEO_INFO_FORMAT(info)))) @@ -2116,7 +2121,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, buffer_size = format->bmiHeader.biSizeImage; gst_util_set_object_arg(G_OBJECT(pin->flip), "method", - format->bmiHeader.biCompression == BI_RGB ? "vertical-flip" : "none"); + (format->bmiHeader.biCompression == BI_RGB + || format->bmiHeader.biCompression == BI_BITFIELDS) ? "vertical-flip" : "none"); } else if (IsEqualGUID(&pin->pin.pin.mt.formattype, &FORMAT_WaveFormatEx) && (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_PCM)

1 0

Anton Baskanov : winegstreamer: Add a second videoconvert to handle 15/16-bit RGB formats.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: e484056171bfd57473660243bc75935409320f37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e484056171bfd57473660243… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 7 01:04:58 2020 +0700 winegstreamer: Add a second videoconvert to handle 15/16-bit RGB formats. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e95205ca44..90a129f29a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1003,7 +1003,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * if (!strcmp(typename, "video/x-raw")) { - GstElement *vconv, *flip, *deinterlace; + GstElement *deinterlace, *vconv, *flip, *vconv2; /* DirectShow can express interlaced video, but downstream filters can't * necessarily consume it. In particular, the video renderer can't. */ @@ -1035,6 +1035,18 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * goto out; } + /* videoflip does not support 15 and 16-bit RGB so add a second videoconvert + * to do the final conversion. */ + if (!(vconv2 = gst_element_factory_make("videoconvert", NULL))) + { + ERR("Failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", + 8 * (int)sizeof(void *)); + goto out; + } + + /* Avoid expensive color matrix conversions. */ + gst_util_set_object_arg(G_OBJECT(vconv2), "matrix-mode", "none"); + /* The bin takes ownership of these elements. */ gst_bin_add(GST_BIN(This->container), deinterlace); gst_element_sync_state_with_parent(deinterlace); @@ -1042,12 +1054,15 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * gst_element_sync_state_with_parent(vconv); gst_bin_add(GST_BIN(This->container), flip); gst_element_sync_state_with_parent(flip); + gst_bin_add(GST_BIN(This->container), vconv2); + gst_element_sync_state_with_parent(vconv2); gst_element_link(deinterlace, vconv); gst_element_link(vconv, flip); + gst_element_link(flip, vconv2); pin->post_sink = gst_element_get_static_pad(deinterlace, "sink"); - pin->post_src = gst_element_get_static_pad(flip, "src"); + pin->post_src = gst_element_get_static_pad(vconv2, "src"); pin->flip = flip; } else if (!strcmp(typename, "audio/x-raw"))

1 0

Anton Baskanov : winegstreamer: Expose 15/16-bit RGB formats.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 0542a34c247f029a0394f308f9f44c5c41d904fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0542a34c247f029a0394f308… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 7 01:04:59 2020 +0700 winegstreamer: Expose 15/16-bit RGB formats. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 90a129f29a..6279c2c28c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1722,6 +1722,8 @@ static HRESULT gstdecoder_source_get_media_type(struct gstdemux_source *pin, GST_VIDEO_FORMAT_BGRA, GST_VIDEO_FORMAT_BGRx, GST_VIDEO_FORMAT_BGR, + GST_VIDEO_FORMAT_RGB16, + GST_VIDEO_FORMAT_RGB15, }; assert(caps); /* We shouldn't be able to get here if caps haven't been set. */

1 0

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

07 Oct '20

Module: wine Branch: master Commit: 8e9b9da0f8896f819312ce3c693d2fbc0fe6b19e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e9b9da0f8896f819312ce3c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:52 2020 +0200 sc: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/sc/sc.c | 123 ++++++++++++++++++------------------------------------- 1 file changed, 40 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e9b9da0f8896f819312…

1 0

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

07 Oct '20

Module: wine Branch: master Commit: 3180972ee2c8e67c425aa7f5279d0cd830455c3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3180972ee2c8e67c425aa7f5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:53 2020 +0200 taskkill: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskkill/taskkill.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 600bab14fd..193ed05829 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -102,12 +102,11 @@ static int WINAPIV taskkill_message_printfW(int msg, ...) static int taskkill_message(int msg) { - static const WCHAR formatW[] = {'%','1',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return taskkill_printfW(formatW, msg_buffer); + return taskkill_printfW(L"%1", msg_buffer); } /* Post WM_CLOSE to all top-level windows belonging to the process with specified PID. */ @@ -444,12 +443,6 @@ static BOOL add_to_task_list(WCHAR *name) * options are detected as parameters when placed after options that accept one. */ static BOOL process_arguments(int argc, WCHAR *argv[]) { - static const WCHAR opForceTerminate[] = {'f',0}; - static const WCHAR opImage[] = {'i','m',0}; - static const WCHAR opPID[] = {'p','i','d',0}; - static const WCHAR opHelp[] = {'?',0}; - static const WCHAR opTerminateChildren[] = {'t',0}; - if (argc > 1) { int i; @@ -460,7 +453,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) if (argc == 2) { argdata = argv[1]; - if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(opHelp, argdata + 1)) + if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(L"?", argdata + 1)) { taskkill_message(STRING_USAGE); exit(0); @@ -476,14 +469,14 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) goto invalid; argdata++; - if (!wcsicmp(opTerminateChildren, argdata)) + if (!wcsicmp(L"t", argdata)) WINE_FIXME("argument T not supported\n"); - if (!wcsicmp(opForceTerminate, argdata)) + if (!wcsicmp(L"f", argdata)) force_termination = TRUE; /* Options /IM and /PID appear to behave identically, except for * the fact that they cannot be specified at the same time. */ - else if ((got_im = !wcsicmp(opImage, argdata)) || - (got_pid = !wcsicmp(opPID, argdata))) + else if ((got_im = !wcsicmp(L"im", argdata)) || + (got_pid = !wcsicmp(L"pid", argdata))) { if (!argv[i + 1]) {

1 0