Index: audio.c
===================================================================
--- audio.c	(revision 74482)
+++ audio.c	(working copy)
@@ -16,7 +16,7 @@
     WAVEOUTCAPSW waveOutputPaps;
     WAVEINCAPS waveInputPaps;
     MIDIOUTCAPS midiOutCaps;
-    TCHAR szNoDevices[256];
+    TCHAR szNoDevices[MAX_STRING];
     UINT DevsNum;
     UINT uIndex;
     HWND hCB;
Index: lang/bg-BG.rc
===================================================================
--- lang/bg-BG.rc	(revision 74484)
+++ lang/bg-BG.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Въпрос"
     5850 "Пускане на РеактОС"
     5851 "Пусков изборник"
-    IDS_REACTOS_LOGOFF "Излизане от РеактОС"
-    IDS_REACTOS_LOGON "Влизане в РеактОС"
+    5852 "Излизане от РеактОС"
+    5853 "Влизане в РеактОС"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/cs-CZ.rc
===================================================================
--- lang/cs-CZ.rc	(revision 74484)
+++ lang/cs-CZ.rc	(working copy)
@@ -266,9 +266,9 @@
     5849 "Otázka"
     5850 "Spuštění systému ReactOS"
     5851 "Otevření nabídky Start"
-    IDS_REACTOS_LOGOFF "Odhlášení od systému ReactOS"
-    IDS_REACTOS_LOGON "Přihlášení k systému ReactOS"
+    5852 "Odhlášení od systému ReactOS"
+    5853 "Přihlášení k systému ReactOS"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/de-DE.rc
===================================================================
--- lang/de-DE.rc	(revision 74484)
+++ lang/de-DE.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Frage"
     5850 "ReactOS starten"
     5851 "Startmenü"
-    IDS_REACTOS_LOGOFF "ReactOS-Abmeldung"
-    IDS_REACTOS_LOGON "ReactOS-Anmeldung"
+    5852 "ReactOS-Abmeldung"
+    5853 "ReactOS-Anmeldung"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/el-GR.rc
===================================================================
--- lang/el-GR.rc	(revision 74484)
+++ lang/el-GR.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Question"
     5850 "Start ReactOS"
     5851 "Start Menu"
-    IDS_REACTOS_LOGOFF "ReactOS Logoff"
-    IDS_REACTOS_LOGON "ReactOS Logon"
+    5852 "ReactOS Logoff"
+    5853 "ReactOS Logon"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/en-US.rc
===================================================================
--- lang/en-US.rc	(revision 74484)
+++ lang/en-US.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Question"
     5850 "Start ReactOS"
     5851 "Start Menu"
-    IDS_REACTOS_LOGOFF "ReactOS Logoff"
-    IDS_REACTOS_LOGON "ReactOS Logon"
+    5852 "ReactOS Logoff"
+    5853 "ReactOS Logon"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/es-ES.rc
===================================================================
--- lang/es-ES.rc	(revision 74484)
+++ lang/es-ES.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Pregunta"
     5850 "Iniciar ReactOS"
     5851 "Menú Inicio"
-    IDS_REACTOS_LOGOFF "Cierre de sesión de ReactOS"
-    IDS_REACTOS_LOGON "Inicio de sesión en ReactOS"
+    5852 "Cierre de sesión de ReactOS"
+    5853 "Inicio de sesión en ReactOS"
     5854 "Explorador de ReactOS"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/fr-FR.rc
===================================================================
--- lang/fr-FR.rc	(revision 74484)
+++ lang/fr-FR.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Question"
     5850 "Démarrer ReactOS"
     5851 "Menu démarrer"
-    IDS_REACTOS_LOGOFF "Déconnexion ReactOS"
-    IDS_REACTOS_LOGON "Connexion ReactOS"
+    5852 "Déconnexion ReactOS"
+    5853 "Connexion ReactOS"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/he-IL.rc
===================================================================
--- lang/he-IL.rc	(revision 74484)
+++ lang/he-IL.rc	(working copy)
@@ -263,9 +263,9 @@
     5849 "שאלה"
     5850 "התחלת ReactOS"
     5851 "תפריט התחל"
-    IDS_REACTOS_LOGOFF "ReactOS ניתוק"
-    IDS_REACTOS_LOGON "ReactOS התחברות"
+    5852 "ReactOS ניתוק"
+    5853 "ReactOS התחברות"
     5854 "ReactOS סייר"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/id-ID.rc
===================================================================
--- lang/id-ID.rc	(revision 74484)
+++ lang/id-ID.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Question"
     5850 "Start ReactOS"
     5851 "Start Menu"
-    IDS_REACTOS_LOGOFF "ReactOS Logoff"
-    IDS_REACTOS_LOGON "ReactOS Logon"
+    5852 "ReactOS Logoff"
+    5853 "ReactOS Logon"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/it-IT.rc
===================================================================
--- lang/it-IT.rc	(revision 74484)
+++ lang/it-IT.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Domanda"
     5850 "Avvio ReactOS"
     5851 "Menu avvio"
-    IDS_REACTOS_LOGOFF "Fine sessione di ReactOS"
-    IDS_REACTOS_LOGON "Inizio sessione di ReactOS"
+    5852 "Fine sessione di ReactOS"
+    5853 "Inizio sessione di ReactOS"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/ja-JP.rc
===================================================================
--- lang/ja-JP.rc	(revision 74484)
+++ lang/ja-JP.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "質問"
     5850 "ReactOSの開始"
     5851 "メニューの開始"
-    IDS_REACTOS_LOGOFF "ReactOSログオフ"
-    IDS_REACTOS_LOGON "ReactOSログオン"
+    5852 "ReactOSログオフ"
+    5853 "ReactOSログオン"
     5854 "ReactOSエクスプローラー"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/nl-NL.rc
===================================================================
--- lang/nl-NL.rc	(revision 74484)
+++ lang/nl-NL.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Question"
     5850 "Start ReactOS"
     5851 "Start Menu"
-    IDS_REACTOS_LOGOFF "ReactOS Logoff"
-    IDS_REACTOS_LOGON "ReactOS Logon"
+    5852 "ReactOS Logoff"
+    5853 "ReactOS Logon"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/no-NO.rc
===================================================================
--- lang/no-NO.rc	(revision 74484)
+++ lang/no-NO.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Spørsmål"
     5850 "Start ReactOS"
     5851 "Start Meny"
-    IDS_REACTOS_LOGOFF "ReactOS Logg av"
-    IDS_REACTOS_LOGON "ReactOS Logg på"
+    5852 "ReactOS Logg av"
+    5853 "ReactOS Logg på"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/pl-PL.rc
===================================================================
--- lang/pl-PL.rc	(revision 74484)
+++ lang/pl-PL.rc	(working copy)
@@ -274,9 +274,9 @@
     5849 "Znak zapytania"
     5850 "Uruchomienie ReactOS"
     5851 "Menu Start"
-    IDS_REACTOS_LOGOFF "Wylogowanie z ReactOS"
-    IDS_REACTOS_LOGON "Logowanie do ReactOS"
+    5852 "Wylogowanie z ReactOS"
+    5853 "Logowanie do ReactOS"
     5854 "Eksplorator ReactOS"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/pt-BR.rc
===================================================================
--- lang/pt-BR.rc	(revision 74484)
+++ lang/pt-BR.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Question"
     5850 "Start ReactOS"
     5851 "Start Menu"
-    IDS_REACTOS_LOGOFF "ReactOS Logoff"
-    IDS_REACTOS_LOGON "ReactOS Logon"
+    5852 "ReactOS Logoff"
+    5853 "ReactOS Logon"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/ro-RO.rc
===================================================================
--- lang/ro-RO.rc	(revision 74484)
+++ lang/ro-RO.rc	(working copy)
@@ -266,9 +266,9 @@
     5849 "Întrebare"
     5850 "Pornire ReactOS"
     5851 "Meniul Pornire"
-    IDS_REACTOS_LOGOFF "Ieșire din ReactOS"
-    IDS_REACTOS_LOGON "Intrare în ReactOS"
+    5852 "Ieșire din ReactOS"
+    5853 "Intrare în ReactOS"
     5854 "Explorator ReactOS"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/ru-RU.rc
===================================================================
--- lang/ru-RU.rc	(revision 74484)
+++ lang/ru-RU.rc	(working copy)
@@ -261,9 +261,9 @@
     5849 "Вопрос"
     5850 "Запуск ReactOS"
     5851 "Главное меню"
-    IDS_REACTOS_LOGOFF "Выход из ReactOS"
-    IDS_REACTOS_LOGON "Вход в ReactOS"
+    5852 "Выход из ReactOS"
+    5853 "Вход в ReactOS"
     5854 "Проводник ReactOS"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/sk-SK.rc
===================================================================
--- lang/sk-SK.rc	(revision 74484)
+++ lang/sk-SK.rc	(working copy)
@@ -266,9 +266,9 @@
     5849 "Otázka"
     5850 "Spustenie systému ReactOS"
     5851 "Ponuka Štart"
-    IDS_REACTOS_LOGOFF "Odhlásenie zo systému ReactOS"
-    IDS_REACTOS_LOGON "Prihlásenie do systému ReactOS"
+    5852 "Odhlásenie zo systému ReactOS"
+    5853 "Prihlásenie do systému ReactOS"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/sq-AL.rc
===================================================================
--- lang/sq-AL.rc	(revision 74484)
+++ lang/sq-AL.rc	(working copy)
@@ -265,9 +265,9 @@
     5849 "Pyetje"
     5850 "Fillo ReactOS"
     5851 "Fillo Menune"
-    IDS_REACTOS_LOGOFF "Dil ReactOS"
-    IDS_REACTOS_LOGON "Hyr ReactOS"
+    5852 "Dil ReactOS"
+    5853 "Hyr ReactOS"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/tr-TR.rc
===================================================================
--- lang/tr-TR.rc	(revision 74484)
+++ lang/tr-TR.rc	(working copy)
@@ -263,9 +263,9 @@
     5849 "Soru"
     5850 "ReactOS'u Başlat"
     5851 "Başlat Seçkesi"
-    IDS_REACTOS_LOGOFF "Oturumu Kapat"
-    IDS_REACTOS_LOGON "Oturum Aç"
+    5852 "Oturumu Kapat"
+    5853 "Oturum Aç"
     5854 "ReactOS Gezgini"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/uk-UA.rc
===================================================================
--- lang/uk-UA.rc	(revision 74484)
+++ lang/uk-UA.rc	(working copy)
@@ -269,9 +269,9 @@
     5849 "Запитання"
     5850 "Запуск ReactOS"
     5851 "Головне меню"
-    IDS_REACTOS_LOGOFF "Вихід із ReactOS"
-    IDS_REACTOS_LOGON "Вхід до ReactOS"
+    5852 "Вихід із ReactOS"
+    5853 "Вхід до ReactOS"
     5854 "ReactOS Explorer"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/zh-CN.rc
===================================================================
--- lang/zh-CN.rc	(revision 74484)
+++ lang/zh-CN.rc	(working copy)
@@ -268,9 +268,9 @@
     5849 "问题"
     5850 "启动 ReactOS"
     5851 "「开始」菜单"
-    IDS_REACTOS_LOGOFF "ReactOS 注销"
-    IDS_REACTOS_LOGON "ReactOS 登录"
+    5852 "ReactOS 注销"
+    5853 "ReactOS 登录"
     5854 "ReactOS 浏览器"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: lang/zh-TW.rc
===================================================================
--- lang/zh-TW.rc	(revision 74484)
+++ lang/zh-TW.rc	(working copy)
@@ -267,9 +267,9 @@
     5849 "問題"
     5850 "啟動 ReactOS"
     5851 "「開始」選單"
-    IDS_REACTOS_LOGOFF "ReactOS 登出"
-    IDS_REACTOS_LOGON "ReactOS 登入"
+    5852 "ReactOS 登出"
+    5853 "ReactOS 登入"
     5854 "ReactOS 瀏覽器"
-    IDS_BROWSE_FOR_SOUND "Search for new sounds"
-    IDS_WAVE_FILES_FILTER "Wave Files (*.wav)|*.wav|"
+    5855 "Wave Files (*.wav)|*.wav|"
+    5856 "Search for new sounds"
 END
Index: mmsys.c
===================================================================
--- mmsys.c	(revision 74482)
+++ mmsys.c	(working copy)
@@ -697,7 +697,7 @@
 {
     PROPSHEETPAGE psp[5];
     PROPSHEETHEADER psh; // = { 0 };
-    TCHAR Caption[256];
+    TCHAR Caption[MAX_STRING];
 
     UNREFERENCED_PARAMETER(lParam);
     UNREFERENCED_PARAMETER(wParam);
Index: mmsys.h
===================================================================
--- mmsys.h	(revision 74481)
+++ mmsys.h	(working copy)
@@ -37,6 +37,8 @@
 #define DRVM_MAPPER_PREFERRED_GET (DRVM_MAPPER+21)
 #define DRVM_MAPPER_PREFERRED_SET (DRVM_MAPPER+22)
 
+#define MAX_STRING  256
+
 /* main.c */
 
 VOID
Index: resource.h
===================================================================
--- resource.h	(revision 74484)
+++ resource.h	(working copy)
@@ -69,8 +69,6 @@
 #define IDS_REACTOS_LOGOFF         5852
 #define IDS_REACTOS_LOGON          5853
 #define IDS_REACTOS_DEFAULT_SCHEME 5856
-#define IDS_BROWSE_FOR_SOUND       6144
-#define IDS_WAVE_FILES_FILTER      6166
 
 /* Strings */
 #define IDS_CPLNAME        1000
Index: sounds.c
===================================================================
--- sounds.c	(revision 74485)
+++ sounds.c	(working copy)
@@ -62,10 +62,10 @@
 LPWSTR MakeFilter(LPWSTR psz)
 {
     WCHAR *pch;
-
-    ASSERT(psz[0] != UNICODE_NULL &&
-           psz[wcslen(psz) - 1] == L'|');
-    for (pch = psz; *pch != UNICODE_NULL; pch++)
+    ASSERT(psz);
+    ASSERT(*psz != UNICODE_NULL);
+    ASSERT(psz[lstrlenW(psz) - 1] == L'|');
+    for (pch = psz; *pch != UNICODE_NULL; ++pch)
     {
         /* replace vertical bar with NULL */
         if (*pch == L'|')
@@ -153,7 +153,6 @@
             return pMap;
 
         pMap = pMap->Next;
-
     }
     return NULL;
 }
@@ -197,7 +196,8 @@
 LoadEventLabel(HKEY hKey, TCHAR * szSubKey)
 {
     HKEY hSubKey;
-    DWORD cbValue;
+    DWORD dwSize;
+    DWORD dwDesc;
     TCHAR szDesc[MAX_PATH];
     TCHAR szData[MAX_PATH];
     PLABEL_MAP pMap;
@@ -211,25 +211,25 @@
         return FALSE;
     }
 
-    cbValue = sizeof(szDesc);
+    dwDesc = sizeof(szDesc);
     if (RegQueryValueEx(hSubKey,
                       NULL,
                       NULL,
                       NULL,
                       (LPBYTE)szDesc,
-                      &cbValue) != ERROR_SUCCESS)
+                      &dwDesc) != ERROR_SUCCESS)
     {
         RegCloseKey(hSubKey);
         return FALSE;
     }
 
-    cbValue = sizeof(szData);
+    dwSize = sizeof(szDesc);
     if (RegQueryValueEx(hSubKey,
                         _T("DispFileName"),
                         NULL,
                         NULL,
                         (LPBYTE)szData,
-                        &cbValue) != ERROR_SUCCESS)
+                        &dwSize) != ERROR_SUCCESS)
     {
         RegCloseKey(hSubKey);
         return FALSE;
@@ -311,7 +311,7 @@
 {
     HKEY hSubKey;
     TCHAR szValue[MAX_PATH];
-    DWORD cbValue, dwResult;
+    DWORD dwValue, dwResult;
     LRESULT lResult;
     PSOUND_SCHEME_CONTEXT pScheme;
 
@@ -324,13 +324,13 @@
         return FALSE;
     }
 
-    cbValue = sizeof(szValue);
+    dwValue = sizeof(szValue);
     dwResult = RegQueryValueEx(hSubKey,
                                NULL,
                                NULL,
                                NULL,
                                (LPBYTE)szValue,
-                               &cbValue);
+                               &dwValue);
     RegCloseKey(hSubKey);
 
     if (dwResult != ERROR_SUCCESS)
@@ -356,7 +356,7 @@
     /* Associate the value with the item in the combobox */
     ComboBox_SetItemData(GetDlgItem(hwndDlg, IDC_SOUND_SCHEME), lResult, pScheme);
 
-    /* Optionally, select the profile */
+    /* Optionally, select the profile */ 
     if (SetDefault)
     {
         ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_SCHEME), lResult);
@@ -371,16 +371,15 @@
 {
     HKEY hSubKey;
     DWORD dwName, dwCurKey, dwResult, dwNumSchemes;
-    DWORD cbDefault;
     TCHAR szName[MAX_PATH];
 
-    cbDefault = sizeof(szDefault);
+    dwName = sizeof(szDefault);
     if (RegQueryValueEx(hKey,
                         NULL,
                         NULL,
                         NULL,
                         (LPBYTE)szDefault,
-                        &cbDefault) != ERROR_SUCCESS)
+                        &dwName) != ERROR_SUCCESS)
     {
         return FALSE;
     }
@@ -461,7 +460,7 @@
     HKEY hSubKey;
     TCHAR szValue[MAX_PATH];
     TCHAR szBuffer[MAX_PATH];
-    DWORD cbValue, cchLength;
+    DWORD dwValue;
     PSOUND_SCHEME_CONTEXT pScheme;
     PLABEL_CONTEXT pLabelContext;
     BOOL bCurrentProfile, bActiveProfile;
@@ -480,13 +479,13 @@
         return FALSE;
     }
 
-    cbValue = sizeof(szValue);
+    dwValue = sizeof(szValue);
     if (RegQueryValueEx(hSubKey,
                         NULL,
                         NULL,
                         NULL,
                         (LPBYTE)szValue,
-                        &cbValue) != ERROR_SUCCESS)
+                        &dwValue) != ERROR_SUCCESS)
     {
         return FALSE;
     }
@@ -503,8 +502,8 @@
     }
     pLabelContext = FindLabelContext(pScheme, AppMap->szName, LabelMap->szName);
 
-    cchLength = ExpandEnvironmentStrings(szValue, szBuffer, _countof(szBuffer));
-    if (cchLength == 0 || cchLength > _countof(szBuffer))
+    dwValue = ExpandEnvironmentStrings(szValue, szBuffer, _countof(szBuffer));
+    if (dwValue == 0 || dwValue > _countof(szBuffer))
     {
         /* fixme */
         return FALSE;
@@ -583,7 +582,7 @@
 {
     HKEY hSubKey;
     TCHAR szDefault[MAX_PATH];
-    DWORD cbValue;
+    DWORD dwDefault;
     DWORD dwCurKey;
     DWORD dwResult;
     DWORD dwNumEntry;
@@ -608,13 +607,13 @@
         return 0;
     }
 
-    cbValue = sizeof(szDefault);
+    dwDefault = sizeof(szDefault);
     if (RegQueryValueEx(hSubKey,
                         NULL,
                         NULL,
                         NULL,
                         (LPBYTE)szDefault,
-                        &cbValue) != ERROR_SUCCESS)
+                        &dwDefault) != ERROR_SUCCESS)
     {
         RegCloseKey(hSubKey);
         HeapFree(GetProcessHeap(), 0, AppMap);
@@ -621,13 +620,13 @@
         return 0;
     }
 
-    cbValue = sizeof(szIcon);
+    dwDefault = sizeof(szIcon);
     if (RegQueryValueEx(hSubKey,
                         _T("DispFileName"),
                         NULL,
                         NULL,
                         (LPBYTE)szIcon,
-                        &cbValue) != ERROR_SUCCESS)
+                        &dwDefault) != ERROR_SUCCESS)
     {
         szIcon[0] = _T('\0');
     }
@@ -744,9 +743,8 @@
 BOOL
 LoadSoundFiles(HWND hwndDlg)
 {
-    TCHAR szList[256];
-    WCHAR szPath[MAX_PATH];
-    WCHAR * ptr;
+    WCHAR szList[MAX_STRING], szPath[MAX_PATH];
+    WCHAR *ptr;
     WIN32_FIND_DATAW FileData;
     HANDLE hFile;
     LRESULT lResult;
@@ -753,11 +751,8 @@
     UINT length;
 
     /* Add no sound listview item */
-    if (LoadString(hApplet, IDS_NO_SOUND, szList, _countof(szList)))
-    {
-        szList[_countof(szList) - 1] = TEXT('\0');
-        ComboBox_AddString(GetDlgItem(hwndDlg, IDC_SOUND_LIST), szList);
-    }
+    LoadStringW(hApplet, IDS_NO_SOUND, szList, _countof(szList));
+    ComboBox_AddString(GetDlgItem(hwndDlg, IDC_SOUND_LIST), szList);
 
     /* Load sound files */
     length = GetWindowsDirectoryW(szPath, MAX_PATH);
@@ -793,11 +788,11 @@
         {
             ptr = FileData.cFileName;
         }
-        lResult = SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)ptr);
+        lResult = ComboBox_AddString(GetDlgItem(hwndDlg, IDC_SOUND_LIST), ptr);
         if (lResult != CB_ERR)
         {
             wcscpy(&szPath[length-1], FileData.cFileName);
-            SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)_wcsdup(szPath));
+            ComboBox_SetItemData(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lResult, _wcsdup(szPath));
         }
     } while (FindNextFileW(hFile, &FileData) != 0);
 
@@ -875,7 +870,8 @@
     PSOUND_SCHEME_CONTEXT pScheme;
     HWND hDlgCtrl;
     PLABEL_CONTEXT pLabelContext;
-    TCHAR Buffer[100];
+    TCHAR Buffer[MAX_STRING];
+    DWORD dwSize;
 
     hDlgCtrl = GetDlgItem(hwndDlg, IDC_SOUND_SCHEME);
 
@@ -901,7 +897,8 @@
         return FALSE;
     }
 
-    RegSetValueEx(hKey, NULL, 0, REG_SZ, (LPBYTE)pScheme->szName, (_tcslen(pScheme->szName) +1) * sizeof(TCHAR));
+    dwSize = (_tcslen(pScheme->szName) + 1) * sizeof(TCHAR);
+    RegSetValueEx(hKey, NULL, 0, REG_SZ, (LPBYTE)pScheme->szName, dwSize);
     RegCloseKey(hKey);
 
     if (RegOpenKeyEx(HKEY_CURRENT_USER,
@@ -921,7 +918,8 @@
 
         if (RegOpenKeyEx(hKey, Buffer, 0, KEY_WRITE, &hSubKey) == ERROR_SUCCESS)
         {
-            RegSetValueEx(hSubKey, NULL, 0, REG_EXPAND_SZ, (LPBYTE)pLabelContext->szValue, (_tcslen(pLabelContext->szValue) +1) * sizeof(TCHAR));
+            dwSize = (_tcslen(pLabelContext->szValue) + 1) * sizeof(TCHAR);
+            RegSetValueEx(hSubKey, NULL, 0, REG_EXPAND_SZ, (LPBYTE)pLabelContext->szValue, dwSize);
             RegCloseKey(hSubKey);
         }
 
@@ -943,8 +941,7 @@
               LPARAM lParam)
 {
     OPENFILENAMEW ofn;
-    WCHAR filename[MAX_PATH];
-    WCHAR szFilter[256], szTitle[256];
+    WCHAR filename[MAX_PATH], szFilter[MAX_STRING], szTitle[MAX_STRING];
     LPWSTR pFileName;
     LRESULT lResult;
 
@@ -983,19 +980,18 @@
                 case IDC_BROWSE_SOUND:
                 {
                     ZeroMemory(&ofn, sizeof(ofn));
-                    ofn.lStructSize = sizeof(ofn);
+                    ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400W;
                     ofn.hwndOwner = hwndDlg;
+                    filename[0] = UNICODE_NULL;
                     ofn.lpstrFile = filename;
-                    ofn.lpstrFile[0] = L'\0';
                     ofn.nMaxFile = _countof(filename);
-                    LoadStringW(hApplet, IDS_WAVE_FILES_FILTER, szFilter, _countof(szFilter));
+                    LoadStringW(hApplet, 5855, szFilter, _countof(szFilter));
                     ofn.lpstrFilter = MakeFilter(szFilter);
-                    ofn.nFilterIndex = 0;
-                    LoadStringW(hApplet, IDS_BROWSE_FOR_SOUND, szTitle, _countof(szTitle));
+                    LoadStringW(hApplet, 5856, szTitle, _countof(szTitle));
                     ofn.lpstrTitle = szTitle;
-                    ofn.lpstrInitialDir = NULL;
-                    ofn.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
-
+                    ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST |
+                                OFN_HIDEREADONLY | OFN_ENABLESIZING |
+                                OFN_DONTADDTORECENT;
                     if (GetOpenFileNameW(&ofn) == TRUE)
                     {
                         // FIXME search if list already contains that sound
@@ -1006,16 +1002,17 @@
                         pFileName++;
 
                         // add to list
-                        lResult = SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)pFileName);
+                        lResult = ComboBox_AddString(GetDlgItem(hwndDlg, IDC_SOUND_LIST), pFileName);
                         if (lResult != CB_ERR)
                         {
                             // add path and select item
-                            SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)_wcsdup(filename));
-                            SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0);
+                            ComboBox_SetItemData(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lResult, _wcsdup(filename));
+                            ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lResult);
                         }
                     }
                     break;
                 }
+
                 case IDC_PLAY_SOUND:
                 {
                     LRESULT lIndex;
@@ -1036,7 +1033,7 @@
                 {
                     if (HIWORD(wParam) == CBN_SELENDOK)
                     {
-                        (void)ListView_DeleteAllItems(GetDlgItem(hwndDlg, IDC_SCHEME_LIST));
+                        ListView_DeleteAllItems(GetDlgItem(hwndDlg, IDC_SCHEME_LIST));
                         ShowSoundScheme(hwndDlg);
                         EnableWindow(GetDlgItem(hwndDlg, IDC_SOUND_LIST), FALSE);
                         EnableWindow(GetDlgItem(hwndDlg, IDC_TEXT_SOUND), FALSE);
@@ -1148,7 +1145,6 @@
                             lIndex = ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), 0);
                             EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), FALSE);
                             break;
-
                         }
                         EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE);
                         lCount = ComboBox_GetCount(GetDlgItem(hwndDlg, IDC_SOUND_LIST));
Index: volume.c
===================================================================
--- volume.c	(revision 74481)
+++ volume.c	(working copy)
@@ -252,7 +252,7 @@
 {
     UINT NumMixers;
     MIXERCAPS mxc;
-    TCHAR szNoDevices[256];
+    TCHAR szNoDevices[MAX_STRING];
 
     CheckDlgButton(hwndDlg,
                    IDC_ICON_IN_TASKBAR,