October 2020 - Wine-Commits

Michael Stefaniuc : winemine: Use wide-char string literals.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 251d0a8a26b359fdb2af5b99e8c9949e7fbb0aeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=251d0a8a26b359fdb2af5b99… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:55 2020 +0200 winemine: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 53 ++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 255d21714f..37ce192704 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -33,19 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winemine); static const DWORD wnd_style = WS_OVERLAPPEDWINDOW & ~WS_THICKFRAME & ~WS_MAXIMIZEBOX; -static const WCHAR registry_key[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','M','i','n','e',0}; - -static const WCHAR xposW[] = {'X','p','o','s',0}; -static const WCHAR yposW[] = {'Y','p','o','s',0}; -static const WCHAR heightW[] = {'H','e','i','g','h','t',0}; -static const WCHAR widthW[] = {'W','i','d','t','h',0}; -static const WCHAR minesW[] = {'M','i','n','e','s',0}; -static const WCHAR difficultyW[] = {'D','i','f','f','i','c','u','l','t','y',0}; -static const WCHAR markW[] = {'M','a','r','k',0}; -static const WCHAR nameW[] = {'N','a','m','e','%','u',0}; -static const WCHAR timeW[] = {'T','i','m','e','%','u',0}; void CheckLevel( BOARD *p_board ) { @@ -77,38 +64,38 @@ static void LoadBoard( BOARD *p_board ) WCHAR key_name[8]; unsigned i; - RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, 0, KEY_QUERY_VALUE, &hkey ); + RegOpenKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\WinMine", 0, KEY_QUERY_VALUE, &hkey ); size = sizeof( p_board->pos.x ); - if( RegQueryValueExW( hkey, xposW, NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) + if( RegQueryValueExW( hkey, L"Xpos", NULL, &type, (BYTE*) &p_board->pos.x, &size ) ) p_board->pos.x = 0; size = sizeof( p_board->pos.y ); - if( RegQueryValueExW( hkey, yposW, NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) + if( RegQueryValueExW( hkey, L"Ypos", NULL, &type, (BYTE*) &p_board->pos.y, &size ) ) p_board->pos.y = 0; size = sizeof( p_board->rows ); - if( RegQueryValueExW( hkey, heightW, NULL, &type, (BYTE*) &p_board->rows, &size ) ) + if( RegQueryValueExW( hkey, L"Height", NULL, &type, (BYTE*) &p_board->rows, &size ) ) p_board->rows = BEGINNER_ROWS; size = sizeof( p_board->cols ); - if( RegQueryValueExW( hkey, widthW, NULL, &type, (BYTE*) &p_board->cols, &size ) ) + if( RegQueryValueExW( hkey, L"Width", NULL, &type, (BYTE*) &p_board->cols, &size ) ) p_board->cols = BEGINNER_COLS; size = sizeof( p_board->mines ); - if( RegQueryValueExW( hkey, minesW, NULL, &type, (BYTE*) &p_board->mines, &size ) ) + if( RegQueryValueExW( hkey, L"Mines", NULL, &type, (BYTE*) &p_board->mines, &size ) ) p_board->mines = BEGINNER_MINES; size = sizeof( p_board->difficulty ); - if( RegQueryValueExW( hkey, difficultyW, NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) + if( RegQueryValueExW( hkey, L"Difficulty", NULL, &type, (BYTE*) &p_board->difficulty, &size ) ) p_board->difficulty = BEGINNER; size = sizeof( p_board->IsMarkQ ); - if( RegQueryValueExW( hkey, markW, NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) + if( RegQueryValueExW( hkey, L"Mark", NULL, &type, (BYTE*) &p_board->IsMarkQ, &size ) ) p_board->IsMarkQ = TRUE; for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, nameW, i+1 ); + wsprintfW( key_name, L"Name%u", i+1 ); size = sizeof( data ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (LPBYTE) data, &size ) == ERROR_SUCCESS ) @@ -118,7 +105,7 @@ static void LoadBoard( BOARD *p_board ) } for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, timeW, i+1 ); + wsprintfW( key_name, L"Time%u", i+1 ); size = sizeof( p_board->best_time[i] ); if( RegQueryValueExW( hkey, key_name, NULL, &type, (BYTE*) &p_board->best_time[i], &size ) ) p_board->best_time[i] = 999; @@ -163,28 +150,28 @@ void SaveBoard( BOARD *p_board ) WCHAR data[MAX_PLAYER_NAME_SIZE+1]; WCHAR key_name[8]; - if( RegCreateKeyExW( HKEY_CURRENT_USER, registry_key, + if( RegCreateKeyExW( HKEY_CURRENT_USER, L"Software\\Microsoft\\WinMine", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ) != ERROR_SUCCESS) return; - RegSetValueExW( hkey, xposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.x, sizeof(p_board->pos.x) ); - RegSetValueExW( hkey, yposW, 0, REG_DWORD, (LPBYTE) &p_board->pos.y, sizeof(p_board->pos.y) ); - RegSetValueExW( hkey, difficultyW, 0, REG_DWORD, (LPBYTE) &p_board->difficulty, sizeof(p_board->difficulty) ); - RegSetValueExW( hkey, heightW, 0, REG_DWORD, (LPBYTE) &p_board->rows, sizeof(p_board->rows) ); - RegSetValueExW( hkey, widthW, 0, REG_DWORD, (LPBYTE) &p_board->cols, sizeof(p_board->cols) ); - RegSetValueExW( hkey, minesW, 0, REG_DWORD, (LPBYTE) &p_board->mines, sizeof(p_board->mines) ); - RegSetValueExW( hkey, markW, 0, REG_DWORD, (LPBYTE) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); + RegSetValueExW( hkey, L"Xpos", 0, REG_DWORD, (BYTE*) &p_board->pos.x, sizeof(p_board->pos.x) ); + RegSetValueExW( hkey, L"Ypos", 0, REG_DWORD, (BYTE*) &p_board->pos.y, sizeof(p_board->pos.y) ); + RegSetValueExW( hkey, L"Difficulty", 0, REG_DWORD, (BYTE*) &p_board->difficulty, sizeof(p_board->difficulty) ); + RegSetValueExW( hkey, L"Height", 0, REG_DWORD, (BYTE*) &p_board->rows, sizeof(p_board->rows) ); + RegSetValueExW( hkey, L"Width", 0, REG_DWORD, (BYTE*) &p_board->cols, sizeof(p_board->cols) ); + RegSetValueExW( hkey, L"Mines", 0, REG_DWORD, (BYTE*) &p_board->mines, sizeof(p_board->mines) ); + RegSetValueExW( hkey, L"Mark", 0, REG_DWORD, (BYTE*) &p_board->IsMarkQ, sizeof(p_board->IsMarkQ) ); for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, nameW, i+1 ); + wsprintfW( key_name, L"Name%u", i+1 ); lstrcpynW( data, p_board->best_name[i], ARRAY_SIZE(data)); RegSetValueExW( hkey, key_name, 0, REG_SZ, (LPBYTE) data, (lstrlenW(data)+1) * sizeof(WCHAR) ); } for( i = 0; i < 3; i++ ) { - wsprintfW( key_name, timeW, i+1 ); + wsprintfW( key_name, L"Time%u", i+1 ); RegSetValueExW( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(p_board->best_time[i]) ); } RegCloseKey( hkey );

1 0

Michael Stefaniuc : taskkill: Use wide-char string literals.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

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

Anton Baskanov : winegstreamer: Expose 15/16-bit RGB formats.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

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

Anton Baskanov : winegstreamer: Use RGB15/16 formats instead of BGR15/16.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

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

Jacek Caban : conhost: Use better default values in create_screen_buffer.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 1ef8c0a1f3deb6da9addf2a8e039c9bac11aa134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ef8c0a1f3deb6da9addf2a8… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Oct 7 10:39:54 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1ff3804ff2..b8baf6d127 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-09-21 23:29+0300\n" +"PO-Revision-Date: 2020-10-07 10:39+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10234,16 +10234,12 @@ msgid "US Eastern Daylight Time" msgstr "JAV Rytinis vasaros laikas" #: dlls/tzres/tzres.rc:172 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "Korėjos juostinis laikas" +msgstr "Šiaurės Korėjos juostinis laikas" #: dlls/tzres/tzres.rc:173 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "Korėjos vasaros laikas" +msgstr "Šiaurės Korėjos vasaros laikas" #: dlls/tzres/tzres.rc:208 msgid "Tasmania Standard Time"

1 0

Michael Stefaniuc : atl: Use wide-char string literals.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 568c32f381f71754b523d57a328684862bd44e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=568c32f381f71754b523d57a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:58 2020 +0200 atl: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.c | 20 +++++------------ dlls/atl/atl_ax.c | 35 +++++++++++++---------------- dlls/atl/registrar.c | 60 ++++++++++++++++++------------------------------- dlls/atl/tests/atl_ax.c | 3 +-- 4 files changed, 44 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=568c32f381f71754b523…

1 0

Michael Stefaniuc : sc: Use wide-char string literals.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

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 : view: Use wide-char string literals.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 16abaccbe7dfa29cd13ddff073e79fd5e7eb4904 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16abaccbe7dfa29cd13ddff0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:54 2020 +0200 view: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/view/view.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 2664eeb9b1..ad29734828 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -24,7 +24,7 @@ static HINSTANCE hInst; static HWND hMainWnd; -static WCHAR szAppName[5] = {'V','i','e','w',0}; +static const WCHAR szAppName[] = L"View"; static WCHAR szTitle[MAX_PATH]; static WCHAR szFileTitle[MAX_PATH]; @@ -52,14 +52,13 @@ typedef struct static BOOL FileOpen(HWND hWnd, WCHAR *fn, int fnsz) { WCHAR filter[120], metafileFilter[100]; - static const WCHAR filterW[] = {'%','s','%','c','*','.','w','m','f',';','*','.','e','m','f','%','c',0}; OPENFILENAMEW ofn = { sizeof(OPENFILENAMEW), 0, 0, NULL, NULL, 0, 0, NULL, fnsz, NULL, 0, NULL, NULL, OFN_SHOWHELP, 0, 0, NULL, 0, NULL }; LoadStringW( hInst, IDS_OPEN_META_STRING, metafileFilter, ARRAY_SIZE(metafileFilter) ); - swprintf( filter, ARRAY_SIZE(filter), filterW, metafileFilter, 0, 0 ); + swprintf( filter, ARRAY_SIZE(filter), L"%s%c*.wmf;*.emf%c", metafileFilter, 0, 0 ); ofn.lpstrFilter = filter; ofn.hwndOwner = hWnd; @@ -217,7 +216,6 @@ static void UpdateWindowCaption(void) { WCHAR szCaption[MAX_PATH]; WCHAR szView[MAX_PATH]; - static const WCHAR hyphenW[] = { ' ','-',' ',0 }; LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); @@ -225,7 +223,7 @@ static void UpdateWindowCaption(void) { lstrcpyW(szCaption, szFileTitle); LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); - lstrcatW(szCaption, hyphenW); + lstrcatW(szCaption, L" - "); lstrcatW(szCaption, szView); } else

1 0

Michael Stefaniuc : advpack: Use wide-char string literals.
by Alexandre Julliard Oct. 7, 2020

Oct. 7, 2020

Module: wine Branch: master Commit: 2a2001b3002603624d2f091293b617cd47d8d6c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2001b3002603624d2f0912… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Oct 7 00:51:57 2020 +0200 advpack: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack.c | 47 +++++++++--------------------------- dlls/advpack/files.c | 36 +++++++--------------------- dlls/advpack/install.c | 60 +++++++++++++--------------------------------- dlls/advpack/reg.c | 29 ++++++++-------------- dlls/advpack/tests/files.c | 7 +----- 5 files changed, 46 insertions(+), 133 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2a2001b3002603624d2f…

1 0