- Wine-Devel - list.winehq.org

[PATCH] msg711.acm: Use wide-char string literals.
by Michael Stefaniuc Oct. 3, 2020

Oct. 3, 2020

Signed-off-by: Michael Stefaniuc <mstefani(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 6909494e29f..7478bfd92a1 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; -- 2.26.2

1 0

[PATCH] msdmo/tests: Use wide-char string literals.
by Michael Stefaniuc Oct. 3, 2020

Oct. 3, 2020

Signed-off-by: Michael Stefaniuc <mstefani(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 b1b2f544ceb..41e6d57d2eb 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; -- 2.26.2

1 0

[PATCH] msacm32.drv: Use wide-char string literals.
by Michael Stefaniuc Oct. 3, 2020

Oct. 3, 2020

Signed-off-by: Michael Stefaniuc <mstefani(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 75d1a60c71a..bb51e2235cd 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 | -- 2.26.2

1 0

[PATCH] mlang: Use wide-char string literals.
by Michael Stefaniuc Oct. 3, 2020

Oct. 3, 2020

Signed-off-by: Michael Stefaniuc <mstefani(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 e3582cca2da..62e9947fb73 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)); } -- 2.26.2

1 0

[PATCH] midimap: Use wide-char string literals.
by Michael Stefaniuc Oct. 3, 2020

Oct. 3, 2020

Signed-off-by: Michael Stefaniuc <mstefani(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 d15e3d76b91..86e4289d897 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 -- 2.26.2

1 0

[PATCH] mciwave: Use wide-char string literals.
by Michael Stefaniuc Oct. 3, 2020

Oct. 3, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciwave/mciwave.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 78f26c2672c..13dd927cd42 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1683,15 +1683,11 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l if (wmw == NULL) { ret = MCIERR_INVALID_DEVICE_ID; } else { - static const WCHAR wszAudio [] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','p','l','a','y','e','r',0}; - static const WCHAR wszWaveIn [] = {'W','i','n','e',' ','W','a','v','e',' ','I','n',0}; - static const WCHAR wszWaveOut[] = {'W','i','n','e',' ','W','a','v','e',' ','O','u','t',0}; - switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) { - case MCI_INFO_PRODUCT: str = wszAudio; break; + case MCI_INFO_PRODUCT: str = L"Wine's audio player"; break; case MCI_INFO_FILE: str = wmw->lpFileName; break; - case MCI_WAVE_INPUT: str = wszWaveIn; break; - case MCI_WAVE_OUTPUT: str = wszWaveOut; break; + case MCI_WAVE_INPUT: str = L"Wine Wave In"; break; + case MCI_WAVE_OUTPUT: str = L"Wine Wave Out"; break; default: WARN("Don't know this info command (%u)\n", dwFlags); ret = MCIERR_UNRECOGNIZED_KEYWORD; @@ -1699,10 +1695,9 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l } if (!ret) { if (lpParms->dwRetSize) { - WCHAR zero = 0; /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize * to the number of characters written, excluding \0. */ - lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + lstrcpynW(lpParms->lpstrReturn, str ? str : L"", lpParms->dwRetSize); } else ret = MCIERR_PARAM_OVERFLOW; } if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY)) -- 2.26.2

1 0

[PATCH] mciseq: Use wide-char string literals.
by Michael Stefaniuc Oct. 3, 2020

Oct. 3, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciseq/mcimidi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 8c52730b15f..33f9fde42c7 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1509,7 +1509,6 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp { LPCWSTR str = 0; DWORD ret = 0; - static const WCHAR wszMidiSeq[] = {'W','i','n','e','\'','s',' ','M','I','D','I',' ','s','e','q','u','e','n','c','e','r',0}; TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); @@ -1519,7 +1518,7 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) { - case MCI_INFO_PRODUCT: str = wszMidiSeq; break; + case MCI_INFO_PRODUCT: str = L"Wine's MIDI sequencer"; break; case MCI_INFO_FILE: str = wmm->lpstrElementName; break; case MCI_INFO_COPYRIGHT: str = wmm->lpstrCopyright; break; case MCI_INFO_NAME: str = wmm->lpstrName; break; @@ -1529,10 +1528,9 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp } if (!ret) { if (lpParms->dwRetSize) { - WCHAR zero = 0; /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize * to the number of characters written, excluding \0. */ - lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + lstrcpynW(lpParms->lpstrReturn, str ? str : L"", lpParms->dwRetSize); } else ret = MCIERR_PARAM_OVERFLOW; } if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY)) -- 2.26.2

1 0

[PATCH] mcicda: Use wide-char string literals.
by Michael Stefaniuc Oct. 3, 2020

Oct. 3, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mcicda/mcicda.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index e23ba5a2d6b..ea7e2a6261d 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -665,15 +665,13 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); if (dwFlags & MCI_INFO_PRODUCT) { - static const WCHAR wszAudioCd[] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','C','D',0}; - str = wszAudioCd; + str = L"Wine's audio CD"; } else if (dwFlags & MCI_INFO_MEDIA_UPC) { ret = MCIERR_NO_IDENTITY; } else if (dwFlags & MCI_INFO_MEDIA_IDENTITY) { DWORD res = 0; CDROM_TOC toc; DWORD br; - static const WCHAR wszLu[] = {'%','l','u',0}; if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { @@ -681,7 +679,7 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) } res = CDROM_Audio_GetSerial(&toc); - swprintf(buffer, ARRAY_SIZE(buffer), wszLu, res); + swprintf(buffer, ARRAY_SIZE(buffer), L"%lu", res); str = buffer; } else { WARN("Don't know this info command (%u)\n", dwFlags); -- 2.26.2

1 0

[PATCH] mciavi32: Use wide-char string literals.
by Michael Stefaniuc Oct. 3, 2020

Oct. 3, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciavi32/info.c | 9 +++------ dlls/mciavi32/mciavi.c | 3 +-- dlls/mciavi32/wnd.c | 13 ++++--------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index d516c4d4b01..d6039129549 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -190,8 +190,6 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) LPCWSTR str = 0; WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); DWORD ret = 0; - static const WCHAR wszAviPlayer[] = {'W','i','n','e','\'','s',' ','A','V','I',' ','p','l','a','y','e','r',0}; - static const WCHAR wszVersion[] = {'1','.','1',0}; if (lpParms == NULL || lpParms->lpstrReturn == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -203,9 +201,9 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) EnterCriticalSection(&wma->cs); if (dwFlags & MCI_INFO_PRODUCT) - str = wszAviPlayer; + str = L"Wine's AVI player"; else if (dwFlags & MCI_INFO_VERSION) - str = wszVersion; + str = L"1.1"; else if (dwFlags & MCI_INFO_FILE) str = wma->lpFileName; else { @@ -213,9 +211,8 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) ret = MCIERR_UNRECOGNIZED_COMMAND; } if (!ret) { - WCHAR zero = 0; /* Only mciwave, mciseq and mcicda set dwRetSize (since NT). */ - lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + lstrcpynW(lpParms->lpstrReturn, str ? str : L"", lpParms->dwRetSize); } LeaveCriticalSection(&wma->cs); return ret; diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index d8df240826b..7a1657f79eb 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -71,7 +71,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) static DWORD MCIAVI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) { WINE_MCIAVI* wma; - static const WCHAR mciAviWStr[] = {'M','C','I','A','V','I',0}; TRACE("%s, %p\n", debugstr_w(str), modp); @@ -88,7 +87,7 @@ static DWORD MCIAVI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) wma->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCIAVI.cs"); wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wma->wDevID = modp->wDeviceID; - wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0); + wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, L"MCIAVI", 0); wma->dwStatus = MCI_MODE_NOT_READY; modp->wCustomCommandTable = wma->wCommandTable; modp->wType = MCI_DEVTYPE_DIGITAL_VIDEO; diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index c9da9ec5c47..d48dbb1357a 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciavi); -static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0}; - static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam); @@ -87,7 +85,7 @@ static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPA BOOL MCIAVI_UnregisterClass(void) { - return UnregisterClassW(mciaviW, MCIAVI_hInstance); + return UnregisterClassW(L"MCIAVI", MCIAVI_hInstance); } BOOL MCIAVI_RegisterClass(void) @@ -101,7 +99,7 @@ BOOL MCIAVI_RegisterClass(void) wndClass.hInstance = MCIAVI_hInstance; wndClass.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); - wndClass.lpszClassName = mciaviW; + wndClass.lpszClassName = L"MCIAVI"; if (RegisterClassW(&wndClass)) return TRUE; if (GetLastError() == ERROR_CLASS_ALREADY_EXISTS) return TRUE; @@ -111,7 +109,6 @@ BOOL MCIAVI_RegisterClass(void) BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpParms) { - static const WCHAR captionW[] = {'W','i','n','e',' ','M','C','I','-','A','V','I',' ','p','l','a','y','e','r',0}; HWND hParent = 0; DWORD dwStyle = WS_OVERLAPPEDWINDOW; RECT rc; @@ -135,10 +132,8 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM rc.left = rc.top = CW_USEDEFAULT; } - wma->hWnd = CreateWindowW(mciaviW, captionW, - dwStyle, rc.left, rc.top, - rc.right, rc.bottom, - hParent, 0, MCIAVI_hInstance, + wma->hWnd = CreateWindowW(L"MCIAVI", L"Wine MCI-AVI player", dwStyle, rc.left, rc.top, + rc.right, rc.bottom, hParent, 0, MCIAVI_hInstance, ULongToPtr(wma->wDevID)); wma->hWndPaint = wma->hWnd; -- 2.26.2

1 0

[PATCH] dxdiagn/tests: Use wide-char string literals.
by Michael Stefaniuc Oct. 3, 2020

Oct. 3, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxdiagn/tests/container.c | 205 +++++++++++---------------------- 1 file changed, 67 insertions(+), 138 deletions(-) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 90287ad0e74..c011ff9cc07 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -34,9 +34,6 @@ struct property_test static IDxDiagProvider *pddp; static IDxDiagContainer *pddc; -static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; -static const WCHAR DxDiag_DisplayDevices[] = {'D','x','D','i','a','g','_','D','i','s','p','l','a','y','D','e','v','i','c','e','s',0}; - static BOOL create_root_IDxDiagContainer(void) { HRESULT hr; @@ -115,8 +112,7 @@ static void test_EnumChildContainerNames(void) HRESULT hr; WCHAR container[256]; DWORD maxcount, index; - static const WCHAR testW[] = {'t','e','s','t',0}; - static const WCHAR zerotestW[] = {0,'e','s','t',0}; + static const WCHAR testW[] = L"test"; if (!create_root_IDxDiagContainer()) { @@ -152,7 +148,7 @@ static void test_EnumChildContainerNames(void) hr = IDxDiagContainer_EnumChildContainerNames(pddc, ~0, container, ARRAY_SIZE(container)); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::EnumChildContainerNames to return E_INVALIDARG, got 0x%08x\n", hr); - ok(!memcmp(container, zerotestW, sizeof(zerotestW)), + ok(!memcmp(container, L"\0est", sizeof(L"\0est")), "Expected the container buffer string to be empty, got %s\n", wine_dbgstr_w(container)); hr = IDxDiagContainer_GetNumberOfChildContainers(pddc, &maxcount); @@ -403,7 +399,7 @@ static void test_EnumPropNames(void) WCHAR container[256], property[256]; IDxDiagContainer *child = NULL; DWORD count, index, propcount; - static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR testW[] = L"test"; if (!create_root_IDxDiagContainer()) { @@ -547,8 +543,7 @@ static void test_GetProp(void) SAFEARRAY *sa; SAFEARRAYBOUND bound; ULONG ref; - static const WCHAR emptyW[] = {0}; - static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR testW[] = L"test"; if (!create_root_IDxDiagContainer()) { @@ -608,11 +603,11 @@ static void test_GetProp(void) ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); - hr = IDxDiagContainer_GetProp(child, emptyW, NULL); + hr = IDxDiagContainer_GetProp(child, L"", NULL); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); V_VT(&var) = 0xdead; - hr = IDxDiagContainer_GetProp(child, emptyW, &var); + hr = IDxDiagContainer_GetProp(child, L"", &var); ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetProp to return E_INVALIDARG, got 0x%08x\n", hr); ok(V_VT(&var) == 0xdead, "Expected the variant to be untouched, got %u\n", V_VT(&var)); @@ -682,23 +677,14 @@ cleanup: static void test_root_children(void) { - static const WCHAR DxDiag_DirectSound[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d',0}; - static const WCHAR DxDiag_DirectMusic[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','M','u','s','i','c',0}; - static const WCHAR DxDiag_DirectInput[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','I','n','p','u','t',0}; - static const WCHAR DxDiag_DirectPlay[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','P','l','a','y',0}; - static const WCHAR DxDiag_SystemDevices[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','D','e','v','i','c','e','s',0}; - static const WCHAR DxDiag_DirectXFiles[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','X','F','i','l','e','s',0}; - static const WCHAR DxDiag_DirectShowFilters[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','h','o','w','F','i','l','t','e','r','s',0}; - static const WCHAR DxDiag_LogicalDisks[] = {'D','x','D','i','a','g','_','L','o','g','i','c','a','l','D','i','s','k','s',0}; - HRESULT hr; DWORD count, index; static const WCHAR *root_children[] = { - DxDiag_SystemInfo, DxDiag_DisplayDevices, DxDiag_DirectSound, - DxDiag_DirectMusic, DxDiag_DirectInput, DxDiag_DirectPlay, - DxDiag_SystemDevices, DxDiag_DirectXFiles, DxDiag_DirectShowFilters, - DxDiag_LogicalDisks + L"DxDiag_SystemInfo", L"DxDiag_DisplayDevices", L"DxDiag_DirectSound", + L"DxDiag_DirectMusic", L"DxDiag_DirectInput", L"DxDiag_DirectPlay", + L"DxDiag_SystemDevices", L"DxDiag_DirectXFiles", L"DxDiag_DirectShowFilters", + L"DxDiag_LogicalDisks" }; if (!create_root_IDxDiagContainer()) @@ -796,75 +782,41 @@ static void test_container_properties(IDxDiagContainer *container, const struct static void test_DxDiag_SystemInfo(void) { - static const WCHAR dwOSMajorVersion[] = {'d','w','O','S','M','a','j','o','r','V','e','r','s','i','o','n',0}; - static const WCHAR dwOSMinorVersion[] = {'d','w','O','S','M','i','n','o','r','V','e','r','s','i','o','n',0}; - static const WCHAR dwOSBuildNumber[] = {'d','w','O','S','B','u','i','l','d','N','u','m','b','e','r',0}; - static const WCHAR dwOSPlatformID[] = {'d','w','O','S','P','l','a','t','f','o','r','m','I','D',0}; - static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a','j','o','r',0}; - static const WCHAR dwDirectXVersionMinor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','i','n','o','r',0}; - static const WCHAR szDirectXVersionLetter[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','L','e','t','t','e','r',0}; - static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; - static const WCHAR bNECPC98[] = {'b','N','E','C','P','C','9','8',0}; - static const WCHAR ullPhysicalMemory[] = {'u','l','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; - static const WCHAR ullUsedPageFile[] = {'u','l','l','U','s','e','d','P','a','g','e','F','i','l','e',0}; - static const WCHAR ullAvailPageFile[] = {'u','l','l','A','v','a','i','l','P','a','g','e','F','i','l','e',0}; - static const WCHAR szWindowsDir[] = {'s','z','W','i','n','d','o','w','s','D','i','r',0}; - static const WCHAR szCSDVersion[] = {'s','z','C','S','D','V','e','r','s','i','o','n',0}; - static const WCHAR szDirectXVersionEnglish[] = {'s','z','D','i','r','e','c','t','X','V','e','r','s','i','o','n','E','n','g','l','i','s','h',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 bNetMeetingRunning[] = {'b','N','e','t','M','e','e','t','i','n','g','R','u','n','n','i','n','g',0}; - static const WCHAR szMachineNameLocalized[] = {'s','z','M','a','c','h','i','n','e','N','a','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 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 szLanguagesEnglish[] = {'s','z','L','a','n','g','u','a','g','e','s','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 szTimeEnglish[] = {'s','z','T','i','m','e','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 szPageFileLocalized[] = {'s','z','P','a','g','e','F','i','l','e','L','o','c','a','l','i','z','e','d',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 szOSLocalized[] = {'s','z','O','S','L','o','c','a','l','i','z','e','d',0}; - static const WCHAR szOSExLocalized[] = {'s','z','O','S','E','x','L','o','c','a','l','i','z','e','d',0}; - static const WCHAR szOSExLongLocalized[] = {'s','z','O','S','E','x','L','o','n','g','L','o','c','a','l','i','z','e','d',0}; - static const WCHAR szOSEnglish[] = {'s','z','O','S','E','n','g','l','i','s','h',0}; - static const WCHAR szOSExEnglish[] = {'s','z','O','S','E','x','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 szProcessorEnglish[] = {'s','z','P','r','o','c','e','s','s','o','r','E','n','g','l','i','s','h',0}; - static const struct property_test property_tests[] = { - {dwOSMajorVersion, VT_UI4}, - {dwOSMinorVersion, VT_UI4}, - {dwOSBuildNumber, VT_UI4}, - {dwOSPlatformID, VT_UI4}, - {dwDirectXVersionMajor, VT_UI4}, - {dwDirectXVersionMinor, VT_UI4}, - {szDirectXVersionLetter, VT_BSTR}, - {bDebug, VT_BOOL}, - {bNECPC98, VT_BOOL}, - {ullPhysicalMemory, VT_BSTR}, - {ullUsedPageFile, VT_BSTR}, - {ullAvailPageFile, VT_BSTR}, - {szWindowsDir, VT_BSTR}, - {szCSDVersion, VT_BSTR}, - {szDirectXVersionEnglish, VT_BSTR}, - {szDirectXVersionLongEnglish, VT_BSTR}, - {bNetMeetingRunning, VT_BOOL}, - {szMachineNameLocalized, VT_BSTR}, - {szMachineNameEnglish, VT_BSTR}, - {szLanguagesLocalized, VT_BSTR}, - {szLanguagesEnglish, VT_BSTR}, - {szTimeLocalized, VT_BSTR}, - {szTimeEnglish, VT_BSTR}, - {szPhysicalMemoryEnglish, VT_BSTR}, - {szPageFileLocalized, VT_BSTR}, - {szPageFileEnglish, VT_BSTR}, - {szOSLocalized, VT_BSTR}, - {szOSExLocalized, VT_BSTR}, - {szOSExLongLocalized, VT_BSTR}, - {szOSEnglish, VT_BSTR}, - {szOSExEnglish, VT_BSTR}, - {szOSExLongEnglish, VT_BSTR}, - {szProcessorEnglish, VT_BSTR}, + {L"dwOSMajorVersion", VT_UI4}, + {L"dwOSMinorVersion", VT_UI4}, + {L"dwOSBuildNumber", VT_UI4}, + {L"dwOSPlatformID", VT_UI4}, + {L"dwDirectXVersionMajor", VT_UI4}, + {L"dwDirectXVersionMinor", VT_UI4}, + {L"szDirectXVersionLetter", VT_BSTR}, + {L"bDebug", VT_BOOL}, + {L"bNECPC98", VT_BOOL}, + {L"ullPhysicalMemory", VT_BSTR}, + {L"ullUsedPageFile", VT_BSTR}, + {L"ullAvailPageFile", VT_BSTR}, + {L"szWindowsDir", VT_BSTR}, + {L"szCSDVersion", VT_BSTR}, + {L"szDirectXVersionEnglish", VT_BSTR}, + {L"szDirectXVersionLongEnglish", VT_BSTR}, + {L"bNetMeetingRunning", VT_BOOL}, + {L"szMachineNameLocalized", VT_BSTR}, + {L"szMachineNameEnglish", VT_BSTR}, + {L"szLanguagesLocalized", VT_BSTR}, + {L"szLanguagesEnglish", VT_BSTR}, + {L"szTimeLocalized", VT_BSTR}, + {L"szTimeEnglish", VT_BSTR}, + {L"szPhysicalMemoryEnglish", VT_BSTR}, + {L"szPageFileLocalized", VT_BSTR}, + {L"szPageFileEnglish", VT_BSTR}, + {L"szOSLocalized", VT_BSTR}, + {L"szOSExLocalized", VT_BSTR}, + {L"szOSExLongLocalized", VT_BSTR}, + {L"szOSEnglish", VT_BSTR}, + {L"szOSExEnglish", VT_BSTR}, + {L"szOSExLongEnglish", VT_BSTR}, + {L"szProcessorEnglish", VT_BSTR}, }; IDxDiagContainer *container; @@ -876,7 +828,7 @@ static void test_DxDiag_SystemInfo(void) return; } - hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SystemInfo, &container); + hr = IDxDiagContainer_GetChildContainer(pddc, L"DxDiag_SystemInfo", &container); ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); if (hr == S_OK) @@ -892,53 +844,30 @@ static void test_DxDiag_SystemInfo(void) static void test_DxDiag_DisplayDevices(void) { - static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; - static const WCHAR szDeviceName[] = {'s','z','D','e','v','i','c','e','N','a','m','e',0}; - static const WCHAR szKeyDeviceID[] = {'s','z','K','e','y','D','e','v','i','c','e','I','D',0}; - static const WCHAR szKeyDeviceKey[] = {'s','z','K','e','y','D','e','v','i','c','e','K','e','y',0}; - static const WCHAR szVendorId[] = {'s','z','V','e','n','d','o','r','I','d',0}; - static const WCHAR szDeviceId[] = {'s','z','D','e','v','i','c','e','I','d',0}; - static const WCHAR szDeviceIdentifier[] = {'s','z','D','e','v','i','c','e','I','d','e','n','t','i','f','i','e','r',0}; - static const WCHAR dwWidth[] = {'d','w','W','i','d','t','h',0}; - static const WCHAR dwHeight[] = {'d','w','H','e','i','g','h','t',0}; - static const WCHAR dwBpp[] = {'d','w','B','p','p',0}; - static const WCHAR szDisplayMemoryLocalized[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','L','o','c','a','l','i','z','e','d',0}; - static const WCHAR szDisplayMemoryEnglish[] = {'s','z','D','i','s','p','l','a','y','M','e','m','o','r','y','E','n','g','l','i','s','h',0}; - static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0}; - static const WCHAR szDriverVersion[] = {'s','z','D','r','i','v','e','r','V','e','r','s','i','o','n',0}; - static const WCHAR szSubSysId[] = {'s','z','S','u','b','S','y','s','I','d',0}; - static const WCHAR szRevisionId[] = {'s','z','R','e','v','i','s','i','o','n','I','d',0}; - static const WCHAR dwRefreshRate[] = {'d','w','R','e','f','r','e','s','h','R','a','t','e',0}; - static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t','u','r','e','r',0}; - static const WCHAR b3DAccelerationExists[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0}; - static const WCHAR b3DAccelerationEnabled[] = {'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; - static const WCHAR bDDAccelerationEnabled[] = {'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0}; - static const WCHAR iAdapter[] = {'i','A','d','a','p','t','e','r',0}; - static const struct property_test property_tests[] = { - {szDescription, VT_BSTR}, - {szDeviceName, VT_BSTR}, - {szKeyDeviceID, VT_BSTR}, - {szKeyDeviceKey, VT_BSTR}, - {szVendorId, VT_BSTR}, - {szDeviceId, VT_BSTR}, - {szDeviceIdentifier, VT_BSTR}, - {dwWidth, VT_UI4}, - {dwHeight, VT_UI4}, - {dwBpp, VT_UI4}, - {szDisplayMemoryLocalized, VT_BSTR}, - {szDisplayMemoryEnglish, VT_BSTR}, - {szDriverName, VT_BSTR}, - {szDriverVersion, VT_BSTR}, - {szSubSysId, VT_BSTR}, - {szRevisionId, VT_BSTR}, - {dwRefreshRate, VT_UI4}, - {szManufacturer, VT_BSTR}, - {b3DAccelerationExists, VT_BOOL}, - {b3DAccelerationEnabled, VT_BOOL}, - {bDDAccelerationEnabled, VT_BOOL}, - {iAdapter, VT_UI4}, + {L"szDescription", VT_BSTR}, + {L"szDeviceName", VT_BSTR}, + {L"szKeyDeviceID", VT_BSTR}, + {L"szKeyDeviceKey", VT_BSTR}, + {L"szVendorId", VT_BSTR}, + {L"szDeviceId", VT_BSTR}, + {L"szDeviceIdentifier", VT_BSTR}, + {L"dwWidth", VT_UI4}, + {L"dwHeight", VT_UI4}, + {L"dwBpp", VT_UI4}, + {L"szDisplayMemoryLocalized", VT_BSTR}, + {L"szDisplayMemoryEnglish", VT_BSTR}, + {L"szDriverName", VT_BSTR}, + {L"szDriverVersion", VT_BSTR}, + {L"szSubSysId", VT_BSTR}, + {L"szRevisionId", VT_BSTR}, + {L"dwRefreshRate", VT_UI4}, + {L"szManufacturer", VT_BSTR}, + {L"b3DAccelerationExists", VT_BOOL}, + {L"b3DAccelerationEnabled", VT_BOOL}, + {L"bDDAccelerationEnabled", VT_BOOL}, + {L"iAdapter", VT_UI4}, }; IDxDiagContainer *display_cont = NULL; @@ -951,7 +880,7 @@ static void test_DxDiag_DisplayDevices(void) return; } - hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_DisplayDevices, &display_cont); + hr = IDxDiagContainer_GetChildContainer(pddc, L"DxDiag_DisplayDevices", &display_cont); ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); if (hr != S_OK) -- 2.26.2

1 0