October 2020 - Wine-devel - list.winehq.org

[PATCH] schtasks: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/schtasks/schtasks.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 2ffc241153d..ae28f30ad48 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -25,16 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(schtasks); -static const WCHAR change_optW[] = {'/','c','h','a','n','g','e',0}; -static const WCHAR create_optW[] = {'/','c','r','e','a','t','e',0}; -static const WCHAR delete_optW[] = {'/','d','e','l','e','t','e',0}; -static const WCHAR enable_optW[] = {'/','e','n','a','b','l','e',0}; -static const WCHAR f_optW[] = {'/','f',0}; -static const WCHAR ru_optW[] = {'/','r','u',0}; -static const WCHAR tn_optW[] = {'/','t','n',0}; -static const WCHAR tr_optW[] = {'/','t','r',0}; -static const WCHAR xml_optW[] = {'/','x','m','l',0}; - static ITaskFolder *get_tasks_root_folder(void) { ITaskService *service; @@ -140,7 +130,7 @@ static int change_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if(!wcsicmp(argv[0], tn_optW)) { + if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -154,12 +144,12 @@ static int change_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; - }else if (!wcsicmp(argv[0], enable_optW)) { + } else if (!wcsicmp(argv[0], L"/enable")) { enable = TRUE; have_option = TRUE; argc--; argv++; - }else if (!wcsicmp(argv[0], tr_optW)) { + } else if (!wcsicmp(argv[0], L"/tr")) { if (argc < 2) { FIXME("Missing /tr value\n"); return 1; @@ -213,7 +203,7 @@ static int create_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if (!wcsicmp(argv[0], xml_optW)) { + if (!wcsicmp(argv[0], L"/xml")) { if (argc < 2) { FIXME("Missing /xml value\n"); return 1; @@ -227,7 +217,7 @@ static int create_command(int argc, WCHAR *argv[]) xml_file = argv[1]; argc -= 2; argv += 2; - }else if(!wcsicmp(argv[0], tn_optW)) { + } else if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -241,11 +231,11 @@ static int create_command(int argc, WCHAR *argv[]) task_name = argv[1]; argc -= 2; argv += 2; - }else if(!wcsicmp(argv[0], f_optW)) { + } else if (!wcsicmp(argv[0], L"/f")) { flags = TASK_CREATE_OR_UPDATE; argc--; argv++; - }else if (!wcsicmp(argv[0], ru_optW)) { + } else if (!wcsicmp(argv[0], L"/ru")) { if (argc < 2) { FIXME("Missing /ru value\n"); return 1; @@ -302,11 +292,11 @@ static int delete_command(int argc, WCHAR *argv[]) HRESULT hres; while (argc) { - if (!wcsicmp(argv[0], f_optW)) { + if (!wcsicmp(argv[0], L"/f")) { TRACE("force opt\n"); argc--; argv++; - }else if(!wcsicmp(argv[0], tn_optW)) { + } else if (!wcsicmp(argv[0], L"/tn")) { if (argc < 2) { FIXME("Missing /tn value\n"); return 1; @@ -357,11 +347,11 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (argc < 2) FIXME("Print current tasks state\n"); - else if (!wcsicmp(argv[1], change_optW)) + else if (!wcsicmp(argv[1], L"/change")) ret = change_command(argc - 2, argv + 2); - else if (!wcsicmp(argv[1], create_optW)) + else if (!wcsicmp(argv[1], L"/create")) ret = create_command(argc - 2, argv + 2); - else if (!wcsicmp(argv[1], delete_optW)) + else if (!wcsicmp(argv[1], L"/delete")) ret = delete_command(argc - 2, argv + 2); else FIXME("Unsupported command %s\n", debugstr_w(argv[1])); -- 2.26.2

1 0

[PATCH] net: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/net/net.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 0f43e8a973d..dbc4bf2bfc6 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -155,7 +155,6 @@ static BOOL net_use(int argc, const WCHAR* argv[]) static BOOL net_enum_services(void) { - static const WCHAR runningW[]={' ',' ',' ',' ','%','1','\n',0}; SC_HANDLE SCManager; LPENUM_SERVICE_STATUS_PROCESSW services; DWORD size, i, count, resume; @@ -184,7 +183,7 @@ static BOOL net_enum_services(void) output_string(STRING_RUNNING_HEADER); for(i = 0; i < count; i++) { - output_printf(runningW, services[i].lpDisplayName); + output_printf(L" %1\n", services[i].lpDisplayName); WINE_TRACE("service=%s state=%d controls=%x\n", wine_dbgstr_w(services[i].lpServiceName), services[i].ServiceStatusProcess.dwCurrentState, @@ -295,19 +294,13 @@ static BOOL arg_is(const WCHAR* str1, const WCHAR* str2) int __cdecl wmain(int argc, const WCHAR* argv[]) { - static const WCHAR helpW[]={'h','e','l','p',0}; - static const WCHAR shelpW[]={'/','h','e','l','p',0}; - static const WCHAR startW[]={'s','t','a','r','t',0}; - static const WCHAR stopW[]={'s','t','o','p',0}; - static const WCHAR useW[]={'u','s','e',0}; - if (argc < 2) { output_string(STRING_USAGE); return 1; } - if(arg_is(argv[1], helpW)) + if(arg_is(argv[1], L"help")) { if(argc > 3) { @@ -316,14 +309,14 @@ int __cdecl wmain(int argc, const WCHAR* argv[]) } if(argc == 2) output_string(STRING_USAGE); - else if(arg_is(argv[2], startW)) + else if(arg_is(argv[2], L"start")) output_string(STRING_START_USAGE); - else if(arg_is(argv[2], stopW)) + else if(arg_is(argv[2], L"stop")) output_string(STRING_STOP_USAGE); else output_string(STRING_USAGE); } - else if(arg_is(argv[1], startW)) + else if(arg_is(argv[1], L"start")) { if(argc > 3) { @@ -335,24 +328,24 @@ int __cdecl wmain(int argc, const WCHAR* argv[]) if (!net_enum_services()) return 1; } - else if(arg_is(argv[2], shelpW)) + else if(arg_is(argv[2], L"/help")) output_string(STRING_START_USAGE); else if(!net_service(NET_START, argv[2])) return 1; } - else if(arg_is(argv[1], stopW)) + else if(arg_is(argv[1], L"stop")) { if(argc != 3) { output_string(STRING_STOP_USAGE); return 1; } - if(arg_is(argv[2], shelpW)) + if(arg_is(argv[2], L"/help")) output_string(STRING_STOP_USAGE); else if(!net_service(NET_STOP, argv[2])) return 1; } - else if(arg_is(argv[1], useW)) + else if(arg_is(argv[1], L"use")) { if(!net_use(argc, argv)) return 1; } -- 2.26.2

1 0

[PATCH] hostname: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/hostname/hostname.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index 0738e718e11..e6c2ed76cd1 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -91,18 +91,15 @@ static int WINAPIV hostname_message_printfW(int msg, ...) static int hostname_message(int msg) { - static const WCHAR formatW[] = {'%','s',0}; WCHAR msg_buffer[8192]; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - return hostname_printfW(formatW, msg_buffer); + return hostname_printfW(L"%s", msg_buffer); } static int display_computer_name(void) { - static const WCHAR fmtW[] = {'%','s','\r','\n',0}; - WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; DWORD size = ARRAY_SIZE(name); BOOL ret; @@ -114,7 +111,7 @@ static int display_computer_name(void) return 1; } - hostname_printfW(fmtW, name); + hostname_printfW(L"%s\r\n", name); return 0; } @@ -122,11 +119,9 @@ int __cdecl wmain(int argc, WCHAR *argv[]) { if (argc > 1) { - static const WCHAR slashHelpW[] = {'/','?',0}; - unsigned int i; - if (!wcsncmp(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1)) + if (!wcsncmp(argv[1], L"/?", ARRAY_SIZE(L"/?") - 1)) { hostname_message(STRING_USAGE); return 1; -- 2.26.2

1 0

[PATCH] extrac32: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/extrac32/extrac32.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index c557ff0733f..278f8ff9bf5 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -115,11 +115,9 @@ static void copy_file(LPCWSTR source, LPCWSTR destination) if (PathFileExistsW(destination) && !force_mode) { - static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0}; - static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0}; WCHAR msg[MAX_PATH+100]; - swprintf(msg, ARRAY_SIZE(msg), overwriteMsg, destination); - if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES) + swprintf(msg, ARRAY_SIZE(msg), L"Overwrite \"%s\"?", destination); + if (MessageBoxW(NULL, msg, L"Extract", MB_YESNO | MB_ICONWARNING) != IDYES) return; } -- 2.26.2

1 0

[PATCH] dxdiag: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/dxdiag/information.c | 59 ++++++++++-------------------- programs/dxdiag/main.c | 13 ++----- programs/dxdiag/output.c | 69 +++++++++++------------------------ 3 files changed, 45 insertions(+), 96 deletions(-) diff --git a/programs/dxdiag/information.c b/programs/dxdiag/information.c index e30aa891dbe..74fe15f7aec 100644 --- a/programs/dxdiag/information.c +++ b/programs/dxdiag/information.c @@ -27,25 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); -static const WCHAR szTimeEnglish[] = {'s','z','T','i','m','e','E','n','g','l','i','s','h',0}; -static const WCHAR szTimeLocalized[] = {'s','z','T','i','m','e','L','o','c','a','l','i','z','e','d',0}; -static const WCHAR szMachineNameEnglish[] = {'s','z','M','a','c','h','i','n','e','N','a','m','e','E','n','g','l','i','s','h',0}; -static const WCHAR szOSExLongEnglish[] = {'s','z','O','S','E','x','L','o','n','g','E','n','g','l','i','s','h',0}; -static const WCHAR szOSExLocalized[] = {'s','z','O','S','E','x','L','o','c','a','l','i','z','e','d',0}; -static const WCHAR szLanguagesEnglish[] = {'s','z','L','a','n','g','u','a','g','e','s','E','n','g','l','i','s','h',0}; -static const WCHAR szLanguagesLocalized[] = {'s','z','L','a','n','g','u','a','g','e','s','L','o','c','a','l','i','z','e','d',0}; -static const WCHAR szSystemManufacturerEnglish[] = {'s','z','S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r','E','n','g','l','i','s','h',0}; -static const WCHAR szSystemModelEnglish[] = {'s','z','S','y','s','t','e','m','M','o','d','e','l','E','n','g','l','i','s','h',0}; -static const WCHAR szBIOSEnglish[] = {'s','z','B','I','O','S','E','n','g','l','i','s','h',0}; -static const WCHAR szProcessorEnglish[] = {'s','z','P','r','o','c','e','s','s','o','r','E','n','g','l','i','s','h',0}; -static const WCHAR szPhysicalMemoryEnglish[] = {'s','z','P','h','y','s','i','c','a','l','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; -static const WCHAR szPageFileEnglish[] = {'s','z','P','a','g','e','F','i','l','e','E','n','g','l','i','s','h',0}; -static const WCHAR szPageFileLocalized[] = {'s','z','P','a','g','e','F','i','l','e','L','o','c','a','l','i','z','e','d',0}; -static const WCHAR szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',0}; -static const WCHAR szDirectXVersionLongEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','o','n','g','E','n','g','l','i','s','h',0}; -static const WCHAR szSetupParamEnglish[] = {'s','z','S','e','t','u','p','P','a','r','a','m','E','n','g','l','i','s','h',0}; -static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0}; - struct property_list { const WCHAR *property_name; @@ -108,41 +89,41 @@ static inline void fill_system_property_list(struct dxdiag_information *dxdiag_i { struct system_information *system_info = &dxdiag_info->system_info; - list[0].property_name = szTimeEnglish; + list[0].property_name = L"szTimeEnglish"; list[0].output = &system_info->szTimeEnglish; - list[1].property_name = szTimeLocalized; + list[1].property_name = L"szTimeLocalized"; list[1].output = &system_info->szTimeLocalized; - list[2].property_name = szMachineNameEnglish; + list[2].property_name = L"szMachineNameEnglish"; list[2].output = &system_info->szMachineNameEnglish; - list[3].property_name = szOSExLongEnglish; + list[3].property_name = L"szOSExLongEnglish"; list[3].output = &system_info->szOSExLongEnglish; - list[4].property_name = szOSExLocalized; + list[4].property_name = L"szOSExLocalized"; list[4].output = &system_info->szOSExLocalized; - list[5].property_name = szLanguagesEnglish; + list[5].property_name = L"szLanguagesEnglish"; list[5].output = &system_info->szLanguagesEnglish; - list[6].property_name = szLanguagesLocalized; + list[6].property_name = L"szLanguagesLocalized"; list[6].output = &system_info->szLanguagesLocalized; - list[7].property_name = szSystemManufacturerEnglish; + list[7].property_name = L"szSystemManufacturerEnglish"; list[7].output = &system_info->szSystemManufacturerEnglish; - list[8].property_name = szSystemModelEnglish; + list[8].property_name = L"szSystemModelEnglish"; list[8].output = &system_info->szSystemModelEnglish; - list[9].property_name = szBIOSEnglish; + list[9].property_name = L"szBIOSEnglish"; list[9].output = &system_info->szBIOSEnglish; - list[10].property_name = szProcessorEnglish; + list[10].property_name = L"szProcessorEnglish"; list[10].output = &system_info->szProcessorEnglish; - list[11].property_name = szPhysicalMemoryEnglish; + list[11].property_name = L"szPhysicalMemoryEnglish"; list[11].output = &system_info->szPhysicalMemoryEnglish; - list[12].property_name = szPageFileEnglish; + list[12].property_name = L"szPageFileEnglish"; list[12].output = &system_info->szPageFileEnglish; - list[13].property_name = szPageFileLocalized; + list[13].property_name = L"szPageFileLocalized"; list[13].output = &system_info->szPageFileLocalized; - list[14].property_name = szWindowsDir; + list[14].property_name = L"szWindowsDir"; list[14].output = &system_info->szWindowsDir; - list[15].property_name = szDirectXVersionLongEnglish; + list[15].property_name = L"szDirectXVersionLongEnglish"; list[15].output = &system_info->szDirectXVersionLongEnglish; - list[16].property_name = szSetupParamEnglish; + list[16].property_name = L"szSetupParamEnglish"; list[16].output = &system_info->szSetupParamEnglish; - list[17].property_name = szDxDiagVersion; + list[17].property_name = L"szDxDiagVersion"; list[17].output = &system_info->szDxDiagVersion; } @@ -172,8 +153,6 @@ static BOOL fill_system_information(IDxDiagContainer *container, struct dxdiag_i return TRUE; } -static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; - static const struct information_fillers { const WCHAR *child_container_name; @@ -181,7 +160,7 @@ static const struct information_fillers void (*free_function)(struct dxdiag_information *); } filler_list[] = { - {DxDiag_SystemInfo, fill_system_information, free_system_information}, + {L"DxDiag_SystemInfo", fill_system_information, free_system_information}, }; void free_dxdiag_information(struct dxdiag_information *system_info) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index 4533236f0f5..968d84adea1 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -105,11 +105,6 @@ static BOOL process_file_name(const WCHAR *cmdline, enum output_type output_type static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info *info) { - static const WCHAR whql_colonW[] = {'w','h','q','l',':',0}; - static const WCHAR offW[] = {'o','f','f',0}; - static const WCHAR onW[] = {'o','n',0}; - static const WCHAR dontskipW[] = {'d','o','n','t','s','k','i','p',0}; - info->whql_check = FALSE; info->output_type = OUTPUT_NONE; @@ -143,17 +138,17 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info ARRAY_SIZE(info->outfile)); case 'W': case 'w': - if (wcsnicmp(cmdline, whql_colonW, 5)) + if (wcsnicmp(cmdline, L"whql:", 5)) return FALSE; cmdline += 5; - if (!wcsnicmp(cmdline, offW, 3)) + if (!wcsnicmp(cmdline, L"off", 3)) { info->whql_check = FALSE; cmdline += 2; } - else if (!wcsnicmp(cmdline, onW, 2)) + else if (!wcsnicmp(cmdline, L"on", 2)) { info->whql_check = TRUE; cmdline++; @@ -165,7 +160,7 @@ static BOOL process_command_line(const WCHAR *cmdline, struct command_line_info case 'd': case 'D': - if (wcsnicmp(cmdline, dontskipW, 8)) + if (wcsnicmp(cmdline, L"dontskip", 8)) return FALSE; cmdline += 8; break; diff --git a/programs/dxdiag/output.c b/programs/dxdiag/output.c index 50240fb2860..95941785c1c 100644 --- a/programs/dxdiag/output.c +++ b/programs/dxdiag/output.c @@ -33,26 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); static char output_buffer[1024]; static const char crlf[2] = "\r\n"; -static const WCHAR DxDiag[] = {'D','x','D','i','a','g',0}; - -static const WCHAR SystemInformation[] = {'S','y','s','t','e','m','I','n','f','o','r','m','a','t','i','o','n',0}; -static const WCHAR Time[] = {'T','i','m','e',0}; -static const WCHAR MachineName[] = {'M','a','c','h','i','n','e','N','a','m','e',0}; -static const WCHAR OperatingSystem[] = {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; -static const WCHAR Language[] = {'L','a','n','g','u','a','g','e',0}; -static const WCHAR SystemManufacturer[] = {'S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r',0}; -static const WCHAR SystemModel[] = {'S','y','s','t','e','m','M','o','d','e','l',0}; -static const WCHAR BIOS[] = {'B','I','O','S',0}; -static const WCHAR Processor[] = {'P','r','o','c','e','s','s','o','r',0}; -static const WCHAR Memory[] = {'M','e','m','o','r','y',0}; -static const WCHAR PageFile[] = {'P','a','g','e','F','i','l','e',0}; -static const WCHAR WindowsDir[] = {'W','i','n','d','o','w','s','D','i','r',0}; -static const WCHAR DirectXVersion[] = {'D','i','r','e','c','t','X','V','e','r','s','i','o','n',0}; -static const WCHAR DXSetupParameters[] = {'D','X','S','e','t','u','p','P','a','r','a','m','e','t','e','r','s',0}; -static const WCHAR DxDiagVersion[] = {'D','x','D','i','a','g','V','e','r','s','i','o','n',0}; -static const WCHAR DxDiagUnicode[] = {'D','x','D','i','a','g','U','n','i','c','o','d','e',0}; -static const WCHAR DxDiag64Bit[] = {'D','x','D','i','a','g','6','4','B','i','t',0}; - struct text_information_field { const char *field_name; @@ -241,41 +221,38 @@ static HRESULT save_xml_document(IXMLDOMDocument *xmldoc, const WCHAR *filename) static inline void fill_system_xml_output_table(struct dxdiag_information *dxdiag_info, struct xml_information_field *fields) { - static const WCHAR zeroW[] = {'0',0}; - static const WCHAR oneW[] = {'1',0}; - - fields[0].tag_name = Time; + fields[0].tag_name = L"Time"; fields[0].value = dxdiag_info->system_info.szTimeEnglish; - fields[1].tag_name = MachineName; + fields[1].tag_name = L"MachineName"; fields[1].value = dxdiag_info->system_info.szMachineNameEnglish; - fields[2].tag_name = OperatingSystem; + fields[2].tag_name = L"OperatingSystem"; fields[2].value = dxdiag_info->system_info.szOSExLongEnglish; - fields[3].tag_name = Language; + fields[3].tag_name = L"Language"; fields[3].value = dxdiag_info->system_info.szLanguagesEnglish; - fields[4].tag_name = SystemManufacturer; + fields[4].tag_name = L"SystemManufacturer"; fields[4].value = dxdiag_info->system_info.szSystemManufacturerEnglish; - fields[5].tag_name = SystemModel; + fields[5].tag_name = L"SystemModel"; fields[5].value = dxdiag_info->system_info.szSystemModelEnglish; - fields[6].tag_name = BIOS; + fields[6].tag_name = L"BIOS"; fields[6].value = dxdiag_info->system_info.szBIOSEnglish; - fields[7].tag_name = Processor; + fields[7].tag_name = L"Processor"; fields[7].value = dxdiag_info->system_info.szProcessorEnglish; - fields[8].tag_name = Memory; + fields[8].tag_name = L"Memory"; fields[8].value = dxdiag_info->system_info.szPhysicalMemoryEnglish; - fields[9].tag_name = PageFile; + fields[9].tag_name = L"PageFile"; fields[9].value = dxdiag_info->system_info.szPageFileEnglish; - fields[10].tag_name = WindowsDir; + fields[10].tag_name = L"WindowsDir"; fields[10].value = dxdiag_info->system_info.szWindowsDir; - fields[11].tag_name = DirectXVersion; + fields[11].tag_name = L"DirectXVersion"; fields[11].value = dxdiag_info->system_info.szDirectXVersionLongEnglish; - fields[12].tag_name = DXSetupParameters; + fields[12].tag_name = L"DXSetupParameters"; fields[12].value = dxdiag_info->system_info.szSetupParamEnglish; - fields[13].tag_name = DxDiagVersion; + fields[13].tag_name = L"DxDiagVersion"; fields[13].value = dxdiag_info->system_info.szDxDiagVersion; - fields[14].tag_name = DxDiagUnicode; - fields[14].value = oneW; - fields[15].tag_name = DxDiag64Bit; - fields[15].value = dxdiag_info->system_info.win64 ? oneW : zeroW; + fields[14].tag_name = L"DxDiagUnicode"; + fields[14].value = L"1"; + fields[15].tag_name = L"DxDiag64Bit"; + fields[15].value = dxdiag_info->system_info.win64 ? L"1" : L"0"; } static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const WCHAR *filename) @@ -286,7 +263,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const struct xml_information_field fields[50]; } output_table[] = { - {SystemInformation}, + {L"SystemInformation"}, }; IXMLDOMDocument *xmldoc = NULL; @@ -304,7 +281,7 @@ static BOOL output_xml_information(struct dxdiag_information *dxdiag_info, const goto error; } - if (!(dxdiag_element = xml_create_element(xmldoc, DxDiag))) + if (!(dxdiag_element = xml_create_element(xmldoc, L"DxDiag"))) goto error; hr = IXMLDOMDocument_appendChild(xmldoc, (IXMLDOMNode *)dxdiag_element, NULL); @@ -380,13 +357,11 @@ static struct output_backend { /* OUTPUT_TEXT */ { - {'.','t','x','t',0}, - output_text_information, + L".txt", output_text_information, }, /* OUTPUT_XML */ { - {'.','x','m','l',0}, - output_xml_information, + L".xml", output_xml_information, }, }; -- 2.26.2

1 0

[PATCH] control: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/control/control.c | 52 ++++++++++++-------------------------- 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/programs/control/control.c b/programs/control/control.c index 9f9005f7488..df23016bce3 100644 --- a/programs/control/control.c +++ b/programs/control/control.c @@ -26,26 +26,6 @@ #include <windows.h> #include <shellapi.h> -/* alphabetical list of recognized optional command line parameters */ -static const WCHAR szP_COLOR[] = {'C','O','L','O','R',0}; -static const WCHAR szP_DATETIME[] = {'D','A','T','E','/','T','I','M','E',0}; -static const WCHAR szP_DESKTOP[] = {'D','E','S','K','T','O','P',0}; -static const WCHAR szP_INTERNATIONAL[] = {'I','N','T','E','R','N','A','T','I','O','N','A','L',0}; -static const WCHAR szP_KEYBOARD[] = {'K','E','Y','B','O','A','R','D',0}; -static const WCHAR szP_MOUSE[] = {'M','O','U','S','E',0}; -static const WCHAR szP_PORTS[] = {'P','O','R','T','S',0}; -static const WCHAR szP_PRINTERS [] = {'P','R','I','N','T','E','R','S',0}; - -/* alphabetical list of appropriate commands to execute */ -static const WCHAR szC_COLOR[] = {'d','e','s','k','.','c','p','l',',',',','2',0}; -static const WCHAR szC_DATETIME[] = {'t','i','m','e','d','a','t','e','.','c','p','l',0}; -static const WCHAR szC_DESKTOP[] = {'d','e','s','k','.','c','p','l',0}; -static const WCHAR szC_INTERNATIONAL[] = {'i','n','t','l','.','c','p','l',0}; -static const WCHAR szC_KEYBOARD[] = {'m','a','i','n','.','c','p','l',' ','@','1',0}; -static const WCHAR szC_MOUSE[] = {'m','a','i','n','.','c','p','l',0}; -static const WCHAR szC_PORTS[] = {'s','y','s','d','m','.','c','p','l',',',',','1',0}; -static const WCHAR szC_PRINTERS[] = {'m','a','i','n','.','c','p','l',' ','@','2',0}; - extern void WINAPI Control_RunDLLW(HWND hWnd, HINSTANCE hInst, LPCWSTR cmd, DWORD nCmdShow); @@ -63,22 +43,22 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPWSTR lpszCmdLine, INT nC } /* check for optional parameter */ - if (!lstrcmpiW(lpszCmdLine,szP_COLOR)) - launch(szC_COLOR); - if (!lstrcmpiW(lpszCmdLine,szP_DATETIME)) - launch(szC_DATETIME); - if (!lstrcmpiW(lpszCmdLine,szP_DESKTOP)) - launch(szC_DESKTOP); - if (!lstrcmpiW(lpszCmdLine,szP_INTERNATIONAL)) - launch(szC_INTERNATIONAL); - if (!lstrcmpiW(lpszCmdLine,szP_KEYBOARD)) - launch(szC_KEYBOARD); - if (!lstrcmpiW(lpszCmdLine,szP_MOUSE)) - launch(szC_MOUSE); - if (!lstrcmpiW(lpszCmdLine,szP_PORTS)) - launch(szC_PORTS); - if (!lstrcmpiW(lpszCmdLine,szP_PRINTERS)) - launch(szC_PRINTERS); + if (!lstrcmpiW(lpszCmdLine, L"COLOR")) + launch(L"desk.cpl,,2"); + if (!lstrcmpiW(lpszCmdLine, L"DATE/TIME")) + launch(L"timedate.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"DESKTOP")) + launch(L"desk.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"INTERNATIONAL")) + launch(L"intl.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"KEYBOARD")) + launch(L"main.cpl @1"); + if (!lstrcmpiW(lpszCmdLine, L"MOUSE")) + launch(L"main.cpl"); + if (!lstrcmpiW(lpszCmdLine, L"PORTS")) + launch(L"sysdm.cpl,,1"); + if (!lstrcmpiW(lpszCmdLine, L"PRINTERS")) + launch(L"main.cpl @2"); /* try to launch if a .cpl file is given directly */ launch(lpszCmdLine); -- 2.26.2

1 0

[PATCH] clock: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/clock/main.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index 3ad636be431..43364745ea5 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -104,10 +104,9 @@ static BOOL CLOCK_ResetTimer(void) period = 1000; if (!SetTimer (Globals.hMainWnd, TIMER_ID, period, NULL)) { - static const WCHAR notimersW[] = {'N','o',' ','a','v','a','i','l','a','b','l','e',' ','t','i','m','e','r','s',0}; WCHAR szApp[MAX_STRING_LEN]; LoadStringW(Globals.hInstance, IDS_CLOCK, szApp, MAX_STRING_LEN); - MessageBoxW(0, notimersW, szApp, MB_ICONEXCLAMATION | MB_OK); + MessageBoxW(0, L"No available timers", szApp, MB_ICONEXCLAMATION | MB_OK); return FALSE; } return TRUE; @@ -390,9 +389,6 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show MSG msg; WNDCLASSW class; - static const WCHAR szClassName[] = {'C','L','C','l','a','s','s',0}; - static const WCHAR szWinName[] = {'C','l','o','c','k',0}; - /* Setup Globals */ memset(&Globals.hFont, 0, sizeof (Globals.hFont)); Globals.bAnalog = TRUE; @@ -408,13 +404,13 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = 0; class.lpszMenuName = 0; - class.lpszClassName = szClassName; + class.lpszClassName = L"CLClass"; } - + if (!RegisterClassW(&class)) return FALSE; - + Globals.MaxX = Globals.MaxY = INITIAL_WINDOW_SIZE; - Globals.hMainWnd = CreateWindowW(szClassName, szWinName, WS_OVERLAPPEDWINDOW, + Globals.hMainWnd = CreateWindowW(L"CLClass", L"Clock", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, Globals.MaxX, Globals.MaxY, 0, 0, hInstance, 0); -- 2.26.2

1 0

[PATCH] cabarc: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cabarc/cabarc.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index d244d6ce27e..3eb28fe9083 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -470,7 +470,6 @@ static BOOL add_file( HFCI fci, WCHAR *name ) static BOOL add_directory( HFCI fci, WCHAR *dir ) { - static const WCHAR wildcardW[] = {'*',0}; WCHAR *p, *buffer; HANDLE handle; WIN32_FIND_DATAW data; @@ -480,7 +479,7 @@ static BOOL add_directory( HFCI fci, WCHAR *dir ) lstrcpyW( buffer, dir ); p = buffer + lstrlenW( buffer ); if (p > buffer && p[-1] != '\\') *p++ = '\\'; - lstrcpyW( p, wildcardW ); + lstrcpyW( p, L"*" ); if ((handle = FindFirstFileW( buffer, &data )) != INVALID_HANDLE_VALUE) { @@ -524,7 +523,6 @@ static BOOL add_file_or_directory( HFCI fci, WCHAR *name ) static int new_cabinet( char *cab_dir ) { - static const WCHAR plusW[] = {'+',0}; WCHAR **file; ERF erf; BOOL ret = FALSE; @@ -550,7 +548,7 @@ static int new_cabinet( char *cab_dir ) for (file = opt_files; *file; file++) { - if (!lstrcmpW( *file, plusW )) + if (!lstrcmpW( *file, L"+" )) FCIFlushFolder( fci, fci_get_next_cab, fci_status ); else if (!(ret = add_file_or_directory( fci, *file ))) break; @@ -586,9 +584,6 @@ static void usage( void ) int __cdecl wmain( int argc, WCHAR *argv[] ) { - static const WCHAR noneW[] = {'n','o','n','e',0}; - static const WCHAR mszipW[] = {'m','s','z','i','p',0}; - WCHAR *p, *command; char buffer[MAX_PATH]; char filename[MAX_PATH]; @@ -617,8 +612,8 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) break; case 'm': argv++; argc--; - if (!wcscmp( argv[1], noneW )) opt_compression = tcompTYPE_NONE; - else if (!wcscmp( argv[1], mszipW )) opt_compression = tcompTYPE_MSZIP; + if (!wcscmp( argv[1], L"none" )) opt_compression = tcompTYPE_NONE; + else if (!wcscmp( argv[1], L"mszip" )) opt_compression = tcompTYPE_MSZIP; else { WINE_MESSAGE( "cabarc: Unknown compression type %s\n", debugstr_w(argv[1])); -- 2.26.2

1 0

[PATCH] attrib: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/attrib/attrib.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 558a393253c..53f63020973 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -24,8 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(attrib); -static const WCHAR starW[] = {'*','\0'}; - /* ========================================================================= * Load a string from the resource file, handling any error * Returns string retrieved from resource file @@ -33,11 +31,10 @@ static const WCHAR starW[] = {'*','\0'}; static WCHAR *ATTRIB_LoadMessage(UINT id) { static WCHAR msg[MAXSTRING]; - const WCHAR failedMsg[] = {'F', 'a', 'i', 'l', 'e', 'd', '!', 0}; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); - lstrcpyW(msg, failedMsg); + lstrcpyW(msg, L"Failed!"); } return msg; } @@ -144,8 +141,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, WCHAR buffer[MAX_PATH]; HANDLE hff; WIN32_FIND_DATAW fd; - WCHAR flags[] = {' ',' ',' ',' ',' ',' ',' ',' ','\0'}; - static const WCHAR slashW[] = {'\\','\0'}; + WCHAR flags[] = L" "; WINE_TRACE("Processing dir '%s', spec '%s', %d,%x,%x\n", wine_dbgstr_w(rootdir), wine_dbgstr_w(filespec), @@ -155,25 +151,22 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, /* Build spec to search for */ lstrcpyW(buffer, rootdir); - lstrcatW(buffer, starW); + lstrcatW(buffer, L"*"); /* Search for directories in the location and recurse if necessary */ WINE_TRACE("Searching for directories with '%s'\n", wine_dbgstr_w(buffer)); hff = FindFirstFileW(buffer, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - const WCHAR dot[] = {'.', 0}; - const WCHAR dotdot[] = {'.', '.', 0}; - /* Only interested in directories, and not . nor .. */ if (!(fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) + !lstrcmpW(fd.cFileName, L".") || !lstrcmpW(fd.cFileName, L"..")) continue; /* Build new root dir to go searching in */ lstrcpyW(buffer, rootdir); lstrcatW(buffer, fd.cFileName); - lstrcatW(buffer, slashW); + lstrcatW(buffer, L"\\"); ATTRIB_processdirectory(buffer, filespec, recurse, includedirs, attrib_set, attrib_clear); @@ -191,12 +184,10 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, hff = FindFirstFileW(buffer, &fd); if (hff != INVALID_HANDLE_VALUE) { do { - const WCHAR dot[] = {'.', 0}; - const WCHAR dotdot[] = {'.', '.', 0}; DWORD count; WINE_TRACE("Found '%s'\n", wine_dbgstr_w(fd.cFileName)); - if (!lstrcmpW(fd.cFileName, dot) || !lstrcmpW(fd.cFileName, dotdot)) + if (!lstrcmpW(fd.cFileName, L".") || !lstrcmpW(fd.cFileName, L"..")) continue; if (!includedirs && (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -212,7 +203,6 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, SetFileAttributesW(buffer, fd.dwFileAttributes); found = TRUE; } else { - static const WCHAR fmt[] = {'%','1',' ',' ',' ',' ',' ','%','2','\n','\0'}; if (fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) { flags[4] = 'H'; } @@ -233,7 +223,7 @@ static BOOL ATTRIB_processdirectory(const WCHAR *rootdir, const WCHAR *filespec, } lstrcpyW(buffer, rootdir); lstrcatW(buffer, fd.cFileName); - ATTRIB_wprintf(fmt, flags, buffer); + ATTRIB_wprintf(L"%1 %2\n", flags, buffer); for (count = 0; count < (ARRAY_SIZE(flags) - 1); count++) flags[count] = ' '; found = TRUE; } @@ -253,18 +243,16 @@ int __cdecl wmain(int argc, WCHAR *argv[]) DWORD attrib_clear = 0; BOOL attrib_recurse = FALSE; BOOL attrib_includedirs = FALSE; - static const WCHAR help_option[] = {'/','?','\0'}; - static const WCHAR wildcardsW[] = {'*','?','\0'}; int i = 1; BOOL found = FALSE; - if ((argc >= 2) && !lstrcmpW(argv[1], help_option)) { + if ((argc >= 2) && !lstrcmpW(argv[1], L"/?")) { ATTRIB_wprintf(ATTRIB_LoadMessage(STRING_HELP)); return 0; } /* By default all files from current directory are taken into account */ - lstrcpyW(name, starW); + lstrcpyW(name, L"*"); while (i < argc) { WCHAR *param = argv[i++]; @@ -311,7 +299,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) /* If a directory is explicitly supplied on the command line, and no wildcards are in the name, then allow it to be changed/displayed */ - if (wcspbrk(originalname, wildcardsW) == NULL) attrib_includedirs = TRUE; + if (wcspbrk(originalname, L"*?") == NULL) attrib_includedirs = TRUE; /* Do all the processing based on the filename arg */ found = ATTRIB_processdirectory(curdir, name, attrib_recurse, -- 2.26.2

1 0

[PATCH] packager: Use wide-char string literals.
by Michael Stefaniuc 05 Oct '20

05 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/packager/packager_main.c | 11 +++-------- dlls/packager/tests/oleobj.c | 8 ++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 0a0790e9030..de07e5ca265 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -181,8 +181,7 @@ static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwRese static HRESULT do_activate_object(struct Package *This, HWND parent) { - static const WCHAR openW[] = {'o','p','e','n',0}; - ShellExecuteW(parent, openW, This->filename, NULL, NULL, SW_SHOW); + ShellExecuteW(parent, L"open", This->filename, NULL, NULL, SW_SHOW); return S_OK; } @@ -396,11 +395,9 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, WCHAR *stream_filename; WCHAR *base_end, extension[MAX_PATH]; - static const WCHAR ole10nativeW[] = {0x0001,'O','l','e','1','0','N','a','t','i','v','e',0}; - TRACE("(%p)->(%p)\n", This, pStg); - hr = IStorage_OpenStream(pStg, ole10nativeW, NULL, + hr = IStorage_OpenStream(pStg, L"\1Ole10Native", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); if(FAILED(hr)){ TRACE("OpenStream gave: %08x\n", hr); @@ -489,8 +486,6 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, file = CreateFileW(This->filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); while(file == INVALID_HANDLE_VALUE){ - static const WCHAR fmtW[] = {' ','(','%','u',')',0}; - if(GetLastError() != ERROR_FILE_EXISTS){ WARN("CreateFile failed: %u\n", GetLastError()); hr = E_FAIL; @@ -499,7 +494,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, /* file exists, so increment file name and try again */ ++i; - wsprintfW(base_end, fmtW, i); + wsprintfW(base_end, L" (%u)", i); lstrcatW(base_end, extension); file = CreateFileW(This->filename, GENERIC_WRITE, FILE_SHARE_READ, NULL, diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 1ce54eda7e7..62875584931 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -210,9 +210,7 @@ static HRESULT WINAPI stg_CreateStream(IStorage* This, LPCOLESTR pwcsName, static HRESULT WINAPI stg_OpenStream(IStorage* This, LPCOLESTR pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream **ppstm) { - static const WCHAR ole10NativeW[] = {1,'O','l','e','1','0','N','a','t','i','v','e',0}; - - if(lstrcmpW(pwcsName, ole10NativeW)) + if(lstrcmpW(pwcsName, L"\1Ole10Native")) return STG_E_FILENOTFOUND; *ppstm = &ole10native_stream; @@ -417,8 +415,6 @@ static void test_packager(void) char contents[11]; BOOL br, extended = FALSE; - static const WCHAR filename3W[] = {'f','i','l','e','n','a','m','e','3','.','t','x','t',0}; - hr = CoCreateInstance(&CLSID_Package, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&oleobj); ok(hr == S_OK || @@ -458,7 +454,7 @@ static void test_packager(void) if(extended){ len = GetTempPathW(ARRAY_SIZE(filename), filename); - lstrcpyW(filename + len, filename3W); + lstrcpyW(filename + len, L"filename3.txt"); file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); -- 2.26.2

1 0