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: 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: sounds.c
===================================================================
--- sounds.c	(revision 74485)
+++ sounds.c	(working copy)
@@ -744,7 +744,7 @@
 BOOL
 LoadSoundFiles(HWND hwndDlg)
 {
-    TCHAR szList[256];
+    WCHAR szList[MAX_STRING]
     WCHAR szPath[MAX_PATH];
     WCHAR * ptr;
     WIN32_FIND_DATAW FileData;
@@ -753,11 +753,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 +790,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 +872,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 +899,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 +920,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 +943,8 @@
               LPARAM lParam)
 {
     OPENFILENAMEW ofn;
-    WCHAR filename[MAX_PATH];
-    WCHAR szFilter[256], szTitle[256];
+    WCHAR filename[MAX_PATH]
+    WCHAR szFilter[MAX_STRING], szTitle[MAX_STRING];
     LPWSTR pFileName;
     LRESULT lResult;
 
@@ -983,19 +983,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));
                     ofn.lpstrFilter = MakeFilter(szFilter);
-                    ofn.nFilterIndex = 0;
                     LoadStringW(hApplet, IDS_BROWSE_FOR_SOUND, 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,12 +1005,12 @@
                         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;
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,