wine-commits October 2020

wine-commits@winehq.org

1 participants
796 discussions

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 : 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 : 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 : 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 : 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 : mciwave: Use wide-char string literals.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 796cd56faf3384dab41be23967766d01e45dd7f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=796cd56faf3384dab41be239… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:17 2020 +0200 mciwave: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 78f26c2672..13dd927cd4 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))

1 0

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

05 Oct '20

Module: wine Branch: master Commit: 521f954d3cf1be2dd41e6cc2eeb4e11c510c10b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=521f954d3cf1be2dd41e6cc2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:13 2020 +0200 dxdiagn/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/dxdiagn/tests/container.c | 205 ++++++++++++++--------------------------- 1 file changed, 67 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=521f954d3cf1be2dd41e…

1 0

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

05 Oct '20

Module: wine Branch: master Commit: 21dca0a2d07dcdea7e43ebbb63dd80970ddd40aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=21dca0a2d07dcdea7e43ebbb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:16 2020 +0200 mciseq: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 8c52730b15..33f9fde42c 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))

1 0

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

05 Oct '20

Module: wine Branch: master Commit: 1d5e028ef47c2112e86be7620792394401656beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d5e028ef47c2112e86be762… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:15 2020 +0200 mcicda: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 e23ba5a2d6..ea7e2a6261 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);

1 0

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

05 Oct '20

Module: wine Branch: master Commit: d9e109fd9249ab8fad697988f3edd8b57646bf50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9e109fd9249ab8fad697988… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:12 2020 +0200 hlink: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/browse_ctx.c | 6 ++---- dlls/hlink/extserv.c | 5 ++--- dlls/hlink/hlink_main.c | 29 +++++++++-------------------- dlls/hlink/link.c | 3 +-- 4 files changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 2038768be4..3fe6885422 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -98,8 +98,6 @@ static ULONG WINAPI IHlinkBC_fnRelease (IHlinkBrowseContext* iface) return ref; } -static const WCHAR szIdent[] = {'W','I','N','E','H','L','I','N','K',0}; - static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, DWORD dwReserved, IUnknown *piunk, IMoniker *pimk, DWORD *pdwRegister) { @@ -111,7 +109,7 @@ static HRESULT WINAPI IHlinkBC_Register(IHlinkBrowseContext* iface, FIXME("(%p)->(%i %p %p %p)\n", This, dwReserved, piunk, pimk, pdwRegister); - hr = CreateItemMoniker(NULL, szIdent, &mon); + hr = CreateItemMoniker(NULL, L"WINEHLINK", &mon); if (FAILED(hr)) return hr; CreateGenericComposite(mon, pimk, &composite); @@ -137,7 +135,7 @@ static HRESULT WINAPI IHlinkBC_GetObject(IHlinkBrowseContext* iface, TRACE("(%p)->(%p, %d, %p)\n", This, pimk, fBindifRootRegistered, ppiunk); - hr = CreateItemMoniker(NULL, szIdent, &mon); + hr = CreateItemMoniker(NULL, L"WINEHLINK", &mon); if (FAILED(hr)) return hr; CreateGenericComposite(mon, pimk, &composite); diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 98af4c1aec..c9154e95c2 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -245,10 +245,9 @@ static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR len = lstrlenW(pwzAdditionalHeaders); if(len && pwzAdditionalHeaders[len-1] != '\n' && pwzAdditionalHeaders[len-1] != '\r') { - static const WCHAR endlW[] = {'\r','\n',0}; - This->headers = heap_alloc(len*sizeof(WCHAR) + sizeof(endlW)); + This->headers = heap_alloc(len*sizeof(WCHAR) + sizeof(L"\r\n")); memcpy(This->headers, pwzAdditionalHeaders, len*sizeof(WCHAR)); - memcpy(This->headers+len, endlW, sizeof(endlW)); + memcpy(This->headers+len, L"\r\n", sizeof(L"\r\n")); }else { This->headers = hlink_strdupW(pwzAdditionalHeaders); } diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index be639363a8..a9f907fa07 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -273,8 +273,6 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) { int len; - static const WCHAR url_ext[] = {'.','u','r','l',0}; - TRACE("(%s)\n", debugstr_w(pwzFileName)); if(!pwzFileName) @@ -284,7 +282,7 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) if(len < 0) return S_FALSE; - return wcsicmp(pwzFileName+len, url_ext) ? S_FALSE : S_OK; + return wcsicmp(pwzFileName+len, L".url") ? S_FALSE : S_OK; } /*********************************************************************** @@ -297,25 +295,16 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) WCHAR *buf; HKEY hkey; - static const WCHAR start_pageW[] = {'S','t','a','r','t',' ','P','a','g','e',0}; - static const WCHAR search_pageW[] = {'S','e','a','r','c','h',' ','P','a','g','e',0}; - - static const WCHAR ie_main_keyW[] = - {'S','o','f','t','w','a','r','e', - '\\','M','i','c','r','o','s','o','f','t','\\', - 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r', - '\\','M','a','i','n',0}; - TRACE("(%u %p)\n", uReference, ppwzReference); *ppwzReference = NULL; switch(uReference) { case HLSR_HOME: - value_name = start_pageW; + value_name = L"Start Page"; break; case HLSR_SEARCHPAGE: - value_name = search_pageW; + value_name = L"Search Page"; break; case HLSR_HISTORYFOLDER: return E_NOTIMPL; @@ -323,7 +312,7 @@ HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) return E_INVALIDARG; } - res = RegOpenKeyW(HKEY_CURRENT_USER, ie_main_keyW, &hkey); + res = RegOpenKeyW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Internet Explorer\\Main", &hkey); if(res != ERROR_SUCCESS) { WARN("Could not open key: %u\n", res); return HRESULT_FROM_WIN32(res); @@ -380,8 +369,7 @@ HRESULT WINAPI HlinkUpdateStackItem(IHlinkFrame *frame, IHlinkBrowseContext *bc, HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNoForceAbs, ULONG *pcchEaten, IMoniker **ppimk) { - static const WCHAR file_colonW[] = {'f','i','l','e',':'}; - ULONG eaten = 0; + ULONG eaten = 0, len; HRESULT hres; TRACE("(%p %s %x %p %p)\n", pibc, debugstr_w(pwzDisplayName), fNoForceAbs, pcchEaten, ppimk); @@ -389,9 +377,10 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo if(fNoForceAbs) FIXME("Unsupported fNoForceAbs\n"); - if(!wcsnicmp(pwzDisplayName, file_colonW, ARRAY_SIZE(file_colonW))) { - pwzDisplayName += ARRAY_SIZE(file_colonW); - eaten += ARRAY_SIZE(file_colonW); + len = ARRAY_SIZE(L"file:") - 1; + if(!wcsnicmp(pwzDisplayName, L"file:", len)) { + pwzDisplayName += len; + eaten += len; while(*pwzDisplayName == '/') { pwzDisplayName++; diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index e11db12516..134f3aefd8 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -537,13 +537,12 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink *iface, DWORD flags, IBindCtx *us } else { - static const WCHAR szOpen[] = {'o','p','e','n',0}; LPWSTR target = NULL; r = IHlink_GetStringReference(iface, HLINKGETREF_DEFAULT, &target, NULL); if (SUCCEEDED(r) && target) { - ShellExecuteW(NULL, szOpen, target, NULL, NULL, SW_SHOW); + ShellExecuteW(NULL, L"open", target, NULL, NULL, SW_SHOW); CoTaskMemFree(target); r = DRAGDROP_S_DROP; }

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2020