diff --git a/reactos/dll/win32/comdlg32/fontdlg.c b/reactos/dll/win32/comdlg32/fontdlg.c
index 2d0cd2e7dae..7551064123c 100644
--- a/reactos/dll/win32/comdlg32/fontdlg.c
+++ b/reactos/dll/win32/comdlg32/fontdlg.c
@@ -34,6 +34,7 @@ static const WCHAR strWineFontData[] = {'_','_','W','I','N','E','_','F','O','N',
 static const WCHAR strWineFontData_a[] =
                                {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A','_','A',0};
 static const WCHAR chooseFontW[] = {'C','H','O','O','S','E','_','F','O','N','T',0};
+static const WCHAR fontsizefmtW[] = {'%','d',0};
 
 /* image list with TrueType bitmaps and more */
 static HIMAGELIST himlTT = 0;
@@ -400,16 +401,15 @@ static BOOL AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf)
 {
     int j;
     WCHAR buffer[20];
-    static const WCHAR strFormat[] = {'%','2','d',0};
 
     if (  (!(lpcf->Flags & CF_LIMITSIZE))  ||
             ((lpcf->Flags & CF_LIMITSIZE) && (h >= lpcf->nSizeMin) && (h <= lpcf->nSizeMax)))
     {
-        wsprintfW(buffer, strFormat, h);
+        sprintfW(buffer, fontsizefmtW, h);
         j=SendMessageW(hwnd, CB_FINDSTRINGEXACT, -1, (LPARAM)buffer);
         if (j==CB_ERR)
         {
-            j=SendMessageW(hwnd, CB_ADDSTRING, 0, (LPARAM)buffer);
+            j=SendMessageW(hwnd, CB_INSERTSTRING, -1, (LPARAM)buffer);
             if (j!=CB_ERR) j = SendMessageW(hwnd, CB_SETITEMDATA, j, h);
             if (j==CB_ERR) return TRUE;
         }
@@ -515,10 +515,11 @@ static INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *
     return 1 ;
 }
 
-static BOOL CFn_FitFontSize( HWND hDlg, int points)
+static void CFn_FitFontSize( HWND hDlg, int points)
 {
+    WCHAR buffW[16];
     int i,n;
-    BOOL ret = FALSE;
+
     /* look for fitting font size in combobox3 */
     n=SendDlgItemMessageW(hDlg, cmb3, CB_GETCOUNT, 0, 0);
     for (i=0;i<n;i++)
@@ -530,11 +531,13 @@ static BOOL CFn_FitFontSize( HWND hDlg, int points)
             SendMessageW(hDlg, WM_COMMAND,
                     MAKEWPARAM(cmb3, CBN_SELCHANGE),
                     (LPARAM)GetDlgItem(hDlg,cmb3));
-            ret = TRUE;
-            break;
+            return;
         }
     }
-    return ret;
+
+    /* no default matching size, set text manually */
+    sprintfW(buffW, fontsizefmtW, points);
+    SetDlgItemTextW(hDlg, cmb3, buffW);
 }
 
 static BOOL CFn_FitFontStyle( HWND hDlg, LONG packedstyle )
@@ -737,6 +740,9 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf)
         SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE),
                 (LPARAM)GetDlgItem(hDlg,cmb5));
     }
+    /* limit text length user can type in as font size */
+    SendDlgItemMessageW(hDlg, cmb3, CB_LIMITTEXT, 5, 0);
+
     if ((lpcf->Flags & CF_USESTYLE) && lpcf->lpszStyle)
     {
         j=SendDlgItemMessageW(hDlg,cmb2,CB_FINDSTRING,-1,(LPARAM)lpcf->lpszStyle);
@@ -886,6 +892,31 @@ static LRESULT CFn_WMDrawItem(LPARAM lParam)
     return TRUE;
 }
 
+static INT get_dialog_font_point_size(HWND hDlg, CHOOSEFONTW *cf)
+{
+    BOOL invalid_size = FALSE;
+    INT i, size;
+
+    i = SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0, 0);
+    if (i != CB_ERR)
+        size = LOWORD(SendDlgItemMessageW(hDlg, cmb3, CB_GETITEMDATA , i, 0));
+    else
+    {
+        WCHAR buffW[8], *endptrW;
+
+        GetDlgItemTextW(hDlg, cmb3, buffW, sizeof(buffW)/sizeof(*buffW));
+        size = strtolW(buffW, &endptrW, 10);
+        invalid_size = size == 0 && *endptrW;
+
+        if (size == 0)
+            size = 10;
+    }
+
+    cf->iPointSize = 10 * size;
+    cf->lpLogFont->lfHeight = -MulDiv(cf->iPointSize, GetScreenDPI(), 720);
+    return invalid_size ? -1 : size;
+}
+
 /***********************************************************************
  *           CFn_WMCommand                               [internal]
  */
@@ -959,9 +990,11 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
             LPLOGFONTW lpxx=lpcf->lpLogFont;
 
             TRACE("WM_COMMAND/cmb2,3 =%08lX\n", lParam);
+
+            /* face name */
             i=SendDlgItemMessageW(hDlg,cmb1,CB_GETCURSEL,0,0);
             if (i==CB_ERR)
-                i=GetDlgItemTextW( hDlg, cmb1, str, 256 );
+                GetDlgItemTextW( hDlg, cmb1, str, sizeof(str)/sizeof(str[0]) );
             else
             {
                 SendDlgItemMessageW(hDlg,cmb1,CB_GETLBTEXT,i,
@@ -974,6 +1007,8 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
                 lpxx->lfPitchAndFamily = HIWORD(l) >> 8;
             }
             lstrcpynW(lpxx->lfFaceName, str, sizeof(lpxx->lfFaceName)/sizeof(lpxx->lfFaceName[0]));
+
+            /* style */
             i=SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0);
             if (i!=CB_ERR)
             {
@@ -983,14 +1018,11 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
                 if ((lpxx->lfWeight=LOWORD(l)) > FW_MEDIUM)
                     lpcf->nFontType |= BOLD_FONTTYPE;
             }
-            i=SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0, 0);
-            if( i != CB_ERR)
-                lpcf->iPointSize = 10 * LOWORD(SendDlgItemMessageW(hDlg, cmb3,
-                            CB_GETITEMDATA , i, 0));
-            else
-                lpcf->iPointSize = 100;
-            lpxx->lfHeight = - MulDiv( lpcf->iPointSize ,
-                    GetScreenDPI(), 720);
+
+            /* size */
+            get_dialog_font_point_size(hDlg, lpcf);
+
+            /* charset */
             i=SendDlgItemMessageW(hDlg, cmb5, CB_GETCURSEL, 0, 0);
             if (i!=CB_ERR)
                 lpxx->lfCharSet=SendDlgItemMessageW(hDlg, cmb5, CB_GETITEMDATA, i, 0);
@@ -1037,6 +1069,18 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
         break;
 
     case IDOK:
+    {
+        WCHAR msgW[80];
+        INT pointsize;
+
+        pointsize = get_dialog_font_point_size(hDlg, lpcf);
+        if (pointsize == -1)
+        {
+            LoadStringW(COMDLG32_hInstance, IDS_FONT_SIZE_INPUT, msgW, sizeof(msgW)/sizeof(*msgW));
+            MessageBoxW(hDlg, msgW, NULL, MB_OK | MB_ICONINFORMATION);
+            return TRUE;
+        }
+
         if (  (!(lpcf->Flags & CF_LIMITSIZE))  ||
               ( (lpcf->Flags & CF_LIMITSIZE) &&
                 (lpcf->iPointSize >= 10 * lpcf->nSizeMin) &&
@@ -1044,18 +1088,18 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
             EndDialog(hDlg, TRUE);
         else
         {
-            WCHAR buffer[80];
             WCHAR format[80];
             DWORD_PTR args[2];
             LoadStringW(COMDLG32_hInstance, IDS_FONT_SIZE, format, sizeof(format)/sizeof(WCHAR));
             args[0] = lpcf->nSizeMin;
             args[1] = lpcf->nSizeMax;
             FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
-                           format, 0, 0, buffer, sizeof(buffer)/sizeof(*buffer),
+                           format, 0, 0, msgW, sizeof(msgW)/sizeof(*msgW),
                            (__ms_va_list*)args);
-            MessageBoxW(hDlg, buffer, NULL, MB_OK);
+            MessageBoxW(hDlg, msgW, NULL, MB_OK);
         }
         return(TRUE);
+    }
     case IDCANCEL:
         EndDialog(hDlg, FALSE);
         return(TRUE);
diff --git a/reactos/dll/win32/comdlg32/itemdlg.c b/reactos/dll/win32/comdlg32/itemdlg.c
index ea34cd022ef..75b31eb61c1 100644
--- a/reactos/dll/win32/comdlg32/itemdlg.c
+++ b/reactos/dll/win32/comdlg32/itemdlg.c
@@ -372,13 +372,13 @@ static UINT get_file_name(FileDialogImpl *This, LPWSTR *str)
             lstrcpyW(*str, This->set_filename);
             return len;
         }
-        return FALSE;
+        return 0;
     }
 
     len = SendMessageW(hwnd_edit, WM_GETTEXTLENGTH, 0, 0);
     *str = CoTaskMemAlloc(sizeof(WCHAR)*(len+1));
     if(!*str)
-        return FALSE;
+        return 0;
 
     SendMessageW(hwnd_edit, WM_GETTEXT, len+1, (LPARAM)*str);
     return len;
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc
index df3f29d8105..083c10e38c9 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Съхрани като"
     IDS_OPEN_FILE   "Отвори файл"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc
index 2ba2c831d6b..7882bae456e 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Anomenar i Desar"
     IDS_OPEN_FILE   "Obre Fitxer"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc
index 547b9621efc..746a6623964 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Ulož pod jménem"
     IDS_OPEN_FILE   "Otevřít soubor"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc
index 5795f5ac4c3..3742c665a2a 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Gem som"
     IDS_OPEN_FILE   "Åben fil"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_De.rc b/reactos/dll/win32/comdlg32/lang/cdlg_De.rc
index 67f1f6aeb9d..35076cad153 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_De.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_De.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Speichern als"
     IDS_OPEN_FILE   "Öffne Datei"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_El.rc b/reactos/dll/win32/comdlg32/lang/cdlg_El.rc
index 84b6ba16a05..9a2b1f58b34 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_El.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_El.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Αποθήκευση ως"
     IDS_OPEN_FILE   "Άνοιγμα Αρχείου"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_En.rc b/reactos/dll/win32/comdlg32/lang/cdlg_En.rc
index ceb83935958..5d84e3bd2ee 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_En.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_En.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Save As"
     IDS_OPEN_FILE   "Open File"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
@@ -432,7 +433,7 @@ BEGIN
   GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX
   AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
-  GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX
+  GROUPBOX "", grp4, 80, 156, 152, 56, BS_GROUPBOX
   LTEXT "L&eft:", stc15, 88, 172, 30, 8
   EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
   LTEXT "&Right:", stc16, 159, 172, 30, 8
@@ -477,14 +478,19 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS
 CAPTION "Open"
 FONT 8, "MS Shell Dlg"
 {
-    LTEXT           "File name:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT
-    EDITTEXT        IDC_FILENAME, 226, 240, 100, 12,  WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    LTEXT           "File name:", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS
+    EDITTEXT        IDC_FILENAME, 226, 240, 100, 12,  WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_CLIPSIBLINGS | ES_AUTOHSCROLL
 
-    LTEXT           "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT
+    LTEXT           "Files of type:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT | WS_CLIPSIBLINGS
     COMBOBOX        IDC_FILETYPE, 226, 256, 100, 12,  WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL |
-                    CBS_HASSTRINGS | CBS_DROPDOWNLIST
+                    WS_CLIPSIBLINGS | CBS_HASSTRINGS | CBS_DROPDOWNLIST
 
-    DEFPUSHBUTTON   "&Open",  IDOK,     350, 240, 40, 14, WS_GROUP
-    PUSHBUTTON      "Cancel", IDCANCEL, 395, 240, 40, 14
-    PUSHBUTTON      "&Help",  pshHelp,  350, 272, 40, 14
+    DEFPUSHBUTTON   "&Open",  IDOK,     350, 240, 32, 14, WS_GROUP | WS_CLIPSIBLINGS
+
+    /* drop-down menu for open button */
+    CONTROL         "6", psh1, "Button", WS_CHILD | WS_CLIPSIBLINGS | WS_GROUP | WS_TABSTOP |
+                    BS_CHECKBOX | BS_PUSHLIKE, 342, 240, 8, 14
+
+    PUSHBUTTON      "Cancel", IDCANCEL, 395, 240, 40, 14, WS_CLIPSIBLINGS
+    PUSHBUTTON      "&Help",  pshHelp,  350, 272, 40, 14, WS_CLIPSIBLINGS
 }
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc
index 8dd9f247d33..eb16ecf6b94 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Konservu"
     IDS_OPEN_FILE   "Malfermu Dosieron"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc
index c49aac38cca..3eeef958cf1 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "&Guardar como"
     IDS_OPEN_FILE   "Abrir archivo"
     IDS_SELECT_FOLDER "Elegir carpeta"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc
index a50ec4a59e4..bc87678776e 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Tallenna nimellä"
     IDS_OPEN_FILE   "Avaa tiedosto"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc
index 92fe1b5877d..90e89f2d559 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Enregistrer"
     IDS_OPEN_FILE   "Ouvrir le fichier"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_He.rc b/reactos/dll/win32/comdlg32/lang/cdlg_He.rc
index 1967c21d704..1f925c5debd 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_He.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_He.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "שמירה בשם"
     IDS_OPEN_FILE   "פתיחת קובץ"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc
index dd79ad4902f..e0f813fa678 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Mentés másként"
     IDS_OPEN_FILE   "Fájl megnyitása"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_It.rc b/reactos/dll/win32/comdlg32/lang/cdlg_It.rc
index 87c545d1cad..04cee0e5df5 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_It.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_It.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Salva con nome"
     IDS_OPEN_FILE   "Apri file"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc
index 20c63ea897c..a011175bff0 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "名前を付けて保存"
     IDS_OPEN_FILE   "ファイルを開く"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc
index 73ee5c491ce..e7fe4f43521 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "다른 이름으로 저장"
     IDS_OPEN_FILE   "파일 열기"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc
index 19ea6fb6e28..d4f05a72676 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Išsaugoti kaip"
     IDS_OPEN_FILE   "Atverti failą"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc
index abcf90434e5..df60e45b80b 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc
@@ -137,6 +137,7 @@ STRINGTABLE
     IDS_SAVE_AS     "&Opslaan als"
     IDS_OPEN_FILE   "Open bestand"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_No.rc b/reactos/dll/win32/comdlg32/lang/cdlg_No.rc
index ce8b3a6cff0..df82403f389 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_No.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_No.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Lagre som"
     IDS_OPEN_FILE   "Åpne fil"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc
index 8f4db09554b..116a8f5c7c0 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Zapisz jako"
     IDS_OPEN_FILE   "Otwórz plik"
     IDS_SELECT_FOLDER "Wybierz folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc
index 92da5b7f29c..49dbd109cdf 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Gravar Como"
     IDS_OPEN_FILE   "Abrir Ficheiro"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc
index 1d8a6b89354..f5b0279413b 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc
@@ -140,6 +140,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Păstrare în:"
     IDS_OPEN_FILE   "Deschidere fișier"
     IDS_SELECT_FOLDER "Selecează dosar"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc
index 96b90141746..8f9893874ce 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Сохранить как"
     IDS_OPEN_FILE   "Открыть файл"
     IDS_SELECT_FOLDER "Выбрать папку"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc
index 49d7926fc66..119e0399b14 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Shrani kot"
     IDS_OPEN_FILE   "Odpri datoteko"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc
index 740f2809f1a..8492ad592dc 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Uložiť ako"
     IDS_OPEN_FILE   "Otvoriť súbor"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc
index ef2fbe3569d..c9e761dc71a 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc
@@ -142,6 +142,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Ruaj si "
     IDS_OPEN_FILE   "Hap"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc
index e3233ebad1a..031a9a752bd 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Sačuvaj kao"
     IDS_OPEN_FILE   "Otvori datoteku"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc
index 9cd0fb8d001..f8826b7c823 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc
@@ -137,6 +137,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Spara som"
     IDS_OPEN_FILE   "Öppna fil"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc
index c2373822680..811bca3c6dc 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc
@@ -137,6 +137,7 @@ STRINGTABLE
     IDS_SAVE_AS     "บันทืก"
     IDS_OPEN_FILE   "แฟ้ม"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc
index 68634bafa9e..ecec4dca279 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc
@@ -137,6 +137,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Ayrı Sakla"
     IDS_OPEN_FILE   "Kütük Aç"
     IDS_SELECT_FOLDER "Dizin Seç"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc
index 25633e2560f..3c2bd8781bc 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "另存新檔"
     IDS_OPEN_FILE   "開啟檔案"
     IDS_SELECT_FOLDER "選擇資料夾"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc
index e96475dcf56..09b6469dab0 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "Зберегти як"
     IDS_OPEN_FILE   "Відкрити файл"
     IDS_SELECT_FOLDER "Select Folder"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc b/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc
index c31c4636942..fbe9feca20c 100644
--- a/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc
+++ b/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc
@@ -138,6 +138,7 @@ STRINGTABLE
     IDS_SAVE_AS     "另存为"
     IDS_OPEN_FILE   "打开文件"
     IDS_SELECT_FOLDER "选择文件夹"
+    IDS_FONT_SIZE_INPUT "Font size has to be a number."
 }
 
 /*
diff --git a/reactos/dll/win32/comdlg32/printdlg.c b/reactos/dll/win32/comdlg32/printdlg.c
index b3ed2b59862..6d5a9547dbf 100644
--- a/reactos/dll/win32/comdlg32/printdlg.c
+++ b/reactos/dll/win32/comdlg32/printdlg.c
@@ -4104,7 +4104,7 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd)
         hr = E_FAIL;
 
     lppd->hDevMode = update_devmode_handleA(lppd->hDevMode, dm);
-    if (!hr && lppd->hDevMode) {
+    if (hr == S_OK && lppd->hDevMode) {
         if (lppd->Flags & PD_RETURNDC) {
             lppd->hDC = CreateDCA(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm);
             if (!lppd->hDC)
@@ -4252,7 +4252,7 @@ HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd)
         hr = E_FAIL;
 
     lppd->hDevMode = update_devmode_handleW(lppd->hDevMode, dm);
-    if (!hr && lppd->hDevMode) {
+    if (hr == S_OK && lppd->hDevMode) {
         if (lppd->Flags & PD_RETURNDC) {
             lppd->hDC = CreateDCW(dbuf->pDriverPath, pbuf->pPrinterName, pbuf->pPortName, dm);
             if (!lppd->hDC)
diff --git a/reactos/dll/win32/comdlg32/resource.h b/reactos/dll/win32/comdlg32/resource.h
index 80c04b17c38..bfb798bacae 100644
--- a/reactos/dll/win32/comdlg32/resource.h
+++ b/reactos/dll/win32/comdlg32/resource.h
@@ -126,12 +126,13 @@
 #define IDC_COLOR_GL     727
 #define IDC_COLOR_BL     728
 
-#define IDS_FONT_SIZE     1200
-#define IDS_SAVE_BUTTON   1201
-#define IDS_SAVE_IN       1202
-#define IDS_SAVE          1203
-#define IDS_SAVE_AS       1204
-#define IDS_OPEN_FILE     1205
-#define IDS_SELECT_FOLDER 1206
+#define IDS_FONT_SIZE       1200
+#define IDS_SAVE_BUTTON     1201
+#define IDS_SAVE_IN         1202
+#define IDS_SAVE            1203
+#define IDS_SAVE_AS         1204
+#define IDS_OPEN_FILE       1205
+#define IDS_SELECT_FOLDER   1206
+#define IDS_FONT_SIZE_INPUT 1207
 
 #define IDS_FAKEDOCTEXT  1300
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 1bbc884b9bc..44a3553d1a3 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -55,7 +55,7 @@ reactos/dll/win32/cabinet             # Synced to WineStaging-1.9.4
 reactos/dll/win32/clusapi             # Synced to WineStaging-1.7.55
 reactos/dll/win32/comcat              # Synced to WineStaging-1.7.55
 reactos/dll/win32/comctl32            # Synced to WineStaging-1.9.4
-reactos/dll/win32/comdlg32            # Synced to WineStaging-1.7.55
+reactos/dll/win32/comdlg32            # Synced to WineStaging-1.9.4
 reactos/dll/win32/compstui            # Synced to WineStaging-1.7.55
 reactos/dll/win32/credui              # Synced to WineStaging-1.7.55
 reactos/dll/win32/crypt32             # Synced to WineStaging-1.7.55