Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 17:31:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MMSYS] Use PWSTR instead of PWCHAR for string (#5333)

Browse source 
Use PWSTR instead of PWCHAR for string
Constify some function arguments
This commit is contained in:
Thamatip Chitpong 2023-06-13 02:52:56 +07:00 committed by GitHub
parent 83762575e1
commit 3da25b73c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/cpl/mmsys/audio.c
View file

@ -162,7 +162,7 @@ InitAudioDlg(HWND hwnd, PGLOBAL_DATA pGlobalData)
} }
VOID VOID
UpdateRegistryString(HWND hwnd, INT ctrl, LPWSTR key, LPWSTR value) UpdateRegistryString(HWND hwnd, INT ctrl, LPCWSTR key, LPCWSTR value)
{ {
HWND hwndCombo = GetDlgItem(hwnd, ctrl); HWND hwndCombo = GetDlgItem(hwnd, ctrl);
INT CurSel = SendMessageW(hwndCombo, CB_GETCURSEL, 0, 0); INT CurSel = SendMessageW(hwndCombo, CB_GETCURSEL, 0, 0);

2
dll/cpl/mmsys/mmsys.c
View file

@ -365,7 +365,7 @@ IsSoftwareBusPnpEnumeratorInstalled()
} }
DWORD DWORD
InstallSoftwareBusPnpEnumerator(LPWSTR InfPath, LPCWSTR HardwareIdList) InstallSoftwareBusPnpEnumerator(LPCWSTR InfPath, LPCWSTR HardwareIdList)
{ {
HDEVINFO DeviceInfoSet = INVALID_HANDLE_VALUE; HDEVINFO DeviceInfoSet = INVALID_HANDLE_VALUE;
SP_DEVINFO_DATA DeviceInfoData; SP_DEVINFO_DATA DeviceInfoData;

40
dll/cpl/mmsys/sounds.c
View file

@ -20,9 +20,9 @@
typedef struct _LABEL_MAP typedef struct _LABEL_MAP
{ {
PWCHAR szName; PWSTR szName;
PWCHAR szDesc; PWSTR szDesc;
PWCHAR szIcon; PWSTR szIcon;
struct _APP_MAP *AppMap; struct _APP_MAP *AppMap;
struct _LABEL_MAP *Next; struct _LABEL_MAP *Next;
} LABEL_MAP, *PLABEL_MAP; } LABEL_MAP, *PLABEL_MAP;
@ -82,7 +82,7 @@ LPWSTR MakeFilter(LPWSTR psz)
return psz; return psz;
} }
PLABEL_MAP FindLabel(PGLOBAL_DATA pGlobalData, PAPP_MAP pAppMap, PWCHAR szName) PLABEL_MAP FindLabel(PGLOBAL_DATA pGlobalData, PAPP_MAP pAppMap, PCWSTR szName)
{ {
PLABEL_MAP pMap = pGlobalData->pLabelMap; PLABEL_MAP pMap = pGlobalData->pLabelMap;
@ -172,7 +172,7 @@ FreeLabelMap(PGLOBAL_DATA pGlobalData)
} }
} }
PAPP_MAP FindApp(PGLOBAL_DATA pGlobalData, PWCHAR szName) PAPP_MAP FindApp(PGLOBAL_DATA pGlobalData, PCWSTR szName)
{ {
PAPP_MAP pMap = pGlobalData->pAppMap; PAPP_MAP pMap = pGlobalData->pAppMap;
@ -201,7 +201,7 @@ FreeAppMap(PGLOBAL_DATA pGlobalData)
} }
} }
PLABEL_CONTEXT FindLabelContext(PGLOBAL_DATA pGlobalData, PSOUND_SCHEME_CONTEXT pSoundScheme, PWCHAR AppName, PWCHAR LabelName) PLABEL_CONTEXT FindLabelContext(PGLOBAL_DATA pGlobalData, PSOUND_SCHEME_CONTEXT pSoundScheme, PCWSTR AppName, PCWSTR LabelName)
{ {
PLABEL_CONTEXT pLabelContext; PLABEL_CONTEXT pLabelContext;
@ -236,7 +236,7 @@ PLABEL_CONTEXT FindLabelContext(PGLOBAL_DATA pGlobalData, PSOUND_SCHEME_CONTEXT
BOOL BOOL
LoadEventLabel(PGLOBAL_DATA pGlobalData, HKEY hKey, PWCHAR szSubKey) LoadEventLabel(PGLOBAL_DATA pGlobalData, HKEY hKey, PCWSTR szSubKey)
{ {
HKEY hSubKey; HKEY hSubKey;
DWORD cbValue; DWORD cbValue;
@ -350,7 +350,7 @@ LoadEventLabels(PGLOBAL_DATA pGlobalData)
BOOL BOOL
AddSoundProfile(HWND hwndDlg, HKEY hKey, PWCHAR szSubKey, BOOL SetDefault) AddSoundProfile(HWND hwndDlg, HKEY hKey, PCWSTR szSubKey, BOOL SetDefault)
{ {
HKEY hSubKey; HKEY hSubKey;
WCHAR szValue[MAX_PATH]; WCHAR szValue[MAX_PATH];
@ -467,7 +467,7 @@ EnumerateSoundProfiles(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey)
} }
PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, PWCHAR szName) PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, PCWSTR szName)
{ {
LRESULT lCount, lIndex, lResult; LRESULT lCount, lIndex, lResult;
PSOUND_SCHEME_CONTEXT pScheme; PSOUND_SCHEME_CONTEXT pScheme;
@ -533,7 +533,7 @@ FreeSoundProfiles(HWND hwndDlg)
} }
BOOL BOOL
ImportSoundLabel(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szProfile, PWCHAR szLabelName, PWCHAR szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap) ImportSoundLabel(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PCWSTR szProfile, PCWSTR szLabelName, PCWSTR szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap)
{ {
HKEY hSubKey; HKEY hSubKey;
WCHAR szValue[MAX_PATH]; WCHAR szValue[MAX_PATH];
@ -594,7 +594,7 @@ ImportSoundLabel(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szPro
DWORD DWORD
ImportSoundEntry(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szLabelName, PWCHAR szAppName, PAPP_MAP pAppMap) ImportSoundEntry(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PCWSTR szLabelName, PCWSTR szAppName, PAPP_MAP pAppMap)
{ {
HKEY hSubKey; HKEY hSubKey;
DWORD dwNumProfiles; DWORD dwNumProfiles;
@ -653,7 +653,7 @@ ImportSoundEntry(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szLab
DWORD DWORD
ImportAppProfile(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szAppName) ImportAppProfile(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PCWSTR szAppName)
{ {
HKEY hSubKey; HKEY hSubKey;
WCHAR szDefault[MAX_PATH]; WCHAR szDefault[MAX_PATH];
@ -817,7 +817,7 @@ LoadSoundFiles(HWND hwndDlg)
{ {
WCHAR szList[256]; WCHAR szList[256];
WCHAR szPath[MAX_PATH]; WCHAR szPath[MAX_PATH];
PWCHAR ptr; PWSTR ptr;
WIN32_FIND_DATAW FileData; WIN32_FIND_DATAW FileData;
HANDLE hFile; HANDLE hFile;
LRESULT lResult; LRESULT lResult;
@ -879,7 +879,7 @@ VOID
FreeSoundFiles(HWND hwndDlg) FreeSoundFiles(HWND hwndDlg)
{ {
LRESULT lCount, lIndex, lResult; LRESULT lCount, lIndex, lResult;
PWCHAR pSoundPath; PWSTR pSoundPath;
HWND hwndComboBox; HWND hwndComboBox;
hwndComboBox = GetDlgItem(hwndDlg, IDC_SOUND_LIST); hwndComboBox = GetDlgItem(hwndDlg, IDC_SOUND_LIST);
@ -895,7 +895,7 @@ FreeSoundFiles(HWND hwndDlg)
continue; continue;
} }
pSoundPath = (PWCHAR)lResult; pSoundPath = (PWSTR)lResult;
free(pSoundPath); free(pSoundPath);
} }
} }
@ -1433,7 +1433,7 @@ SoundsDlgProc(HWND hwndDlg,
break; break;
} }
if (_wcsicmp(pLabelContext->szValue, (PWCHAR)lResult) || (lIndex != pLabelContext->szValue[0])) if (_wcsicmp(pLabelContext->szValue, (PWSTR)lResult) || (lIndex != pLabelContext->szValue[0]))
{ {
/* Update the tree view item image */ /* Update the tree view item image */
item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE;
@ -1446,10 +1446,10 @@ SoundsDlgProc(HWND hwndDlg,
/// ///
/// Should store in current member /// Should store in current member
/// ///
StringCchCopyW(pLabelContext->szValue, _countof(pLabelContext->szValue), (PWCHAR)lResult); StringCchCopyW(pLabelContext->szValue, _countof(pLabelContext->szValue), (PWSTR)lResult);
} }
if (wcslen((PWCHAR)lResult) && lIndex != 0 && pGlobalData->NumWavOut != 0) if (wcslen((PWSTR)lResult) && lIndex != 0 && pGlobalData->NumWavOut != 0)
{ {
EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE);
} }
@ -1486,7 +1486,7 @@ SoundsDlgProc(HWND hwndDlg,
case WM_NOTIFY: case WM_NOTIFY:
{ {
PLABEL_CONTEXT pLabelContext; PLABEL_CONTEXT pLabelContext;
PWCHAR ptr; PWSTR ptr;
LPNMHDR lpnm = (LPNMHDR)lParam; LPNMHDR lpnm = (LPNMHDR)lParam;
@ -1549,7 +1549,7 @@ SoundsDlgProc(HWND hwndDlg,
if (lResult == CB_ERR || lResult == 0) if (lResult == CB_ERR || lResult == 0)
continue; continue;
if (!wcscmp((PWCHAR)lResult, pLabelContext->szValue)) if (!wcscmp((PWSTR)lResult, pLabelContext->szValue))
{ {
ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex); ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex);
return FALSE; return FALSE;