October 2020 - Wine-Commits

Michael Stefaniuc : msdmo/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

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

Oct. 5, 2020

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

Oct. 5, 2020

Module: wine Branch: master Commit: eede9959edb5a91ada6651a10ca6ba257e213c63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eede9959edb5a91ada6651a1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:30 2020 +0200 xolehlp: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xolehlp/xolehlp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 4baf31f260..29b3024445 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -657,11 +657,10 @@ static BOOL is_local_machineA( const CHAR *server ) } static BOOL is_local_machineW( const WCHAR *server ) { - static const WCHAR dotW[] = {'.',0}; WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len = ARRAY_SIZE( buffer ); - if (!server || !wcscmp( server, dotW )) return TRUE; + if (!server || !wcscmp( server, L"." )) return TRUE; if (GetComputerNameW( buffer, &len ) && !wcsicmp( server, buffer )) return TRUE; return FALSE; }

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: f6e7f00010195966c022ca7456fdd4e3952cac82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6e7f00010195966c022ca74… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:29 2020 +0200 xinput1_3: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index bb719ed56c..8aea638a8d 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -243,12 +243,11 @@ void HID_find_gamepads(xinput_controller *devices) while (SetupDiEnumDeviceInterfaces(device_info_set, NULL, &hid_guid, idx++, &interface_data)) { - static const WCHAR ig[] = {'I','G','_',0}; if (!SetupDiGetDeviceInterfaceDetailW(device_info_set, &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) continue; - if (!wcsstr(data->DevicePath, ig)) + if (!wcsstr(data->DevicePath, L"IG_")) continue; open_device_idx = -1;

1 0

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

Oct. 5, 2020

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

Oct. 5, 2020

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

Oct. 5, 2020

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

Oct. 5, 2020

Module: wine Branch: master Commit: 69e612c51253ef27796fe4f16263f432dd7ae2a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e612c51253ef27796fe4f1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:14 2020 +0200 mciavi32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(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 d516c4d4b0..d603912954 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 d8df240826..7a1657f79e 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 c9da9ec5c4..d48dbb1357 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;

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 1d17d8d4712c34ed186db6205f3316374b9c274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d17d8d4712c34ed186db620… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:11 2020 +0200 explorerframe: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 12 ++++-------- dlls/explorerframe/tests/nstc.c | 17 +++++------------ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 37e1a553a4..0abaded85a 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -75,8 +75,6 @@ static const DWORD unsupported_styles2 = NSTCS2_INTERRUPTNOTIFICATIONS | NSTCS2_SHOWNULLSPACEMENU | NSTCS2_DISPLAYPADDING | NSTCS2_DISPLAYPINNEDONLY | NTSCS2_NOSINGLETONAUTOEXPAND | NTSCS2_NEVERINSERTNONENUMERATED; -static const WCHAR thispropW[] = {'P','R','O','P','_','T','H','I','S',0}; - static inline NSTC2Impl *impl_from_INameSpaceTreeControl2(INameSpaceTreeControl2 *iface) { return CONTAINING_RECORD(iface, NSTC2Impl, INameSpaceTreeControl2_iface); @@ -510,7 +508,7 @@ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) This->tv_oldwndproc = (WNDPROC)SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)tv_wndproc); if(This->tv_oldwndproc) - SetPropW(This->hwnd_tv, thispropW, This); + SetPropW(This->hwnd_tv, L"PROP_THIS", This); return TRUE; } @@ -534,7 +532,7 @@ static LRESULT destroy_namespacetree(NSTC2Impl *This) if(This->tv_oldwndproc) { SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)This->tv_oldwndproc); - RemovePropW(This->hwnd_tv, thispropW); + RemovePropW(This->hwnd_tv, L"PROP_THIS"); } INameSpaceTreeControl2_RemoveAllRoots(&This->INameSpaceTreeControl2_iface); @@ -762,7 +760,7 @@ static LRESULT on_kbd_event(NSTC2Impl *This, UINT uMsg, WPARAM wParam, LPARAM lP static LRESULT CALLBACK tv_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { - NSTC2Impl *This = (NSTC2Impl*)GetPropW(hWnd, thispropW); + NSTC2Impl *This = (NSTC2Impl*)GetPropW(hWnd, L"PROP_THIS"); switch(uMessage) { case WM_KEYDOWN: @@ -879,9 +877,7 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, DWORD window_style, window_ex_style; INITCOMMONCONTROLSEX icex; RECT rc; - static const WCHAR NSTC2_CLASS_NAME[] = - {'N','a','m','e','s','p','a','c','e','T','r','e','e', - 'C','o','n','t','r','o','l',0}; + static const WCHAR NSTC2_CLASS_NAME[] = L"NamespaceTreeControl"; TRACE("%p (%p, %p, %x)\n", This, hwndParent, prc, nstcsFlags); diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index a48e3affef..6433b69ebf 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -781,13 +781,6 @@ static void test_basics(void) int cbstate; WCHAR curdirW[MAX_PATH]; WCHAR buf[MAX_PATH]; - static const WCHAR testdirW[] = {'t','e','s','t','d','i','r',0}; - static const WCHAR testdir2W[] = - {'t','e','s','t','d','i','r','\\','t','e','s','t','d','i','r','2',0}; - static const WCHAR test1W[] = - {'t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; - static const WCHAR explorerW[] = {'E','x','p','l','o','r','e','r',0}; - static const WCHAR randomW[] = {'_','_','h','e','l','l','o',0}; /* These should exist on platforms supporting the NSTC */ ok(pSHCreateShellItem != NULL, "No SHCreateShellItem.\n"); @@ -827,19 +820,19 @@ static void test_basics(void) lstrcpyW(buf, curdirW); myPathAddBackslashW(buf); - lstrcatW(buf, testdirW); + lstrcatW(buf, L"testdir"); hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psitestdir); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) goto cleanup; lstrcpyW(buf, curdirW); myPathAddBackslashW(buf); - lstrcatW(buf, testdir2W); + lstrcatW(buf, L"testdir\\testdir2"); hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psitestdir2); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) goto cleanup; lstrcpyW(buf, curdirW); myPathAddBackslashW(buf); - lstrcatW(buf, test1W); + lstrcatW(buf, L"testdir\\test1.txt"); hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psitest1); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) goto cleanup; @@ -1725,9 +1718,9 @@ static void test_basics(void) { hr = INameSpaceTreeControl_SetTheme(pnstc, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl_SetTheme(pnstc, explorerW); + hr = INameSpaceTreeControl_SetTheme(pnstc, L"Explorer"); ok(hr == S_OK, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl_SetTheme(pnstc, randomW); + hr = INameSpaceTreeControl_SetTheme(pnstc, L"__hello"); ok(hr == S_OK, "Got 0x%08x\n", hr); }

1 0

Henri Verbeet : include: Update the d3d12 headers from vkd3d.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 32e07a38095771463c372feac3183947ce69acb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32e07a38095771463c372fea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Oct 3 15:07:57 2020 +0330 include: Update the d3d12 headers from vkd3d. This corresponds to vkd3d as of commit ec6fe1cc9dd31ed17d5c9818632ce9ab83d6c441. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d12.idl | 390 ++++++++++++++++++++++++++++++++++++++++++++- include/d3d12sdklayers.idl | 13 ++ 2 files changed, 399 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32e07a38095771463c37…

1 0