October 2020 - Wine-commits

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

05 Oct '20

Module: wine Branch: master Commit: 4c9e8c67880471e0cd9f840e6e85c9428b2dc77c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9e8c67880471e0cd9f840e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:18 2020 +0200 midimap: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index d15e3d76b9..86e4289d89 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -220,9 +220,8 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) size = sizeof(out); if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) { - static const WCHAR cs[] = {'C','u','r','r','e','n','t','S','c','h','e','m','e',0}; size = sizeof(buffer); - if (!RegQueryValueExW(hKey, cs, 0, &type, (void*)buffer, &size)) + if (!RegQueryValueExW(hKey, L"CurrentScheme", 0, &type, (void*)buffer, &size)) { if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) ret = MIDIMAP_LoadSettingsDefault(mom, NULL); @@ -234,9 +233,8 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) } if (ret == 2) { - static const WCHAR ci[] = {'C','u','r','r','e','n','t','I','n','s','t','r','u','m','e','n','t',0}; size = sizeof(buffer); - if (!RegQueryValueExW(hKey, ci, 0, &type, (void*)buffer, &size) && *buffer) + if (!RegQueryValueExW(hKey, L"CurrentInstrument", 0, &type, (void*)buffer, &size) && *buffer) { ret = MIDIMAP_LoadSettingsDefault(mom, buffer); } @@ -470,8 +468,7 @@ static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiC { static const MIDIOUTCAPSW mappercaps = { 0x00FF, 0x0001, 0x0100, /* Manufacturer and Product ID */ - {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}, - MOD_MAPPER, 0, 0, 0xFFFF, + L"Wine midi mapper", MOD_MAPPER, 0, 0, 0xFFFF, /* Native returns volume caps of underlying device + MIDICAPS_STREAM */ MIDICAPS_VOLUME|MIDICAPS_LRVOLUME }; @@ -552,7 +549,6 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, */ static LRESULT MIDIMAP_drvOpen(void) { - static const WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; MIDIOUTCAPSW moc; unsigned dev, i; BOOL found_valid_port = FALSE; @@ -574,7 +570,7 @@ static LRESULT MIDIMAP_drvOpen(void) midiOutPorts[dev].lpbPatch = NULL; for (i = 0; i < 16; i++) midiOutPorts[dev].aChn[i] = i; - if (wcsncmp(midiOutPorts[dev].name, throughportW, lstrlenW(throughportW)) != 0) + if (wcsncmp(midiOutPorts[dev].name, L"Midi Through", lstrlenW(L"Midi Through")) != 0) found_valid_port = TRUE; } else

1 0

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

05 Oct '20

Module: wine Branch: master Commit: 250e6d9f8c417341e498ba35ad7938ec93d21a21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=250e6d9f8c417341e498ba35… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:19 2020 +0200 mlang: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e3582cca2d..62e9947fb7 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -392,8 +392,6 @@ static const MIME_CP_INFO vietnamese_cp[] = "windows-1258", "windows-1258", "windows-1258" } }; -static const WCHAR asciiW[] = {'a','s','c','i','i',0}; - static const MIME_CP_INFO western_cp[] = { { "IBM EBCDIC (US-Canada)", @@ -446,7 +444,7 @@ static const MIME_CP_INFO western_cp[] = 20127, MIMECONTF_MAILNEWS | MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, - "us-ascii", "us-ascii", "us-ascii", asciiW }, + "us-ascii", "us-ascii", "us-ascii", L"ascii" }, { "Western European (ISO)", 28591, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | @@ -3934,14 +3932,7 @@ static BOOL register_codepages(void) WCHAR buf[32]; LSTATUS status; - static const WCHAR db_key_nameW[] = { - 'M','I','M','E', - '\\','D','a','t','a','b','a','s','e', - '\\','C','o','d','e','p','a','g','e',0}; - static const WCHAR familyW[] = {'F','a','m','i','l','y',0}; - static const WCHAR formatW[] = {'%','u',0}; - - status = RegCreateKeyW(HKEY_CLASSES_ROOT, db_key_nameW, &db_key); + status = RegCreateKeyW(HKEY_CLASSES_ROOT, L"MIME\\Database\\Codepage", &db_key); if (status != ERROR_SUCCESS) return FALSE; @@ -3949,7 +3940,7 @@ static BOOL register_codepages(void) { for (info = family->mime_cp_info; info < family->mime_cp_info + family->number_of_cp; info++) { - swprintf(buf, ARRAY_SIZE(buf), formatW, info->cp); + swprintf(buf, ARRAY_SIZE(buf), L"%u", info->cp); status = RegCreateKeyW(db_key, buf, &key); if (status != ERROR_SUCCESS) continue; @@ -3966,7 +3957,7 @@ static BOOL register_codepages(void) } else { - RegSetValueExW(key, familyW, 0, REG_DWORD, (BYTE*)&family->family_codepage, + RegSetValueExW(key, L"Family", 0, REG_DWORD, (BYTE*)&family->family_codepage, sizeof(family->family_codepage)); }

1 0

Michael Stefaniuc : msacm32.drv: Use wide-char string literals.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 60eb0d4ba735958d65384ab0515fbf0b3b4d640f URL: https://source.winehq.org/git/wine.git/?a=commit;h=60eb0d4ba735958d65384ab0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:20 2020 +0200 msacm32.drv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32.drv/wavemap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 75d1a60c71..bb51e2235c 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -493,8 +493,6 @@ static DWORD wodGetPosition(WAVEMAPDATA* wom, LPMMTIME lpTime, DWORD dwParam2) static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveCaps, DWORD dwParam2) { - static const WCHAR name[] = {'W','i','n','e',' ','w','a','v','e',' ','o','u','t',' ','m','a','p','p','e','r',0}; - TRACE("(%04x %p %p %08x)\n",wDevID, wom, lpWaveCaps, dwParam2); /* if opened low driver, forward message */ @@ -511,7 +509,7 @@ static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveC woc.wMid = 0x00FF; woc.wPid = 0x0001; woc.vDriverVersion = 0x0332; - lstrcpyW(woc.szPname, name); + lstrcpyW(woc.szPname, L"Wine wave out mapper"); woc.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 | @@ -1063,11 +1061,10 @@ static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCa /* otherwise, return caps of mapper itself */ if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) { WAVEINCAPSW wic; - static const WCHAR init[] = {'W','i','n','e',' ','w','a','v','e',' ','i','n',' ','m','a','p','p','e','r',0}; wic.wMid = 0x00FF; wic.wPid = 0x0001; wic.vDriverVersion = 0x0001; - lstrcpyW(wic.szPname, init); + lstrcpyW(wic.szPname, L"Wine wave in mapper"); wic.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 |

1 0

Michael Stefaniuc : msdmo/tests: Use wide-char string literals.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: dea1fceb71117d449356c45e9fb547a044a8cea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea1fceb71117d449356c45e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:21 2020 +0200 msdmo/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/tests/msdmo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index b1b2f544ce..41e6d57d2e 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -41,7 +41,6 @@ static const char *guid_to_string(const GUID *guid) static void test_DMOUnregister(void) { static char buffer[200]; - static const WCHAR testdmoW[] = {'t','e','s','t','d','m','o',0}; HRESULT hr; hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); @@ -51,10 +50,10 @@ static void test_DMOUnregister(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); /* can't register for all categories */ - hr = DMORegister(testdmoW, &GUID_unknowndmo, &GUID_NULL, 0, 0, NULL, 0, NULL); + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_NULL, 0, 0, NULL, 0, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = DMORegister(testdmoW, &GUID_unknowndmo, &GUID_unknowncategory, 0, 0, NULL, 0, NULL); + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, 0, NULL, 0, NULL); if (hr != S_OK) { win_skip("Failed to register DMO. Probably user doesn't have persmissions to do so.\n"); return;

1 0

Michael Stefaniuc : msg711.acm: Use wide-char string literals.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 2c209ccb0bbe7109a0c5d47cf0653ee0ac9bf78f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c209ccb0bbe7109a0c5d47c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:22 2020 +0200 msg711.acm: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 6909494e29..7478bfd92a 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -675,10 +675,6 @@ static LRESULT G711_DriverDetails(PACMDRIVERDETAILSW add) */ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { - static const WCHAR szPcm[]={'P','C','M',0}; - static const WCHAR szALaw[]={'A','-','L','a','w',0}; - static const WCHAR szULaw[]={'U','-','L','a','w',0}; - switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -712,19 +708,19 @@ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); - lstrcpyW(aftd->szFormatTag, szPcm); + lstrcpyW(aftd->szFormatTag, L"PCM"); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ALAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); aftd->cStandardFormats = ARRAY_SIZE(ALaw_Formats); - lstrcpyW(aftd->szFormatTag, szALaw); + lstrcpyW(aftd->szFormatTag, L"A-Law"); break; case 2: aftd->dwFormatTag = WAVE_FORMAT_MULAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); aftd->cStandardFormats = ARRAY_SIZE(ULaw_Formats); - lstrcpyW(aftd->szFormatTag, szULaw); + lstrcpyW(aftd->szFormatTag, L"U-Law"); break; } return MMSYSERR_NOERROR;

1 0

Michael Stefaniuc : netcfgx/tests: Use wide-char string literals.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: bbb00dce7ee0f14a6e6a157c880b0228eddc17cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb00dce7ee0f14a6e6a157c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:23 2020 +0200 netcfgx/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netcfgx/tests/netcfgx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index fda39f5773..31558f44f4 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -25,8 +25,6 @@ static void create_configuration(void) { - static const WCHAR tcpipW[] = {'M','S','_','T','C','P','I','P',0}; - static const WCHAR myclient[] = {'M','Y',' ','C','L','I','E','N','T',0}; HRESULT hr; INetCfg *config = NULL; INetCfgLock *netlock = NULL; @@ -40,7 +38,7 @@ static void create_configuration(void) hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); ok(hr == S_OK || hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); if(hr == S_OK) @@ -55,10 +53,10 @@ static void create_configuration(void) ok(hr == S_OK, "got 0x%08x\n", hr); /* AcquireWriteLock needs to be run before Initialize */ - hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); - hr = INetCfg_FindComponent(config, tcpipW, &component); + hr = INetCfg_FindComponent(config, L"MS_TCPIP", &component); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if(hr == S_OK) {

1 0

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

05 Oct '20

Module: wine Branch: master Commit: b72440fa2e1016681cbfcebcdc4792b6ced3eb53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72440fa2e1016681cbfcebc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:24 2020 +0200 propsys: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys_main.c | 12 +++--------- dlls/propsys/propvar.c | 21 ++++++--------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 75963d7b6c..91ebc62127 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -280,12 +280,6 @@ HRESULT WINAPI PSRefreshPropertySchema(void) HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch) { - static const WCHAR guid_fmtW[] = {'{','%','0','8','X','-','%','0','4','X','-', - '%','0','4','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; - static const WCHAR pid_fmtW[] = {'%','u',0}; - WCHAR pidW[PKEY_PIDSTR_MAX + 1]; LPWSTR p = psz; int len; @@ -305,8 +299,8 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch return E_NOT_SUFFICIENT_BUFFER; } - swprintf(psz, cch, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, - pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1], + swprintf(psz, cch, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", pkey->fmtid.Data1, + pkey->fmtid.Data2, pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1], pkey->fmtid.Data4[2], pkey->fmtid.Data4[3], pkey->fmtid.Data4[4], pkey->fmtid.Data4[5], pkey->fmtid.Data4[6], pkey->fmtid.Data4[7]); @@ -315,7 +309,7 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch *p++ = ' '; cch -= GUIDSTRING_MAX - 1 + 1; - len = swprintf(pidW, ARRAY_SIZE(pidW), pid_fmtW, pkey->pid); + len = swprintf(pidW, ARRAY_SIZE(pidW), L"%u", pkey->pid); if (cch >= len + 1) { diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index dcfee2b0cc..ae08cd1d8d 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -245,10 +245,6 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) { - static const WCHAR trueW[] = {'t','r','u','e',0}; - static const WCHAR falseW[] = {'f','a','l','s','e',0}; - static const WCHAR true2W[] = {'#','T','R','U','E','#',0}; - static const WCHAR false2W[] = {'#','F','A','L','S','E','#',0}; LONGLONG res; HRESULT hr; @@ -267,13 +263,13 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) if (!propvarIn->u.pwszVal) return DISP_E_TYPEMISMATCH; - if (!lstrcmpiW(propvarIn->u.pwszVal, trueW) || !lstrcmpW(propvarIn->u.pwszVal, true2W)) + if (!lstrcmpiW(propvarIn->u.pwszVal, L"true") || !lstrcmpW(propvarIn->u.pwszVal, L"#TRUE#")) { *ret = TRUE; return S_OK; } - if (!lstrcmpiW(propvarIn->u.pwszVal, falseW) || !lstrcmpW(propvarIn->u.pwszVal, false2W)) + if (!lstrcmpiW(propvarIn->u.pwszVal, L"false") || !lstrcmpW(propvarIn->u.pwszVal, L"#FALSE#")) { *ret = FALSE; return S_OK; @@ -406,11 +402,10 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault) { - static const WCHAR str_empty[] = {0}; if (propvarIn->vt == VT_BSTR) { if (propvarIn->u.bstrVal == NULL) - return str_empty; + return L""; return propvarIn->u.bstrVal; } @@ -580,13 +575,9 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p static void PROPVAR_GUIDToWSTR(REFGUID guid, WCHAR *str) { - static const WCHAR format[] = {'{','%','0','8','X','-','%','0','4','X','-','%','0','4','X', - '-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; - - swprintf(str, 39, format, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + swprintf(str, 39, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", guid->Data1, + guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], + guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); } HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar)

1 0

Michael Stefaniuc : slc/tests: Use wide-char string literals.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 7fa86c9b92b6fbab25053793a7a000d348de38fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fa86c9b92b6fbab25053793… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:25 2020 +0200 slc/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/slc/tests/slc.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/slc/tests/slc.c b/dlls/slc/tests/slc.c index b9296b2da1..fc0b1c84ad 100644 --- a/dlls/slc/tests/slc.c +++ b/dlls/slc/tests/slc.c @@ -29,40 +29,33 @@ static void test_SLGetWindowsInformationDWORD(void) { - static const WCHAR NonexistentLicenseValueW[] = {'N','o','n','e','x','i','s','t','e','n','t','-', - 'L','i','c','e','n','s','e','-','V','a','l','u','e',0}; - static const WCHAR KernelMUILanguageAllowedW[] = {'K','e','r','n','e','l','-','M','U','I','-', - 'L','a','n','g','u','a','g','e','-','A','l','l','o','w','e','d',0}; - static const WCHAR KernelMUINumberAllowedW[] = {'K','e','r','n','e','l','-','M','U','I','-', - 'N','u','m','b','e','r','-','A','l','l','o','w','e','d',0}; - static const WCHAR emptyW[] = {0}; DWORD value; HRESULT res; - res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, NULL); + res = SLGetWindowsInformationDWORD(L"Nonexistent-License-Value", NULL); ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); res = SLGetWindowsInformationDWORD(NULL, &value); ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); value = 0xdeadbeef; - res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, &value); + res = SLGetWindowsInformationDWORD(L"Nonexistent-License-Value", &value); ok(res == SL_E_VALUE_NOT_FOUND, "expected SL_E_VALUE_NOT_FOUND, got %08x\n", res); ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); value = 0xdeadbeef; - res = SLGetWindowsInformationDWORD(emptyW, &value); + res = SLGetWindowsInformationDWORD(L"", &value); ok(res == SL_E_RIGHT_NOT_GRANTED || broken(res == 0xd000000d) /* Win 8 */, "expected SL_E_RIGHT_NOT_GRANTED, got %08x\n", res); ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); value = 0xdeadbeef; - res = SLGetWindowsInformationDWORD(KernelMUILanguageAllowedW, &value); + res = SLGetWindowsInformationDWORD(L"Kernel-MUI-Language-Allowed", &value); ok(res == SL_E_DATATYPE_MISMATCHED, "expected SL_E_DATATYPE_MISMATCHED, got %08x\n", res); ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); value = 0xdeadbeef; - res = SLGetWindowsInformationDWORD(KernelMUINumberAllowedW, &value); + res = SLGetWindowsInformationDWORD(L"Kernel-MUI-Number-Allowed", &value); ok(res == S_OK, "expected S_OK, got %u\n", res); ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n"); }

1 0

Michael Stefaniuc : virtdisk/tests: Use wide-char string literals.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 153dcacfc8be4d4cc966c4bdd874d82173abacff URL: https://source.winehq.org/git/wine.git/?a=commit;h=153dcacfc8be4d4cc966c4bd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:27 2020 +0200 virtdisk/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/virtdisk/tests/virtdisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index 23d070574a..34118e532b 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -55,7 +55,7 @@ static void test_OpenVirtualDisk(void) HANDLE handle; VIRTUAL_STORAGE_TYPE stgtype; OPEN_VIRTUAL_DISK_PARAMETERS param; - static const WCHAR vdisk[] = {'t','e','s','t','.','v','h','d',0}; + static const WCHAR vdisk[] = L"test.vhd"; ret = pOpenVirtualDisk(NULL, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret);

1 0

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

05 Oct '20

Module: wine Branch: master Commit: 144d898fbaf716c536c8fec1ad45321485165316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=144d898fbaf716c536c8fec1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:28 2020 +0200 wiaservc: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/service.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wiaservc/service.c b/dlls/wiaservc/service.c index c1cdb83e60..524181f72a 100644 --- a/dlls/wiaservc/service.c +++ b/dlls/wiaservc/service.c @@ -107,7 +107,6 @@ StartCount(void) VOID WINAPI ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) { - static const WCHAR stisvc_nameW[] = {'s','t','i','s','v','c',0}; TRACE("(%d, %p)\n", dwArgc, lpszArgv); stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); @@ -116,7 +115,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) return; } - status_handle = RegisterServiceCtrlHandlerExW(stisvc_nameW, ServiceHandler, NULL); + status_handle = RegisterServiceCtrlHandlerExW(L"stisvc", ServiceHandler, NULL); if (!status_handle) { ERR("failed to register handler: %u\n", GetLastError()); return;

1 0