diff --git a/reactos/dll/win32/comdlg32/cdlg.h b/reactos/dll/win32/comdlg32/cdlg.h
index e4fa9c5bc8c..22cd5a21e8a 100644
--- a/reactos/dll/win32/comdlg32/cdlg.h
+++ b/reactos/dll/win32/comdlg32/cdlg.h
@@ -21,7 +21,8 @@
 #ifndef _WINE_DLL_CDLG_H
 #define _WINE_DLL_CDLG_H
 
-#include <wownt32.h>
+#include "dlgs.h"
+#include "wownt32.h"
 
 /* Common dialogs implementation globals */
 #define COMDLG32_Atom	((ATOM)0xa000)	/* MS uses this one to identify props */
@@ -153,6 +154,15 @@ typedef struct {
 
 #define IDS_FAKEDOCTEXT  1300
 
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "commctrl.h"
+#include "shlobj.h"
+#include "shellapi.h"
+
 /* ITEMIDLIST */
 
 extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
@@ -175,7 +185,7 @@ extern BOOL  WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType);
  * Do NOT Export to other programs and dlls
  */
 
-BOOL CC_HookCallChk( LPCHOOSECOLORW lpcc );
+BOOL CC_HookCallChk( const CHOOSECOLORW *lpcc );
 int CC_MouseCheckResultWindow( HWND hDlg, LPARAM lParam );
 LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam );
 LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam );
@@ -183,7 +193,7 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD
 						notifyCode, HWND hwndCtl );
 LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam );
 LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam );
-void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPRECT lprect );
+void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect );
 void CC_PaintSelectedColor( HWND hDlg, COLORREF cr );
 int CC_RGBtoHSL(char c, int r, int g, int b);
 void CC_PaintCross( HWND hDlg, int x, int y);
@@ -192,7 +202,7 @@ int CC_CheckDigitsInEdit( HWND hwnd, int maxval );
 void CC_EditSetHSL( HWND hDlg, int h, int s, int l );
 int CC_HSLtoRGB(char c, int hue, int sat, int lum);
 void CC_EditSetRGB( HWND hDlg, COLORREF cr );
-void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, COLORREF* lpcr );
+void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF* lpcr );
 
 typedef struct
 {
@@ -203,10 +213,10 @@ typedef struct
 } CFn_ENUMSTRUCT, *LPCFn_ENUMSTRUCT;
 
 INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM,
-                  UINT nFontType, LPCHOOSEFONTW lpcf, HWND hwnd,
+                  UINT nFontType, const CHOOSEFONTW *lpcf, HWND hwnd,
                   LPCFn_ENUMSTRUCT e);
 INT AddFontStyle(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *metrics,
-                 UINT nFontType, LPCHOOSEFONTW lpcf, HWND hcmb2, HWND hcmb3,
+                 UINT nFontType, const CHOOSEFONTW *lpcf, HWND hcmb2, HWND hcmb3,
                  HWND hDlg, BOOL iswin16);
 void _dump_cf_flags(DWORD cflags);
 
@@ -217,6 +227,6 @@ LRESULT CFn_WMDrawItem(HWND hDlg, WPARAM wParam, LPARAM lParam);
 LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
                       LPCHOOSEFONTW lpcf);
 LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam,
-                      LPCHOOSEFONTW lpcf);
+                      const CHOOSEFONTW *lpcf);
 
 #endif /* _WINE_DLL_CDLG_H */
diff --git a/reactos/dll/win32/comdlg32/cdlg16.h b/reactos/dll/win32/comdlg32/cdlg16.h
index fbc44d4f509..00d204e7099 100644
--- a/reactos/dll/win32/comdlg32/cdlg16.h
+++ b/reactos/dll/win32/comdlg32/cdlg16.h
@@ -23,7 +23,6 @@
 #ifndef _WINE_DLL_CDLG16_H
 #define _WINE_DLL_CDLG16_H
 
-#define COM_NO_WINDOWS_H
 #include "dlgs.h"
 #include "wine/windef16.h"
 #include "wine/winbase16.h"
diff --git a/reactos/dll/win32/comdlg32/cdlg32.c b/reactos/dll/win32/comdlg32/cdlg32.c
index c927d1eedb1..57f30363977 100644
--- a/reactos/dll/win32/comdlg32/cdlg32.c
+++ b/reactos/dll/win32/comdlg32/cdlg32.c
@@ -19,16 +19,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "commdlg.h"
+#include "cderr.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
+#include "cdlg.h"
+
+
 HINSTANCE	COMDLG32_hInstance = 0;
 
 static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES;
 
-HINSTANCE	SHELL32_hInstance = 0;
-HINSTANCE	SHFOLDER_hInstance = 0;
+static HINSTANCE	SHELL32_hInstance;
+static HINSTANCE	SHFOLDER_hInstance;
 
 /* ITEMIDLIST */
 LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
@@ -52,17 +63,17 @@ BOOL (WINAPI *COMDLG32_SHGetFolderPathW)(HWND,int,HANDLE,DWORD,LPWSTR);
  *	FALSE if sibling could not be loaded or instantiated twice, TRUE
  *	otherwise.
  */
-static const char * GPA_string = "Failed to get entry point %s for hinst = 0x%08x\n";
+static const char GPA_string[] = "Failed to get entry point %s for hinst = %p\n";
 #define GPA(dest, hinst, name) \
 	if(!(dest = (void*)GetProcAddress(hinst,name)))\
 	{ \
-	  ERR((LPSTR)GPA_string, debugstr_a(name), hinst); \
+	  ERR(GPA_string, debugstr_a(name), hinst); \
 	  return FALSE; \
 	}
 
 BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved)
 {
-	TRACE("(%p, %ld, %p)\n", hInstance, Reason, Reserved);
+	TRACE("(%p, %d, %p)\n", hInstance, Reason, Reserved);
 
 	switch(Reason)
 	{
@@ -143,7 +154,7 @@ LPVOID COMDLG32_AllocMem(
  */
 void COMDLG32_SetCommDlgExtendedError(DWORD err)
 {
-	TRACE("(%08lx)\n", err);
+	TRACE("(%08x)\n", err);
         if (COMDLG32_TlsIndex == TLS_OUT_OF_INDEXES)
 	  COMDLG32_TlsIndex = TlsAlloc();
 	if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES)
diff --git a/reactos/dll/win32/comdlg32/cdlg_Bg.rc b/reactos/dll/win32/comdlg32/cdlg_Bg.rc
index 6b0d7a418c1..f990df05ada 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Bg.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Bg.rc
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995 Alexandre Julliard
+ * Copyright 2005 Milko Krachounov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,98 +17,98 @@
  */
 
 /*
- * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
+ * Тук изрично пишеше да не пипам нещо, ама аз го пипнах.
+ * Ако има проблеми някой да ги оправи. 
  */
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Отваряне"
+CAPTION "Отвори"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Файлово &име:", 1090, 6, 6, 76, 9
+ LTEXT "&Име на файл:", 1090, 6, 6, 76, 9
  EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
  LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Папки:", -1, 110, 6, 92, 9
+ LTEXT "&Директории:", -1, 110, 6, 92, 9
  LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
  LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
-/* LTEXT "Файлове от &вид:", 1089, 6, 104, 90, 9*/
- LTEXT "Показване на файлове от вид:", 1089, 6, 104, 90, 9
+ LTEXT "&Тип файлове:", 1089, 6, 104, 90, 9
  COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  LTEXT "&Устройства:", 1091, 110, 104, 92, 9
  COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Отваряне", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Отказ", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Помо&щ", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "Сазмо за &четене", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "Отвори", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Отмени", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Помощ", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "Само за &четене", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Запис като..."
+CAPTION "Съхрани като ..."
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Файлово &име:", 1090, 6, 6, 76, 9
+ LTEXT "&Име на файл:", 1090, 6, 6, 76, 9
  EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
  LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "&Папки", -1, 110, 6, 92, 9
+ LTEXT "&Директории:", -1, 110, 6, 92, 9
  LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
  LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
- LTEXT "Файлове от &вид::", 1089, 6, 104, 90, 9
+ LTEXT "&Тип файлове:", 1089, 6, 104, 90, 9
  COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  LTEXT "&Устройства:", 1091, 110, 104, 92, 9
  COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Запис като", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Отказ", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Помо&щ", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "Съхрани", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Отмени", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Помощ", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
  CHECKBOX "Само за &четене", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
 PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Разпечатване"
+CAPTION "Печат"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "Печатач:", 1088, 6, 6, 40, 9
+ LTEXT "Принтер:", 1088, 6, 6, 40, 9
  LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Област на отпечатване", grp1, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "Вси&чки", rad1, 16, 45, 60, 12
- RADIOBUTTON "Из&бор", rad2, 16, 60, 60, 12
+ GROUPBOX "Разпечатай", grp1, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Всичко", rad1, 16, 45, 60, 12
+ RADIOBUTTON "&Избраното", rad2, 16, 60, 60, 12
  RADIOBUTTON "&Страници", rad3, 16, 75, 60, 12
- DEFPUSHBUTTON "Разпечатване", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Отказ", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Настройка", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "Разпечатай", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Отмени", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Настройки", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
  LTEXT "&От:", 1090, 60, 80, 30, 9
  LTEXT "&До:", 1091, 120, 80, 30, 9
- LTEXT "&Качество на печат:", 1092, 6, 100, 76, 9
+ LTEXT "&Качество:", 1092, 6, 100, 76, 9
  COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Разпечатване във файл", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Стегнат", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Печат във &файл", chx1, 20, 100, 60, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Сгъстено", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
 
 PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Настройка за печат"
+CAPTION "Настройки на печатането"
 FONT 8, "MS Shell Dlg"
 {
- GROUPBOX "Печатач", grp1, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "Под&разбран печатач", rad1, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Specific &Printer", rad2, 16, 50, 80, 12
+ GROUPBOX "Принтер", grp1, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "Принтер по под&разбиране", rad1, 16, 20, 80, 12
+ LTEXT "[няма]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Друг &принтер", rad2, 16, 50, 80, 12
  COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Добре", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Отказ", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Настройка", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Насоченост", grp2, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "Из&правена", rad3, 50, 100, 40, 12
- RADIOBUTTON "&Легнала", rad4, 50, 115, 40, 12
+ DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Отмени", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Настройки", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Ориентация", grp2, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "Пор&трет", rad3, 50, 100, 40, 12
+ RADIOBUTTON "Пейза&ж", rad4, 50, 115, 40, 12
  ICON "LANDSCAP", stc10, 10, 95, 32, 32
  ICON "PORTRAIT", stc11, 10, 95, 32, 32
- GROUPBOX "Хартия", grp3, 120, 85, 180, 50, BS_GROUPBOX
+ GROUPBOX "Paper", grp3, 120, 85, 180, 50, BS_GROUPBOX
  LTEXT "Раз&мер", 1089, 130, 95, 30, 9
  LTEXT "&Източник", 1090, 130, 110, 30, 9
  COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
@@ -124,165 +124,165 @@ FONT 8, "MS Shell Dlg"
     LTEXT           "&Шрифт:",stc1 ,6,3,40,9
     COMBOBOX        cmb1, 6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Вид шрифт:",stc2 ,108,3,44,9
+    LTEXT           "&Стил:",stc2 ,108,3,44,9
     COMBOBOX        cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "&Размер:",stc3,179,3,30,9
+    LTEXT           "Ра&змер:",stc3,179,3,30,9
     COMBOBOX        cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
-    DEFPUSHBUTTON   "Добре",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
-    PUSHBUTTON      "Отказ",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Прилагане", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "Помо&щ" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
-    GROUPBOX        "Украса",grp1,6,72,84,34,WS_GROUP
-    CHECKBOX	    "За&чертан", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "&Подчертан", chx2, 10,94,50,10, BS_AUTOCHECKBOX
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Отмени",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "При&ложи", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Помощ" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
+    GROUPBOX        "Ефекти",grp1,6,72,84,34,WS_GROUP
+    CHECKBOX	    "&Зачертан", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "Под&чертан", chx2, 10,94,50,10, BS_AUTOCHECKBOX
     LTEXT           "&Цвят:", stc4 ,6,110,30,9
     COMBOBOX        cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Образец",grp2,98,72,120,36,WS_GROUP
-    CTEXT           "АаБбЮюЯя",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
-    LTEXT           "&Знаков набор:",stc7 ,98,114,40,9
+    GROUPBOX        "Пример",grp2,98,72,120,36,WS_GROUP
+    CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+    LTEXT           "&Азбука:",stc7 ,98,114,40,9
     COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
 
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 314, 185
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Цвят"
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Основни цветове:",   1088, 4,    4,  140, 10
- LTEXT "&Собствени цветове:",  1089, 4,   106, 140, 10
- LTEXT "Цвят |  &Плътен",  1090, 150, 151,  48, 10
- LTEXT   "&Червен:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Зелен:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Син:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Hue:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Потребителски цветове:",  1089, 4,   106, 140, 10
+ LTEXT "Цвят|&Плътен",  1090, 150, 151,  48, 10
+ LTEXT   "&Червено:", 726 /*1094*/,261,126,32,10
+ EDITTEXT 706, 295,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Зелено:",727/*1095*/,261,140,32,10
+ EDITTEXT 707, 295,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Синьо:",728 /*1096*/,261,154,32,10
+ EDITTEXT 708, 295,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Тон:" ,723 /*1091*/,197,126,42,10
+ EDITTEXT 703, 241,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Наситеност:" ,724 /*1092*/,197,140,42,10
+ EDITTEXT 704, 241,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Осветеност:" ,725 /*1093*/,197,154,42,10
+ EDITTEXT 705, 241,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
  CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
  CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
- DEFPUSHBUTTON "Добре",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Отказ", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "OK",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Отмени", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Помощ", pshHelp,100,166, 44, 14
- PUSHBUTTON "&Добавяне към собствените цветове",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Задаване на собствени цветове >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
+ PUSHBUTTON "&Добави потребителски цвят",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Определи цветове >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&П",713,300,200,4,14   /* just a dummy:  'П' is  like  &П  in "&Плътен"  */
 }
 
 
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 281, 62
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Търсене"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Търсене на:", -1, 4, 8, 42, 8
- EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Съвпадение на &целите думи", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Отчитане на &глАвНоСТта", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Посока", grp1, 107, 26, 68, 28
- CONTROL "На&горе", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "На&долу", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ LTEXT "Търси &за:", -1, 4, 8, 42, 8
+ EDITTEXT edt1, 47, 7, 158, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Само цели думи", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Чувствителен регистър", chx2, 4, 42, 96, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Посока", grp1, 107, 26, 98, 28
+ CONTROL "На&горе", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12
+ CONTROL "На&долу", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 158, 38, 40, 12
 
- DEFPUSHBUTTON "&Търсене на &следващ", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Отказ", IDCANCEL	 , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Помо&щ", pshHelp	 , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "&Намери следващ", IDOK, 212,  5, 65, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Отмени", IDCANCEL	 , 212, 23, 65, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Помощ", pshHelp	 , 212, 45, 65, 14, WS_GROUP | WS_TABSTOP
 }
 
 
-REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 281, 94
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Замяна"
 FONT 8, "MS Shell Dlg"
 {
- LTEXT "&Търсене на:", -1, 4, 9, 48, 8
- EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Търси &за:", -1, 4, 9, 48, 8
+ EDITTEXT edt1, 47, 7, 158, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT "За&мяна с:", -1, 4, 26, 48, 8
- EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Съвпадение на &целите думи", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Отчитане на &глАвНоСТта", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ EDITTEXT edt2, 47, 24, 158, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Само цели думи", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Чувствителен регистър", chx2, 5, 62, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 
- DEFPUSHBUTTON "Търсене на &следващ", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "За&мяна", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Замяна на вси&чки", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Отказ", IDCANCEL	 , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Помо&щ", pshHelp	 , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "&Намери следващ", IDOK, 212,  4, 65, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "&Замени", psh1	 , 212, 21, 65, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Замени &всички", psh2 , 212, 38, 65, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Отмяна", IDCANCEL	 , 212, 55, 65, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Помощ", pshHelp	 , 212, 75, 65, 14, WS_GROUP | WS_TABSTOP
 }
 
 
-PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 321, 186
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
       DS_CONTEXTHELP | DS_3DLOOK
-CAPTION "Разпечатване"
+CAPTION "Печат"
 FONT 8, "MS Shell Dlg"
 {
-    DEFPUSHBUTTON   "Добре",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
-    PUSHBUTTON      "Отказ", IDCANCEL, 232,164, 48,14, WS_GROUP
-    PUSHBUTTON      "Помо&щ",  pshHelp,  50, 161, 48,14, WS_GROUP
+    DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Отмени", IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "&Помощ",  pshHelp,  50, 161, 48,14, WS_GROUP
 
-    GROUPBOX        "Печатач",        grp4,   8,  4, 272,84, WS_GROUP
-    CONTROL         "Разпечатване във &файл", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
-    PUSHBUTTON      "&Свойства",    psh2, 212, 17,  60,14, WS_GROUP
+    GROUPBOX        "Принтер",        grp4,   8,  4, 305,84, WS_GROUP
+    CONTROL         "Печат във &файл", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,217,70,74,12
+    PUSHBUTTON      "Сво&йства",    psh2, 212, 17,  60,14, WS_GROUP
     LTEXT           "&Име:",         stc6,  16, 20,  36,8
     COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     LTEXT           "Състояние:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Вид:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Къде:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Забележка:",       stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Remark",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Текст",    stc12, 57, 36, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Тип:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Текст",     stc11, 57, 48, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Място:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Текст", stc14, 57, 60, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Коментар:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Текст",   stc13, 57, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
-    GROUPBOX        "Бройки",         grp2, 160, 92, 120,64, WS_GROUP
-    LTEXT           "Брой разпечатвания:",stc5,168,108,68,8
-    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
-    CONTROL         "Под&реждане",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
-    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+    GROUPBOX        "Копия",         grp2, 172, 92, 141,64, WS_GROUP
+    LTEXT           "Брой &копия:",stc5,180,108,68,8
+    ICON            "",               ico3, 174,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "Под&реждане",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,252,130,57,12
+    EDITTEXT                          edt3, 252,106,  32,12, WS_GROUP | ES_NUMBER
 
-    GROUPBOX        "Разпечатване на",    grp1,   8,92,  144,64, WS_GROUP
-    CONTROL         "Вси&чки",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
-    CONTROL         "&Страници",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    GROUPBOX        "Разпечатай",    grp1,   8,92,  156,64, WS_GROUP
+    CONTROL         "&Всичко",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "&Страници",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,48,12
     CONTROL         "&Избраното",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
-    EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
-    EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
-    RTEXT           "&от:",         stc2,  52,124,  20,8
-    RTEXT           "&до:",           stc3, 100,124,  16,8
+    EDITTEXT                          edt1,  86,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT                          edt2, 130,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "&от:",         stc2,  64,124,  20,8
+    RTEXT           "&до:",           stc3, 112,124,  16,8
 }
 
 PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
       DS_CONTEXTHELP | DS_3DLOOK
-CAPTION "Печатна настройка"
+CAPTION "Настройки на печатането"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON   "Добре",IDOK,180,156,48,14,WS_GROUP
-    PUSHBUTTON      "Отказ",IDCANCEL,232,156,48,14
+    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
+    PUSHBUTTON      "Отмени",IDCANCEL,232,156,48,14
 /*    PUSHBUTTON      "Мрежа...", psh5, 284,156,48,14 */
 
-    GROUPBOX        "Печатач",        grp4,   8,  4, 272,84, WS_GROUP
-    PUSHBUTTON      "&Свойства",    psh2, 212, 17,  60,14, WS_GROUP
+    GROUPBOX        "Принтер",        grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "Сво&йства",    psh2, 212, 17,  60,14, WS_GROUP
     LTEXT           "&Име:",         stc6,  16, 20,  36,8
     COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     LTEXT           "Състояние:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Вид:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Къде:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Забележка:",       stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "Dummy Remark",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Текст",    stc12, 57, 36, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Тип:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Текст",     stc11, 57, 48, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Място:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Текст", stc14, 57, 60, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Коментар:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Текст",   stc13, 57, 72, 219,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
     GROUPBOX        "Хартия",          grp2,   8, 92, 164,56, WS_GROUP
     LTEXT           "Раз&мер:",         stc2,  16,108,  36, 8
@@ -290,188 +290,186 @@ BEGIN
     LTEXT           "&Източник:",       stc3,  16,128,  36, 8
     COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
 
-    GROUPBOX        "Насоченост",    grp1, 180, 92, 100,56, WS_GROUP
+    GROUPBOX        "Ориентация",    grp1, 180, 92, 100,56, WS_GROUP
     ICON            "",               ico1, 195,112,  18,20, WS_GROUP
-    CONTROL         "Из&правена",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
-    CONTROL         "&Легнала",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+    CONTROL         "Пор&трет",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "Пейза&ж",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
 END
 
 PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Setup Page"
+CAPTION "Настройки на страницата"
 FONT 8, "MS Shell Dlg"
 BEGIN
   CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
   CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
   CONTROL "", rct3, "Static", SS_GRAYRECT,  84, 88, 80, 4
-  GROUPBOX "Paper", grp2, 8, 96, 224, 56, BS_GROUPBOX
-  LTEXT "&Size:", stc2, 16, 112, 36, 8
+  GROUPBOX "Хартия", grp2, 8, 96, 224, 56, BS_GROUPBOX
+  LTEXT "Раз&мер:", stc2, 16, 112, 36, 8
   COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
-  LTEXT "&Tray:", stc3, 16, 132, 36, 8
+  LTEXT "&Контейнер:", stc3, 16, 132, 36, 8
   COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Насоченост", grp1, 8, 156, 64, 56, BS_GROUPBOX
-  AUTORADIOBUTTON "Из&правена", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
-  AUTORADIOBUTTON "&Легнала", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
-  GROUPBOX "Полета", grp4, 80, 156, 152, 56, BS_GROUPBOX
-  LTEXT "&Ляво:", stc15, 88, 172, 21, 8
+  GROUPBOX "Ориентация", grp1, 8, 156, 64, 56, BS_GROUPBOX
+  AUTORADIOBUTTON "Пор&трет", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "Пейза&ж", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+  GROUPBOX "Рамки", grp4, 80, 156, 152, 56, BS_GROUPBOX
+  LTEXT "&Лява:", stc15, 88, 172, 21, 8
   EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  LTEXT "&Дясно:", stc16, 159, 172, 27, 8
+  LTEXT "&Дясна:", stc16, 159, 172, 27, 8
   EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  LTEXT "&Горно:", stc17, 88, 192, 21, 8
+  LTEXT "&Горна:", stc17, 88, 192, 21, 8
   EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  LTEXT "&Долно:", stc18, 159, 192, 23, 8
+  LTEXT "Д&олна:", stc18, 159, 192, 23, 8
   EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  DEFPUSHBUTTON "Добре", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
-  PUSHBUTTON "Отказ", IDCANCEL, 126, 220, 50, 14
-  PUSHBUTTON "&Печатач...", psh3, 184, 220, 48, 14
+  DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+  PUSHBUTTON "Отмени", IDCANCEL, 126, 220, 50, 14
+  PUSHBUTTON "&Принтер...", psh3, 184, 220, 48, 14
 END
 
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
-CAPTION "Отваряне"
+CAPTION "Отвори"
 FONT 8, "MS Shell Dlg"
 {
-    LTEXT	"Търсене &в:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
+    LTEXT	"М&ясто:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
 
     LTEXT	"" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
     LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
 
-    LTEXT	"Файлово &име",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    LTEXT	"&Име на файл:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
     EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
 
-    LTEXT	"Файлове от &вид:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    LTEXT	"&Тип файлове:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
     COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
-    CONTROL	"Отваряне само за &четене",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+    CONTROL	"Само за &четене",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
 
-    DEFPUSHBUTTON	"&Отваряне",		 IDOK,222,110,50,14
-    PUSHBUTTON		"Отказ",		 IDCANCEL,222,128,50,14
-    PUSHBUTTON		"Помо&щ",		 pshHelp,222,145,50,14
+    DEFPUSHBUTTON	"&Отвори",		 IDOK,222,110,50,14
+    PUSHBUTTON		"Отмени",		 IDCANCEL,222,128,50,14
+    PUSHBUTTON		"&Помощ",		 pshHelp,222,145,50,14
 }
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_ABOUTBOX            "&За FolderPicker Test"
-    IDS_DOCUMENTFOLDERS     "Папки за документи"
-    IDS_PERSONAL            "Документи"
-    IDS_FAVORITES           "Любимки"
+    IDS_ABOUTBOX            "&Относно FolderPicker теста"
+    IDS_DOCUMENTFOLDERS     "Папки с документи"
+    IDS_PERSONAL            "Моите документи"
+    IDS_FAVORITES           "Отметки"
     IDS_PATH                "Системен път"
-    IDS_DESKTOP             "Работна площ"
+    IDS_DESKTOP             "Работен плот"
     IDS_FONTS               "Шрифтове"
-    IDS_MYCOMPUTER          "Моят компютър"
+    IDS_MYCOMPUTER          "Моя компютър"
 }
 
 STRINGTABLE DISCARDABLE
 {
     IDS_SYSTEMFOLDERS       "Системни папки"
-    IDS_LOCALHARDRIVES      "Местни твърди дискове"
-    IDS_FILENOTFOUND        "Ненамерен файл"
-    IDS_VERIFYFILE          "Проверете, дали е зададено правилното файлово име"
-    IDS_CREATEFILE          "Файлът не съществува\nДа го създам ли"
-    IDS_OVERWRITEFILE       "Файлът вече съществува.\nДа го заменя ли?"
-    IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path"
-    IDS_INVALID_FILENAME    "Файловите имена не могат да съдържат следните знаци: \n                          / : < > |"
+    IDS_LOCALHARDRIVES      "Локални устройства"
+    IDS_FILENOTFOUND        "Файлът не е намерен"
+    IDS_VERIFYFILE          "Проверете дали сте въвели правилно името на файла"
+    IDS_CREATEFILE          "Файлът не съществува.\nИскате ли да го създадете?"
+    IDS_OVERWRITEFILE       "Файлът вече съществува.\nИскате ли да го замените?"
+    IDS_INVALID_FILENAME_TITLE "Невалидни знаци в пътя"
+    IDS_INVALID_FILENAME    "Името на файла не може да съдържа следните символи: \n                          / : < > |"
     IDS_PATHNOTEXISTING     "Пътят не съществува"
     IDS_FILENOTEXISTING     "Файлът не съществува"
 }
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_UPFOLDER         "Ниво нагоре"
-    IDS_NEWFOLDER        "Създаване на нова папка"
+    IDS_UPFOLDER         "Едно ниво нагоре"
+    IDS_NEWFOLDER        "Създай нова папка"
     IDS_LISTVIEW         "Списък"
-    IDS_REPORTVIEW       "Подробен изглед"
-    IDS_TODESKTOP        "Обзор на работната площ"
+    IDS_REPORTVIEW       "Подробности"
+    IDS_TODESKTOP        "Премини към работния плот"
 }
 
 STRINGTABLE DISCARDABLE
 {
-    PD32_PRINT_TITLE       "Разпечатване"
+    PD32_PRINT_TITLE       "Печат"
 
-    PD32_VALUE_UREADABLE                  "Нечетима стойност"
-    PD32_INVALID_PAGE_RANGE "This value does not lie within the page range.\n\
-Please enter a value between %d and %d."
-    PD32_FROM_NOT_ABOVE_TO                "The 'from' entry cannot exceed the \
-'to' entry."
-    PD32_MARGINS_OVERLAP                  "Margins overlap or fall outside \
-Paper boundaries.\nPlease reenter margins."
-    PD32_NR_OF_COPIES_EMPTY               "The number of 'Number of copies' \
-value cannot be empty."
-    PD32_TOO_LARGE_COPIES                 "This large number of copies is not \
-supported by your printer.\nPlease enter a value between 1 and %d."
-    PD32_PRINT_ERROR                      "Появисе се грешка в печатача."
-    PD32_NO_DEFAULT_PRINTER               "No default printer defined."
-    PD32_CANT_FIND_PRINTER                "Cannot find the printer."
-    PD32_OUT_OF_MEMORY                    "Паметта изчерпана."
+    PD32_VALUE_UREADABLE                  "Нечетим елемент"
+    PD32_INVALID_PAGE_RANGE "Невалиден номер на страница.\n\
+Използвайте стойности между %d и %d."
+    PD32_FROM_NOT_ABOVE_TO                "Стойността 'от' не може да е по-голяма от \
+стойността 'до'."
+    PD32_MARGINS_OVERLAP                  "Границите се препокриват или излизат извън \
+края на страницата.\nКоригирайте ги."
+    PD32_NR_OF_COPIES_EMPTY               "Трябва да въведете брой копия, които \
+да бъдат отпечатани."
+    PD32_TOO_LARGE_COPIES                 "Въвели сте по-голям брой копия, отколкото \
+вашият принтер поддържа.\nВъведете число между 1 и %d."
+    PD32_PRINT_ERROR                      "Появи се грешка при печатането."
+    PD32_NO_DEFAULT_PRINTER               "Не е зададен принтер по подразбиране."
+    PD32_CANT_FIND_PRINTER                "Принтерът не може да бъде намерен."
+    PD32_OUT_OF_MEMORY                    "Недостиг на памет."
     PD32_GENERIC_ERROR                    "Появи се грешка."
-    PD32_DRIVER_UNKNOWN                   "Unknown printer driver."
-    PD32_NO_DEVICES                       "Before you can perform printer-related tasks \
-such as page setup or printing a document, you need to install a printer. \
-Please install one and retry."
+    PD32_DRIVER_UNKNOWN                   "Непознат драйвер за принтера."
+    PD32_NO_DEVICES                       "Преди да можете да извършвате опареции, \
+свързани с печат като настройка на страницата или разпечатване на документ, \
+само ако имате инсталиран принтер. Инсталирайте принтер и опитайте отново."
 
-    PD32_DEFAULT_PRINTER                  "Подразбран печатач; "
-    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "На опашката има %d документа"
-    PD32_MARGINS_IN_INCHES                "Полета [цолове]"
-    PD32_MARGINS_IN_MILIMETERS            "Полета [мм]"
+    PD32_DEFAULT_PRINTER                  "Принтер по подразбиране; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "Има %d документа в опашката"
+    PD32_MARGINS_IN_INCHES                "Граници [инчове]"
+    PD32_MARGINS_IN_MILIMETERS            "Граници [мм]"
     PD32_MILIMETERS                       "мм"
 
-    PD32_PRINTER_STATUS_READY             "Готов"
-    PD32_PRINTER_STATUS_PAUSED            "Задържан; "
+    PD32_PRINTER_STATUS_READY             "Готово"
+    PD32_PRINTER_STATUS_PAUSED            "Преустановено; "
     PD32_PRINTER_STATUS_ERROR             "Грешка; "
-    PD32_PRINTER_STATUS_PENDING_DELETION  "Изтриването предстои; "
-    PD32_PRINTER_STATUS_PAPER_JAM         "Засядане на хартия; "
-    PD32_PRINTER_STATUS_PAPER_OUT         "Недостик на хартия; "
-    PD32_PRINTER_STATUS_MANUAL_FEED       "Ръчно листоподаване; "
-    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Затруднения с хартията; "
-    PD32_PRINTER_STATUS_OFFLINE           "Печатачът изключен; "
-    PD32_PRINTER_STATUS_IO_ACTIVE         "Работещ В/И; "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "Предстоящо изтриване; "
+    PD32_PRINTER_STATUS_PAPER_JAM         "Задръстване на хартията; "
+    PD32_PRINTER_STATUS_PAPER_OUT         "Няма хартия; "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "Поставете хартия ръчно; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Проблем с хартията; "
+    PD32_PRINTER_STATUS_OFFLINE           "Принтера изключен; "
+    PD32_PRINTER_STATUS_IO_ACTIVE         "Вход/Изход активен; "
     PD32_PRINTER_STATUS_BUSY              "Зает; "
-    PD32_PRINTER_STATUS_PRINTING          "Печата; "
-    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Изходният съдържател е пълен; "
-    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Недостъпен; "
-    PD32_PRINTER_STATUS_WAITING           "Изчаква; "
-    PD32_PRINTER_STATUS_PROCESSING        "Работи; "
-    PD32_PRINTER_STATUS_INITIALIZING      "Подготва се; "
-    PD32_PRINTER_STATUS_WARMING_UP        "Загрява; "
-    PD32_PRINTER_STATUS_TONER_LOW         "Оцветителят свършва; "
-    PD32_PRINTER_STATUS_NO_TONER          "Няма оцветител; "
-    PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
+    PD32_PRINTER_STATUS_PRINTING          "Печати; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Изходния контейнер е пълен; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Не е наличен; "
+    PD32_PRINTER_STATUS_WAITING           "Изчакване; "
+    PD32_PRINTER_STATUS_PROCESSING        "Обработка; "
+    PD32_PRINTER_STATUS_INITIALIZING      "Подготовка; "
+    PD32_PRINTER_STATUS_WARMING_UP        "Загряване; "
+    PD32_PRINTER_STATUS_TONER_LOW         "Тонера на привършване; "
+    PD32_PRINTER_STATUS_NO_TONER          "Няма тонер; "
+    PD32_PRINTER_STATUS_PAGE_PUNT         "Подаване на хартията; "
     PD32_PRINTER_STATUS_USER_INTERVENTION "Прекъснато от потребителя; "
     PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Недостиг на памет; "
-    PD32_PRINTER_STATUS_DOOR_OPEN         "Вратата на печатача е отворена; "
-    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Неизвестен печатов сървър; "
-    PD32_PRINTER_STATUS_POWER_SAVE        "Енергоспестяващо състояние; "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "Капака на принтера е отворен; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Неизвестен принтер сървър; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "Режим на пестене на енергия; "
 }
 
 STRINGTABLE DISCARDABLE /* Color names */
 {
-    IDS_COLOR_BLACK     "Черен"
-    IDS_COLOR_MAROON    "Червено- кафяв"
+    IDS_COLOR_BLACK     "Черно"
+    IDS_COLOR_MAROON    "Шатен" /* Maroon? Червеникаво кафяв? */
     IDS_COLOR_GREEN     "Зелен"
     IDS_COLOR_OLIVE     "Маслинен"
-    IDS_COLOR_NAVY      "Морско син"
-    IDS_COLOR_PURPLE    "Лилав"
-/*    IDS_COLOR_TEAL      "Teal"*/
-    IDS_COLOR_TEAL      "Патладжанен"
+    IDS_COLOR_NAVY      "Тъмносин"
+    IDS_COLOR_PURPLE    "Морав"
+    IDS_COLOR_TEAL      "Синьозелен"
     IDS_COLOR_GRAY      "Сив"
-    IDS_COLOR_SILVER    "Сребрист"
+    IDS_COLOR_SILVER    "Сребърен"
     IDS_COLOR_RED       "Червен"
-/*    IDS_COLOR_LIME      "Lime" */
-    IDS_COLOR_LIME      "Варов"
+    IDS_COLOR_LIME      "Жълтозелен" /* Бях го кръстил Лимонен, но ми убиха детските мечти, лимона не бил жълтозелен */
     IDS_COLOR_YELLOW    "Жълт"
     IDS_COLOR_BLUE      "Син"
-    IDS_COLOR_FUCHSIA   "Fuchsia"
-    IDS_COLOR_AQUA      "Синьозелен"
-    IDS_COLOR_WHITE     "Бял"
+    IDS_COLOR_FUCHSIA   "Пурпурен"  /* Бах'мааму */
+    IDS_COLOR_AQUA      "Аквамарин" /* Зеленосин */
+    IDS_COLOR_WHITE     "Бяло"
 }
 
 STRINGTABLE DISCARDABLE
 {
-    IDS_FONT_SIZE   "Изерете размер на шрифта между %d и %d точки."
-    IDS_SAVE_BUTTON "&Запис"
-    IDS_SAVE_IN     "Запис &в:"
-    IDS_SAVE        "Запис"
-    IDS_SAVE_AS     "Запис като"
-    IDS_OPEN_FILE   "Отваряне на файл"
+    IDS_FONT_SIZE   "Изберете размер на шрифта между %d и %d пункта."
+    IDS_SAVE_BUTTON "&Съхрани"
+    IDS_SAVE_IN     "Съхрани &в:"
+    IDS_SAVE        "Съхрани"
+    IDS_SAVE_AS     "Съхрани като"
+    IDS_OPEN_FILE   "Отвори файл"
 }
diff --git a/reactos/dll/win32/comdlg32/cdlg_Ca.rc b/reactos/dll/win32/comdlg32/cdlg_Ca.rc
index 243dca130cc..adf60de4c5b 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Ca.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Ca.rc
@@ -156,17 +156,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "Colors person&alitzats:", 1089, 4, 106, 140, 10
  LTEXT "Color Sтl&id", 1090, 150, 151, 48, 10
  LTEXT   "&Roig:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Verd:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "Bla&u:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Tint:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Llum.:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
diff --git a/reactos/dll/win32/comdlg32/cdlg_Da.rc b/reactos/dll/win32/comdlg32/cdlg_Da.rc
index 0b85a824266..b5bc3ab91ae 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Da.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Da.rc
@@ -156,17 +156,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "&Selvvalgte farver:",  1089, 4,   106, 140, 10
  LTEXT "&Ensfarvet",  1090, 150, 151,  48, 10
  LTEXT   "&Rшd:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Grшn:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Blе:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Intensitet:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Farvemжtning:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Lysstyrke:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
diff --git a/reactos/dll/win32/comdlg32/cdlg_De.rc b/reactos/dll/win32/comdlg32/cdlg_De.rc
index b995d7ee88d..bdb35d61ef4 100644
--- a/reactos/dll/win32/comdlg32/cdlg_De.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_De.rc
@@ -187,17 +187,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "Selbs&tdefinierte Farben:",  1089, 4,   106, 140, 10
  LTEXT "Farbe |  B&asis",  1090, 150, 151,  48, 10
  LTEXT   "&Rot:", 726 ,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Grьn:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Blau:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Farbe:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Sдtt:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "H&ell:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
diff --git a/reactos/dll/win32/comdlg32/cdlg_Es.rc b/reactos/dll/win32/comdlg32/cdlg_Es.rc
index 53d9d3e5f76..6ee4881d778 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Es.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Es.rc
@@ -389,7 +389,7 @@ STRINGTABLE DISCARDABLE
 
     PD32_VALUE_UREADABLE                  "Entrada ilegible"
     PD32_INVALID_PAGE_RANGE "Este valor no concuerda con el rango de la \
-pбgina.\n Por favor, introduzca un valor entre %d y %d."
+pбgina.\n\ Por favor, introduzca un valor entre %d y %d."
     PD32_FROM_NOT_ABOVE_TO                "La entrada 'desde' no puede exceder \
 a la entrada 'hasta'."
     PD32_MARGINS_OVERLAP                  "Los mбrgenes se superponen o quedan \
diff --git a/reactos/dll/win32/comdlg32/cdlg_Fi.rc b/reactos/dll/win32/comdlg32/cdlg_Fi.rc
index 6bd2a784c36..958827e6dff 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Fi.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Fi.rc
@@ -157,17 +157,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "&Muokatut vдrit:",  1089, 4,   106, 140, 10
  LTEXT "Vдri|&Tasainen",    1090, 150, 151,  48, 10
  LTEXT   "&Pun:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Vihr:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "Si&n:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Sдvy:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Kyll:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "K&irkk:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
diff --git a/reactos/dll/win32/comdlg32/cdlg_Fr.rc b/reactos/dll/win32/comdlg32/cdlg_Fr.rc
index 4f7c9ec4eeb..a47048d5752 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Fr.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Fr.rc
@@ -160,17 +160,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "&Couleurs personnalisйes:",  1089, 4,   106, 140, 10
  LTEXT "Couleur |  &Uni",  1090, 150, 151,  48, 10
  LTEXT   "&Rouge:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Vert:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "Bl&eu:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Teinte:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Lum.:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
diff --git a/reactos/dll/win32/comdlg32/cdlg_Hu.rc b/reactos/dll/win32/comdlg32/cdlg_Hu.rc
index 04dfa0c5253..b11b0902d68 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Hu.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Hu.rc
@@ -155,17 +155,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "&Egyedi szнnek:",  1089, 4,   106, 140, 10
  LTEXT "Szнn |  &Tцmцr",  1090, 150, 151,  48, 10
  LTEXT   "&Vцrцs:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Zцld:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Kйk:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Hue:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
diff --git a/reactos/dll/win32/comdlg32/cdlg_It.rc b/reactos/dll/win32/comdlg32/cdlg_It.rc
index 801f7809bd3..ed086f71560 100644
--- a/reactos/dll/win32/comdlg32/cdlg_It.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_It.rc
@@ -158,17 +158,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "Colori &Utente:",  1089, 4,   106, 140, 10
  LTEXT "Colore |  Sol&ido",  1090, 150, 151,  48, 10
  LTEXT   "&Rosso:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Verde:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Blu:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Tinta:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
diff --git a/reactos/dll/win32/comdlg32/cdlg_Ja.rc b/reactos/dll/win32/comdlg32/cdlg_Ja.rc
index 76af67ea199..811197a3a9f 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Ja.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Ja.rc
@@ -156,17 +156,17 @@ FONT 9, "MS UI Gothic"
  LTEXT "Ќмђ¬‚µ‚ЅђF(&C):",  1089, 4,   106, 140, 10
  LTEXT "ђF |",  1090, 150, 151,  48, 10
  LTEXT   "ђФ(&R):", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "—О(&G):",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "ђВ(&B):",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "ђFЌ‡‚ў(&U):" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "‘N‚в‚©‚і(&S):" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "–ѕ‚й‚і(&L):" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
diff --git a/reactos/dll/win32/comdlg32/cdlg_Ko.rc b/reactos/dll/win32/comdlg32/cdlg_Ko.rc
index 14ae5d5b2e6..46f91e1afd1 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Ko.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Ko.rc
@@ -22,7 +22,7 @@
  * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
  */
 
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -37,9 +37,9 @@ FONT 9, "MS Shell Dlg"
  LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
  LTEXT "ЖДАП ЗьЅД ёс·П(&T):", 1089, 6, 104, 90, 9
  COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "µе¶уАМєк(&v):", 1091, 110, 104, 92, 9
+ LTEXT "µе¶уАМєк(&V):", 1091, 110, 104, 92, 9
  COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "Open", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "ї­±в", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "ГлјТ", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "µµїтё»(&H)", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
  CHECKBOX "АР±в Аьїл(&R)", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
@@ -59,7 +59,7 @@ FONT 9, "MS Shell Dlg"
  LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
  LTEXT "ЖДАП ЗьЅД ёс·П(&T):", 1089, 6, 104, 90, 9
  COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "µе¶уАМєк(&v):", 1091, 110, 104, 92, 9
+ LTEXT "µе¶уАМєк(&V):", 1091, 110, 104, 92, 9
  COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  DEFPUSHBUTTON "ґЩёҐ АМё§Аё·О АъАе", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "ГлјТ", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
@@ -77,7 +77,7 @@ FONT 9, "MS Shell Dlg"
  LTEXT "", 1089, 60, 6, 150, 9
  GROUPBOX "АОјв №ьА§", grp1, 6, 30, 160, 65, BS_GROUPBOX
  RADIOBUTTON "ёрµО(&A)", rad1, 16, 45, 60, 12
- RADIOBUTTON "ј±ЕГ(&e)", rad2, 16, 60, 60, 12
+ RADIOBUTTON "ј±ЕГ(&E)", rad2, 16, 60, 60, 12
  RADIOBUTTON "ВК(&P)", rad3, 16, 75, 60, 12
  DEFPUSHBUTTON "АОјв", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "ГлјТ", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
@@ -86,7 +86,7 @@ FONT 9, "MS Shell Dlg"
  LTEXT "іЎ(&T):", 1091, 120, 80, 30, 9
  LTEXT "АОјв З°Бъ(&Q):", 1092, 6, 100, 76, 9
  COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "ЖДАП·О АОјв(&l)", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "ЖДАП·О АОјв(&L)", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  CHECKBOX "ЖшАМ Бј°Ф", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
@@ -105,12 +105,12 @@ FONT 9, "MS Shell Dlg"
  PUSHBUTTON "ГлјТ", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "јіБ¤(&S)", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
  GROUPBOX "№жЗв", grp2, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "јј·О(&r)", rad3, 50, 100, 40, 12
+ RADIOBUTTON "јј·О(&R)", rad3, 50, 100, 40, 12
  RADIOBUTTON "°Ў·О(&L)", rad4, 50, 115, 40, 12
  ICON "LANDSCAP", stc10, 10, 95, 32, 32
  ICON "PORTRAIT", stc11, 10, 95, 32, 32
  GROUPBOX "БѕАМ", grp3, 120, 85, 180, 50, BS_GROUPBOX
- LTEXT "Е©±в(&z)", 1089, 130, 95, 30, 9
+ LTEXT "Е©±в(&Z)", 1089, 130, 95, 30, 9
  LTEXT "їшє»(&S)", 1090, 130, 110, 30, 9
  COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
@@ -125,7 +125,7 @@ FONT 9, "MS Shell Dlg"
     LTEXT           "±ЫІГ(&F):",stc1 ,6,3,40,9
     COMBOBOX        cmb1, 6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
-    LTEXT           "±ЫІГ ЅєЕёАП(&y):",stc2 ,108,3,44,9
+    LTEXT           "±ЫІГ ЅєЕёАП(&Y):",stc2 ,108,3,44,9
     COMBOBOX        cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
     LTEXT           "Е©±в(&S):",stc3,179,3,30,9
@@ -136,14 +136,14 @@ FONT 9, "MS Shell Dlg"
     PUSHBUTTON      "ґхЗП±в(&A)", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
     PUSHBUTTON      "µµїтё»(&H)" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
     GROUPBOX        "Иї°ъ",grp1,6,72,84,34,WS_GROUP
-    CHECKBOX	    "ГлјТј±(&k)", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX	    "ГлјТј±(&K)", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
     CHECKBOX 	    "№ШБЩ(&U)", chx2, 10,94,50,10, BS_AUTOCHECKBOX
     LTEXT           "»ц»у(&C):", stc4 ,6,110,30,9
     COMBOBOX        cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "»щЗГ",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
-    LTEXT           "ЅєЕ©ёіЖ®(&i):",stc7 ,98,114,40,9
+    LTEXT           "ЅєЕ©ёіЖ®(&I):",stc7 ,98,114,40,9
     COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
@@ -156,7 +156,7 @@ FONT 9, "MS Shell Dlg"
 {
  LTEXT "±вє» »ц»у(&B):",   1088, 4,    4,  140, 10
  LTEXT "»зїлАЪ Б¤АЗ »ц»у(&C):",  1089, 4,   106, 140, 10
- LTEXT "»ц»у | ґЬ»ц(&i)",  1090, 150, 151,  48, 10
+ LTEXT "»ц»у | ґЬ»ц(&I)",  1090, 150, 151,  48, 10
  LTEXT   "»Ў°­(&R):", 726 /*1094*/,249,126,24,10
  EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "ім»ц(&G):",727/*1095*/,249,140,24,10
@@ -188,7 +188,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "ГЈ±в"
 FONT 9, "MS Shell Dlg"
 {
- LTEXT "ГЈА» і»їл(&n):", -1, 4, 8, 42, 8
+ LTEXT "ГЈА» і»їл(&N):", -1, 4, 8, 42, 8
  EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  CHECKBOX "ґЬѕо ґЬА§·О(&W)", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  CHECKBOX "ґл/јТ№®АЪ ±ёєР(&C)", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -207,9 +207,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "№ЩІЩ±в"
 FONT 9, "MS Shell Dlg"
 {
- LTEXT "ГЈА» і»їл(&n):", -1, 4, 9, 48, 8
+ LTEXT "ГЈА» і»їл(&N):", -1, 4, 9, 48, 8
  EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "№ЩІЬ і»їл(&p):", -1, 4, 26, 48, 8
+ LTEXT "№ЩІЬ і»їл(&P):", -1, 4, 26, 48, 8
  EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  CHECKBOX "ґЬѕо ґЬА§·О(&W)", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  CHECKBOX "ґл/јТ№®АЪ ±ёєР(&C)", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -233,7 +233,7 @@ FONT 9, "MS Shell Dlg"
     PUSHBUTTON      "µµїтё»(&H)",  pshHelp,  50, 161, 48,14, WS_GROUP
 
     GROUPBOX        "ЗБё°ЕН",        grp4,   8,  4, 272,84, WS_GROUP
-    CONTROL         "ЖДАП·О АОјв(&l)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    CONTROL         "ЖДАП·О АОјв(&L)", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
     PUSHBUTTON      "јУјє(&P)",    psh2, 212, 17,  60,14, WS_GROUP
     LTEXT           "АМё§(&N):",         stc6,  16, 20,  36,8
     COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
@@ -247,19 +247,19 @@ FONT 9, "MS Shell Dlg"
     LTEXT           "ґх№М јіён",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
     GROUPBOX        "є№»зє»",         grp2, 160, 92, 120,64, WS_GROUP
-    LTEXT           "є№»зє» °№јц(&c):",stc5,168,108,68,8
+    LTEXT           "є№»зє» °№јц(&C):",stc5,168,108,68,8
     ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
-    CONTROL         "Б¤·Д(&o)",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+    CONTROL         "Б¤·Д(&O)",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
     EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
 
     GROUPBOX        "АОјв №ьА§",    grp1,   8,92,  144,64, WS_GROUP
     CONTROL         "ёрµО(&A)",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
-    CONTROL         "ЖдАМБц(&g)",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "ЖдАМБц(&G)",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
     CONTROL         "ј±ЕГ їµїЄ(&S)",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
     EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
     EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
-    RTEXT           "ї©±вј­єОЕН(&f):",         stc2,  52,124,  20,8
-    RTEXT           "ї©±в±оБц(&t):",           stc3, 100,124,  16,8
+    RTEXT           "ї©±вј­єОЕН(&F):",         stc2,  52,124,  20,8
+    RTEXT           "ї©±в±оБц(&T):",           stc3, 100,124,  16,8
 }
 
 PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
@@ -286,15 +286,15 @@ BEGIN
     LTEXT           "ґх№М јіён",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
     GROUPBOX        "БѕАМ",          grp2,   8, 92, 164,56, WS_GROUP
-    LTEXT           "Е©±в(&z):",         stc2,  16,108,  36, 8
+    LTEXT           "Е©±в(&Z):",         stc2,  16,108,  36, 8
     COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     LTEXT           "їшє»(&S):",       stc3,  16,128,  36, 8
     COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
 
     GROUPBOX        "№жЗв",    grp1, 180, 92, 100,56, WS_GROUP
     ICON            "",               ico1, 195,112,  18,20, WS_GROUP
-    CONTROL         "јј·О(&o)",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
-    CONTROL         "°Ў·О(&a)",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+    CONTROL         "јј·О(&O)",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "°Ў·О(&A)",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
 END
 
 PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
@@ -314,17 +314,17 @@ BEGIN
   AUTORADIOBUTTON "јј·О(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
   AUTORADIOBUTTON "°Ў·О(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
   GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX
-  LTEXT "їЮВК(&e):", stc15, 88, 172, 21, 8
+  LTEXT "їЮВК(&E):", stc15, 88, 172, 21, 8
   EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
   LTEXT "їАёҐВК(&R):", stc16, 159, 172, 27, 8
   EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  LTEXT "А§(&o):", stc17, 88, 192, 21, 8
+  LTEXT "А§(&O):", stc17, 88, 192, 21, 8
   EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
   LTEXT "ѕЖ·Ў(&B):", stc18, 159, 192, 23, 8
   EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
   DEFPUSHBUTTON "И®АО", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
   PUSHBUTTON "ГлјТ", IDCANCEL, 126, 220, 50, 14
-  PUSHBUTTON "ЗБё°ЕН(&r)...", psh3, 184, 220, 48, 14
+  PUSHBUTTON "ЗБё°ЕН(&R)...", psh3, 184, 220, 48, 14
 END
 
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
@@ -332,19 +332,19 @@ STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_S
 CAPTION "ї­±в"
 FONT 9, "MS Shell Dlg"
 {
-    LTEXT	"єё±в(&i):",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
+    LTEXT	"єё±в(&I):",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
 
     LTEXT	"" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
     LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
 
-    LTEXT	"ЖДАП АМё§(&n):",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    LTEXT	"ЖДАП АМё§(&N):",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
     EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
 
-    LTEXT	"ЖДАП ЗьЅД(&t):",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    LTEXT	"ЖДАП ЗьЅД(&T):",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
     COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
-    CONTROL	"АР±в АьїлАё·О ї­±в(&r)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+    CONTROL	"АР±в АьїлАё·О ї­±в(&R)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
 
     DEFPUSHBUTTON	"ї­±в(&O)",		 IDOK,222,110,50,14
     PUSHBUTTON		"ГлјТ",		 IDCANCEL,222,128,50,14
@@ -469,7 +469,7 @@ STRINGTABLE DISCARDABLE
 {
     IDS_FONT_SIZE   "%d їН %d ЖчАОЖ® »зАМїЎј­ ±ЫІГ Е©±в ј±ЕГ."
     IDS_SAVE_BUTTON "АъАе(&S)"
-    IDS_SAVE_IN     "АъАе(&i):"
+    IDS_SAVE_IN     "АъАе(&I):"
     IDS_SAVE        "АъАе"
     IDS_SAVE_AS     "ґЩёҐ АМё§Аё·О АъАе"
     IDS_OPEN_FILE   "ЖДАП ї­±в"
diff --git a/reactos/dll/win32/comdlg32/cdlg_Nl.rc b/reactos/dll/win32/comdlg32/cdlg_Nl.rc
index 04ba677700e..7ac94ea2118 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Nl.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Nl.rc
@@ -156,17 +156,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "&Aangepaste kleuren:",  1089, 4,   106, 140, 10
  LTEXT "Kleur |  &Effen",  1090, 157, 151,  48, 10
  LTEXT   "&Rood:", 726 /*1094*/,       256,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Groen:",727/*1095*/,        256,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "Blau&w:",728 /*1096*/,       256,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "Ti&nt:" ,723 /*1091*/,        196,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Intensiteit:" ,724 /*1092*/, 196,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Helderheid:" ,725 /*1093*/,  196,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
@@ -219,6 +219,29 @@ FONT 8, "MS Shell Dlg"
  PUSHBUTTON "&Help", pshHelp	 , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
+NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
+CAPTION "Openen"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT	"&Zoeken in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
+    COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT	"" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
+    LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+
+    LTEXT	"Bestands&naam:",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY
+    EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
+
+    LTEXT	"Bestands&typen:",IDC_FILETYPESTATIC,5,128,48,8, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL	"Openen met als kenmerk &Alleen-lezen",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+    DEFPUSHBUTTON	"&Openen",		 IDOK,222,110,50,14
+    PUSHBUTTON		"Annuleren",		 IDCANCEL,222,128,50,14
+    PUSHBUTTON		"&Help",		 pshHelp,222,145,50,14
+}
 
 PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
@@ -260,7 +283,40 @@ FONT 8, "MS Shell Dlg"
     RTEXT           "&t/m:",           stc3, 100,124,  16,8
 }
 
+STRINGTABLE DISCARDABLE
+{
+    IDS_ABOUTBOX            "&Info over FolderPicker"
+    IDS_DOCUMENTFOLDERS     "Documenten Mappen"
+    IDS_PERSONAL            "Mijn Documenten"
+    IDS_FAVORITES           "Mijn Favorieten"
+    IDS_PATH                "Systeem Pad"
+    IDS_DESKTOP             "Bureaublad"
+    IDS_FONTS               "Lettertype"
+    IDS_MYCOMPUTER          "Deze Computer"
+}
 
+STRINGTABLE DISCARDABLE
+{
+    IDS_SYSTEMFOLDERS       "Systeem mappen"
+    IDS_LOCALHARDRIVES      "Lokale vaste schijven"
+    IDS_FILENOTFOUND        "Bestand niet gevonden"
+    IDS_VERIFYFILE          "Controleer of de juiste bestandnaam is opgegeven"
+    IDS_CREATEFILE          "Dit bestand bestaat nog niet\nWilt u het bestand aanmaken?"
+    IDS_OVERWRITEFILE       "Bestand bestaat al.\nWilt u het vervangen?"
+    IDS_INVALID_FILENAME_TITLE "De naam van het pad bevat ongeldige tekens"
+    IDS_INVALID_FILENAME    "De volgende tekens mogen niet in de bestandsnaam voorkomen:\n                          / : < > |"
+    IDS_PATHNOTEXISTING     "Het pad bestaat niet"
+    IDS_FILENOTEXISTING     "Kan het bestand niet vinden"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_UPFOLDER         "Bovenliggende map"
+    IDS_NEWFOLDER        "Nieuwe map aanmaken"
+    IDS_LISTVIEW         "Lijst"
+    IDS_REPORTVIEW       "Details"
+    IDS_TODESKTOP        "Ga naar Bureaublad"
+}
 
 STRINGTABLE DISCARDABLE
 {
@@ -323,3 +379,33 @@ wachtrij"
     PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Print server onbekend; "
     PD32_PRINTER_STATUS_POWER_SAVE        "Power safe mode; "
 }
+
+STRINGTABLE DISCARDABLE /* Color names */
+{
+   IDS_COLOR_BLACK      "Zwart"
+   IDS_COLOR_MAROON     "Kastanjebruin"
+   IDS_COLOR_GREEN      "Groen"
+   IDS_COLOR_OLIVE      "Olijfgroen"
+   IDS_COLOR_NAVY       "Marineblauw"
+   IDS_COLOR_PURPLE     "Paars"
+   IDS_COLOR_TEAL       "Groenblauw"
+   IDS_COLOR_GRAY       "Grijs"
+   IDS_COLOR_SILVER     "Zilver"
+   IDS_COLOR_RED        "Rood"
+   IDS_COLOR_LIME       "Lichtgroen"
+   IDS_COLOR_YELLOW     "Geel"
+   IDS_COLOR_BLUE       "Blauw"
+   IDS_COLOR_FUCHSIA    "Fuchsiapaars"
+   IDS_COLOR_AQUA       "Zeeblauw"
+   IDS_COLOR_WHITE      "Wit"
+}
+
+STRINGTABLE DISCARDABLE
+{
+   IDS_FONT_SIZE        "Selecteer een lettertype tussen %d en %d punten."
+   IDS_SAVE_BUTTON      "&Opslaan"
+   IDS_SAVE_IN          "Op&slaan in:"
+   IDS_SAVE             "Opslaan"
+   IDS_SAVE_AS          "Opslaan als"
+   IDS_OPEN_FILE        "Open bestand"
+}
diff --git a/reactos/dll/win32/comdlg32/cdlg_No.rc b/reactos/dll/win32/comdlg32/cdlg_No.rc
index 4a5c520c025..8a0b79f18e0 100644
--- a/reactos/dll/win32/comdlg32/cdlg_No.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_No.rc
@@ -20,7 +20,7 @@
  * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
  */
 
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -402,8 +402,7 @@ Oppgi en verdi mellom %d og %d."
     PD32_GENERIC_ERROR                    "En feil har oppstеtt."
     PD32_DRIVER_UNKNOWN                   "Ukjent skriverdriver."
     PD32_NO_DEVICES                       "Du mе installere en skriver fшr du \
-    kan gjшre skriver-relaterte oppgaver som е endre \
-    sideoppsettet og skrive ut et dokument. \
+    kan gjшre skriver-relaterte oppgaver som е endre \ sideoppsettet og skrive ut et dokument. \
     Installer en og prшv pе nytt."
 
     PD32_DEFAULT_PRINTER                  "Standardskriver; "
diff --git a/reactos/dll/win32/comdlg32/cdlg_Pl.rc b/reactos/dll/win32/comdlg32/cdlg_Pl.rc
index a04f56c0558..4e2b8f37044 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Pl.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Pl.rc
@@ -183,22 +183,22 @@ FONT 8, "MS Shell Dlg"
 }
 
 
-FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 62
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 285, 62
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Znajdџ"
 FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Znajdџ:", -1, 4, 8, 42, 8
- EDITTEXT edt1, 35, 7, 160, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Uwzglкdniaj tylko caіe wyrazy", chx1, 4, 26, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "&Uwzglкdniaj wielkoњж liter", chx2, 4, 42, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Kierunek", grp1, 127, 26, 68, 28
- CONTROL "W &gуrк", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 131, 38, 20, 12
- CONTROL "W &dуі", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 158, 38, 30, 12
+ EDITTEXT edt1, 35, 7, 169, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Uwzglкdniaj tylko caіe wyrazy", chx1, 4, 26, 110, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Uwzglкdniaj wielkoњж liter", chx2, 4, 42, 110, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Kierunek", grp1, 118, 26, 87, 28
+ CONTROL "W &gуrк", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 122, 38, 39, 12
+ CONTROL "W &dуі", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 38, 36, 12
 
- DEFPUSHBUTTON "&Znajdџ nastкpny", IDOK, 202,  5, 69, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Anuluj", IDCANCEL	 , 202, 23, 69, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Pomoc", pshHelp	 , 202, 45, 69, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "&Znajdџ nastкpny", IDOK, 211,  5, 70, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Anuluj", IDCANCEL	 , 211, 23, 70, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Pomoc", pshHelp	 , 211, 45, 70, 14, WS_GROUP | WS_TABSTOP
 }
 
 
@@ -402,9 +402,9 @@ STRINGTABLE DISCARDABLE
     PD32_OUT_OF_MEMORY       "Za maіo pamiкci dla tej operacji."
     PD32_GENERIC_ERROR       "Podczas tej operacji wyst№piі bі№d."
     PD32_DRIVER_UNKNOWN      "Nieznany sterownik drukarki."
-    PD32_NO_DEVICES                       "Before you can perform printer-related tasks \
-such as page setup or printing a document, you need to install a printer. \
-Please install one and retry."
+    PD32_NO_DEVICES                       "Zanim bкdzie moїna wykonywaж czynnoњci zwi№zane \
+z drukowaniem takie jak ustawienie strony lub wydruk dokumentu naleїy zainstalowaж drukarkк. \
+Po zainstalowaniu sprуbuj ponownie."
 
     PD32_DEFAULT_PRINTER                  "Domyњlna Drukarka; "
     PD32_NR_OF_DOCUMENTS_IN_QUEUE         "W kolejce znajduj№ siк %d dokumenty"
diff --git a/reactos/dll/win32/comdlg32/cdlg_Pt.rc b/reactos/dll/win32/comdlg32/cdlg_Pt.rc
index 7f9f8f4dff6..900f722dabd 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Pt.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Pt.rc
@@ -1,6 +1,7 @@
 /*
  * Copyright 1997 Ricardo R. Massaro
  * Copyright 2003 Marcelo Duarte
+ * Copyright 2006 Amйrico Josй Melo
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,7 +22,7 @@
  * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
  */
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -44,6 +45,31 @@ FONT 8, "MS Shell Dlg"
  CHECKBOX "&Somente Leitura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Abrir"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Nome do &Ficheiro:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&DirectГіrios:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Listar Ficheiros do &Tipo:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Con&troladores:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Abrir", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Apenas Leitura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -66,6 +92,31 @@ FONT 8, "MS Shell Dlg"
  CHECKBOX "&Somente Leitura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Gravar Como ..."
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Nome do &Ficheiro:", 1090, 6, 6, 76, 9
+ EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&DirectГіrios:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Listar Ficheiros do &Tipo:", 1089, 6, 104, 90, 9
+ COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Con&troladores:", 1091, 110, 104, 92, 9
+ COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Gravar &Como", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ajuda", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Apenas Leitura", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -89,6 +140,32 @@ FONT 8, "MS Shell Dlg"
  CHECKBOX "C&ondensado", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Imprimir"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Impressora:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Faixa de ImpressГЈo", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Tudo", 1056, 16, 45, 60, 12
+ RADIOBUTTON "S&elecção", 1057, 16, 60, 60, 12
+ RADIOBUTTON "&PГЎginas", 1058, 16, 75, 60, 12
+ DEFPUSHBUTTON "Imprimir", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&De:", 1090, 60, 80, 30, 9
+ LTEXT "&AtГ©:", 1091, 120, 80, 30, 9
+ LTEXT "&Qualidade de ImpressГЈo:", 1092, 6, 100, 76, 9
+ COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Imprimir para Ficheiro", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "C&ondensado", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -115,6 +192,35 @@ FONT 8, "MS Shell Dlg"
  COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configurações de Impressão"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "Impressora", 1072, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Impressora Prdefinida", 1056, 16, 20, 80, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Impressora &EspecГ­fica", 1057, 16, 50, 80, 12
+ COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Configurar", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientação", 1073, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "&Retrato", 1058, 50, 100, 40, 12
+ RADIOBUTTON "&Paisagem", 1059, 50, 115, 40, 12
+ ICON "LANDSCAP", 1097, 10, 95, 32, 32
+ ICON "PORTRAIT", 1098, 10, 95, 32, 32
+ GROUPBOX "Papel", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Tamanho", 1089, 130, 95, 30, 9
+ LTEXT "&Fonte de Alimentação", 1090, 130, 110, 30, 9
+ COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -142,11 +248,47 @@ FONT 8, "MS Shell Dlg"
 		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Exemplo",grp2,98,72,120,36,WS_GROUP
     CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
-    LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
+    /* FIXME: Translate */
+    LTEXT           "Scr&ipt:",stc7 ,98,114,80,9
     COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Tipo de Letra"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT           "&Tipo de Letra:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Estilo do Tipo de Letra:",1089 ,108,3,50,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&Tamanho:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
+    PUSHBUTTON      "Cancelar",IDCANCEL,218,23,40,14,WS_GROUP
+    PUSHBUTTON      "&Aplicar", 1026,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "A&juda" , 1038,218,57,40,14,WS_GROUP
+    GROUPBOX        "Efeitos",1072,6,72,84,34,WS_GROUP
+    CHECKBOX	    "&Riscado", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&Sublinhado", 1041, 10,94,50,10, BS_AUTOCHECKBOX
+    LTEXT           "&Cor:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Exemplo",grp2,98,72,120,36,WS_GROUP
+    CTEXT           "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+    LTEXT           "Scr&ipt:",stc7 ,98,114,80,9
+    COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
+		    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -157,17 +299,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "&Cores do Usuбrio:",  1089, 4,   106, 140, 10
  LTEXT "Colorido|Sуlid&o",  1090, 150, 151,  48, 10
  LTEXT   "Ver&melho:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Verde:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "A&zul:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "Mat&iz:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "Sa&t:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
@@ -182,6 +324,8 @@ FONT 8, "MS Shell Dlg"
 }
 
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Procurar"
@@ -200,6 +344,28 @@ FONT 8, "MS Shell Dlg"
  PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Procurar"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Procurar:", -1, 4, 8, 42, 8
+ EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Palavra &Inteira", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Maisculas/minusculas", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direcção", 1072, 107, 26, 68, 28
+ CONTROL "A&cima", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "A&baixo", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "&Find Next", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -220,6 +386,29 @@ FONT 8, "MS Shell Dlg"
  PUSHBUTTON "A&juda", pshHelp,			174, 75, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Substituir"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Procurar:", -1, 4, 9, 48, 8
+ EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Substituir Pa&ra:", -1, 4, 26, 48, 8
+ EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Palavra &inteira", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Maisculas/minsculas", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "Procurar PrГіxima", IDOK,	174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "&Substituir", psh1,			174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Substituir &Todas", psh2,		174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancelar", IDCANCEL,		174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&juda", pshHelp,			174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
 
 PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
@@ -261,6 +450,51 @@ FONT 8, "MS Shell Dlg"
     RTEXT           "&atй:",			stc3, 100,124,  16,8
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Imprimir"
+FONT 8, "MS Shell Dlg"
+{
+    DEFPUSHBUTTON   "OK",	IDOK,     180,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON	    "Cancelar",	IDCANCEL, 232,164, 50,14, WS_GROUP
+    PUSHBUTTON      "&Ajuda",   pshHelp,  50, 161, 50,14, WS_GROUP
+
+    GROUPBOX        "Impressora",		grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "Imprimir em &ficheiro",	chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    PUSHBUTTON      "Propri&edades",		psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Nome:",			stc6,  16, 20,  36,8
+    COMBOBOX					cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Estado:",			stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Estado 'Dummy'",		stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Tipo:",			stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Tipo 'Dummy'",		stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Onde:",			stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location",		stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "ComentГЎrio:",		stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "ComentГЎrio 'Dummy'",		stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "CГіpias",			grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "Nmero de &cГіpias:",	stc5, 168,108,  68, 8
+    ICON            "",				ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "&Agrupar",			chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+    EDITTEXT					edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+
+    GROUPBOX        "Faixa de impressГЈo",	grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "&Todos",			rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "PГЎginas",			rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "Selecção",			rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    EDITTEXT					edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT					edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "&de:",			stc2,  52,124,  20,8
+    RTEXT           "&atГ©",			stc3, 100,124,  16,8
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
       DS_CONTEXTHELP | DS_3DLOOK
@@ -296,6 +530,46 @@ BEGIN
     CONTROL	"&Paisagem",      rad2, "Button", BS_AUTORADIOBUTTON, 224, 126, 52, 12
 END
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Print Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    DEFPUSHBUTTON   "OK",	IDOK,180,156,50,14,WS_GROUP
+    PUSHBUTTON      "Cancelar",	IDCANCEL,232,156,50,14
+/*    PUSHBUTTON      "Rede...",	psh5, 284,156,50,14 */
+
+    GROUPBOX	"Impressora",     grp4,   8,   4, 272,  84, WS_GROUP
+    PUSHBUTTON	"&Propriedades",  psh2, 212,  17,  60,  14, WS_GROUP
+    LTEXT	"&Nome:",         stc6,  16,  20,  36,   8
+    COMBOBOX			  cmb1,  52,  18, 152, 152, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT	"Estado:",        stc8,  16,  36,  36,  10, SS_NOPREFIX
+    LTEXT	"EStado 'Dummy'",    stc12, 52,  36, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT	"Tipo:",          stc7,  16,  48,  36,  10, SS_NOPREFIX
+    LTEXT	"Tipo 'Dummy'",     stc11, 52,  48, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT	"Localização:",          stc10, 16,  60,  36,  10, SS_NOPREFIX
+    LTEXT	"Localização 'Dummy'", stc14, 52,  60, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT	"ComentГЎrio",     stc9,  16,  72,  36,  10, SS_NOPREFIX
+    LTEXT	"ComentГЎrio 'Dummy'",   stc13, 52,  72, 224,  10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX	"Papel",          grp2,   8,  92, 164,  56, WS_GROUP
+    LTEXT       "&Tamanho:",      stc2,  16, 108,  36,   8
+    COMBOBOX                      cmb2,  52, 106, 112, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT	"&Origem:",       stc3,  16, 128,  36,   8
+    COMBOBOX                      cmb3,  52, 126, 112, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+    GROUPBOX	"Orientação",     grp1, 180,  92, 100,  56, WS_GROUP
+    ICON	"",               ico1, 195, 112,  18,  20, WS_GROUP
+    CONTROL     "&Retrato",       rad1, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 224, 106, 52, 12
+    CONTROL	"&Paisagem",      rad2, "Button", BS_AUTORADIOBUTTON, 224, 126, 52, 12
+END
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuraзхes de Pбgina"
@@ -326,6 +600,41 @@ BEGIN
   PUSHBUTTON "Im&pressora...", psh3, 184, 220, 50, 14
 END
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Configurações de Página"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+  CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+  CONTROL "", rct3, "Static", SS_GRAYRECT,  84, 88, 80, 4
+  GROUPBOX "Papel", grp2, 8, 96, 224, 56, BS_GROUPBOX
+  LTEXT "&Tamanho:", stc2, 16, 112, 36, 8
+  COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  LTEXT "&Bandeja:", stc3, 16, 132, 36, 8
+  COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+  GROUPBOX "Orientaçao", grp1, 8, 156, 64, 56, BS_GROUPBOX
+  AUTORADIOBUTTON "&Retrato", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+  AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+  GROUPBOX "Bordas", grp4, 80, 156, 152, 56, BS_GROUPBOX
+  LTEXT "&Esquerda:", stc15, 88, 172, 21, 8
+  EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "&Direita:", stc16, 159, 172, 27, 8
+  EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "&Superior:", stc17, 88, 192, 21, 8
+  EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  LTEXT "&Inferior:", stc18, 159, 192, 23, 8
+  EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+  DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+  PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14
+  PUSHBUTTON "Im&pressora...", psh3, 184, 220, 50, 14
+END
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "Abrir"
@@ -350,6 +659,35 @@ FONT 8, "MS Shell Dlg"
     PUSHBUTTON		"&Ajuda",		pshHelp,222,145,50,14
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
+CAPTION "Abrir"
+FONT 8, "MS Shell Dlg"
+{
+    LTEXT	"&Examinar:",IDC_LOOKINSTATIC,5,6,31,8, SS_NOTIFY
+    COMBOBOX	IDC_LOOKIN,40,3,134,300,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT	"" , IDC_TOOLBARSTATIC, 172, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
+    LISTBOX	IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+
+    LTEXT	"&Nome do ficheiro:",IDC_FILENAMESTATIC,5,112,48,16, SS_NOTIFY
+    EDITTEXT	IDC_FILENAME,54,111,155,12,ES_AUTOHSCROLL
+
+    LTEXT	"Ficheiros do &tipo:",IDC_FILETYPESTATIC,5,131,48,16, SS_NOTIFY
+    COMBOBOX	IDC_FILETYPE,54,129,155,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL	"Abrir como &apenas- leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10
+
+    DEFPUSHBUTTON	"&Abrir",		IDOK,222,110,50,14
+    PUSHBUTTON		"Cancelar",		IDCANCEL,222,128,50,14
+    PUSHBUTTON		"&Ajuda",		pshHelp,222,145,50,14
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 STRINGTABLE DISCARDABLE
 {
     IDS_ABOUTBOX	"&Sobre FolderPicker Test"
@@ -362,6 +700,23 @@ STRINGTABLE DISCARDABLE
     IDS_MYCOMPUTER	"Meu Computador"
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_ABOUTBOX	"&Acerca do FolderPicker Test"
+    IDS_DOCUMENTFOLDERS	"Pastas de Documentos"
+    IDS_PERSONAL	"Os Meus Documentos"
+    IDS_FAVORITES	"Favoritos"
+    IDS_PATH		"Localização do Sistema"
+    IDS_DESKTOP		"ГЃrea de Trabalho"
+    IDS_FONTS		"Tipos de Letra"
+    IDS_MYCOMPUTER	"O Meu Computador"
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 STRINGTABLE DISCARDABLE
 {
     IDS_SYSTEMFOLDERS	"Pastas do Sistema"
@@ -376,6 +731,25 @@ STRINGTABLE DISCARDABLE
     IDS_FILENOTEXISTING     "Arquivo nгo existe"
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_SYSTEMFOLDERS	"Pastas do Sistema"
+    IDS_LOCALHARDRIVES	"Discos RГ­gidos Locais"
+    IDS_FILENOTFOUND	"Ficheiro nГЈo encontrado"
+    IDS_VERIFYFILE	"Por favor verifique se foi fornecido o nome correcto do ficheiro"
+    IDS_CREATEFILE	"O ficheiro nГЈo existe\nGostaria de o criar"
+    IDS_OVERWRITEFILE       "O ficheiro jГЎ existe.\nGostaria de o substituir?"
+    IDS_INVALID_FILENAME_TITLE "Caracter(es) inválidos na localização"
+    IDS_INVALID_FILENAME    "Um nome de ficheiro nГЈo pode conter quaisquer dos seguintes caracteres: \n                          / : < > |"
+    IDS_PATHNOTEXISTING     "A localização não existe"
+    IDS_FILENOTEXISTING     "O ficheiro nГЈo existe"
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 STRINGTABLE DISCARDABLE
 {
     IDS_UPFOLDER         "Um Nнvel Acima"
@@ -385,6 +759,20 @@ STRINGTABLE DISCARDABLE
     IDS_TODESKTOP        "Бrea de Trabalho"
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_UPFOLDER         "Um NГ­vel Acima"
+    IDS_NEWFOLDER        "Criar Nova Pasta"
+    IDS_LISTVIEW         "Lista"
+    IDS_REPORTVIEW       "Detalhes"
+    IDS_TODESKTOP        "ГЃrea de Trabalho"
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 STRINGTABLE DISCARDABLE
 {
     PD32_PRINT_TITLE				"Imprimir"
@@ -442,6 +830,68 @@ Please install one and retry."
     PD32_PRINTER_STATUS_POWER_SAVE		"Modo econфmico; "
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE DISCARDABLE
+{
+    PD32_PRINT_TITLE				"Imprimir"
+
+    PD32_VALUE_UREADABLE			"Entrada IlegГ­vel"
+    PD32_INVALID_PAGE_RANGE			"Este valor nГЈo se encaixa na faixa de pГЎginas\n\
+Por favor entre um valor entre %d e %d."
+    PD32_FROM_NOT_ABOVE_TO			"A entrada DE não pode exceder ATÉ"
+    PD32_MARGINS_OVERLAP			"As margens estГЈo fora das medidas \
+do papel.\nPor favor reentre as margens."
+    PD32_NR_OF_COPIES_EMPTY			"O nГєmero de cГіpias nГЈo pode ter valor vazio."
+    PD32_TOO_LARGE_COPIES			"Esta grande quantidade de cГіpias nГЈo Г© suportada \
+pela sua impressora.\nPor favor entre um valor entre 1 e %d."
+    PD32_PRINT_ERROR				"Ocorreu um erro de impressГЈo."
+    PD32_NO_DEFAULT_PRINTER			"NГЈo existe uma impressora predefinida."
+    PD32_CANT_FIND_PRINTER			"NГЈo Г© possГ­vel encontrar uma impressora."
+    PD32_OUT_OF_MEMORY				"MemГіria insuficiente."
+    PD32_GENERIC_ERROR				"Ocorreu algum erro."
+    PD32_DRIVER_UNKNOWN				"Controlador de impressora desconhecido."
+    PD32_NO_DEVICES                       "Antes de realizar tarefas relacionadas com a impressora \
+tais como configuração de páginas ou imprimir um documento, precisa instalar uma impressora. \
+Por favor instale uma e tente novamente."
+
+    PD32_DEFAULT_PRINTER			"Impressora Prdefinida; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE		"Existem %d documentos na fila"
+    PD32_MARGINS_IN_INCHES			"Margens [polegadas]"
+    PD32_MARGINS_IN_MILIMETERS			"Margens [mm]"
+    PD32_MILIMETERS				"mm"
+
+    PD32_PRINTER_STATUS_READY			"Pronto"
+    PD32_PRINTER_STATUS_PAUSED			"Pausada; "
+    PD32_PRINTER_STATUS_ERROR			"Erro; "
+    PD32_PRINTER_STATUS_PENDING_DELETION	"ExclusГЈo pendente; "
+    PD32_PRINTER_STATUS_PAPER_JAM		"Papel atolado; "
+    PD32_PRINTER_STATUS_PAPER_OUT		"Sem papel; "
+    PD32_PRINTER_STATUS_MANUAL_FEED		"Alimentação manual; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM		"Problemas com o papel; "
+    PD32_PRINTER_STATUS_OFFLINE			"Impressora desligada; "
+    PD32_PRINTER_STATUS_IO_ACTIVE		"E/S Activa; "
+    PD32_PRINTER_STATUS_BUSY			"Ocupada; "
+    PD32_PRINTER_STATUS_PRINTING		"A imprimir; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL		"A bandeja de saida encontra-se cheia; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE		"NГЈo disponГ­vel; "
+    PD32_PRINTER_STATUS_WAITING			"A esperar; "
+    PD32_PRINTER_STATUS_PROCESSING		"A processar; "
+    PD32_PRINTER_STATUS_INITIALIZING		"A inicializar; "
+    PD32_PRINTER_STATUS_WARMING_UP		"A aquecer; "
+    PD32_PRINTER_STATUS_TONER_LOW		"Pouco toner; "
+    PD32_PRINTER_STATUS_NO_TONER		"Sem toner; "
+    PD32_PRINTER_STATUS_PAGE_PUNT		"Lançar página; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION	"Intervenção do utilizador; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY		"MemГіria insuficiente; "
+    PD32_PRINTER_STATUS_DOOR_OPEN		"A impressora estГЎ aberta; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN		"Servidor de impressГЈo desconhecido; "
+    PD32_PRINTER_STATUS_POWER_SAVE		"Modo econГіmico; "
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 STRINGTABLE DISCARDABLE /* Nomes de cores */
 {
     IDS_COLOR_BLACK     "Preto"
@@ -462,6 +912,31 @@ STRINGTABLE DISCARDABLE /* Nomes de cores */
     IDS_COLOR_WHITE     "Branco"
 }
 
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE DISCARDABLE /* Nomes de cores */
+{
+    IDS_COLOR_BLACK     "Preto"
+    IDS_COLOR_MAROON    "Castanho"
+    IDS_COLOR_GREEN     "Verde"
+    IDS_COLOR_OLIVE     "Verde-oliva"
+    IDS_COLOR_NAVY      "Azul-marinho"
+    IDS_COLOR_PURPLE    "Roxo"
+    IDS_COLOR_TEAL      "Azul-petrГіleo"
+    IDS_COLOR_GRAY      "Cinza"
+    IDS_COLOR_SILVER    "Prateado"
+    IDS_COLOR_RED       "Vermelho"
+    IDS_COLOR_LIME      "Verde-lima"
+    IDS_COLOR_YELLOW    "Amarelo"
+    IDS_COLOR_BLUE      "Azul"
+    IDS_COLOR_FUCHSIA   "Fcsia"
+    IDS_COLOR_AQUA      "Azul-piscina"
+    IDS_COLOR_WHITE     "Branco"
+}
+
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
 STRINGTABLE DISCARDABLE
 {
     IDS_FONT_SIZE   "Selecione o tamanho da fonte entre %d e %d pontos."
@@ -471,3 +946,15 @@ STRINGTABLE DISCARDABLE
     IDS_SAVE_AS     "Salvar como"
     IDS_OPEN_FILE   "Abrir Arquivo"
 }
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_FONT_SIZE   "Selecione o tamanho da fonte entre %d e %d pontos."
+    IDS_SAVE_BUTTON "&Gravar"
+    IDS_SAVE_IN     "Gravar &em:"
+    IDS_SAVE        "Gravar"
+    IDS_SAVE_AS     "Gravar como"
+    IDS_OPEN_FILE   "Abrir Ficheiro"
+}
diff --git a/reactos/dll/win32/comdlg32/cdlg_Ru.rc b/reactos/dll/win32/comdlg32/cdlg_Ru.rc
index 425346ec418..6e7adb8ccb0 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Ru.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Ru.rc
@@ -141,7 +141,7 @@ FONT 8, "MS Shell Dlg"
 		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Образец",grp2,98,72,120,36,WS_GROUP
     CTEXT           "АаБбAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
-    LTEXT           "Scr&ipt (translate):",stc7 ,98,114,80,9
+    LTEXT           "На&бор символов:",stc7 ,98,114,80,9
     COMBOBOX        cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |   WS_VSCROLL | WS_TABSTOP
 }
@@ -156,17 +156,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "До&полнительные цвета:",  1089, 4,   106, 140, 10
  LTEXT "Цвет|За&ливка",  1090, 150, 151,  48, 10
  LTEXT   "Крас&ный:", 726 /*1094*/,254,126,32,10
- EDITTEXT 706, 288,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT   "&Зеленый:",727/*1095*/,254,140,32,10
- EDITTEXT 707, 288,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 288,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Зелёный:",727/*1095*/,254,140,32,10
+ EDITTEXT 707, 288,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "С&иний:",728 /*1096*/,264,154,24,10
- EDITTEXT 708, 288,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 288,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "О&ттенок:" ,723 /*1091*/,202,126,30,10
- EDITTEXT 703, 234,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 234,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Контраст:" ,724 /*1092*/,199,140,34,10
- EDITTEXT 704, 234,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 234,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Яркость:" ,725 /*1093*/,202,154,30,10
- EDITTEXT 705, 234,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 234,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
@@ -210,7 +210,7 @@ FONT 8, "MS Shell Dlg"
  LTEXT "З&аменить на:", -1, 4, 26, 48, 8
  EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  CHECKBOX "&Только слово целиком", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "С &учетом регистра", 1041, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "С &учётом регистра", 1041, 5, 62, 104, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 
  DEFPUSHBUTTON "&Найти далее", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
  PUSHBUTTON "&Заменить", psh1	 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
@@ -232,22 +232,22 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Принтер",        grp4,   8,  4, 272,84, WS_GROUP
     CONTROL         "Печать в фай&л", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
     PUSHBUTTON      "&Свойства",    psh2, 212, 17,  60,14, WS_GROUP
-    LTEXT           "&Имя:",         stc6,  16, 20,  36,8
-    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "Статус:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "Эмулирован",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Тип:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "Эмулирован",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Место:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Эмулировано", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Примечание:",   stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "Эмулировано",   stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "&Имя:",         stc6,  16, 20,  46,8
+    COMBOBOX                          cmb4,  64, 18, 140,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Статус:",        stc8,  16, 36,  46,10, SS_NOPREFIX
+    LTEXT           "Эмулирован",    stc12, 64, 36, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Тип:",          stc7,  16, 48,  46,10, SS_NOPREFIX
+    LTEXT           "Эмулирован",     stc11, 64, 48, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Место:",         stc10, 16, 60,  46,10, SS_NOPREFIX
+    LTEXT           "Эмулировано", stc14, 64, 60, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Примечание:",   stc9,  16, 72,  46,10, SS_NOPREFIX
+    LTEXT           "Эмулировано",   stc13, 64, 72, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
     GROUPBOX        "Копии",         grp2, 160, 92, 120,64, WS_GROUP
     LTEXT           "Число &копий:",stc5,168,108,68,8
-    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
-    CONTROL         "&Разбить",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,40,12
-    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+    ICON            "",               ico3, 162,124,  60,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "&Разбить",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,42,12
+    EDITTEXT                          edt3, 230,106,  42,12, WS_GROUP | ES_NUMBER
 
     GROUPBOX        "Печатать",    grp1,   8,92,  144,64, WS_GROUP
     CONTROL         "&Все",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
@@ -278,7 +278,7 @@ BEGIN
     LTEXT           "Тип:",          stc7,  16, 48,  36,10, SS_NOPREFIX
     LTEXT           "Эмулирован",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Место:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Эмулировано", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Эмулировано", stc14, 52, 60, 36,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
     LTEXT           "Заметки:",       stc9,  16, 72,  36,10, SS_NOPREFIX
     LTEXT           "Эмулированы",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
@@ -339,7 +339,7 @@ FONT 8, "MS Shell Dlg"
     LTEXT	"Имя &файла:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
     EDITTEXT	IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
 
-    LTEXT	"Файлы &типа",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    LTEXT	"&Тип файлов:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
     COMBOBOX	IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 
     CONTROL	"Только для &чтения",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
@@ -399,14 +399,14 @@ STRINGTABLE DISCARDABLE
     PD32_TOO_LARGE_COPIES                 "Такое большое количество копий не \
 может быть напечатано Вашим принтером.\nВведите значение между 1 и %d"
     PD32_PRINT_ERROR                      "Произошла ошибка принтера"
-    PD32_NO_DEFAULT_PRINTER               "Нет принтера, устаовленного по умолчанию"
+    PD32_NO_DEFAULT_PRINTER               "Нет принтера, установленного по умолчанию"
     PD32_CANT_FIND_PRINTER                "Не удалось найти принтер"
     PD32_OUT_OF_MEMORY                    "Мало памяти"
     PD32_GENERIC_ERROR                    "Произошла(и) ошибка(и)"
     PD32_DRIVER_UNKNOWN                   "Неизвестный драйвер принтера"
-    PD32_NO_DEVICES                       "Before you can perform printer-related tasks \
-such as page setup or printing a document, you need to install a printer. \
-Please install one and retry."
+    PD32_NO_DEVICES                       "Отсутствуют принтеры в системе. \
+Проверьте, что хотя бы один принтер установлен и система печати запущена. \
+"
 
     PD32_DEFAULT_PRINTER                  "Принтер по умолчанию; "
     PD32_NR_OF_DOCUMENTS_IN_QUEUE         "%d документов в очереди"
@@ -441,3 +441,33 @@ Please install one and retry."
     PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Неизвестный сервер принтера; "
     PD32_PRINTER_STATUS_POWER_SAVE        "Питание в безопасном режиме; "
 }
+
+STRINGTABLE DISCARDABLE /* Color names */
+{
+    IDS_COLOR_BLACK     "Чёрный"
+    IDS_COLOR_MAROON    "Тёмно-бордовый"
+    IDS_COLOR_GREEN     "Зелёный"
+    IDS_COLOR_OLIVE     "Оливковый"
+    IDS_COLOR_NAVY      "Тёмно-синий"
+    IDS_COLOR_PURPLE    "Пурпурный"
+    IDS_COLOR_TEAL      "Морской волны"
+    IDS_COLOR_GRAY      "Серый"
+    IDS_COLOR_SILVER    "Серебряный"
+    IDS_COLOR_RED       "Красный"
+    IDS_COLOR_LIME      "Лимонный"
+    IDS_COLOR_YELLOW    "Жёлтый"
+    IDS_COLOR_BLUE      "Синий"
+    IDS_COLOR_FUCHSIA   "Ярко-розовый"
+    IDS_COLOR_AQUA      "Голубой"
+    IDS_COLOR_WHITE     "Белый"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_FONT_SIZE   "Выберите шрифт размером %d - %d пунктов."
+    IDS_SAVE_BUTTON "&Сохранить"
+    IDS_SAVE_IN     "Сохранить &в:"
+    IDS_SAVE        "Сохранить"
+    IDS_SAVE_AS     "Сохранить как"
+    IDS_OPEN_FILE   "Открыть файл"
+}
diff --git a/reactos/dll/win32/comdlg32/cdlg_Sv.rc b/reactos/dll/win32/comdlg32/cdlg_Sv.rc
index b9a579fc8a2..46af76637a3 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Sv.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Sv.rc
@@ -20,7 +20,7 @@
  * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
  */
 
-LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -154,17 +154,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "&Egendefinerade fдrger:",  1089, 4,   106, 140, 10
  LTEXT "Enfдrgat",  1090, 150, 151,  48, 10
  LTEXT   "&Rцd:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Grцn:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Blе:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Int:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Met:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
diff --git a/reactos/dll/win32/comdlg32/cdlg_Uk.rc b/reactos/dll/win32/comdlg32/cdlg_Uk.rc
index f8b0c5e3f3d..bc5ad2beec7 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Uk.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Uk.rc
@@ -1,6 +1,5 @@
 /*
  * Copyright 2004 Ilya Korniyko
- * Copyright 2007 Artem Reznikov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -157,17 +156,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "Д&одаткові кольори:",  1089, 4,   106, 140, 10
  LTEXT "Колір|За&ливка",  1090, 150, 151,  48, 10
  LTEXT   "&Червоний:", 726 /*1094*/,254,126,32,10
- EDITTEXT 706, 288,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 288,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Зелений:",727/*1095*/,254,140,32,10
- EDITTEXT 707, 288,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 288,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "С&иній:",728 /*1096*/,264,154,24,10
- EDITTEXT 708, 288,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 288,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "Від&тінок:" ,723 /*1091*/,202,126,30,10
- EDITTEXT 703, 234,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 234,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Контраст:" ,724 /*1092*/,199,140,34,10
- EDITTEXT 704, 234,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 234,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Яскравість:" ,725 /*1093*/,202,154,30,10
- EDITTEXT 705, 234,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 234,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
@@ -233,22 +232,22 @@ FONT 8, "MS Shell Dlg"
     GROUPBOX        "Принтер",        grp4,   8,  4, 272,84, WS_GROUP
     CONTROL         "Друк у фай&л", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
     PUSHBUTTON      "&Властивості",    psh2, 212, 17,  60,14, WS_GROUP
-    LTEXT           "&Ім'я:",         stc6,  16, 20,  36,8
-    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    LTEXT           "Статус:",        stc8,  16, 36,  36,10, SS_NOPREFIX
-    LTEXT           "Емульовано",    stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Тип:",          stc7,  16, 48,  36,10, SS_NOPREFIX
-    LTEXT           "Емульовано",     stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Місце:",         stc10, 16, 60,  36,10, SS_NOPREFIX
-    LTEXT           "Емульовано", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
-    LTEXT           "Примітка:",    stc9,  16, 72,  36,10, SS_NOPREFIX
-    LTEXT           "Емульовано",   stc13, 60, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "&Ім'я:",         stc6,  16, 20,  46,8
+    COMBOBOX                          cmb4,  64, 18, 140,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Статус:",        stc8,  16, 36,  46,10, SS_NOPREFIX
+    LTEXT           "Емульовано",    stc12, 64, 36, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Тип:",          stc7,  16, 48,  46,10, SS_NOPREFIX
+    LTEXT           "Емульовано",     stc11, 64, 48, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Місце:",         stc10, 16, 60,  46,10, SS_NOPREFIX
+    LTEXT           "Емульовано", stc14, 64, 60, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Примітка:",    stc9,  16, 72,  46,10, SS_NOPREFIX
+    LTEXT           "Емульовано",   stc13, 64, 72, 100,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
 
     GROUPBOX        "Копії",         grp2, 160, 92, 120,64, WS_GROUP
     LTEXT           "Число &копій:",stc5,168,108,68,8
-    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
-    CONTROL         "&Розбити",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,40,12
-    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+    ICON            "",               ico3, 162,124,  60,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "&Розбити",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,42,12
+    EDITTEXT                          edt3, 230,106,  42,12, WS_GROUP | ES_NUMBER
 
     GROUPBOX        "Друкувати",    grp1,   8,92,  144,64, WS_GROUP
     CONTROL         "&Все",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
@@ -256,7 +255,7 @@ FONT 8, "MS Shell Dlg"
     CONTROL         "&Виділення",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
     EDITTEXT                          edt1,  85,122,  20,12, WS_GROUP | ES_NUMBER
     EDITTEXT                          edt2, 120,122,  20,12, WS_GROUP | ES_NUMBER
-    RTEXT           "&від:",         stc2,  70,124,  10,8
+    RTEXT           "&від:",         stc2,  70,124,  12,8
     RTEXT           "&до:",           stc3, 106,124,  10,8
 }
 
@@ -295,36 +294,6 @@ BEGIN
     CONTROL         "Л&андшафт",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
 END
 
-PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Параметри сторінки"
-FONT 8, "MS Shell Dlg"
-BEGIN
-  CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
-  CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
-  CONTROL "", rct3, "Static", SS_GRAYRECT,  84, 88, 80, 4
-  GROUPBOX "Папір", grp2, 8, 96, 224, 56, BS_GROUPBOX
-  LTEXT "&Розмір:", stc2, 16, 112, 36, 8
-  COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
-  LTEXT "Пода&ча:", stc3, 16, 132, 36, 8
-  COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
-  GROUPBOX "Орієнтація", grp1, 8, 156, 64, 56, BS_GROUPBOX
-  AUTORADIOBUTTON "&Книжкова", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
-  AUTORADIOBUTTON "&Альбомна", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
-  GROUPBOX "Поля", grp4, 80, 156, 152, 56, BS_GROUPBOX
-  LTEXT "&ліве:", stc15, 88, 172, 21, 8
-  EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  LTEXT "&праве:", stc16, 159, 172, 27, 8
-  EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  LTEXT "&верхнє:", stc17, 88, 192, 21, 8
-  EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  LTEXT "&нижнє:", stc18, 159, 192, 23, 8
-  EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
-  DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
-  PUSHBUTTON "Скасувати", IDCANCEL, 126, 220, 50, 14
-  PUSHBUTTON "Пр&интер...", psh3, 184, 220, 48, 14
-END
-
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "Відкрити"
@@ -461,13 +430,3 @@ STRINGTABLE DISCARDABLE /* Color names */
     IDS_COLOR_AQUA      "Аквамарин"
     IDS_COLOR_WHITE     "Білий"
 }
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_FONT_SIZE   "Select a font size between %d and %d points."
-    IDS_SAVE_BUTTON "&Save"
-    IDS_SAVE_IN     "Save &in:"
-    IDS_SAVE        "Save"
-    IDS_SAVE_AS     "Save as"
-    IDS_OPEN_FILE   "Open File"
-}
diff --git a/reactos/dll/win32/comdlg32/cdlg_Wa.rc b/reactos/dll/win32/comdlg32/cdlg_Wa.rc
index 7a90a0e9ccf..b2cc1392462 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Wa.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Wa.rc
@@ -161,17 +161,17 @@ FONT 8, "MS Shell Dlg"
  LTEXT "&Coleurs da vosse:",  1089, 4,   106, 140, 10
  LTEXT "Coleur | &Uni",  1090, 150, 151,  48, 10
  LTEXT   "&Rodje:", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Vert:",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT   "&Bleu:",728 /*1096*/,249,154,24,10
- EDITTEXT 708, 275,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Tinte:" ,723 /*1091*/,202,126,22,10
- EDITTEXT 703, 226,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Sat.:" ,724 /*1092*/,202,140,22,10
- EDITTEXT 704, 226,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT  "&Lum.:" ,725 /*1093*/,202,154,22,10
- EDITTEXT 705, 226,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
  CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
  CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
  CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116 CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
diff --git a/reactos/dll/win32/comdlg32/colordlg.c b/reactos/dll/win32/comdlg32/colordlg.c
index 9646fc9e81f..a1cd5f6c4cc 100644
--- a/reactos/dll/win32/comdlg32/colordlg.c
+++ b/reactos/dll/win32/comdlg32/colordlg.c
@@ -23,7 +23,20 @@
    sometimes, especially when 2 instances of the
    dialog are loaded at the same time */
 
-#include <precomp.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "commdlg.h"
+#include "dlgs.h"
+#include "wine/debug.h"
+#include "cderr.h"
+#include "cdlg.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
@@ -75,7 +88,7 @@ typedef struct CCPRIVATE
     int capturedGraph;   /* control mouse captured */
     RECT focusRect;      /* rectangle last focused item */
     HWND hwndFocus;      /* handle last focused item */
-} *LCCPRIV;
+} CCPRIV, *LPCCPRIV;
 
 /***********************************************************************
  *                             CC_HSLtoRGB                    [internal]
@@ -193,7 +206,7 @@ int CC_RGBtoHSL(char c, int r, int g, int b)
 /***********************************************************************
  *                  CC_DrawCurrentFocusRect                       [internal]
  */
-static void CC_DrawCurrentFocusRect( LCCPRIV lpp )
+static void CC_DrawCurrentFocusRect( const CCPRIV *lpp )
 {
   if (lpp->hwndFocus)
   {
@@ -206,7 +219,7 @@ static void CC_DrawCurrentFocusRect( LCCPRIV lpp )
 /***********************************************************************
  *                  CC_DrawFocusRect                       [internal]
  */
-static void CC_DrawFocusRect( LCCPRIV lpp, HWND hwnd, int x, int y, int rows, int cols)
+static void CC_DrawFocusRect( LPCCPRIV lpp, HWND hwnd, int x, int y, int rows, int cols)
 {
   RECT rect;
   int dx, dy;
@@ -235,7 +248,7 @@ static void CC_DrawFocusRect( LCCPRIV lpp, HWND hwnd, int x, int y, int rows, in
  *                CC_MouseCheckPredefColorArray               [internal]
  *                returns 1 if one of the predefined colors is clicked
  */
-static int CC_MouseCheckPredefColorArray( LCCPRIV lpp, HWND hDlg, int dlgitem, int rows, int cols,
+static int CC_MouseCheckPredefColorArray( LPCCPRIV lpp, HWND hDlg, int dlgitem, int rows, int cols,
 	    LPARAM lParam )
 {
  HWND hwnd;
@@ -269,7 +282,7 @@ static int CC_MouseCheckPredefColorArray( LCCPRIV lpp, HWND hDlg, int dlgitem, i
  *                  CC_MouseCheckUserColorArray               [internal]
  *                  return 1 if the user clicked a color
  */
-static int CC_MouseCheckUserColorArray( LCCPRIV lpp, HWND hDlg, int dlgitem, int rows, int cols,
+static int CC_MouseCheckUserColorArray( LPCCPRIV lpp, HWND hDlg, int dlgitem, int rows, int cols,
 	    LPARAM lParam )
 {
  HWND hwnd;
@@ -450,8 +463,9 @@ void CC_PaintTriangle( HWND hDlg, int y)
  int height;
  int oben;
  RECT rect;
+ HBRUSH hbr;
  HWND hwnd = GetDlgItem(hDlg, 0x2be);
- LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+ LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
 
  if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6)))   /* if full size */
  {
@@ -470,7 +484,9 @@ void CC_PaintTriangle( HWND hDlg, int y)
    points[2].y = points[0].y - w;
    points[2].x = points[1].x = points[0].x + w;
 
-   FillRect(hDC, &lpp->old3angle, (HBRUSH)GetClassLongPtrW( hwnd, GCLP_HBRBACKGROUND));
+   hbr = (HBRUSH)GetClassLongPtrW( hwnd, GCLP_HBRBACKGROUND);
+   if (!hbr) hbr = GetSysColorBrush(COLOR_BTNFACE);
+   FillRect(hDC, &lpp->old3angle, hbr);
    lpp->old3angle.left  = points[0].x;
    lpp->old3angle.right = points[1].x + 1;
    lpp->old3angle.top   = points[2].y - 1;
@@ -489,7 +505,7 @@ void CC_PaintCross( HWND hDlg, int x, int y)
  HDC hDC;
  int w = GetDialogBaseUnits();
  HWND hwnd = GetDlgItem(hDlg, 0x2c6);
- LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+ LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
  RECT rect;
  POINT point, p;
  HPEN hPen;
@@ -534,7 +550,7 @@ static void CC_PrepareColorGraph( HWND hDlg )
 {
  int sdif, hdif, xdif, ydif, r, g, b, hue, sat;
  HWND hwnd = GetDlgItem(hDlg, 0x2c6);
- LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+ LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
  HBRUSH hbrush;
  HDC hdc ;
  RECT rect, client;
@@ -577,7 +593,7 @@ static void CC_PrepareColorGraph( HWND hDlg )
 static void CC_PaintColorGraph( HWND hDlg )
 {
  HWND hwnd = GetDlgItem( hDlg, 0x2c6 );
- LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+ LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
  HDC  hDC;
  RECT rect;
  if (IsWindowVisible(hwnd))   /* if full size */
@@ -637,7 +653,7 @@ static void CC_PaintLumBar( HWND hDlg, int hue, int sat )
 void CC_EditSetRGB( HWND hDlg, COLORREF cr )
 {
  char buffer[10];
- LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+ LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
  int r = GetRValue(cr);
  int g = GetGValue(cr);
  int b = GetBValue(cr);
@@ -660,7 +676,7 @@ void CC_EditSetRGB( HWND hDlg, COLORREF cr )
 void CC_EditSetHSL( HWND hDlg, int h, int s, int l )
 {
  char buffer[10];
- LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+ LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
 
  if (IsWindowVisible( GetDlgItem(hDlg, 0x2c6) ))   /* if full size */
  {
@@ -679,10 +695,10 @@ void CC_EditSetHSL( HWND hDlg, int h, int s, int l )
 /***********************************************************************
  *                       CC_SwitchToFullSize                  [internal]
  */
-void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPRECT lprect )
+void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPCRECT lprect )
 {
  int i;
- LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+ LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
 
  EnableWindow( GetDlgItem(hDlg, 0x2cf), FALSE);
  CC_PrepareColorGraph(hDlg);
@@ -718,7 +734,7 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
  HDC  hdc;
  HBRUSH hBrush;
  int dx, dy, i, j, k;
- LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+ LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
 
  GetClientRect(hwnd, &rect);
  dx = rect.right / cols;
@@ -727,7 +743,9 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
 
  hdc = GetDC(hwnd);
  GetClientRect(hwnd, &rect);
- FillRect(hdc, &rect, (HBRUSH)GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND));
+ hBrush = (HBRUSH)GetClassLongPtrW( hwnd, GCLP_HBRBACKGROUND);
+ if (!hBrush) hBrush = GetSysColorBrush(COLOR_BTNFACE);
+ FillRect(hdc, &rect, hBrush);
  for ( j = 0; j < rows; j++ )
  {
   for ( i = 0; i < cols; i++ )
@@ -753,14 +771,14 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols)
  *                             CC_PaintUserColorArray         [internal]
  *               Paint the 16 user-selected colors
  */
-void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, COLORREF* lpcr )
+void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, const COLORREF *lpcr )
 {
  HWND hwnd = GetDlgItem(hDlg, 0x2d1);
  RECT rect;
  HDC  hdc;
  HBRUSH hBrush;
  int dx, dy, i, j, k;
- LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+ LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
 
  GetClientRect(hwnd, &rect);
 
@@ -771,7 +789,9 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, COLORREF* lpcr )
  hdc = GetDC(hwnd);
  if (hdc)
  {
-  FillRect(hdc, &rect, (HBRUSH)GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND) );
+  hBrush = (HBRUSH)GetClassLongPtrW( hwnd, GCLP_HBRBACKGROUND);
+  if (!hBrush) hBrush = GetSysColorBrush(COLOR_BTNFACE);
+  FillRect( hdc, &rect, hBrush );
   for (j = 0; j < rows; j++)
   {
    for (i = 0; i < cols; i++)
@@ -800,7 +820,7 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, COLORREF* lpcr )
 /***********************************************************************
  *                             CC_HookCallChk                 [internal]
  */
-BOOL CC_HookCallChk( LPCHOOSECOLORW lpcc )
+BOOL CC_HookCallChk( const CHOOSECOLORW *lpcc )
 {
  if (lpcc)
   if(lpcc->Flags & CC_ENABLEHOOK)
@@ -819,7 +839,7 @@ static LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam )
    HWND hwnd;
    RECT rect;
    POINT point;
-   LCCPRIV lpp;
+   LPCCPRIV lpp;
 
    TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
    lpp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct CCPRIVATE) );
@@ -926,8 +946,8 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode,
     UINT cokmsg;
     HDC hdc;
     COLORREF *cr;
-    LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
-    TRACE("CC_WMCommand wParam=%x lParam=%lx\n", wParam, lParam);
+    LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
+    TRACE("CC_WMCommand wParam=%lx lParam=%lx\n", wParam, lParam);
     switch (LOWORD(wParam))
     {
           case 0x2c2:  /* edit notify RGB */
@@ -1048,7 +1068,7 @@ LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode,
 LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam )
 {
     PAINTSTRUCT ps;
-    LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+    LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
 
     BeginPaint(hDlg, &ps);
     /* we have to paint dialog children except text and buttons */
@@ -1069,7 +1089,7 @@ LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam )
  */
 LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam )
 {
-   LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+   LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
    if (lpp->capturedGraph)
    {
        lpp->capturedGraph = 0;
@@ -1085,7 +1105,7 @@ LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam )
  */
 LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam )
 {
-   LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+   LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
    int r, g, b;
 
    if (lpp->capturedGraph)
@@ -1123,7 +1143,7 @@ LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam )
  */
 LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam )
 {
-   LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+   LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
    int r, g, b, i;
    i = 0;
 
@@ -1182,7 +1202,7 @@ static INT_PTR CALLBACK ColorDlgProc( HWND hDlg, UINT message,
 {
 
  int res;
- LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp );
+ LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp );
  if (message != WM_INITDIALOG)
  {
   if (!lpp)
@@ -1315,7 +1335,9 @@ BOOL WINAPI ChooseColorW( LPCHOOSECOLORW lpChCol )
 BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol )
 
 {
+  LPWSTR template_name = NULL;
   BOOL ret;
+
   LPCHOOSECOLORW lpcc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHOOSECOLORW));
   lpcc->lStructSize = sizeof(*lpcc);
   lpcc->hwndOwner = lpChCol->hwndOwner;
@@ -1328,10 +1350,11 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol )
   if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) {
       if (HIWORD(lpChCol->lpTemplateName)) {
 	  INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0);
-	  lpcc->lpTemplateName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
-	  MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, (LPWSTR)lpcc->lpTemplateName, len );
+          template_name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
+          MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, template_name, len );
+          lpcc->lpTemplateName = template_name;
       } else {
-	  lpcc->lpTemplateName = (LPWSTR)lpChCol->lpTemplateName;
+	  lpcc->lpTemplateName = (LPCWSTR)lpChCol->lpTemplateName;
       }
   }
 
@@ -1339,7 +1362,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol )
 
   if (ret)
       lpChCol->rgbResult = lpcc->rgbResult;
-  if (HIWORD(lpcc->lpTemplateName)) HeapFree(GetProcessHeap(), 0, (LPSTR)lpcc->lpTemplateName);
+  HeapFree(GetProcessHeap(), 0, template_name);
   HeapFree(GetProcessHeap(), 0, lpcc);
   return ret;
 }
diff --git a/reactos/dll/win32/comdlg32/colordlg16.c b/reactos/dll/win32/comdlg32/colordlg16.c
index 3ab94cb70dd..7680239da1e 100644
--- a/reactos/dll/win32/comdlg32/colordlg16.c
+++ b/reactos/dll/win32/comdlg32/colordlg16.c
@@ -197,7 +197,7 @@ static LRESULT CC_WMCommand16( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD not
     HDC hdc;
     COLORREF *cr;
     LCCPRIV lpp = (LCCPRIV)GetWindowLongPtrW(hDlg, DWLP_USER);
-    TRACE("CC_WMCommand wParam=%x lParam=%lx\n", wParam, lParam);
+    TRACE("CC_WMCommand wParam=%lx lParam=%lx\n", wParam, lParam);
     switch (wParam)
     {
           case 0x2c2:  /* edit notify RGB */
@@ -400,7 +400,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol )
     HANDLE16 hDlgTmpl16 = 0, hResource16 = 0;
     HGLOBAL16 hGlobal16 = 0;
     BOOL16 bRet = FALSE;
-    LPCVOID template;
+    LPVOID template;
     FARPROC16 ptr;
 
     TRACE("ChooseColor\n");
@@ -447,7 +447,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol )
         if (!hGlobal16)
         {
             COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE);
-            ERR("alloc failure for %ld bytes\n", size);
+            ERR("alloc failure for %d bytes\n", size);
             return FALSE;
         }
         template = GlobalLock16(hGlobal16);
@@ -458,7 +458,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol )
             GlobalFree16(hGlobal16);
             return FALSE;
         }
-        ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template);
+        ConvertDialog32To16(template32, size, template);
         hDlgTmpl16 = hGlobal16;
     }
 
diff --git a/reactos/dll/win32/comdlg32/comdlg32.rbuild b/reactos/dll/win32/comdlg32/comdlg32.rbuild
index 89228e0892a..af50cf1940b 100644
--- a/reactos/dll/win32/comdlg32/comdlg32.rbuild
+++ b/reactos/dll/win32/comdlg32/comdlg32.rbuild
@@ -1,34 +1,33 @@
-<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true" usewrc="false">
+<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true">
 	<importlibrary definition="comdlg32.spec.def" />
 	<include base="comdlg32">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__REACTOS__" />
+	<define name="__WINESRC__" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<define name="WINVER">0x501</define>
 	<library>wine</library>
-	<library>uuid</library>
-	<library>ntdll</library>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>gdi32</library>
-	<library>user32</library>
-	<library>comctl32</library>
 	<library>shell32</library>
 	<library>shlwapi</library>
+	<library>comctl32</library>
 	<library>winspool</library>
+	<library>user32</library>
+	<library>gdi32</library>
+	<library>advapi32</library>
+	<library>kernel32</library>
+	<library>ntdll</library>
 	<library>ole32</library>
+	<library>uuid</library>
 	<file>cdlg32.c</file>
 	<file>colordlg.c</file>
 	<file>filedlg.c</file>
 	<file>filedlg31.c</file>
 	<file>filedlgbrowser.c</file>
-	<file>filetitle.c</file>
 	<file>finddlg32.c</file>
 	<file>fontdlg.c</file>
 	<file>printdlg.c</file>
 	<file>rsrc.rc</file>
 	<file>comdlg32.spec</file>
-	<pch>precomp.h</pch>
 </module>
diff --git a/reactos/dll/win32/comdlg32/comdlg32_ros.diff b/reactos/dll/win32/comdlg32/comdlg32_ros.diff
index 2771619bab1..10faa42425c 100644
--- a/reactos/dll/win32/comdlg32/comdlg32_ros.diff
+++ b/reactos/dll/win32/comdlg32/comdlg32_ros.diff
@@ -1,439 +1,310 @@
-Index: colordlg.c
-===================================================================
---- colordlg.c	(revision 25649)
-+++ colordlg.c	(working copy)
-@@ -23,20 +23,7 @@
-    sometimes, especially when 2 instances of the
-    dialog are loaded at the same time */
- 
--#include <ctype.h>
--#include <stdlib.h>
--#include <stdarg.h>
--#include <stdio.h>
--#include <string.h>
--#include "windef.h"
--#include "winbase.h"
--#include "wingdi.h"
--#include "winuser.h"
--#include "commdlg.h"
--#include "dlgs.h"
--#include "wine/debug.h"
--#include "cderr.h"
--#include "cdlg.h"
-+#include <precomp.h>
- 
- WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
- 
-Index: filedlgbrowser.c
-===================================================================
---- filedlgbrowser.c	(revision 25649)
-+++ filedlgbrowser.c	(working copy)
-@@ -19,29 +19,8 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
--#include <stdarg.h>
--#include <stdio.h>
--#include <string.h>
-+#include <precomp.h>
- 
--#define COBJMACROS
--#define NONAMELESSUNION
--#define NONAMELESSSTRUCT
--
--#include "windef.h"
--#include "winbase.h"
--#include "winnls.h"
--#include "wingdi.h"
--#include "winuser.h"
--#include "winreg.h"
--
--#define NO_SHLWAPI_STREAM
--#include "shlwapi.h"
--#include "filedlgbrowser.h"
--#include "cdlg.h"
--#include "shlguid.h"
--#include "servprov.h"
--#include "wine/debug.h"
--
- WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
- 
- typedef struct
-Index: precomp.h
-===================================================================
---- precomp.h	(revision 0)
-+++ precomp.h	(revision 0)
-@@ -0,0 +1,76 @@
-+#ifndef PRECOMP_H__
-+#define PRECOMP_H__
-+
-+#include <ctype.h>
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <string.h>
-+
-+#define COBJMACROS
-+#define NONAMELESSUNION
-+#define NONAMELESSSTRUCT
-+#define NO_SHLWAPI_STREAM
-+#define COM_NO_WINDOWS_H
-+#define _COMDLG32_
-+
-+#if defined (_MSC_VER)
-+#include <windef.h>
-+#include <winbase.h>
-+#include <wingdi.h>
-+#include <winuser.h>
-+#include <commdlg.h>
-+#include <shellapi.h>
-+#include <shlguid.h>
-+#include <shlobj.h>
-+#include <shlwapi.h>
-+#include <guiddef.h>
-+#include <dlgs.h>
-+#include <cderr.h>
-+#endif
-+
-+#include "wine/windef.h"
-+#include "winbase.h"
-+#include "wine/wingdi.h"
-+#include "wine/winuser.h"
-+#include "wine/commdlg.h"
-+#include "wine/shellapi.h"
-+
-+#if !defined (_MSC_VER)
-+#include "psdk/shlguid.h"
-+#include "psdk/shlobj.h"
-+#endif
-+
-+#include "wine/shlguid.h"
-+#include "wine/shlobj.h"
-+
-+#if !defined (_MSC_VER)
-+#include "psdk/shlguid.h"
-+#include "psdk/shlwapi.h"
-+#include "wine/shlwapi.h"
-+#endif
-+
-+#include "wine/winbase16.h"
-+#include "wine/winuser16.h"
-+#include "wine/guiddef.h"
-+#include "wine/dlgs.h"
-+#include "wine/debug.h"
-+#include "wine/unicode.h"
-+
-+#include <cderr.h>
-+#include <cdlg.h>
-+#include <winspool.h>
-+#include <winerror.h>
-+#include <winnls.h>
-+#include <winreg.h>
-+#include <winternl.h>
-+
-+//local headers
-+#include "cdlg.h"
-+#include "printdlg.h"
-+#include "filedlgbrowser.h"
-+#include "cdlg.h"
-+#include "servprov.h"
-+#include "filedlg31.h"
-+
-+#endif
-
-Property changes on: precomp.h
-___________________________________________________________________
-Name: svn:eol-style
-   + native
-
-Index: finddlg32.c
-===================================================================
---- finddlg32.c	(revision 25649)
-+++ finddlg32.c	(working copy)
-@@ -19,23 +19,10 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
--#include <stdarg.h>
--#include <string.h>
--#include "windef.h"
--#include "winbase.h"
--#include "winnls.h"
--#include "wingdi.h"
--#include "winuser.h"
--#include "commdlg.h"
--#include "cderr.h"
--#include "dlgs.h"
--#include "wine/debug.h"
-+#include <precomp.h>
- 
- WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
- 
--#include "cdlg.h"
--
--
- /*-----------------------------------------------------------------------*/
- 
- static UINT		FindReplaceMessage;
-Index: cdlg.h
-===================================================================
---- cdlg.h	(revision 25649)
-+++ cdlg.h	(working copy)
-@@ -21,9 +21,7 @@
- #ifndef _WINE_DLL_CDLG_H
- #define _WINE_DLL_CDLG_H
- 
--#define COM_NO_WINDOWS_H
--#include "dlgs.h"
--#include "wownt32.h"
-+#include <wownt32.h>
- 
- /* Common dialogs implementation globals */
- #define COMDLG32_Atom	((ATOM)0xa000)	/* MS uses this one to identify props */
-@@ -155,15 +153,6 @@
- 
- #define IDS_FAKEDOCTEXT  1300
- 
--#include "windef.h"
--#include "winbase.h"
--#include "wingdi.h"
--#include "winuser.h"
--#include "winnls.h"
--#include "commctrl.h"
--#include "shlobj.h"
--#include "shellapi.h"
--
- /* ITEMIDLIST */
- 
- extern LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST);
-Index: cdlg32.c
-===================================================================
---- cdlg32.c	(revision 25649)
-+++ cdlg32.c	(working copy)
-@@ -19,21 +19,10 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
--#include <stdarg.h>
-+#include <precomp.h>
- 
--#include "windef.h"
--#include "winbase.h"
--#include "wingdi.h"
--#include "winuser.h"
--#include "commdlg.h"
--#include "cderr.h"
--#include "wine/debug.h"
--
- WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
- 
--#include "cdlg.h"
--
--
- HINSTANCE	COMDLG32_hInstance = 0;
- 
- static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES;
 Index: printdlg.c
 ===================================================================
---- printdlg.c	(revision 25649)
-+++ printdlg.c	(revision 25650)
-@@ -20,32 +20,11 @@
-  * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
--#include <ctype.h>
--#include <stdlib.h>
--#include <stdarg.h>
--#include <stdio.h>
--#include <string.h>
+--- printdlg.c	(revision 23123)
++++ printdlg.c	(working copy)
+@@ -347,7 +347,7 @@
+ 	        lpdm->dmCollate =
+ 		  (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
+ 	    if (lpdm->dmFields & DM_COPIES)
+-	        lpdm->dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
++	        lpdm->u.s.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ 	} else {
+ 	    if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
+ 	        lppd->Flags |= PD_COLLATE;
+@@ -425,7 +425,7 @@
+ 	        lpdm->dmCollate =
+ 		  (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
+ 	    if (lpdm->dmFields & DM_COPIES)
+-	        lpdm->dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
++	        lpdm->u.s.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ 	} else {
+ 	    if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
+ 	        lppd->Flags |= PD_COLLATE;
+@@ -590,9 +590,9 @@
+                                       Sel, 0);
+         if (dm) {
+             if (nIDComboBox == cmb2)
+-                dm->u1.s1.dmPaperSize = oldWord;
++                dm->u.s.dmPaperSize = oldWord;
+             else
+-                dm->dmDefaultSource = oldWord;
++                dm->u.s.dmDefaultSource = oldWord;
+         }
+     }
+     else {
+@@ -602,9 +602,9 @@
+          */
+         if (dm) {
+             if (nIDComboBox == cmb2)
+-                oldWord = dm->u1.s1.dmPaperSize;
++                oldWord = dm->u.s.dmPaperSize;
+             else
+-                oldWord = dm->dmDefaultSource;
++                oldWord = dm->u.s.dmDefaultSource;
+         }
+     }
  
--#define NONAMELESSUNION
--#define NONAMELESSSTRUCT
--#include "windef.h"
--#include "winbase.h"
--#include "wingdi.h"
--#include "winuser.h"
--#include "winspool.h"
--#include "winerror.h"
-+#include <precomp.h>
+@@ -700,9 +700,9 @@
+                                       Sel, 0);
+         if (dm) {
+             if (nIDComboBox == cmb2)
+-                dm->u1.s1.dmPaperSize = oldWord;
++                dm->u.s.dmPaperSize = oldWord;
+             else
+-                dm->dmDefaultSource = oldWord;
++                dm->u.s.dmDefaultSource = oldWord;
+         }
+     }
+     else {
+@@ -712,9 +712,9 @@
+          */
+         if (dm) {
+             if (nIDComboBox == cmb2)
+-                oldWord = dm->u1.s1.dmPaperSize;
++                oldWord = dm->u.s.dmPaperSize;
+             else
+-                oldWord = dm->dmDefaultSource;
++                oldWord = dm->u.s.dmDefaultSource;
+         }
+     }
  
--#include "wine/debug.h"
--
--#include "commdlg.h"
--#include "dlgs.h"
--#include "cderr.h"
--
- WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
+@@ -964,7 +964,7 @@
+ 	  if (lppd->hDevMode == 0)
+ 	      copies = lppd->nCopies;
+ 	  else
+-	      copies = lpdm->dmCopies;
++	      copies = lpdm->u.s.dmCopies;
+ 	  if(copies == 0) copies = 1;
+ 	  else if(copies < 0) copies = MAX_COPIES;
+ 	  SetDlgItemInt(hDlg, edt3, copies, FALSE);
+@@ -986,7 +986,7 @@
+             ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
  
--#include "cdlg.h"
--#include "printdlg.h"
--
- /* Yes these constants are the same, but we're just copying win98 */
- #define UPDOWN_ID 0x270f
- #define MAX_COPIES 9999
-Index: fontdlg.c
-===================================================================
---- fontdlg.c	(revision 25649)
-+++ fontdlg.c	(working copy)
-@@ -19,20 +19,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
+     } else { /* PD_PRINTSETUP */
+-      BOOL bPortrait = (lpdm->u1.s1.dmOrientation == DMORIENT_PORTRAIT);
++      BOOL bPortrait = (lpdm->u.s.dmOrientation == DMORIENT_PORTRAIT);
  
--#include <ctype.h>
--#include <stdlib.h>
--#include <stdarg.h>
--#include <stdio.h>
--#include <string.h>
--#include "windef.h"
--#include "winbase.h"
--#include "winnls.h"
--#include "wingdi.h"
--#include "winuser.h"
--#include "commdlg.h"
--#include "dlgs.h"
--#include "wine/debug.h"
--#include "cderr.h"
-+#include <precomp.h>
+       PRINTDLG_SetUpPaperComboBoxA(hDlg, cmb2,
+ 				  PrintStructures->lpPrinterInfo->pPrinterName,
+@@ -1113,7 +1113,7 @@
+ 	  if (lppd->hDevMode == 0)
+ 	      copies = lppd->nCopies;
+ 	  else
+-	      copies = lpdm->dmCopies;
++	      copies = lpdm->u.s.dmCopies;
+ 	  if(copies == 0) copies = 1;
+ 	  else if(copies < 0) copies = MAX_COPIES;
+ 	  SetDlgItemInt(hDlg, edt3, copies, FALSE);
+@@ -1135,7 +1135,7 @@
+             ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
  
- WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
+     } else { /* PD_PRINTSETUP */
+-      BOOL bPortrait = (lpdm->u1.s1.dmOrientation == DMORIENT_PORTRAIT);
++      BOOL bPortrait = (lpdm->u.s.dmOrientation == DMORIENT_PORTRAIT);
  
-Index: filedlg.c
-===================================================================
---- filedlg.c	(revision 25649)
-+++ filedlg.c	(working copy)
-@@ -46,40 +46,11 @@
-  *
-  */
+       PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2,
+ 				  PrintStructures->lpPrinterInfo->pPrinterName,
+@@ -1509,7 +1509,7 @@
+     case rad1: /* Paperorientation */
+         if (lppd->Flags & PD_PRINTSETUP)
+         {
+-              lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
++              lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+               SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
+                           (LPARAM)(PrintStructures->hPortraitIcon));
+         }
+@@ -1518,7 +1518,7 @@
+     case rad2: /* Paperorientation */
+         if (lppd->Flags & PD_PRINTSETUP)
+         {
+-              lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
++              lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+               SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
+                           (LPARAM)(PrintStructures->hLandscapeIcon));
+         }
+@@ -1542,7 +1542,7 @@
+       {
+ 	  DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
+ 	  if(Sel != CB_ERR)
+-	      lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
++	      lpdm->u.s.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
+ 							    CB_GETITEMDATA,
+ 							    Sel, 0);
+       }
+@@ -1552,7 +1552,7 @@
+       {
+ 	  DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
+ 	  if(Sel != CB_ERR)
+-	      lpdm->dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
++	      lpdm->u.s.dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
+ 							  CB_GETITEMDATA, Sel,
+ 							  0);
+       }
+@@ -1563,8 +1563,8 @@
+ 	case rad1:                         /* orientation */
+ 	case rad2:
+ 	    if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
+-	        if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
+-		    lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
++	        if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
++		    lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ 		    SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
+ 					(WPARAM)IMAGE_ICON,
+ 					(LPARAM)PrintStructures->hPortraitIcon);
+@@ -1573,8 +1573,8 @@
+ 					(LPARAM)PrintStructures->hPortraitIcon);
+ 		}
+ 	    } else {
+-	        if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
+-	            lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
++	        if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
++	            lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ 		    SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
+ 					(WPARAM)IMAGE_ICON,
+ 					(LPARAM)PrintStructures->hLandscapeIcon);
+@@ -1673,7 +1673,7 @@
+     case rad1: /* Paperorientation */
+         if (lppd->Flags & PD_PRINTSETUP)
+         {
+-              lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
++              lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+               SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
+                           (LPARAM)(PrintStructures->hPortraitIcon));
+         }
+@@ -1682,7 +1682,7 @@
+     case rad2: /* Paperorientation */
+         if (lppd->Flags & PD_PRINTSETUP)
+         {
+-              lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
++              lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+               SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
+                           (LPARAM)(PrintStructures->hLandscapeIcon));
+         }
+@@ -1706,7 +1706,7 @@
+       {
+ 	  DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0);
+ 	  if(Sel != CB_ERR)
+-	      lpdm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
++	      lpdm->u.s.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
+ 							    CB_GETITEMDATA,
+ 							    Sel, 0);
+       }
+@@ -1716,7 +1716,7 @@
+       {
+ 	  DWORD Sel = SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0, 0);
+ 	  if(Sel != CB_ERR)
+-	      lpdm->dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
++	      lpdm->u.s.dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
+ 							  CB_GETITEMDATA, Sel,
+ 							  0);
+       }
+@@ -1727,8 +1727,8 @@
+ 	case rad1:                         /* orientation */
+ 	case rad2:
+ 	    if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
+-	        if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
+-		    lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
++	        if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
++		    lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ 		    SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
+ 					(WPARAM)IMAGE_ICON,
+ 					(LPARAM)PrintStructures->hPortraitIcon);
+@@ -1737,8 +1737,8 @@
+ 					(LPARAM)PrintStructures->hPortraitIcon);
+ 		}
+ 	    } else {
+-	        if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
+-	            lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
++	        if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
++	            lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ 		    SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
+ 					(WPARAM)IMAGE_ICON,
+ 					(LPARAM)PrintStructures->hLandscapeIcon);
+@@ -2499,15 +2499,15 @@
  
--#include "config.h"
--#include "wine/port.h"
-+//#include "config.h"
-+//#include "wine/port.h"
+     /* Save paper orientation into device context */
+     if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y)
+-        dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
++        dm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+     else
+-        dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
++        dm->u.s.dmOrientation = DMORIENT_PORTRAIT;
  
--#include <ctype.h>
--#include <stdlib.h>
--#include <stdarg.h>
--#include <stdio.h>
--#include <string.h>
-+#include <precomp.h>
+     /* Save paper size into the device context */
+     paperword = SendDlgItemMessageA(hDlg,cmb2,CB_GETITEMDATA,
+         SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0);
+     if (paperword != CB_ERR)
+-        dm->u1.s1.dmPaperSize = paperword;
++        dm->u.s.dmPaperSize = paperword;
+     else
+         FIXME("could not get dialog text for papersize cmbbox?\n");
  
--#define COBJMACROS
--#define NONAMELESSUNION
--#define NONAMELESSSTRUCT
--
--#include "windef.h"
--#include "winbase.h"
--#include "winreg.h"
--#include "winternl.h"
--#include "winnls.h"
--#include "wine/unicode.h"
--#include "wingdi.h"
--#include "winuser.h"
--#include "winreg.h"
--#include "commdlg.h"
--#include "dlgs.h"
--#include "cdlg.h"
--#include "filedlg31.h"
--#include "wine/debug.h"
--#include "cderr.h"
--#include "shellapi.h"
--#include "shlguid.h"
--#include "shlobj.h"
--#include "filedlgbrowser.h"
--#include "shlwapi.h"
--
- WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
- 
- #define UNIMPLEMENTED_FLAGS \
-Index: comdlg32.rbuild
-===================================================================
---- comdlg32.rbuild	(revision 25649)
-+++ comdlg32.rbuild	(working copy)
-@@ -30,4 +30,5 @@
- 	<file>printdlg.c</file>
- 	<file>rsrc.rc</file>
- 	<file>comdlg32.spec</file>
-+	<pch>precomp.h</pch>
- </module>
-Index: filedlg31.c
-===================================================================
---- filedlg31.c	(revision 25649)
-+++ filedlg31.c	(working copy)
-@@ -18,33 +18,11 @@
-  * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
--#include <ctype.h>
--#include <stdlib.h>
--#include <stdarg.h>
--#include <stdio.h>
--#include <string.h>
--#include "windef.h"
--#include "winbase.h"
--#include "winnls.h"
--#include "wingdi.h"
--#include "winuser.h"
--#include "wine/unicode.h"
--#include "wine/debug.h"
--#include "cderr.h"
--#include "winreg.h"
--#include "winternl.h"
--#include "winuser.h"
--#include "commdlg.h"
--#include "cderr.h"
--#include "winreg.h"
--#include "winternl.h"
--#include "shlwapi.h"
- 
-+#include <precomp.h>
-+
- WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
- 
--#include "cdlg.h"
--#include "filedlg31.h"
--
- #define BUFFILE 512
- #define BUFFILEALLOC 512 * sizeof(WCHAR)
- 
-Index: filetitle.c
-===================================================================
---- filetitle.c	(revision 25649)
-+++ filetitle.c	(working copy)
-@@ -19,22 +19,8 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
--#include <stdarg.h>
--#include <string.h>
-+#include <precomp.h>
- 
--#include "windef.h"
--#include "winbase.h"
--#include "winnls.h"
--#include "winreg.h"
--#include "winternl.h"
--#include "wingdi.h"
--#include "winuser.h"
--#include "commdlg.h"
--#include "cdlg.h"
--#include "cdlg16.h"
--#include "wine/unicode.h"
--#include "wine/debug.h"
--
- WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
- 
- /***********************************************************************
-@@ -49,11 +35,11 @@
-     LPWSTR lpWTitle;
- 
-     RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile);
--    lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR));
-+    lpWTitle = HeapAlloc( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR));
-     ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf);
-     if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL );
-     RtlFreeUnicodeString( &strWFile );
--    RtlFreeHeap( GetProcessHeap(), 0, lpWTitle );
-+    HeapFree( GetProcessHeap(), 0, lpWTitle );
-     return ret;
- }
+@@ -2515,7 +2515,7 @@
+     paperword = SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA,
+         SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0), 0);
+     if (paperword != CB_ERR)
+-        dm->dmDefaultSource = paperword;
++        dm->u.s.dmDefaultSource = paperword;
+     else
+         FIXME("could not get dialog text for papersize cmbbox?\n");
  
+@@ -2809,7 +2809,7 @@
+     case cmb3:
+ 	if(msg == CBN_SELCHANGE){
+ 	    DEVMODEA *dm = GlobalLock(pda->pdlg.hDevMode);
+-	    dm->dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,CB_GETITEMDATA,
++	    dm->u.s.dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,CB_GETITEMDATA,
+                 SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0);
+ 	    GlobalUnlock(pda->pdlg.hDevMode);
+ 	}
+@@ -2832,10 +2832,10 @@
+ 	                        DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT);
+ 	    ClosePrinter(hPrinter);
+ 	    /* Changing paper */
+-	    PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u1.s1.dmPaperSize, &(pda->curdlg.ptPaperSize));
++	    PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u.s.dmPaperSize, &(pda->curdlg.ptPaperSize));
+ 	    pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x);
+ 	    pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y);
+-            if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE){
++            if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE){
+                 DWORD tmp = pda->curdlg.ptPaperSize.x;
+                 pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y;
+                 pda->curdlg.ptPaperSize.y = tmp;
+@@ -2849,7 +2849,7 @@
+ 	    count = SendDlgItemMessageA(hDlg, cmb2, CB_GETCOUNT, 0, 0);
+ 	    if(count != CB_ERR){ 
+                 for(i=0; i<count; ++i){
+-		    if(SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0) == dm->u1.s1.dmPaperSize) {
++		    if(SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0) == dm->u.s.dmPaperSize) {
+ 			SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0);
+ 			break;
+ 		    }
+@@ -3153,7 +3153,7 @@
+ 	}
+         /* Set orientation radiobutton properly */
+         dm = GlobalLock(pda->dlga->hDevMode);
+-        if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE)
++        if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
+             CheckRadioButton(hDlg, rad1, rad2, rad2);
+ 	else /* this is default if papersize is not set */
+             CheckRadioButton(hDlg, rad1, rad2, rad1);
+@@ -3198,8 +3198,8 @@
+         PRINTDLG_PS_ChangePrinterA(hDlg, pda);
+ 	dm = GlobalLock(pda->pdlg.hDevMode);
+ 	if(dm){
+-	    dm->dmDefaultSource = 15; /*FIXME: Automatic select. Does it always 15 at start? */
+-	    PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u1.s1.dmPaperSize, &pda->curdlg.ptPaperSize);
++	    dm->u.s.dmDefaultSource = 15; /*FIXME: Automatic select. Does it always 15 at start? */
++	    PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u.s.dmPaperSize, &pda->curdlg.ptPaperSize);
+             GlobalUnlock(pda->pdlg.hDevMode);
+ 	    pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x);
+ 	    pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y);
+@@ -3401,7 +3401,7 @@
+ 	DEVMODEA *dm;
+ 	
+ 	dm = GlobalLock(pdlg.hDevMode);
+-    	PRINTDLG_PaperSizeA(&pdlg, dm->u1.s1.dmPaperSize, &setupdlg->ptPaperSize);
++    	PRINTDLG_PaperSizeA(&pdlg, dm->u.s.dmPaperSize, &setupdlg->ptPaperSize);
+ 	GlobalUnlock(pdlg.hDevMode);
+ 	setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x);
+ 	setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y);
diff --git a/reactos/dll/win32/comdlg32/filedlg.c b/reactos/dll/win32/comdlg32/filedlg.c
index 8f2c4267c63..e8e82f2c0c1 100644
--- a/reactos/dll/win32/comdlg32/filedlg.c
+++ b/reactos/dll/win32/comdlg32/filedlg.c
@@ -46,10 +46,39 @@
  *
  */
 
-//#include "config.h"
-//#include "wine/port.h"
+#include "config.h"
+#include "wine/port.h"
 
-#include <precomp.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winternl.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "commdlg.h"
+#include "dlgs.h"
+#include "cdlg.h"
+#include "filedlg31.h"
+#include "cderr.h"
+#include "shellapi.h"
+#include "shlobj.h"
+#include "filedlgbrowser.h"
+#include "shlwapi.h"
+
+#include "wine/unicode.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
@@ -111,53 +140,52 @@ typedef struct tagFD32_PRIVATE
 
 /* Combo box macros */
 #define CBAddString(hwnd,str) \
-  SendMessageA(hwnd,CB_ADDSTRING,0,(LPARAM)str);
-#define CBAddStringW(hwnd,str) \
-  SendMessageW(hwnd,CB_ADDSTRING,0,(LPARAM)str);
+    SendMessageW(hwnd, CB_ADDSTRING, 0, (LPARAM)(str));
 
 #define CBInsertString(hwnd,str,pos) \
-  SendMessageA(hwnd,CB_INSERTSTRING,(WPARAM)pos,(LPARAM)str);
+    SendMessageW(hwnd, CB_INSERTSTRING, (WPARAM)(pos), (LPARAM)(str));
 
 #define CBDeleteString(hwnd,pos) \
-  SendMessageA(hwnd,CB_DELETESTRING,(WPARAM)pos,0);
+    SendMessageW(hwnd, CB_DELETESTRING, (WPARAM)(pos), 0);
 
 #define CBSetItemDataPtr(hwnd,iItemId,dataPtr) \
-  SendMessageA(hwnd,CB_SETITEMDATA,(WPARAM)iItemId,(LPARAM)dataPtr);
+    SendMessageW(hwnd, CB_SETITEMDATA, (WPARAM)(iItemId), (LPARAM)(dataPtr));
 
 #define CBGetItemDataPtr(hwnd,iItemId) \
-  SendMessageA(hwnd,CB_GETITEMDATA,(WPARAM)iItemId,0)
+    SendMessageW(hwnd, CB_GETITEMDATA, (WPARAM)(iItemId), 0)
 
 #define CBGetLBText(hwnd,iItemId,str) \
-  SendMessageA(hwnd,CB_GETLBTEXT,(WPARAM)iItemId,(LPARAM)str);
+    SendMessageW(hwnd, CB_GETLBTEXT, (WPARAM)(iItemId), (LPARAM)(str));
 
 #define CBGetCurSel(hwnd) \
-  SendMessageA(hwnd,CB_GETCURSEL,0,0);
+    SendMessageW(hwnd, CB_GETCURSEL, 0, 0);
 
 #define CBSetCurSel(hwnd,pos) \
-  SendMessageA(hwnd,CB_SETCURSEL,(WPARAM)pos,0);
+    SendMessageW(hwnd, CB_SETCURSEL, (WPARAM)(pos), 0);
 
 #define CBGetCount(hwnd) \
-    SendMessageA(hwnd,CB_GETCOUNT,0,0);
+    SendMessageW(hwnd, CB_GETCOUNT, 0, 0);
 #define CBShowDropDown(hwnd,show) \
-  SendMessageA(hwnd,CB_SHOWDROPDOWN,(WPARAM)show,0);
+    SendMessageW(hwnd, CB_SHOWDROPDOWN, (WPARAM)(show), 0);
 #define CBSetItemHeight(hwnd,index,height) \
-  SendMessageA(hwnd,CB_SETITEMHEIGHT,(WPARAM)index,(LPARAM)height);
+    SendMessageW(hwnd, CB_SETITEMHEIGHT, (WPARAM)(index), (LPARAM)(height));
 
 #define CBSetExtendedUI(hwnd,flag) \
-  SendMessageA(hwnd,CB_SETEXTENDEDUI,(WPARAM)(flag),0)
+    SendMessageW(hwnd, CB_SETEXTENDEDUI, (WPARAM)(flag), 0)
 
-const char *FileOpenDlgInfosStr = "FileOpenDlgInfos"; /* windows property description string */
-const char *LookInInfosStr = "LookInInfos"; /* LOOKIN combo box property */
+const char FileOpenDlgInfosStr[] = "FileOpenDlgInfos"; /* windows property description string */
+static const char LookInInfosStr[] = "LookInInfos"; /* LOOKIN combo box property */
 
 /***********************************************************************
  * Prototypes
  */
 
 /* Internal functions used by the dialog */
+static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam);
 static LRESULT FILEDLG95_FillControls(HWND hwnd, WPARAM wParam, LPARAM lParam);
 static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam);
 static LRESULT FILEDLG95_OnWMGetIShellBrowser(HWND hwnd);
-       BOOL    FILEDLG95_OnOpen(HWND hwnd);
+static BOOL    FILEDLG95_OnOpen(HWND hwnd);
 static LRESULT FILEDLG95_InitControls(HWND hwnd);
 static void    FILEDLG95_Clean(HWND hwnd);
 
@@ -189,17 +217,16 @@ static int     FILEDLG95_LOOKIN_RemoveMostExpandedItem(HWND hwnd);
 static void    FILEDLG95_LOOKIN_Clean(HWND hwnd);
 
 /* Miscellaneous tool functions */
-static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName);
+static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPWSTR lpstrFileName);
 IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs);
 LPITEMIDLIST  GetParentPidl(LPITEMIDLIST pidl);
-LPITEMIDLIST  GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName);
+static LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName);
 
 /* Shell memory allocation */
 static void *MemAlloc(UINT size);
 static void MemFree(void *mem);
 
-INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
+static INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 static BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed);
 static BOOL BrowseSelectedFolder(HWND hwnd);
@@ -226,13 +253,13 @@ static BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos)
     /* test for missing functionality */
     if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS)
     {
-      FIXME("Flags 0x%08lx not yet implemented\n",
+      FIXME("Flags 0x%08x not yet implemented\n",
          fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS);
     }
 
     /* Create the dialog from a template */
 
-    if(!(hRes = FindResourceA(COMDLG32_hInstance,MAKEINTRESOURCEA(NEWFILEOPENORD),(LPSTR)RT_DIALOG)))
+    if(!(hRes = FindResourceW(COMDLG32_hInstance,MAKEINTRESOURCEW(NEWFILEOPENORD),(LPCWSTR)RT_DIALOG)))
     {
         COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
         return FALSE;
@@ -247,20 +274,27 @@ static BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos)
     /* old style hook messages */
     if (IsHooked(fodInfos))
     {
-      fodInfos->HookMsg.fileokstring = RegisterWindowMessageA(FILEOKSTRINGA);
-      fodInfos->HookMsg.lbselchstring = RegisterWindowMessageA(LBSELCHSTRINGA);
-      fodInfos->HookMsg.helpmsgstring = RegisterWindowMessageA(HELPMSGSTRINGA);
-      fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRINGA);
+      fodInfos->HookMsg.fileokstring = RegisterWindowMessageW(FILEOKSTRINGW);
+      fodInfos->HookMsg.lbselchstring = RegisterWindowMessageW(LBSELCHSTRINGW);
+      fodInfos->HookMsg.helpmsgstring = RegisterWindowMessageW(HELPMSGSTRINGW);
+      fodInfos->HookMsg.sharevistring = RegisterWindowMessageW(SHAREVISTRINGW);
     }
 
     /* Some shell namespace extensions depend on COM being initialized. */
     hr = OleInitialize(NULL);
 
-    lRes = DialogBoxIndirectParamA(COMDLG32_hInstance,
-                                  (LPDLGTEMPLATEA) template,
-                                  fodInfos->ofnInfos->hwndOwner,
-                                  FileOpenDlgProc95,
-                                  (LPARAM) fodInfos);
+    if (fodInfos->unicode)
+      lRes = DialogBoxIndirectParamW(COMDLG32_hInstance,
+                                     template,
+                                     fodInfos->ofnInfos->hwndOwner,
+                                     FileOpenDlgProc95,
+                                     (LPARAM) fodInfos);
+    else
+      lRes = DialogBoxIndirectParamA(COMDLG32_hInstance,
+                                     (LPCDLGTEMPLATEA) template,
+                                     fodInfos->ofnInfos->hwndOwner,
+                                     FileOpenDlgProc95,
+                                     (LPARAM) fodInfos);
     if (SUCCEEDED(hr)) 
         OleUninitialize();
 
@@ -289,6 +323,9 @@ BOOL  WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
   LPWSTR filter = NULL;
   LPWSTR customfilter = NULL;
 
+  /* Initialize CommDlgExtendedError() */
+  COMDLG32_SetCommDlgExtendedError(0);
+
   /* Initialize FileOpenDlgInfos structure */
   ZeroMemory(&fodInfos, sizeof(FileOpenDlgInfos));
 
@@ -394,19 +431,12 @@ BOOL  WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
       MemFree(lpstrSavDir);
   }
 
-  if(title)
-    MemFree(title);
-  if(defext)
-    MemFree(defext);
-  if(filter)
-    MemFree(filter);
-  if(customfilter)
-    MemFree(customfilter);
-  if(fodInfos.initdir)
-    MemFree(fodInfos.initdir);
-
-  if(fodInfos.filename)
-    MemFree(fodInfos.filename);
+  MemFree(title);
+  MemFree(defext);
+  MemFree(filter);
+  MemFree(customfilter);
+  MemFree(fodInfos.initdir);
+  MemFree(fodInfos.filename);
 
   TRACE("selected file: %s\n",ofn->lpstrFile);
 
@@ -426,6 +456,9 @@ BOOL  WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType)
   FileOpenDlgInfos fodInfos;
   LPWSTR lpstrSavDir = NULL;
 
+  /* Initialize CommDlgExtendedError() */
+  COMDLG32_SetCommDlgExtendedError(0);
+
   /* Initialize FileOpenDlgInfos structure */
   ZeroMemory(&fodInfos, sizeof(FileOpenDlgInfos));
 
@@ -449,7 +482,7 @@ BOOL  WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType)
   if(ofn->lpstrInitialDir)
   {
     /* fodInfos.initdir = strdupW(ofn->lpstrInitialDir); */
-    DWORD len = strlenW(ofn->lpstrInitialDir)+1;
+    DWORD len = lstrlenW(ofn->lpstrInitialDir)+1;
     fodInfos.initdir = MemAlloc(len*sizeof(WCHAR));
     memcpy(fodInfos.initdir,ofn->lpstrInitialDir,len*sizeof(WCHAR));
   }
@@ -742,9 +775,14 @@ static HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
           return NULL;
     	}
       }
-      hChildDlg = CreateDialogIndirectParamA(hinst, template, hwnd,
-                                             IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate,
-                                             (LPARAM)fodInfos->ofnInfos);
+      if (fodInfos->unicode)
+          hChildDlg = CreateDialogIndirectParamW(hinst, template, hwnd,
+              IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate,
+              (LPARAM)fodInfos->ofnInfos);
+      else
+          hChildDlg = CreateDialogIndirectParamA(hinst, template, hwnd,
+              IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate,
+              (LPARAM)fodInfos->ofnInfos);
       if(hChildDlg)
       {
         ShowWindow(hChildDlg,SW_SHOW);
@@ -843,10 +881,10 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer
     if( fodInfos->unicode )
     {
         LPWSTR bufW = buffer;
-        total = strlenW(lpstrCurrentDir) + 1 + sizeUsed;
+        total = lstrlenW(lpstrCurrentDir) + 1 + sizeUsed;
 
         /* Prepend the current path */
-        n = strlenW(lpstrCurrentDir) + 1;
+        n = lstrlenW(lpstrCurrentDir) + 1;
         memcpy( bufW, lpstrCurrentDir, min(n,size) * sizeof(WCHAR));
         if(n<size)
         {
@@ -940,7 +978,7 @@ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM
                     WideCharToMultiByte(CP_ACP, 0, lpstrPath, -1, 
                                         (LPSTR)lParam, (int)wParam, NULL, NULL);
             }        
-            retval = strlenW(lpstrPath);
+            retval = lstrlenW(lpstrPath);
             break;
 
         case CDM_GETSPEC:
@@ -1000,35 +1038,12 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
             so it will be easily accessible through a GetPropA(...) */
       	 SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos);
 
+         FILEDLG95_InitControls(hwnd);
+
       	 fodInfos->DlgInfos.hwndCustomDlg =
      	   CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd);
 
-         FILEDLG95_InitControls(hwnd);
-
-         if (fodInfos->DlgInfos.hwndCustomDlg)
-         {
-             RECT rc;
-             UINT flags = SWP_NOACTIVATE;
-
-             ArrangeCtrlPositions(fodInfos->DlgInfos.hwndCustomDlg, hwnd,
-                 (fodInfos->ofnInfos->Flags & (OFN_HIDEREADONLY | OFN_SHOWHELP)) == OFN_HIDEREADONLY);
-
-             /* resize the custom dialog to the parent size */
-             if (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))
-                 GetClientRect(hwnd, &rc);
-             else
-             {
-                 /* our own fake template is zero sized and doesn't have
-                  * children, so there is no need to resize it.
-                  * Picasa depends on it.
-                  */
-                 flags |= SWP_NOSIZE;
-                 SetRectEmpty(&rc);
-             }
-             SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM,
-                          0, 0, rc.right, rc.bottom, flags);
-         }
-
+         FILEDLG95_ResizeControls(hwnd, wParam, lParam);
       	 FILEDLG95_FillControls(hwnd, wParam, lParam);
 
          SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE);
@@ -1112,11 +1127,11 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
   int win2000plus = 0;
   int win98plus   = 0;
   int handledPath = FALSE;
-  OSVERSIONINFOA osVi;
+  OSVERSIONINFOW osVi;
   static const WCHAR szwSlash[] = { '\\', 0 };
   static const WCHAR szwStar[] = { '*',0 };
 
-  TBBUTTON tbb[] =
+  static const TBBUTTON tbb[] =
   {
    {0,                 0,                   TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0 },
    {VIEW_PARENTFOLDER, FCIDM_TB_UPFOLDER,   TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 },
@@ -1141,8 +1156,8 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
   TRACE("%p\n", fodInfos);
 
   /* Get windows version emulating */
-  osVi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);
-  GetVersionExA(&osVi);
+  osVi.dwOSVersionInfoSize = sizeof(osVi);
+  GetVersionExW(&osVi);
   if (osVi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
     win98plus   = ((osVi.dwMajorVersion > 4) || ((osVi.dwMajorVersion == 4) && (osVi.dwMinorVersion > 0)));
   } else if (osVi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
@@ -1168,21 +1183,28 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
   rectTB.left = rectlook.right;
   rectTB.top = rectlook.top-1;
 
-  fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL,
-        WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
-        rectTB.left, rectTB.top,
-        rectTB.right - rectTB.left, rectTB.bottom - rectTB.top,
-        hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL);
+  if (fodInfos->unicode)
+      fodInfos->DlgInfos.hwndTB = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL,
+          WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
+          rectTB.left, rectTB.top,
+          rectTB.right - rectTB.left, rectTB.bottom - rectTB.top,
+          hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL);
+  else
+      fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL,
+          WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
+          rectTB.left, rectTB.top,
+          rectTB.right - rectTB.left, rectTB.bottom - rectTB.top,
+          hwnd, (HMENU)IDC_TOOLBAR, COMDLG32_hInstance, NULL);
 
-  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
+  SendMessageW(fodInfos->DlgInfos.hwndTB, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0);
 
 /* FIXME: use TB_LOADIMAGES when implemented */
-/*  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_LOADIMAGES, (WPARAM) IDB_VIEW_SMALL_COLOR, HINST_COMMCTRL);*/
-  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, (WPARAM) 12, (LPARAM) &tba[0]);
-  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, (WPARAM) 1, (LPARAM) &tba[1]);
+/*  SendMessageW(fodInfos->DlgInfos.hwndTB, TB_LOADIMAGES, IDB_VIEW_SMALL_COLOR, HINST_COMMCTRL);*/
+  SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 12, (LPARAM) &tba[0]);
+  SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, 1, (LPARAM) &tba[1]);
 
-  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSA, (WPARAM) 9,(LPARAM) &tbb);
-  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0);
+  SendMessageW(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSW, 9, (LPARAM) &tbb);
+  SendMessageW(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0);
 
   /* Set the window text with the text specified in the OPENFILENAME structure */
   if(fodInfos->title)
@@ -1213,13 +1235,13 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
          if (result) {
 
             /* nameBit is always shorter than the original filename */
-            strcpyW(fodInfos->filename,nameBit);
+            lstrcpyW(fodInfos->filename,nameBit);
 
             *nameBit = 0x00;
             if (fodInfos->initdir == NULL)
                 MemFree(fodInfos->initdir);
-            fodInfos->initdir = MemAlloc((strlenW(tmpBuf) + 1)*sizeof(WCHAR));
-            strcpyW(fodInfos->initdir, tmpBuf);
+            fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf) + 1)*sizeof(WCHAR));
+            lstrcpyW(fodInfos->initdir, tmpBuf);
             handledPath = TRUE;
             TRACE("Value in Filename includes path, overriding InitialDir: %s, %s\n",
                     debugstr_w(fodInfos->filename), debugstr_w(fodInfos->initdir));
@@ -1243,23 +1265,22 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
           WCHAR *nameBit;
           DWORD result;
 
-          strcpyW(tmpBuf, fodInfos->initdir);
+          lstrcpyW(tmpBuf, fodInfos->initdir);
           if( PathFileExistsW(tmpBuf) ) {
               /* initdir does not have to be a directory. If a file is
                * specified, the dir part is taken */
               if( PathIsDirectoryW(tmpBuf)) {
-                  if (tmpBuf[strlenW(tmpBuf)-1] != '\\') {
-                     strcatW(tmpBuf, szwSlash);
+                  if (tmpBuf[lstrlenW(tmpBuf)-1] != '\\') {
+                     lstrcatW(tmpBuf, szwSlash);
                   }
-                  strcatW(tmpBuf, szwStar);
+                  lstrcatW(tmpBuf, szwStar);
               }
               result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit);
               if (result) {
                  *nameBit = 0x00;
-                 if (fodInfos->initdir)
-                    MemFree(fodInfos->initdir);
-                 fodInfos->initdir = MemAlloc((strlenW(tmpBuf2) + 1)*sizeof(WCHAR));
-                 strcpyW(fodInfos->initdir, tmpBuf2);
+                 MemFree(fodInfos->initdir);
+                 fodInfos->initdir = MemAlloc((lstrlenW(tmpBuf2) + 1)*sizeof(WCHAR));
+                 lstrcpyW(fodInfos->initdir, tmpBuf2);
                  handledPath = TRUE;
                  TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir));
               }
@@ -1290,14 +1311,13 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
             int len;
 
             /* nameBit is always shorter than the original filename */
-            strcpyW(fodInfos->filename, nameBit);
+            lstrcpyW(fodInfos->filename, nameBit);
             *nameBit = 0x00;
 
-            len = strlenW(tmpBuf);
-            if(fodInfos->initdir)
-               MemFree(fodInfos->initdir);
+            len = lstrlenW(tmpBuf);
+            MemFree(fodInfos->initdir);
             fodInfos->initdir = MemAlloc((len+1)*sizeof(WCHAR));
-            strcpyW(fodInfos->initdir, tmpBuf);
+            lstrcpyW(fodInfos->initdir, tmpBuf);
 
             handledPath = TRUE;
             TRACE("Value in Filename includes path, overriding initdir: %s, %s\n",
@@ -1322,7 +1342,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
 
            /* Skip the title */
            if(! *lpstrPos) break;	/* end */
-           lpstrPos += strlenW(lpstrPos) + 1;
+           lpstrPos += lstrlenW(lpstrPos) + 1;
 
            /* See if any files exist in the current dir with this extension */
            if(! *lpstrPos) break;	/* end */
@@ -1331,13 +1351,12 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
 
            if (hFind == INVALID_HANDLE_VALUE) {
                /* None found - continue search */
-               lpstrPos += strlenW(lpstrPos) + 1;
+               lpstrPos += lstrlenW(lpstrPos) + 1;
 
            } else {
                searchMore = FALSE;
 
-               if(fodInfos->initdir)
-                  MemFree(fodInfos->initdir);
+               MemFree(fodInfos->initdir);
                fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR));
                GetCurrentDirectoryW(MAX_PATH, fodInfos->initdir);
 
@@ -1382,7 +1401,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
   /* Must the open as read only check box be checked ?*/
   if(fodInfos->ofnInfos->Flags & OFN_READONLY)
   {
-    SendDlgItemMessageA(hwnd,IDC_OPENREADONLY,BM_SETCHECK,(WPARAM)TRUE,0);
+    SendDlgItemMessageW(hwnd,IDC_OPENREADONLY,BM_SETCHECK,TRUE,0);
   }
 
   /* Must the open as read only check box be hidden? */
@@ -1399,24 +1418,6 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
     EnableWindow(GetDlgItem(hwnd, pshHelp), FALSE);
   }
 
-  /* Resize the height, if open as read only checkbox ad help button
-     are hidden and we are not using a custom template nor a customDialog
-     */
-  if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
-       (!(fodInfos->ofnInfos->Flags &
-         (OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE))) && 
-       (!fodInfos->DlgInfos.hwndCustomDlg ))
-  {
-    RECT rectDlg, rectHelp, rectCancel;
-    GetWindowRect(hwnd, &rectDlg);
-    GetWindowRect(GetDlgItem(hwnd, pshHelp), &rectHelp);
-    GetWindowRect(GetDlgItem(hwnd, IDCANCEL), &rectCancel);
-    /* subtract the height of the help button plus the space between
-       the help button and the cancel button to the height of the dialog */
-    SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left,
-                 (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom),
-                 SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
-  }
   /* change Open to Save */
   if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
   {
@@ -1429,6 +1430,61 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
   return 0;
 }
 
+/***********************************************************************
+ *      FILEDLG95_ResizeControls
+ *
+ * WM_INITDIALOG message handler (after hook notification)
+ */
+static LRESULT FILEDLG95_ResizeControls(HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) lParam;
+
+  if (fodInfos->DlgInfos.hwndCustomDlg)
+  {
+    RECT rc;
+    UINT flags = SWP_NOACTIVATE;
+
+    ArrangeCtrlPositions(fodInfos->DlgInfos.hwndCustomDlg, hwnd,
+        (fodInfos->ofnInfos->Flags & (OFN_HIDEREADONLY | OFN_SHOWHELP)) == OFN_HIDEREADONLY);
+
+    /* resize the custom dialog to the parent size */
+    if (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))
+      GetClientRect(hwnd, &rc);
+    else
+    {
+      /* our own fake template is zero sized and doesn't have children, so
+       * there is no need to resize it. Picasa depends on it.
+       */
+      flags |= SWP_NOSIZE;
+      SetRectEmpty(&rc);
+    }
+      SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM,
+          0, 0, rc.right, rc.bottom, flags);
+  }
+  else
+  {
+    /* Resize the height, if open as read only checkbox ad help button are
+     * hidden and we are not using a custom template nor a customDialog
+     */
+    if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
+                (!(fodInfos->ofnInfos->Flags &
+                   (OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE))))
+    {
+      RECT rectDlg, rectHelp, rectCancel;
+      GetWindowRect(hwnd, &rectDlg);
+      GetWindowRect(GetDlgItem(hwnd, pshHelp), &rectHelp);
+      GetWindowRect(GetDlgItem(hwnd, IDCANCEL), &rectCancel);
+      /* subtract the height of the help button plus the space between the help
+       * button and the cancel button to the height of the dialog
+       */
+      SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left,
+          (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom),
+          SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
+    }
+  }
+  return TRUE;
+}
+
 /***********************************************************************
  *      FILEDLG95_FillControls
  *
@@ -1648,23 +1704,23 @@ BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCo
         LoadStringW(COMDLG32_hInstance, IDS_FILENOTFOUND, lpstrNotFound, 100);
         LoadStringW(COMDLG32_hInstance, IDS_VERIFYFILE, lpstrMsg, 100);
 
-        strcpyW(tmp, lpstrTemp);
-        strcatW(tmp, nl);
-        strcatW(tmp, lpstrNotFound);
-        strcatW(tmp, nl);
-        strcatW(tmp, lpstrMsg);
+        lstrcpyW(tmp, lpstrTemp);
+        lstrcatW(tmp, nl);
+        lstrcatW(tmp, lpstrNotFound);
+        lstrcatW(tmp, nl);
+        lstrcatW(tmp, lpstrMsg);
 
         MessageBoxW(hwnd, tmp, fodInfos->title, MB_OK | MB_ICONEXCLAMATION);
         return FALSE;
       }
 
       /* move to the next file in the list of files */
-      lpstrTemp += strlenW(lpstrTemp) + 1;
+      lpstrTemp += lstrlenW(lpstrTemp) + 1;
       COMDLG32_SHFree(pidl);
     }
   }
 
-  nSizePath = strlenW(lpstrPathSpec) + 1;
+  nSizePath = lstrlenW(lpstrPathSpec) + 1;
   if ( !(fodInfos->ofnInfos->Flags & OFN_EXPLORER) )
   {
     /* For "oldstyle" dialog the components have to
@@ -1675,7 +1731,7 @@ BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCo
   if(fodInfos->unicode)
   {
     LPOPENFILENAMEW ofn = fodInfos->ofnInfos;
-    strcpyW( ofn->lpstrFile, lpstrPathSpec);
+    lstrcpyW( ofn->lpstrFile, lpstrPathSpec);
     memcpy( ofn->lpstrFile + nSizePath, lpstrFileList, sizeUsed*sizeof(WCHAR) );
   }
   else
@@ -1782,20 +1838,20 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
   /* if the user specifyed a fully qualified path use it */
   if(PathIsRelativeW(lpstrFileList))
   {
-    strcatW(lpstrPathAndFile, lpstrFileList);
+    lstrcatW(lpstrPathAndFile, lpstrFileList);
   }
   else
   {
     /* does the path have a drive letter? */
     if (PathGetDriveNumberW(lpstrFileList) == -1)
-      strcpyW(lpstrPathAndFile+2, lpstrFileList);
+      lstrcpyW(lpstrPathAndFile+2, lpstrFileList);
     else
-      strcpyW(lpstrPathAndFile, lpstrFileList);
+      lstrcpyW(lpstrPathAndFile, lpstrFileList);
   }
 
   /* resolve "." and ".." */
   PathCanonicalizeW(lpstrTemp, lpstrPathAndFile );
-  strcpyW(lpstrPathAndFile, lpstrTemp);
+  lstrcpyW(lpstrPathAndFile, lpstrTemp);
   TRACE("canon=%s\n", debugstr_w(lpstrPathAndFile));
 
   MemFree(lpstrFileList);
@@ -1842,13 +1898,13 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
       DWORD dwEaten, dwAttributes;
       LPWSTR p;
 
-      strcpyW(lpwstrTemp, lpszTemp);
+      lstrcpyW(lpwstrTemp, lpszTemp);
       p = PathFindNextComponentW(lpwstrTemp);
 
       if (!p) break; /* end of path */
 
       *p = 0;
-      lpszTemp = lpszTemp + strlenW(lpwstrTemp);
+      lpszTemp = lpszTemp + lstrlenW(lpwstrTemp);
 
       /* There are no wildcards when OFN_NOVALIDATE is set */
       if(*lpszTemp==0 && !(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE))
@@ -1877,7 +1933,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
       if(SUCCEEDED(IShellFolder_ParseDisplayName(lpsf, hwnd, NULL, lpwstrTemp, &dwEaten, &pidl, &dwAttributes)))
       {
         /* the path component is valid, we have a pidl of the next path component */
-        TRACE("parse OK attr=0x%08lx pidl=%p\n", dwAttributes, pidl);
+        TRACE("parse OK attr=0x%08x pidl=%p\n", dwAttributes, pidl);
         if(dwAttributes & SFGAO_FOLDER)
         {
           if(FAILED(IShellFolder_BindToObject(lpsf, pidl, 0, &IID_IShellFolder, (LPVOID*)&lpsfChild)))
@@ -1952,11 +2008,10 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
         DWORD len;
 
         /* replace the current filter */
-        if(fodInfos->ShellInfos.lpstrCurrentFilter)
-	  MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
-        len = strlenW(lpszTemp)+1;
+        MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
+        len = lstrlenW(lpszTemp)+1;
         fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc(len * sizeof(WCHAR));
-        strcpyW( fodInfos->ShellInfos.lpstrCurrentFilter, lpszTemp);
+        lstrcpyW( fodInfos->ShellInfos.lpstrCurrentFilter, lpszTemp);
 
         /* set the filter cb to the extension when possible */
         if(-1 < (iPos = FILEDLG95_FILETYPE_SearchExt(fodInfos->DlgInfos.hwndFileTypeCB, lpszTemp)))
@@ -1974,13 +2029,18 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
           IPersistFolder2_Release(ppf2);
 	  if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent))
 	  {
-	    IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE);
+            if (SUCCEEDED(IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE)))
+            {
+              SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE);
+            }
 	  }
 	  else if( nOpenAction == ONOPEN_SEARCH )
 	  {
-            IShellView_Refresh(fodInfos->Shell.FOIShellView);
+            if (fodInfos->Shell.FOIShellView)
+              IShellView_Refresh(fodInfos->Shell.FOIShellView);
 	  }
           COMDLG32_SHFree(pidlCurrent);
+          SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1);
         }
       }
       ret = FALSE;
@@ -1991,7 +2051,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
         WCHAR *ext = NULL;
 
         /* update READONLY check box flag */
-	if ((SendMessageA(GetDlgItem(hwnd,IDC_OPENREADONLY),BM_GETCHECK,0,0) & 0x03) == BST_CHECKED)
+	if ((SendMessageW(GetDlgItem(hwnd,IDC_OPENREADONLY),BM_GETCHECK,0,0) & 0x03) == BST_CHECKED)
 	  fodInfos->ofnInfos->Flags |= OFN_READONLY;
 	else
 	  fodInfos->ofnInfos->Flags &= ~OFN_READONLY;
@@ -2006,10 +2066,10 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
             WCHAR *filterExt = NULL;
             LPWSTR lpstrFilter = NULL;
             static const WCHAR szwDot[] = {'.',0};
-            int PathLength = strlenW(lpstrPathAndFile);
+            int PathLength = lstrlenW(lpstrPathAndFile);
 
             /* Attach the dot*/
-            strcatW(lpstrPathAndFile, szwDot);
+            lstrcatW(lpstrPathAndFile, szwDot);
     
             /*Get the file extension from file type filter*/
             lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
@@ -2019,9 +2079,9 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
                 filterExt = PathFindExtensionW(lpstrFilter);
 
             if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/
-                strcatW(lpstrPathAndFile, filterExt + 1);
+                lstrcatW(lpstrPathAndFile, filterExt + 1);
             else if ( fodInfos->defext ) /* attach the default file extension*/
-                strcatW(lpstrPathAndFile, fodInfos->defext);
+                lstrcatW(lpstrPathAndFile, fodInfos->defext);
 
             /* In Open dialog: if file does not exist try without extension */
             if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile))
@@ -2059,7 +2119,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
 
         /* Check that the size of the file does not exceed buffer size.
              (Allow for extra \0 if OFN_MULTISELECT is set.) */
-        if(strlenW(lpstrPathAndFile) < fodInfos->ofnInfos->nMaxFile -
+        if(lstrlenW(lpstrPathAndFile) < fodInfos->ofnInfos->nMaxFile -
             ((fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT) ? 1 : 0))
         {
           LPWSTR lpszTemp;
@@ -2138,7 +2198,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
         {
           WORD size;
 
-          size = strlenW(lpstrPathAndFile) + 1;
+          size = lstrlenW(lpstrPathAndFile) + 1;
           if (fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT)
              size += 1;
           /* return needed size in first two bytes of lpstrFile */
@@ -2278,8 +2338,11 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd)
     COMDLG32_SHFree(fodInfos->ShellInfos.pidlAbsCurrent);
 
     /* clean Shell interfaces */
-    IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView);
-    IShellView_Release(fodInfos->Shell.FOIShellView);
+    if (fodInfos->Shell.FOIShellView)
+    {
+      IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView);
+      IShellView_Release(fodInfos->Shell.FOIShellView);
+    }
     IShellFolder_Release(fodInfos->Shell.FOIShellFolder);
     IShellBrowser_Release(fodInfos->Shell.FOIShellBrowser);
     if (fodInfos->Shell.FOIDataObject)
@@ -2308,15 +2371,15 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
       LPCWSTR lpstrPos = fodInfos->customfilter;
 
       /* Get the title */
-      lpstrPos += strlenW(fodInfos->customfilter) + 1;
+      lpstrPos += lstrlenW(fodInfos->customfilter) + 1;
 
       /* Copy the extensions */
       if (! *lpstrPos) return E_FAIL;	/* malformed filter */
-      if (!(lpstrExt = MemAlloc((strlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL;
-      strcpyW(lpstrExt,lpstrPos);
+      if (!(lpstrExt = MemAlloc((lstrlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL;
+      lstrcpyW(lpstrExt,lpstrPos);
 
       /* Add the item at the end of the combo */
-      CBAddStringW(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->customfilter);
+      CBAddString(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->customfilter);
       CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters, lpstrExt);
       nFilters++;
   }
@@ -2336,16 +2399,16 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
       /* Get the title */
       if(! *lpstrPos) break;	/* end */
       lpstrDisplay = lpstrPos;
-      lpstrPos += strlenW(lpstrPos) + 1;
+      lpstrPos += lstrlenW(lpstrPos) + 1;
 
-      CBAddStringW(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay);
+      CBAddString(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay);
 
       nFilters++;
 
       /* Copy the extensions */
-      if (!(lpstrExt = MemAlloc((strlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL;
-      strcpyW(lpstrExt,lpstrPos);
-      lpstrPos += strlenW(lpstrPos) + 1;
+      if (!(lpstrExt = MemAlloc((lstrlenW(lpstrPos)+1)*sizeof(WCHAR)))) return E_FAIL;
+      lstrcpyW(lpstrExt,lpstrPos);
+      lpstrPos += lstrlenW(lpstrPos) + 1;
 
       /* Add the item at the end of the combo */
       CBSetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, nFilters-1, lpstrExt);
@@ -2391,9 +2454,9 @@ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
     {
       DWORD len;
       CharLowerW(lpstrFilter); /* lowercase */
-      len = strlenW(lpstrFilter)+1;
+      len = lstrlenW(lpstrFilter)+1;
       fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) );
-      strcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter);
+      lstrcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter);
     }
   } else
       fodInfos->ofnInfos->nFilterIndex = 0;
@@ -2424,8 +2487,7 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode)
         (fodInfos->customfilter == NULL ? 1 : 0);
 
       /* Set the current filter with the current selection */
-      if(fodInfos->ShellInfos.lpstrCurrentFilter)
-         MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
+      MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
 
       lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
                                              iItem);
@@ -2433,14 +2495,15 @@ static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode)
       {
           DWORD len;
           CharLowerW(lpstrFilter); /* lowercase */
-          len = strlenW(lpstrFilter)+1;
+          len = lstrlenW(lpstrFilter)+1;
           fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) );
-          strcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter);
+          lstrcpyW(fodInfos->ShellInfos.lpstrCurrentFilter,lpstrFilter);
           SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE);
       }
 
       /* Refresh the actual view to display the included items*/
-      IShellView_Refresh(fodInfos->Shell.FOIShellView);
+      if (fodInfos->Shell.FOIShellView)
+        IShellView_Refresh(fodInfos->Shell.FOIShellView);
     }
   }
   return FALSE;
@@ -2490,8 +2553,7 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd)
     }
   }
   /* Current filter */
-  if(fodInfos->ShellInfos.lpstrCurrentFilter)
-     MemFree(fodInfos->ShellInfos.lpstrCurrentFilter);
+  MemFree(fodInfos->ShellInfos.lpstrCurrentFilter);
 
 }
 
@@ -2607,10 +2669,10 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct)
   COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
   RECT rectText;
   RECT rectIcon;
-  SHFILEINFOA sfi;
+  SHFILEINFOW sfi;
   HIMAGELIST ilItemImage;
   int iIndentation;
-  TEXTMETRICA tm;
+  TEXTMETRICW tm;
   LPSFOLDER tmpFolder;
 
 
@@ -2628,20 +2690,20 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct)
 
   if(pDIStruct->itemID == liInfos->uSelectedItem)
   {
-    ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
+    ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem,
                                                0,
                                                &sfi,
-                                               sizeof (SHFILEINFOA),
+                                               sizeof (sfi),
                                                SHGFI_PIDL | SHGFI_SMALLICON |
                                                SHGFI_OPENICON | SHGFI_SYSICONINDEX    |
                                                SHGFI_DISPLAYNAME );
   }
   else
   {
-    ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
+    ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem,
                                                   0,
                                                   &sfi,
-                                                  sizeof (SHFILEINFOA),
+                                                  sizeof (sfi),
                                                   SHGFI_PIDL | SHGFI_SMALLICON |
                                                   SHGFI_SYSICONINDEX |
                                                   SHGFI_DISPLAYNAME);
@@ -2665,10 +2727,10 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct)
   if(pDIStruct->itemState & ODS_COMBOBOXEDIT)
   {
     iIndentation = 0;
-    ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
+    ilItemImage = (HIMAGELIST) SHGetFileInfoW ((LPCWSTR) tmpFolder->pidlItem,
                                                 0,
                                                 &sfi,
-                                                sizeof (SHFILEINFOA),
+                                                sizeof (sfi),
                                                 SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON
                                                 | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME  );
 
@@ -2686,7 +2748,7 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct)
   rectIcon.bottom = pDIStruct->rcItem.bottom;
 
   /* Initialise the text display area */
-  GetTextMetricsA(pDIStruct->hDC, &tm);
+  GetTextMetricsW(pDIStruct->hDC, &tm);
   rectText.left = rectIcon.right;
   rectText.top =
 	  (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2;
@@ -2704,7 +2766,7 @@ static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct)
 
   /* Draw the associated text */
   if(sfi.szDisplayName)
-    TextOutA(pDIStruct->hDC,rectText.left,rectText.top,sfi.szDisplayName,strlen(sfi.szDisplayName));
+    TextOutW(pDIStruct->hDC,rectText.left,rectText.top,sfi.szDisplayName,lstrlenW(sfi.szDisplayName));
 
 
   return NOERROR;
@@ -2759,7 +2821,7 @@ static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode)
 static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId)
 {
   LPITEMIDLIST pidlNext;
-  SHFILEINFOA sfi;
+  SHFILEINFOW sfi;
   SFOLDER *tmpFolder;
   LookInInfos *liInfos;
 
@@ -2787,20 +2849,20 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId)
     liInfos->iMaxIndentation = tmpFolder->m_iIndent;
 
   sfi.dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM;
-  SHGetFileInfoA((LPSTR)pidl,
+  SHGetFileInfoW((LPCWSTR)pidl,
                   0,
                   &sfi,
                   sizeof(sfi),
                   SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX
                   | SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED);
 
-  TRACE("-- Add %s attr=%08lx\n", sfi.szDisplayName, sfi.dwAttributes);
+  TRACE("-- Add %s attr=%08x\n", debugstr_w(sfi.szDisplayName), sfi.dwAttributes);
 
   if((sfi.dwAttributes & SFGAO_FILESYSANCESTOR) || (sfi.dwAttributes & SFGAO_FILESYSTEM))
   {
     int iItemID;
 
-    TRACE("-- Add %s at %u\n", sfi.szDisplayName, tmpFolder->m_iIndent);
+    TRACE("-- Add %s at %u\n", debugstr_w(sfi.szDisplayName), tmpFolder->m_iIndent);
 
     /* Add the item at the end of the list */
     if(iInsertId < 0)
@@ -2934,7 +2996,7 @@ static int FILEDLG95_LOOKIN_SearchItem(HWND hwnd,WPARAM searchArg,int iSearchMet
   int i = 0;
   int iCount = CBGetCount(hwnd);
 
-  TRACE("0x%08x 0x%x\n",searchArg, iSearchMethod);
+  TRACE("0x%08lx 0x%x\n",searchArg, iSearchMethod);
 
   if (iCount != CB_ERR)
   {
@@ -2991,8 +3053,8 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd)
     FileOpenDlgInfos *fodInfos;
     LPITEMIDLIST      pidl;
     UINT              nFiles = 0, nFileToOpen, nFileSelected, nLength = 0;
-    char              lpstrTemp[MAX_PATH];
-    LPSTR             lpstrAllFile = NULL, lpstrCurrFile = NULL;
+    WCHAR             lpstrTemp[MAX_PATH];
+    LPWSTR            lpstrAllFile, lpstrCurrFile;
 
     TRACE("\n");
     fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
@@ -3016,7 +3078,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd)
 
           if ( ! IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl) ) /* Ignore folders */
 	  {
-            nLength += strlen( lpstrTemp ) + 3;
+            nLength += lstrlenW( lpstrTemp ) + 3;
             nFiles++;
 	  }
           COMDLG32_SHFree( pidl );
@@ -3026,8 +3088,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd)
 
     /* allocate the buffer */
     if (nFiles <= 1) nLength = MAX_PATH;
-    lpstrAllFile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength);
-    lpstrAllFile[0] = '\0';
+    lpstrAllFile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nLength * sizeof(WCHAR));
 
     /* Generate the string for the edit control */
     if(nFiles >= 1)
@@ -3048,55 +3109,56 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd)
             if ( nFiles > 1)
 	    {
               *lpstrCurrFile++ =  '\"';
-              strcpy( lpstrCurrFile, lpstrTemp );
-              lpstrCurrFile += strlen( lpstrTemp );
-              strcpy( lpstrCurrFile, "\" " );
-              lpstrCurrFile += 2;
+              lstrcpyW( lpstrCurrFile, lpstrTemp );
+              lpstrCurrFile += lstrlenW( lpstrTemp );
+              *lpstrCurrFile++ = '\"';
+              *lpstrCurrFile++ = ' ';
+              *lpstrCurrFile = 0;
 	    }
 	    else
 	    {
-              strcpy( lpstrAllFile, lpstrTemp );
+              lstrcpyW( lpstrAllFile, lpstrTemp );
 	    }
           }
           COMDLG32_SHFree( (LPVOID) pidl );
 	}
       }
-      SetWindowTextA( fodInfos->DlgInfos.hwndFileName, lpstrAllFile );
+      SetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrAllFile );
        
       /* Select the file name like Windows does */ 
-      SendMessageA(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, (WPARAM)0, (LPARAM)-1);
+      SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, (LPARAM)-1);
     }
     HeapFree(GetProcessHeap(),0, lpstrAllFile );
 }
 
 
 /* copied from shell32 to avoid linking to it
- * FIXME: why?  shell32 is already linked
+ * Although shell32 is already linked the behaviour of exported StrRetToStrN
+ * is dependent on whether emulated OS is unicode or not.
  */
-static HRESULT COMDLG32_StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
+static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
 {
 	switch (src->uType)
 	{
 	  case STRRET_WSTR:
-	    WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, (LPSTR)dest, len, NULL, NULL);
+	    lstrcpynW(dest, src->u.pOleStr, len);
 	    COMDLG32_SHFree(src->u.pOleStr);
 	    break;
 
 	  case STRRET_CSTR:
-	    lstrcpynA((LPSTR)dest, src->u.cStr, len);
+            if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len ) && len)
+                  dest[len-1] = 0;
 	    break;
 
 	  case STRRET_OFFSET:
-	    lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
+            if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1, dest, len ) && len)
+                  dest[len-1] = 0;
 	    break;
 
 	  default:
-	    FIXME("unknown type!\n");
-	    if (len)
-	    {
-	      *(LPSTR)dest = '\0';
-	    }
-	    return(E_FAIL);
+	    FIXME("unknown type %x!\n", src->uType);
+	    if (len) *dest = '\0';
+	    return E_FAIL;
 	}
 	return S_OK;
 }
@@ -3153,8 +3215,8 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U
 	/* single, unquoted string */
 	if ((nStrLen > 0) && (*sizeUsed == 0) )
 	{
-	  strcpyW(*lpstrFileList, lpstrEdit);
-	  nFileIndex = strlenW(lpstrEdit) + 1;
+	  lstrcpyW(*lpstrFileList, lpstrEdit);
+	  nFileIndex = lstrlenW(lpstrEdit) + 1;
 	  (*sizeUsed) = nFileIndex;
 	  nFileCount = 1;
 	}
@@ -3277,7 +3339,7 @@ UINT GetNumSelected( IDataObject *doSelected )
  * E_FAIL otherwise
  */
 
-static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName)
+static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPWSTR lpstrFileName)
 {
   STRRET str;
   HRESULT hRes;
@@ -3295,7 +3357,7 @@ static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR
   /* Get the display name of the pidl relative to the folder */
   if (SUCCEEDED(hRes = IShellFolder_GetDisplayNameOf(lpsf, pidl, dwFlags, &str)))
   {
-      return COMDLG32_StrRetToStrNA(lpstrFileName, MAX_PATH, &str, pidl);
+      return COMDLG32_StrRetToStrNW(lpstrFileName, MAX_PATH, &str, pidl);
   }
   return E_FAIL;
 }
@@ -3352,7 +3414,7 @@ LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl)
  * returns the pidl of the file name relative to folder
  * NULL if an error occurred
  */
-LPITEMIDLIST GetPidlFromName(IShellFolder *lpsf,LPWSTR lpcstrFileName)
+static LPITEMIDLIST GetPidlFromName(IShellFolder *lpsf,LPWSTR lpcstrFileName)
 {
   LPITEMIDLIST pidl = NULL;
   ULONG ulEaten;
@@ -3387,7 +3449,7 @@ BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl)
 
   	ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
 
-	TRACE("-- 0x%08lx 0x%08lx\n", uAttr, ret);
+	TRACE("-- 0x%08x 0x%08x\n", uAttr, ret);
 	/* see documentation shell 4.1*/
         return uAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER);
 }
@@ -3543,7 +3605,7 @@ static BOOL CALLBACK FD32_Init(LPARAM lParam, PFD31_DATA lfs, DWORD data)
  *
  *      called from the common 16/32 code to call the appropriate hook
  */
-static BOOL CALLBACK FD32_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
+static BOOL CALLBACK FD32_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam,
                                  LPARAM lParam)
 {
     BOOL ret;
@@ -3551,18 +3613,18 @@ static BOOL CALLBACK FD32_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wPara
 
     if (priv->ofnA)
     {
-        TRACE("Call hookA %p (%p, %04x, %08x, %08lx)\n",
+        TRACE("Call hookA %p (%p, %04x, %08lx, %08lx)\n",
                priv->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
         ret = priv->ofnA->lpfnHook(lfs->hwnd, wMsg, wParam, lParam);
-        TRACE("ret hookA %p (%p, %04x, %08x, %08lx)\n",
+        TRACE("ret hookA %p (%p, %04x, %08lx, %08lx)\n",
                priv->ofnA->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
         return ret;
     }
 
-    TRACE("Call hookW %p (%p, %04x, %08x, %08lx)\n",
+    TRACE("Call hookW %p (%p, %04x, %08lx, %08lx)\n",
            lfs->ofnW->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
     ret = lfs->ofnW->lpfnHook(lfs->hwnd, wMsg, wParam, lParam);
-    TRACE("Ret hookW %p (%p, %04x, %08x, %08lx)\n",
+    TRACE("Ret hookW %p (%p, %04x, %08lx, %08lx)\n",
            lfs->ofnW->lpfnHook, lfs->hwnd, wMsg, wParam, lParam);
     return ret;
 }
@@ -3571,7 +3633,7 @@ static BOOL CALLBACK FD32_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wPara
  *                              FD32_UpdateResult            [internal]
  *          update the real client structures if any
  */
-static void CALLBACK FD32_UpdateResult(PFD31_DATA lfs)
+static void CALLBACK FD32_UpdateResult(const FD31_DATA *lfs)
 {
     PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632;
     LPOPENFILENAMEW ofnW = lfs->ofnW;
@@ -3591,7 +3653,7 @@ static void CALLBACK FD32_UpdateResult(PFD31_DATA lfs)
  *                              FD32_UpdateFileTitle            [internal]
  *          update the real client structures if any
  */
-static void CALLBACK FD32_UpdateFileTitle(PFD31_DATA lfs)
+static void CALLBACK FD32_UpdateFileTitle(const FD31_DATA *lfs)
 {
     PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632;
     LPOPENFILENAMEW ofnW = lfs->ofnW;
@@ -3609,7 +3671,7 @@ static void CALLBACK FD32_UpdateFileTitle(PFD31_DATA lfs)
  *                              FD32_SendLbGetCurSel         [internal]
  *          retrieve selected listbox item
  */
-static LRESULT CALLBACK FD32_SendLbGetCurSel(PFD31_DATA lfs)
+static LRESULT CALLBACK FD32_SendLbGetCurSel(const FD31_DATA *lfs)
 {
     return SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETCURSEL, 0, 0);
 }
@@ -3619,7 +3681,7 @@ static LRESULT CALLBACK FD32_SendLbGetCurSel(PFD31_DATA lfs)
  *                              FD32_Destroy          [internal]
  *      called from the common 16/32 code to cleanup 32 bit data
  */
-static void CALLBACK FD32_Destroy(PFD31_DATA lfs)
+static void CALLBACK FD32_Destroy(const FD31_DATA *lfs)
 {
     PFD32_PRIVATE priv = (PFD32_PRIVATE) lfs->private1632;
 
@@ -3663,7 +3725,7 @@ static INT_PTR CALLBACK FD32_FileOpenDlgProc(HWND hWnd, UINT wMsg,
 {
     PFD31_DATA lfs = (PFD31_DATA)GetPropA(hWnd,FD31_OFN_PROP);
 
-    TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam);
+    TRACE("msg=%x wparam=%lx lParam=%lx\n", wMsg, wParam, lParam);
     if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook)
         {
             INT_PTR lRet;
@@ -3719,12 +3781,12 @@ static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* addess of structure with da
 
     if (!lpofn || !FD31_Init()) return FALSE;
 
-    TRACE("ofn flags %08lx\n", lpofn->Flags);
+    TRACE("ofn flags %08x\n", lpofn->Flags);
     FD32_SetupCallbacks(&callbacks);
     lfs = FD31_AllocPrivate((LPARAM) lpofn, dlgType, &callbacks, (DWORD) FALSE);
     if (lfs)
     {
-        hInst = (HINSTANCE)GetWindowLongPtrA( lpofn->hwndOwner, GWLP_HINSTANCE );
+        hInst = (HINSTANCE)GetWindowLongPtrW( lpofn->hwndOwner, GWLP_HINSTANCE );
         bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner,
                                         FD32_FileOpenDlgProc, (LPARAM)lfs);
         FD31_DestroyPrivate(lfs);
@@ -3782,7 +3844,7 @@ BOOL WINAPI GetOpenFileNameA(
 {
     BOOL win16look = FALSE;
 
-    TRACE("flags %08lx\n", ofn->Flags);
+    TRACE("flags %08x\n", ofn->Flags);
 
     /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */
     if (ofn->Flags & OFN_FILEMUSTEXIST)
@@ -3812,7 +3874,7 @@ BOOL WINAPI GetOpenFileNameW(
 {
     BOOL win16look = FALSE;
 
-    TRACE("flags %08lx\n", ofn->Flags);
+    TRACE("flags %08x\n", ofn->Flags);
 
     /* OFN_FILEMUSTEXIST implies OFN_PATHMUSTEXIST */
     if (ofn->Flags & OFN_FILEMUSTEXIST)
@@ -3875,3 +3937,82 @@ BOOL WINAPI GetSaveFileNameW(
     else
         return GetFileDialog95W(ofn, SAVE_DIALOG);
 }
+
+/***********************************************************************
+ *	GetFileTitleA		(COMDLG32.@)
+ *
+ * See GetFileTitleW.
+ */
+short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf)
+{
+    int ret;
+    UNICODE_STRING strWFile;
+    LPWSTR lpWTitle;
+
+    RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile);
+    lpWTitle = RtlAllocateHeap( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR));
+    ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf);
+    if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL );
+    RtlFreeUnicodeString( &strWFile );
+    RtlFreeHeap( GetProcessHeap(), 0, lpWTitle );
+    return ret;
+}
+
+
+/***********************************************************************
+ *	GetFileTitleW		(COMDLG32.@)
+ *
+ * Get the name of a file.
+ *
+ * PARAMS
+ *  lpFile  [I] name and location of file
+ *  lpTitle [O] returned file name
+ *  cbBuf   [I] buffer size of lpTitle
+ *
+ * RETURNS
+ *  Success: zero
+ *  Failure: negative number.
+ */
+short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf)
+{
+	int i, len;
+        static const WCHAR brkpoint[] = {'*','[',']',0};
+	TRACE("(%p %p %d);\n", lpFile, lpTitle, cbBuf);
+
+	if(lpFile == NULL || lpTitle == NULL)
+		return -1;
+
+	len = lstrlenW(lpFile);
+
+	if (len == 0)
+		return -1;
+
+	if(strpbrkW(lpFile, brkpoint))
+		return -1;
+
+	len--;
+
+	if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':')
+		return -1;
+
+	for(i = len; i >= 0; i--)
+	{
+		if (lpFile[i] == '/' ||  lpFile[i] == '\\' ||  lpFile[i] == ':')
+		{
+			i++;
+			break;
+		}
+	}
+
+	if(i == -1)
+		i++;
+
+	TRACE("---> %s\n", debugstr_w(&lpFile[i]));
+
+	len = lstrlenW(lpFile+i)+1;
+	if(cbBuf < len)
+		return len;
+
+	lstrcpyW(lpTitle, &lpFile[i]);
+	return 0;
+}
diff --git a/reactos/dll/win32/comdlg32/filedlg16.c b/reactos/dll/win32/comdlg32/filedlg16.c
index 294a5c5c71f..bf9325d09e5 100644
--- a/reactos/dll/win32/comdlg32/filedlg16.c
+++ b/reactos/dll/win32/comdlg32/filedlg16.c
@@ -46,7 +46,7 @@ typedef struct tagFD16_PRIVATE
  *                              FD16_MapOfnStruct16          [internal]
  *      map a 16 bits structure to an Unicode one
  */
-static void FD16_MapOfnStruct16(LPOPENFILENAME16 ofn16, LPOPENFILENAMEW ofnW, BOOL open)
+static void FD16_MapOfnStruct16(const OPENFILENAME16 *ofn16, LPOPENFILENAMEW ofnW, BOOL open)
 {
     OPENFILENAMEA ofnA;
     /* first convert to linear pointers */
@@ -85,11 +85,11 @@ static void FD16_MapOfnStruct16(LPOPENFILENAME16 ofn16, LPOPENFILENAMEW ofnW, BO
  * by a 16 bits application
  *
  */
-static BOOL FD16_GetTemplate(PFD31_DATA lfs)
+static BOOL FD16_GetTemplate(const FD31_DATA *lfs)
 {
     PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
     LPOPENFILENAME16 ofn16 = priv->ofn16;
-    LPCVOID template;
+    LPVOID template;
     HGLOBAL16 hGlobal16 = 0;
 
     if (ofn16->Flags & OFN_ENABLETEMPLATEHANDLE)
@@ -135,7 +135,7 @@ static BOOL FD16_GetTemplate(PFD31_DATA lfs)
         if (!hGlobal16)
         {
             COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE);
-            ERR("alloc failure for %ld bytes\n", size);
+            ERR("alloc failure for %d bytes\n", size);
             return FALSE;
         }
         template = GlobalLock16(hGlobal16);
@@ -146,7 +146,7 @@ static BOOL FD16_GetTemplate(PFD31_DATA lfs)
             GlobalFree16(hGlobal16);
             return FALSE;
         }
-        ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template);
+        ConvertDialog32To16(template32, size, template);
         priv->hDlgTmpl16 = hGlobal16;
         priv->hGlobal16 = hGlobal16;
     }
@@ -183,7 +183,7 @@ static BOOL CALLBACK FD16_Init(LPARAM lParam, PFD31_DATA lfs, DWORD data)
  *
  *      called from the common 16/32 code to call the appropriate hook
  */
-static BOOL CALLBACK FD16_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
+static BOOL CALLBACK FD16_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam,
                                  LPARAM lParam)
 {
     PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
@@ -202,7 +202,7 @@ static BOOL CALLBACK FD16_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wPara
  *                              FD31_UpdateResult            [internal]
  *          update the real client structures
  */
-static void CALLBACK FD16_UpdateResult(PFD31_DATA lfs)
+static void CALLBACK FD16_UpdateResult(const FD31_DATA *lfs)
 {
     PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
     LPOPENFILENAMEW ofnW = lfs->ofnW;
@@ -238,7 +238,7 @@ static void CALLBACK FD16_UpdateResult(PFD31_DATA lfs)
  *                              FD16_UpdateFileTitle         [internal]
  *          update the real client structures
  */
-static void CALLBACK FD16_UpdateFileTitle(PFD31_DATA lfs)
+static void CALLBACK FD16_UpdateFileTitle(const FD31_DATA *lfs)
 {
     PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
     LPOPENFILENAMEW ofnW = lfs->ofnW;
@@ -257,7 +257,7 @@ static void CALLBACK FD16_UpdateFileTitle(PFD31_DATA lfs)
  *                              FD16_SendLbGetCurSel         [internal]
  *          retrieve selected listbox item
  */
-static LRESULT CALLBACK FD16_SendLbGetCurSel(PFD31_DATA lfs)
+static LRESULT CALLBACK FD16_SendLbGetCurSel(const FD31_DATA *lfs)
 {
     return SendDlgItemMessageW(lfs->hwnd, lst1, LB_GETCURSEL16, 0, 0);
 }
@@ -267,7 +267,7 @@ static LRESULT CALLBACK FD16_SendLbGetCurSel(PFD31_DATA lfs)
  *                              FD16_Destroy          [internal]
  *      called from the common 16/32 code to cleanup 32 bit data
  */
-static void CALLBACK FD16_Destroy(PFD31_DATA lfs)
+static void CALLBACK FD16_Destroy(const FD31_DATA *lfs)
 {
     PFD16_PRIVATE priv = (PFD16_PRIVATE) lfs->private1632;
 
@@ -299,7 +299,7 @@ static void FD16_SetupCallbacks(PFD31_CALLBACKS callbacks)
  *                              FD16_MapDrawItemStruct       [internal]
  *      map a 16 bits drawitem struct to 32
  */
-static void FD16_MapDrawItemStruct(LPDRAWITEMSTRUCT16 lpdis16, LPDRAWITEMSTRUCT lpdis)
+static void FD16_MapDrawItemStruct(const DRAWITEMSTRUCT16 *lpdis16, LPDRAWITEMSTRUCT lpdis)
 {
     lpdis->CtlType = lpdis16->CtlType;
     lpdis->CtlID = lpdis16->CtlID;
@@ -513,3 +513,12 @@ BOOL16 WINAPI GetSaveFileName16(
     TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile));
     return bRet;
 }
+
+
+/***********************************************************************
+ *	GetFileTitle		(COMMDLG.27)
+ */
+short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf)
+{
+	return GetFileTitleA(lpFile, lpTitle, cbBuf);
+}
diff --git a/reactos/dll/win32/comdlg32/filedlg31.c b/reactos/dll/win32/comdlg32/filedlg31.c
index 060097a1fea..89bedb0131b 100644
--- a/reactos/dll/win32/comdlg32/filedlg31.c
+++ b/reactos/dll/win32/comdlg32/filedlg31.c
@@ -18,11 +18,28 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include <precomp.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "winreg.h"
+#include "winternl.h"
+#include "commdlg.h"
+#include "shlwapi.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
+#include "cdlg.h"
+#include "filedlg31.h"
+
 #define BUFFILE 512
 #define BUFFILEALLOC 512 * sizeof(WCHAR)
 
@@ -89,7 +106,7 @@ static void FD31_StripEditControl(HWND hwnd)
  *
  *      Call the appropriate hook
  */
-BOOL FD31_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
+BOOL FD31_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam,
                          LPARAM lParam)
 {
     return lfs->callbacks->CWP(lfs, wMsg, wParam, lParam);
@@ -98,7 +115,7 @@ BOOL FD31_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
 /***********************************************************************
  * 				FD31_ScanDir                 [internal]
  */
-static BOOL FD31_ScanDir(HWND hWnd, LPWSTR newPath)
+static BOOL FD31_ScanDir(HWND hWnd, LPCWSTR newPath)
 {
     WCHAR		buffer[BUFFILE];
     HWND 		hdlg, hdlgDir;
@@ -149,7 +166,7 @@ static BOOL FD31_ScanDir(HWND hWnd, LPWSTR newPath)
  * 				FD31_GetFileType		[internal]
  */
 
-static LPWSTR FD31_GetFileType(LPWSTR cfptr, LPWSTR fptr, WORD index)
+static LPCWSTR FD31_GetFileType(LPCWSTR cfptr, LPCWSTR fptr, const WORD index)
 {
   int n, i;
   i = 0;
@@ -169,14 +186,14 @@ static LPWSTR FD31_GetFileType(LPWSTR cfptr, LPWSTR fptr, WORD index)
 	  return fptr;
 	fptr += lstrlenW(fptr) + 1;
     }
-  return (LPWSTR) FILE_star; /* FIXME */
+  return FILE_star; /* FIXME */
 }
 
 /***********************************************************************
  *                              FD31_WMDrawItem              [internal]
  */
 LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam,
-       int savedlg, LPDRAWITEMSTRUCT lpdis)
+       int savedlg, const DRAWITEMSTRUCT *lpdis)
 {
     WCHAR *str;
     HICON hIcon;
@@ -281,7 +298,7 @@ LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam,
  *                              FD31_UpdateResult            [internal]
  *      update the displayed file name (with path)
  */
-static void FD31_UpdateResult(PFD31_DATA lfs, WCHAR *tmpstr)
+static void FD31_UpdateResult(const FD31_DATA *lfs, const WCHAR *tmpstr)
 {
     int lenstr2;
     LPOPENFILENAMEW ofnW = lfs->ofnW;
@@ -319,7 +336,7 @@ static void FD31_UpdateResult(PFD31_DATA lfs, WCHAR *tmpstr)
  *                              FD31_UpdateFileTitle         [internal]
  *      update the displayed file name (without path)
  */
-static void FD31_UpdateFileTitle(PFD31_DATA lfs)
+static void FD31_UpdateFileTitle(const FD31_DATA *lfs)
 {
   LONG lRet;
   LPOPENFILENAMEW ofnW = lfs->ofnW;
@@ -335,7 +352,7 @@ static void FD31_UpdateFileTitle(PFD31_DATA lfs)
 /***********************************************************************
  *                              FD31_DirListDblClick         [internal]
  */
-static LRESULT FD31_DirListDblClick( PFD31_DATA lfs )
+static LRESULT FD31_DirListDblClick( const FD31_DATA *lfs )
 {
   LONG lRet;
   HWND hWnd = lfs->hwnd;
@@ -373,7 +390,7 @@ static LRESULT FD31_DirListDblClick( PFD31_DATA lfs )
  *                              FD31_FileListSelect         [internal]
  *    called when a new item is picked in the file list
  */
-static LRESULT FD31_FileListSelect( PFD31_DATA lfs )
+static LRESULT FD31_FileListSelect( const FD31_DATA *lfs )
 {
     LONG lRet;
     HWND hWnd = lfs->hwnd;
@@ -406,7 +423,7 @@ static LRESULT FD31_FileListSelect( PFD31_DATA lfs )
  *      before accepting the file name, test if it includes wild cards
  *      tries to scan the directory and returns TRUE if no error.
  */
-static LRESULT FD31_TestPath( PFD31_DATA lfs, LPWSTR path )
+static LRESULT FD31_TestPath( const FD31_DATA *lfs, LPWSTR path )
 {
     HWND hWnd = lfs->hwnd;
     LPWSTR pBeginFileName, pstr2;
@@ -475,7 +492,7 @@ static LRESULT FD31_TestPath( PFD31_DATA lfs, LPWSTR path )
  *                              FD31_Validate               [internal]
  *   called on: click Ok button, Enter in edit, DoubleClick in file list
  */
-static LRESULT FD31_Validate( PFD31_DATA lfs, LPWSTR path, UINT control, INT itemIndex,
+static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control, INT itemIndex,
                                  BOOL internalUse )
 {
     LONG lRet;
@@ -539,7 +556,7 @@ static LRESULT FD31_Validate( PFD31_DATA lfs, LPWSTR path, UINT control, INT ite
  *                              FD31_DiskChange             [internal]
  *    called when a new item is picked in the disk selection combo
  */
-static LRESULT FD31_DiskChange( PFD31_DATA lfs )
+static LRESULT FD31_DiskChange( const FD31_DATA *lfs )
 {
     LONG lRet;
     HWND hWnd = lfs->hwnd;
@@ -563,7 +580,7 @@ static LRESULT FD31_DiskChange( PFD31_DATA lfs )
  *                              FD31_FileTypeChange         [internal]
  *    called when a new item is picked in the file type combo
  */
-static LRESULT FD31_FileTypeChange( PFD31_DATA lfs )
+static LRESULT FD31_FileTypeChange( const FD31_DATA *lfs )
 {
     LONG lRet;
     LPWSTR pstr;
@@ -582,7 +599,7 @@ static LRESULT FD31_FileTypeChange( PFD31_DATA lfs )
  *                              FD31_WMCommand               [internal]
  */
 LRESULT FD31_WMCommand(HWND hWnd, LPARAM lParam, UINT notification,
-       UINT control, PFD31_DATA lfs )
+       UINT control, const FD31_DATA *lfs )
 {
     switch (control)
     {
@@ -678,7 +695,7 @@ static LPWSTR FD31_DupToW(LPCSTR str, DWORD size)
  *                              FD31_MapOfnStructA          [internal]
  *      map a 32 bits Ansi structure to an Unicode one
  */
-void FD31_MapOfnStructA(const LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL open)
+void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL open)
 {
     UNICODE_STRING usBuffer;
 
@@ -706,12 +723,14 @@ void FD31_MapOfnStructA(const LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL o
         ofnW->lpstrTitle = usBuffer.Buffer;
     } else {
         WCHAR buf[16];
+        LPWSTR title_tmp;
         int len;
         LoadStringW(COMDLG32_hInstance, open ? IDS_OPEN_FILE : IDS_SAVE_AS,
                     buf, sizeof(buf)/sizeof(WCHAR));
         len = lstrlenW(buf)+1;
-        ofnW->lpstrTitle = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
-        memcpy((void*)ofnW->lpstrTitle, buf, len*sizeof(WCHAR));
+        title_tmp = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
+        memcpy(title_tmp, buf, len * sizeof(WCHAR));
+        ofnW->lpstrTitle = title_tmp;
     }
     ofnW->Flags = ofnA->Flags;
     ofnW->nFileOffset = ofnA->nFileOffset;
@@ -725,7 +744,7 @@ void FD31_MapOfnStructA(const LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL o
             ofnW->lpTemplateName = usBuffer.Buffer;
         }
         else /* numbered resource */
-            ofnW->lpTemplateName = (LPWSTR) ofnA->lpTemplateName;
+            ofnW->lpTemplateName = (LPCWSTR) ofnA->lpTemplateName;
     }
 }
 
@@ -734,7 +753,7 @@ void FD31_MapOfnStructA(const LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL o
  *                              FD31_FreeOfnW          [internal]
  *      Undo all allocations done by FD31_MapOfnStructA
  */
-void FD31_FreeOfnW(LPOPENFILENAMEW ofnW)
+void FD31_FreeOfnW(OPENFILENAMEW *ofnW)
 {
    HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter);
    HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter);
@@ -808,7 +827,7 @@ LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
   lfs->hwnd = hWnd;
   ofn = lfs->ofnW;
 
-  TRACE("flags=%lx initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir));
+  TRACE("flags=%x initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir));
 
   SetWindowTextW( hWnd, ofn->lpstrTitle );
   /* read custom filter information */
@@ -853,8 +872,8 @@ LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
   	ofn->nFilterIndex = 1;
   SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0);
   lstrcpynW(tmpstr, FD31_GetFileType(ofn->lpstrCustomFilter,
-	     (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
-  TRACE("nFilterIndex = %ld, SetText of edt1 to %s\n",
+	     ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE);
+  TRACE("nFilterIndex = %d, SetText of edt1 to %s\n",
   			ofn->nFilterIndex, debugstr_w(tmpstr));
   SetDlgItemTextW( hWnd, edt1, tmpstr );
   /* get drive list */
diff --git a/reactos/dll/win32/comdlg32/filedlg31.h b/reactos/dll/win32/comdlg32/filedlg31.h
index 8e5c7f00060..7328f07d209 100644
--- a/reactos/dll/win32/comdlg32/filedlg31.h
+++ b/reactos/dll/win32/comdlg32/filedlg31.h
@@ -22,20 +22,20 @@
 #define FD31_OFN_PROP "FILEDLG_OFN"
 
 /* Forward declare */
-typedef struct tagFD31_DATA *PFD31_DATA;
+typedef struct tagFD31_DATA FD31_DATA, *PFD31_DATA;
 
 typedef struct tagFD31_CALLBACKS
 {
     BOOL (CALLBACK *Init)(LPARAM lParam, PFD31_DATA lfs, DWORD data);
-    BOOL (CALLBACK *CWP)(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
-                        LPARAM lParam); /* CWP instead of CallWindowProc to avoid macro expansion */
-    void (CALLBACK *UpdateResult)(PFD31_DATA lfs);
-    void (CALLBACK *UpdateFileTitle)(PFD31_DATA lfs);
-    LRESULT (CALLBACK *SendLbGetCurSel)(PFD31_DATA lfs);
-    void (CALLBACK *Destroy)(PFD31_DATA lfs);
+    BOOL (CALLBACK *CWP)(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam,
+                         LPARAM lParam); /* CWP instead of CallWindowProc to avoid macro expansion */
+    void (CALLBACK *UpdateResult)(const FD31_DATA *lfs);
+    void (CALLBACK *UpdateFileTitle)(const FD31_DATA *lfs);
+    LRESULT (CALLBACK *SendLbGetCurSel)(const FD31_DATA *lfs);
+    void (CALLBACK *Destroy)(const FD31_DATA *lfs);
 } FD31_CALLBACKS, *PFD31_CALLBACKS;
 
-typedef struct tagFD31_DATA
+struct tagFD31_DATA
 {
     HWND hwnd; /* file dialog window handle */
     BOOL hook; /* TRUE if the dialog is hooked */
@@ -48,21 +48,21 @@ typedef struct tagFD31_DATA
                              a W copy for A/16 API */
     LPVOID private1632; /* 16/32 bit caller private data */
     PFD31_CALLBACKS callbacks; /* callbacks to handle 16/32 bit differences */
-} FD31_DATA;
+};
 
 extern BOOL FD31_Init(void);
 extern PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType,
                                     PFD31_CALLBACKS callbacks, DWORD data);
 extern void FD31_DestroyPrivate(PFD31_DATA lfs);
-extern void FD31_MapOfnStructA(LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL open);
-extern void FD31_FreeOfnW(LPOPENFILENAMEW ofnW);
-extern BOOL FD31_CallWindowProc(PFD31_DATA lfs, UINT wMsg, WPARAM wParam,
+extern void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL open);
+extern void FD31_FreeOfnW(OPENFILENAMEW *ofnW);
+extern BOOL FD31_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam,
                                 LPARAM lParam);
 extern LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam);
 extern LONG FD31_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam,
-                            int savedlg, LPDRAWITEMSTRUCT lpdis);
+                            int savedlg, const DRAWITEMSTRUCT *lpdis);
 extern LRESULT FD31_WMCommand(HWND hWnd, LPARAM lParam, UINT notification,
-                              UINT control, PFD31_DATA lfs);
+                              UINT control, const FD31_DATA *lfs);
 extern int FD31_GetFldrHeight(void);
 
 #endif /* _WINE_DLL_FILEDLG31_H */
diff --git a/reactos/dll/win32/comdlg32/filedlgbrowser.c b/reactos/dll/win32/comdlg32/filedlgbrowser.c
index 7a3ecd10f50..11608f04323 100644
--- a/reactos/dll/win32/comdlg32/filedlgbrowser.c
+++ b/reactos/dll/win32/comdlg32/filedlgbrowser.c
@@ -19,7 +19,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+
+#define NO_SHLWAPI_STREAM
+#include "shlwapi.h"
+#include "filedlgbrowser.h"
+#include "cdlg.h"
+#include "shlguid.h"
+#include "servprov.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
@@ -55,20 +76,7 @@ static const IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl;
 *   Local Prototypes
 */
 
-static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv);
-
-/**************************************************************************
-*   External Prototypes
-*/
-extern const char *FileOpenDlgInfosStr;
-
-extern IShellFolder*    GetShellFolderFromPidl(LPITEMIDLIST pidlAbs);
-extern LPITEMIDLIST     GetParentPidl(LPITEMIDLIST pidl);
-extern LPITEMIDLIST     GetPidlFromName(IShellFolder *psf,LPCSTR lpcstrFileName);
-
-extern int     FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl);
-extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
-
+static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, const IShellView *ppshv);
 
 /*
  *   Helper functions
@@ -117,7 +125,7 @@ static void COMDLG32_DumpSBSPFlags(UINT uflags)
     }
 }
 
-static void COMDLG32_UpdateCurrentDir(FileOpenDlgInfos *fodInfos)
+static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos)
 {
     LPSHELLFOLDER psfDesktop;
     STRRET strret;
@@ -143,7 +151,7 @@ static void COMDLG32_UpdateCurrentDir(FileOpenDlgInfos *fodInfos)
 /* copied from shell32 to avoid linking to it */
 static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPCITEMIDLIST pidl)
 {
-	TRACE("dest=%p len=0x%lx strret=%p pidl=%p stub\n",dest,len,src,pidl);
+	TRACE("dest=%p len=0x%x strret=%p pidl=%p stub\n",dest,len,src,pidl);
 
 	switch (src->uType)
 	{
@@ -254,7 +262,7 @@ static ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface)
     IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p,%lu)\n", This, ref - 1);
+    TRACE("(%p,%u)\n", This, ref - 1);
 
     return ref;
 }
@@ -267,7 +275,7 @@ static ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface)
     IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p,%lu)\n", This, ref + 1);
+    TRACE("(%p,%u)\n", This, ref + 1);
 
     if (!ref)
     {
@@ -368,7 +376,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
         }
         /* create an absolute pidl */
         pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent,
-                                                        (LPITEMIDLIST)pidl);
+                                                        (LPCITEMIDLIST)pidl);
     }
     else if(wFlags & SBSP_PARENT)
     {
@@ -380,7 +388,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
     else /* SBSP_ABSOLUTE is 0x0000 */
     {
         /* An absolute pidl (relative from the desktop) */
-        pidlTmp =  COMDLG32_PIDL_ILClone((LPITEMIDLIST)pidl);
+        pidlTmp =  COMDLG32_PIDL_ILClone((LPCITEMIDLIST)pidl);
         psfTmp = GetShellFolderFromPidl(pidlTmp);
     }
 
@@ -467,7 +475,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
 
     return hRes;
 error:
-    ERR("Failed with error 0x%08lx\n", hRes);
+    ERR("Failed with error 0x%08x\n", hRes);
     return hRes;
 }
 
@@ -512,7 +520,7 @@ static HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
 {
     IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
 
-    FIXME("(%p 0x%08lx %p)\n", This, grfMode, ppStrm);
+    FIXME("(%p 0x%08x %p)\n", This, grfMode, ppStrm);
 
     /* Feature not implemented */
     return E_NOTIMPL;
@@ -601,7 +609,7 @@ static HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,
     IShellBrowserImpl *This = (IShellBrowserImpl *)iface;
     LRESULT lres;
 
-    TRACE("(%p)->(0x%08x 0x%08x 0x%08x 0x%08lx %p)\n", This, id, uMsg, wParam, lParam, pret);
+    TRACE("(%p)->(0x%08x 0x%08x 0x%08lx 0x%08lx %p)\n", This, id, uMsg, wParam, lParam, pret);
 
     switch (id)
     {
@@ -822,7 +830,11 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBr
 	    {
 		FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
 		if(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
-		    SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner,IDOK,"&Save");
+		{
+		    WCHAR szSave[16];
+		    LoadStringW(COMDLG32_hInstance, IDS_SAVE_BUTTON, szSave, sizeof(szSave)/sizeof(WCHAR));
+		    SetDlgItemTextW(fodInfos->ShellInfos.hwndOwner, IDOK, szSave);
+		}
             }
             break;
         case CDBOSC_SELCHANGE:
@@ -883,7 +895,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr
 /**************************************************************************
 *  IShellBrowserImpl_ICommDlgBrowser_OnSelChange
 */
-static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv)
+static HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, const IShellView *ppshv)
 {
     FileOpenDlgInfos *fodInfos;
 
diff --git a/reactos/dll/win32/comdlg32/filedlgbrowser.h b/reactos/dll/win32/comdlg32/filedlgbrowser.h
index e1ff58647d3..2342d3d3ebb 100644
--- a/reactos/dll/win32/comdlg32/filedlgbrowser.h
+++ b/reactos/dll/win32/comdlg32/filedlgbrowser.h
@@ -26,7 +26,6 @@
 #include <stdarg.h>
 #endif
 
-#define COM_NO_WINDOWS_H
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
@@ -157,4 +156,15 @@ BOOL IsPidlFolder (LPSHELLFOLDER psf, LPCITEMIDLIST pidl);
 /* Functions used by the EDIT box */
 void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd);
 
+/**************************************************************************
+*   External Prototypes
+*/
+extern const char FileOpenDlgInfosStr[];
+
+extern IShellFolder*    GetShellFolderFromPidl(LPITEMIDLIST pidlAbs);
+extern LPITEMIDLIST     GetParentPidl(LPITEMIDLIST pidl);
+
+extern int     FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl);
+extern LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
+
 #endif /*SHBROWSER_H*/
diff --git a/reactos/dll/win32/comdlg32/filetitle.c b/reactos/dll/win32/comdlg32/filetitle.c
deleted file mode 100644
index d426bb34fa4..00000000000
--- a/reactos/dll/win32/comdlg32/filetitle.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * COMMDLG - File Dialogs
- *
- * Copyright 1994 Martin Ayotte
- * Copyright 1996 Albrecht Kleine
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <precomp.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
-
-/***********************************************************************
- *	GetFileTitleA		(COMDLG32.@)
- *
- * See GetFileTitleW.
- */
-short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf)
-{
-    int ret;
-    UNICODE_STRING strWFile;
-    LPWSTR lpWTitle;
-
-    RtlCreateUnicodeStringFromAsciiz(&strWFile, lpFile);
-    lpWTitle = HeapAlloc( GetProcessHeap(), 0, cbBuf*sizeof(WCHAR));
-    ret = GetFileTitleW(strWFile.Buffer, lpWTitle, cbBuf);
-    if (!ret) WideCharToMultiByte( CP_ACP, 0, lpWTitle, -1, lpTitle, cbBuf, NULL, NULL );
-    RtlFreeUnicodeString( &strWFile );
-    HeapFree( GetProcessHeap(), 0, lpWTitle );
-    return ret;
-}
-
-
-/***********************************************************************
- *	GetFileTitleW		(COMDLG32.@)
- *
- * Get the name of a file.
- *
- * PARAMS
- *  lpFile  [I] name and location of file
- *  lpTitle [O] returned file name
- *  cbBuf   [I] buffer size of lpTitle
- *
- * RETURNS
- *  Success: zero
- *  Failure: negative number.
- */
-short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf)
-{
-	int i, len;
-        static const WCHAR brkpoint[] = {'*','[',']',0};
-	TRACE("(%p %p %d);\n", lpFile, lpTitle, cbBuf);
-
-	if(lpFile == NULL || lpTitle == NULL)
-		return -1;
-
-	len = strlenW(lpFile);
-
-	if (len == 0)
-		return -1;
-
-	if(strpbrkW(lpFile, brkpoint))
-		return -1;
-
-	len--;
-
-	if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':')
-		return -1;
-
-	for(i = len; i >= 0; i--)
-	{
-		if (lpFile[i] == '/' ||  lpFile[i] == '\\' ||  lpFile[i] == ':')
-		{
-			i++;
-			break;
-		}
-	}
-
-	if(i == -1)
-		i++;
-
-	TRACE("---> '%s'\n", debugstr_w(&lpFile[i]));
-
-	len = strlenW(lpFile+i)+1;
-	if(cbBuf < len)
-		return len;
-
-	strcpyW(lpTitle, &lpFile[i]);
-	return 0;
-}
-
-
-/***********************************************************************
- *	GetFileTitle		(COMMDLG.27)
- */
-short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf)
-{
-	return GetFileTitleA(lpFile, lpTitle, cbBuf);
-}
diff --git a/reactos/dll/win32/comdlg32/finddlg.c b/reactos/dll/win32/comdlg32/finddlg16.c
similarity index 96%
rename from reactos/dll/win32/comdlg32/finddlg.c
rename to reactos/dll/win32/comdlg32/finddlg16.c
index 61dacd97e1f..f30bae80172 100644
--- a/reactos/dll/win32/comdlg32/finddlg.c
+++ b/reactos/dll/win32/comdlg32/finddlg16.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <ctype.h>
@@ -126,7 +126,7 @@ static BOOL FINDDLG_Get16BitsTemplate(LFRPRIVATE lfr)
         if (!hGlobal16)
         {
             COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE);
-            ERR("alloc failure for %ld bytes\n", size);
+            ERR("alloc failure for %d bytes\n", size);
             return FALSE;
         }
         lfr->template = GlobalLock16(hGlobal16);
@@ -137,7 +137,7 @@ static BOOL FINDDLG_Get16BitsTemplate(LFRPRIVATE lfr)
             GlobalFree16(hGlobal16);
             return FALSE;
         }
-        ConvertDialog32To16((LPVOID)template32, size, (LPVOID)lfr->template);
+        ConvertDialog32To16(template32, size, (LPVOID)lfr->template);
         lfr->hDlgTmpl16 = hGlobal16;
         lfr->hGlobal16 = hGlobal16;
     }
@@ -228,7 +228,7 @@ HWND16 WINAPI ReplaceText16( SEGPTR find )
  *                              FINDDLG_WMInitDialog            [internal]
  */
 static LRESULT FINDDLG_WMInitDialog(HWND hWnd, LPARAM lParam, LPDWORD lpFlags,
-                                    LPSTR lpstrFindWhat, BOOL fUnicode)
+                                    LPCSTR lpstrFindWhat, BOOL fUnicode)
 {
     SetWindowLongPtrW(hWnd, DWLP_USER, lParam);
     *lpFlags &= ~(FR_FINDNEXT | FR_REPLACE | FR_REPLACEALL | FR_DIALOGTERM);
@@ -237,7 +237,7 @@ static LRESULT FINDDLG_WMInitDialog(HWND hWnd, LPARAM lParam, LPDWORD lpFlags,
      * FindNext (IDOK) button.  Only after typing some text, the button should be
      * enabled.
      */
-    if (fUnicode) SetDlgItemTextW(hWnd, edt1, (LPWSTR)lpstrFindWhat);
+    if (fUnicode) SetDlgItemTextW(hWnd, edt1, (LPCWSTR)lpstrFindWhat);
 	else SetDlgItemTextA(hWnd, edt1, lpstrFindWhat);
     CheckRadioButton(hWnd, rad1, rad2, (*lpFlags & FR_DOWN) ? rad2 : rad1);
     if (*lpFlags & (FR_HIDEUPDOWN | FR_NOUPDOWN)) {
@@ -341,8 +341,8 @@ BOOL16 CALLBACK FindTextDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
  *                              REPLACEDLG_WMInitDialog         [internal]
  */
 static LRESULT REPLACEDLG_WMInitDialog(HWND hWnd, LPARAM lParam,
-		    LPDWORD lpFlags, LPSTR lpstrFindWhat,
-		    LPSTR lpstrReplaceWith, BOOL fUnicode)
+		    LPDWORD lpFlags, LPCSTR lpstrFindWhat,
+		    LPCSTR lpstrReplaceWith, BOOL fUnicode)
 {
     SetWindowLongPtrW(hWnd, DWLP_USER, lParam);
     *lpFlags &= ~(FR_FINDNEXT | FR_REPLACE | FR_REPLACEALL | FR_DIALOGTERM);
@@ -353,8 +353,8 @@ static LRESULT REPLACEDLG_WMInitDialog(HWND hWnd, LPARAM lParam,
      */
     if (fUnicode)
     {
-	SetDlgItemTextW(hWnd, edt1, (LPWSTR)lpstrFindWhat);
-	SetDlgItemTextW(hWnd, edt2, (LPWSTR)lpstrReplaceWith);
+	SetDlgItemTextW(hWnd, edt1, (LPCWSTR)lpstrFindWhat);
+	SetDlgItemTextW(hWnd, edt2, (LPCWSTR)lpstrReplaceWith);
     } else
     {
 	SetDlgItemTextA(hWnd, edt1, lpstrFindWhat);
diff --git a/reactos/dll/win32/comdlg32/finddlg32.c b/reactos/dll/win32/comdlg32/finddlg32.c
index d876f6f52fd..5485804733d 100644
--- a/reactos/dll/win32/comdlg32/finddlg32.c
+++ b/reactos/dll/win32/comdlg32/finddlg32.c
@@ -19,10 +19,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
+#include <stdarg.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "commdlg.h"
+#include "cderr.h"
+#include "dlgs.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
+#include "cdlg.h"
+
+
 /*-----------------------------------------------------------------------*/
 
 static UINT		FindReplaceMessage;
@@ -286,8 +299,8 @@ static INT_PTR CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPA
  *		FALSE: Failure
  */
 static BOOL COMDLG32_FR_CheckPartial(
-	LPFINDREPLACEA pfr,	/* [in] Find structure */
-        BOOL Replace		/* [in] True if called as replace */
+	const FINDREPLACEA *pfr,	/* [in] Find structure */
+	BOOL Replace			/* [in] True if called as replace */
 ) {
 	if(!pfr)
         {
@@ -361,7 +374,7 @@ static HWND COMDLG32_FR_DoFindReplace(
         DWORD error;
         LPDLGTEMPLATEW rcs;
 
-	TRACE("hInst=%p, Flags=%08lx\n", pdata->fr.hInstance, pdata->fr.Flags);
+	TRACE("hInst=%p, Flags=%08x\n", pdata->fr.hInstance, pdata->fr.Flags);
 
         if(!(pdata->fr.Flags & FR_ENABLETEMPLATEHANDLE))
         {
diff --git a/reactos/dll/win32/comdlg32/fontdlg.c b/reactos/dll/win32/comdlg32/fontdlg.c
index 73e7945b734..a900c69e340 100644
--- a/reactos/dll/win32/comdlg32/fontdlg.c
+++ b/reactos/dll/win32/comdlg32/fontdlg.c
@@ -19,7 +19,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winnls.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "commdlg.h"
+#include "dlgs.h"
+#include "wine/debug.h"
+#include "cderr.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
@@ -34,8 +47,8 @@ static const WCHAR chooseFontW[] = {'C','H','O','O','S','E','_','F','O','N','T',
 static HIMAGELIST himlTT = 0;
 #define TTBITMAP_XSIZE 20 /* x-size of the bitmaps */
 
-INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 /* There is a table here of all charsets, and the sample text for each.
  * There is a second table that translates a charset into an index into
@@ -75,7 +88,7 @@ static const WCHAR stIso88594[]={'A','a','B','b',0}; /* ISO-8859-4 */
 static const WCHAR stIso885910[]={'A','a','B','b',0}; /* ISO-8859-10 */
 static const WCHAR stCeltic[]={'A','a','B','b',0};/* Celtic */
 
-static const WCHAR *sample_lang_text[]={
+static const WCHAR * const sample_lang_text[]={
     stWestern,stSymbol,stShiftJis,stHangul,stGB2312,
     stBIG5,stGreek,stTurkish,stHebrew,stArabic,
     stBaltic,stVietname,stCyrillic,stEastEur,stThai,
@@ -274,7 +287,7 @@ static const COLORREF textcolors[TEXT_COLORS]=
 /***********************************************************************
  *                          CFn_HookCallChk32                 [internal]
  */
-static BOOL CFn_HookCallChk32(LPCHOOSEFONTW lpcf)
+static BOOL CFn_HookCallChk32(const CHOOSEFONTW *lpcf)
 {
     if (lpcf)
         if(lpcf->Flags & CF_ENABLEHOOK)
@@ -287,7 +300,7 @@ static BOOL CFn_HookCallChk32(LPCHOOSEFONTW lpcf)
  *              AddFontFamily                               [internal]
  */
 INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM,
-        UINT nFontType, LPCHOOSEFONTW lpcf, HWND hwnd, LPCFn_ENUMSTRUCT e)
+        UINT nFontType, const CHOOSEFONTW *lpcf, HWND hwnd, LPCFn_ENUMSTRUCT e)
 {
     int i;
     WORD w;
@@ -328,7 +341,7 @@ static INT WINAPI FontFamilyEnumProc(const ENUMLOGFONTEXW *lpElfex,
 {
     LPCFn_ENUMSTRUCT e;
     e=(LPCFn_ENUMSTRUCT)lParam;
-    return AddFontFamily( lpElfex, (NEWTEXTMETRICEXW *) metrics,
+    return AddFontFamily( lpElfex, (const NEWTEXTMETRICEXW *) metrics,
             dwFontType, e->lpcf32w, e->hWnd1, e);
 }
 
@@ -373,13 +386,14 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTW *lplf)
         hf=SelectObject(hdc,hf);
         DeleteObject(hf);
                 /* font successful created ? */
-        if (tm.tmWeight==fontstyles[i].weight &&
+        if (((fontstyles[i].weight == FW_NORMAL && tm.tmWeight <= FW_MEDIUM) ||
+             (fontstyles[i].weight == FW_BOLD && tm.tmWeight > FW_MEDIUM)) &&
             ((tm.tmItalic != 0)==fontstyles[i].italic))
         {
             j=SendMessageW(hwnd,CB_ADDSTRING,0,(LPARAM)fontstyles[i].stname );
             if (j==CB_ERR) return 1;
             j=SendMessageW(hwnd, CB_SETITEMDATA, j,
-                           MAKELONG(fontstyles[i].weight,fontstyles[i].italic));
+                           MAKELONG(tm.tmWeight,fontstyles[i].italic));
             if (j==CB_ERR) return 1;
         }
     }
@@ -389,7 +403,7 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTW *lplf)
 /*************************************************************************
  *              AddFontSizeToCombo3                           [internal]
  */
-static int AddFontSizeToCombo3(HWND hwnd, UINT h, LPCHOOSEFONTW lpcf)
+static int AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf)
 {
     int j;
     WCHAR buffer[20];
@@ -413,7 +427,7 @@ static int AddFontSizeToCombo3(HWND hwnd, UINT h, LPCHOOSEFONTW lpcf)
 /*************************************************************************
  *              SetFontSizesToCombo3                           [internal]
  */
-static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTW lpcf)
+static int SetFontSizesToCombo3(HWND hwnd, const CHOOSEFONTW *lpcf)
 {
     static const BYTE sizes[]={6,7,8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72};
     int i;
@@ -426,7 +440,7 @@ static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTW lpcf)
 /*************************************************************************
  *              CFn_GetDC                           [internal]
  */
-static inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf)
+static inline HDC CFn_GetDC(const CHOOSEFONTW *lpcf)
 {
     HDC ret = ((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC) ?
         lpcf->hDC :
@@ -438,7 +452,7 @@ static inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf)
 /*************************************************************************
  *              CFn_ReleaseDC                           [internal]
  */
-static inline void CFn_ReleaseDC(LPCHOOSEFONTW lpcf, HDC hdc)
+static inline void CFn_ReleaseDC(const CHOOSEFONTW *lpcf, HDC hdc)
 {
         if(!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC))
             ReleaseDC(0, hdc);
@@ -448,7 +462,7 @@ static inline void CFn_ReleaseDC(LPCHOOSEFONTW lpcf, HDC hdc)
  *                 AddFontStyle                          [internal]
  */
 INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM,
-                UINT nFontType, LPCHOOSEFONTW lpcf, HWND hcmb2, HWND hcmb3,
+                UINT nFontType, const CHOOSEFONTW *lpcf, HWND hcmb2, HWND hcmb3,
                 HWND hDlg, BOOL iswin16)
 {
     int i;
@@ -457,7 +471,7 @@ INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM,
     HDC hdc;
 
     TRACE("(nFontType=%d)\n",nFontType);
-    TRACE("  %s h=%ld w=%ld e=%ld o=%ld wg=%ld i=%d u=%d s=%d"
+    TRACE("  %s h=%d w=%d e=%d o=%d wg=%d i=%d u=%d s=%d"
             " ch=%d op=%d cp=%d q=%d pf=%xh\n",
             debugstr_w(lplf->lfFaceName),lplf->lfHeight,lplf->lfWidth,
             lplf->lfEscapement,lplf->lfOrientation,
@@ -607,6 +621,8 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
         ShowWindow(GetDlgItem(hDlg,pshHelp),SW_HIDE);
     if (!(lpcf->Flags & CF_APPLY))
         ShowWindow(GetDlgItem(hDlg,psh3),SW_HIDE);
+    if (lpcf->Flags & CF_NOSCRIPTSEL)
+        EnableWindow(GetDlgItem(hDlg,cmb5),FALSE);
     if (lpcf->Flags & CF_EFFECTS)
     {
         for (i=0;i<TEXT_COLORS;i++)
@@ -695,6 +711,15 @@ LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam,
         SendDlgItemMessageW(hDlg,cmb1,CB_SETCURSEL,0,0);
         SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb1, CBN_SELCHANGE),
                 (LPARAM)GetDlgItem(hDlg,cmb1));
+        SendDlgItemMessageW(hDlg,cmb2,CB_SETCURSEL,0,0);
+        SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb2, CBN_SELCHANGE),
+                (LPARAM)GetDlgItem(hDlg,cmb1));
+        SendDlgItemMessageW(hDlg,cmb3,CB_SETCURSEL,0,0);
+        SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb3, CBN_SELCHANGE),
+                (LPARAM)GetDlgItem(hDlg,cmb3));
+        SendDlgItemMessageW(hDlg,cmb5,CB_SETCURSEL,0,0);
+        SendMessageW(hDlg, WM_COMMAND, MAKEWPARAM(cmb5, CBN_SELCHANGE),
+                (LPARAM)GetDlgItem(hDlg,cmb5));
     }
     if ((lpcf->Flags & CF_USESTYLE) && lpcf->lpszStyle)
     {
@@ -855,7 +880,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
     HDC hdc;
     LPLOGFONTW lpxx=lpcf->lpLogFont;
 
-    TRACE("WM_COMMAND wParam=%08lX lParam=%08lX\n", (LONG)wParam, lParam);
+    TRACE("WM_COMMAND wParam=%08X lParam=%08lX\n", (LONG)wParam, lParam);
     switch (LOWORD(wParam))
     {
     case cmb1:
@@ -1052,7 +1077,7 @@ static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam, LPCHOOSEFO
     return TRUE;
 }
 
-LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcf)
+LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSEFONTW *lpcf)
 {
     WINDOWINFO info;
 
@@ -1068,7 +1093,7 @@ LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcf)
         MapWindowPoints( 0, hDlg, (LPPOINT) &info.rcWindow, 2);
         hdc = BeginPaint( hDlg, &ps );
 
-        TRACE("erase %d, rect=(%ld,%ld)-(%ld,%ld)\n", ps.fErase,
+        TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n", ps.fErase,
               ps.rcPaint.left, ps.rcPaint.top,
               ps.rcPaint.right, ps.rcPaint.bottom);
 
diff --git a/reactos/dll/win32/comdlg32/fontdlg16.c b/reactos/dll/win32/comdlg32/fontdlg16.c
index 4fd0d2fb9e1..9a857296441 100644
--- a/reactos/dll/win32/comdlg32/fontdlg16.c
+++ b/reactos/dll/win32/comdlg32/fontdlg16.c
@@ -32,7 +32,6 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "commdlg.h"
-#include "dlgs.h"
 #include "wine/debug.h"
 #include "cderr.h"
 
@@ -44,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 static const WCHAR strWineFontData16[] =
                                {'_','_','W','I','N','E','_','F','O','N','T','D','L','G','D','A','T','A','1','6',0};
 
-static void FONT_LogFont16To32W( const LPLOGFONT16 font16, LPLOGFONTW font32 )
+static void FONT_LogFont16To32W( const LOGFONT16 *font16, LPLOGFONTW font32 )
 {
     font32->lfHeight = font16->lfHeight;
     font32->lfWidth = font16->lfWidth;
@@ -72,15 +71,17 @@ static void FONT_Metrics16To32W( const TEXTMETRIC16 *pm16,
     pnm32w->ntmTm.tmExternalLeading = pm16->tmExternalLeading;
 }
 
-static void CFn_CHOOSEFONT16to32W(LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w)
+static void CFn_CHOOSEFONT16to32W(const CHOOSEFONT16 *chf16, LPCHOOSEFONTW chf32w)
 {
   int len;
   if (chf16->Flags & CF_ENABLETEMPLATE)
   {
+      LPWSTR name32w;
+
       len = MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), -1, NULL, 0);
-      chf32w->lpTemplateName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
-      MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName),
-                           -1, (LPWSTR)chf32w->lpTemplateName, len);
+      name32w = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
+      MultiByteToWideChar( CP_ACP, 0, MapSL(chf16->lpTemplateName), -1, name32w, len);
+      chf32w->lpTemplateName = name32w;
   }
   if (chf16->Flags & CF_USESTYLE)
   {
@@ -106,7 +107,7 @@ static void CFn_CHOOSEFONT16to32W(LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w)
 /***********************************************************************
  *                          CFn_HookCallChk                 [internal]
  */
-static BOOL CFn_HookCallChk(LPCHOOSEFONT16 lpcf)
+static BOOL CFn_HookCallChk(const CHOOSEFONT16 *lpcf)
 {
  if (lpcf)
   if(lpcf->Flags & CF_ENABLEHOOK)
@@ -164,22 +165,23 @@ INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics,
 BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
 {
     HINSTANCE16 hInst;
-    HANDLE16 hDlgTmpl16 = 0, hResource16 = 0;
+    HANDLE16 hDlgTmpl16 = 0;
     HGLOBAL16 hGlobal16 = 0;
     BOOL16 bRet = FALSE;
-    LPCVOID template;
+    LPVOID template;
     FARPROC16 ptr;
     CHOOSEFONTW cf32w;
     LOGFONTW lf32w;
     LOGFONT16 *font16;
     SEGPTR lpTemplateName;
 
+    TRACE("ChooseFont\n");
+
+    if (!lpChFont) return FALSE;
+
     cf32w.lpLogFont=&lf32w;
     CFn_CHOOSEFONT16to32W(lpChFont, &cf32w);
 
-    TRACE("ChooseFont\n");
-    if (!lpChFont) return FALSE;
-
     if (TRACE_ON(commdlg))
 	_dump_cf_flags(lpChFont->Flags);
 
@@ -230,7 +232,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
         if (!hGlobal16)
         {
             COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE);
-            ERR("alloc failure for %ld bytes\n", size);
+            ERR("alloc failure for %d bytes\n", size);
             return FALSE;
         }
         template = GlobalLock16(hGlobal16);
@@ -241,7 +243,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
             GlobalFree16(hGlobal16);
             return FALSE;
         }
-        ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template);
+        ConvertDialog32To16(template32, size, template);
         hDlgTmpl16 = hGlobal16;
 
     }
@@ -254,7 +256,6 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont)
     hInst = GetWindowLongPtrA(HWND_32(lpChFont->hwndOwner), GWLP_HINSTANCE);
     bRet = DialogBoxIndirectParam16(hInst, hDlgTmpl16, lpChFont->hwndOwner,
                      (DLGPROC16) ptr, (DWORD)lpChFont);
-    if (hResource16) FreeResource16(hDlgTmpl16);
     if (hGlobal16)
     {
         GlobalUnlock16(hGlobal16);
diff --git a/reactos/dll/win32/comdlg32/precomp.h b/reactos/dll/win32/comdlg32/precomp.h
deleted file mode 100644
index 4416df16e2a..00000000000
--- a/reactos/dll/win32/comdlg32/precomp.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef PRECOMP_H__
-#define PRECOMP_H__
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#define NO_SHLWAPI_STREAM
-#define COM_NO_WINDOWS_H
-#define _COMDLG32_
-
-//#if defined (_MSC_VER)
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commdlg.h>
-#include <shellapi.h>
-#include <shlguid.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-#include <guiddef.h>
-#include <dlgs.h>
-#include <cderr.h>
-//#endif
-
-#if !defined (_MSC_VER)
-#include "psdk/shlguid.h"
-#include "psdk/shlobj.h"
-#endif
-
-#include "shlguid.h"
-#include "shlobj.h"
-
-#if !defined (_MSC_VER)
-#include "psdk/shlguid.h"
-#include "psdk/shlwapi.h"
-#endif
-
-#include "wine/winbase16.h"
-#include "wine/winuser16.h"
-#include "wine/dlgs.h"
-#include "wine/debug.h"
-#include "wine/unicode.h"
-
-#include <cderr.h>
-#include <cdlg.h>
-#include <winspool.h>
-#include <winerror.h>
-#include <winnls.h>
-#include <winreg.h>
-#include <winternl.h>
-
-//local headers
-#include "cdlg.h"
-#include "printdlg.h"
-#include "filedlgbrowser.h"
-#include "cdlg.h"
-#include "servprov.h"
-#include "filedlg31.h"
-
-#endif
diff --git a/reactos/dll/win32/comdlg32/printdlg.c b/reactos/dll/win32/comdlg32/printdlg.c
index 67669c54332..2681871d60e 100644
--- a/reactos/dll/win32/comdlg32/printdlg.c
+++ b/reactos/dll/win32/comdlg32/printdlg.c
@@ -20,17 +20,38 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
 
-#include <precomp.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winspool.h"
+#include "winerror.h"
+
+#include "wine/debug.h"
+
+#include "commdlg.h"
+#include "dlgs.h"
+#include "cderr.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
+#include "cdlg.h"
+#include "printdlg.h"
+
 /* Yes these constants are the same, but we're just copying win98 */
 #define UPDOWN_ID 0x270f
 #define MAX_COPIES 9999
 
 /* Debugging info */
-static struct pd_flags psd_flags[] = {
+static const struct pd_flags psd_flags[] = {
   {PSD_MINMARGINS,"PSD_MINMARGINS"},
   {PSD_MARGINS,"PSD_MARGINS"},
   {PSD_INTHOUSANDTHSOFINCHES,"PSD_INTHOUSANDTHSOFINCHES"},
@@ -164,8 +185,8 @@ static INT PRINTDLG_SetUpPrinterListComboW(HWND hDlg, UINT id, LPCWSTR name)
  *
  *  (NB. when we handle unicode the offsets will be in wchars).
  */
-static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, char* DeviceDriverName,
-				    char* DeviceName, char* OutputPort)
+static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName,
+				    const char* DeviceName, const char* OutputPort)
 {
     long size;
     char*   pDevNamesSpace;
@@ -376,7 +397,10 @@ static BOOL PRINTDLG_UpdatePrintDlgW(HWND hDlg,
 	    }
 	    lppd->nFromPage = nFromPage;
 	    lppd->nToPage   = nToPage;
+	    lppd->Flags |= PD_PAGENUMS;
 	}
+	else
+	    lppd->Flags &= ~PD_PAGENUMS;
 
 	if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */
 	    static WCHAR file[] = {'F','I','L','E',':',0};
@@ -649,8 +673,8 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg,
 
 static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg,
 					int   nIDComboBox,
-					WCHAR* PrinterName,
-					WCHAR* PortName,
+					const WCHAR* PrinterName,
+					const WCHAR* PortName,
 					LPDEVMODEW dm)
 {
     int     i;
@@ -761,7 +785,7 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg,
 /***********************************************************************
  *               PRINTDLG_UpdatePrinterInfoTexts               [internal]
  */
-static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, LPPRINTER_INFO_2A pi)
+static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, const PRINTER_INFO_2A *pi)
 {
     char   StatusMsg[256];
     char   ResourceString[256];
@@ -797,7 +821,7 @@ static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, LPPRINTER_INFO_2A pi)
     return;
 }
 
-static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, LPPRINTER_INFO_2W pi)
+static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, const PRINTER_INFO_2W *pi)
 {
     WCHAR   StatusMsg[256];
     WCHAR   ResourceString[256];
@@ -1833,7 +1857,7 @@ static INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
  *      PRINTDLG_GetDlgTemplate
  *
  */
-static HGLOBAL PRINTDLG_GetDlgTemplateA(PRINTDLGA *lppd)
+static HGLOBAL PRINTDLG_GetDlgTemplateA(const PRINTDLGA *lppd)
 {
     HRSRC hResInfo;
     HGLOBAL hDlgTmpl;
@@ -1867,7 +1891,7 @@ static HGLOBAL PRINTDLG_GetDlgTemplateA(PRINTDLGA *lppd)
     return hDlgTmpl;
 }
 
-static HGLOBAL PRINTDLG_GetDlgTemplateW(PRINTDLGW *lppd)
+static HGLOBAL PRINTDLG_GetDlgTemplateW(const PRINTDLGW *lppd)
 {
     HRSRC hResInfo;
     HGLOBAL hDlgTmpl;
@@ -1970,19 +1994,26 @@ static BOOL PRINTDLG_CreateDCW(LPPRINTDLGW lppd)
 BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
 {
     BOOL      bRet = FALSE;
-    LPVOID   ptr;
-    HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrA( lppd->hwndOwner, GWLP_HINSTANCE );
+    LPVOID    ptr;
+    HINSTANCE hInst;
 
+    if (!lppd)
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION);
+        return FALSE;
+    }
+
+    hInst = (HINSTANCE)GetWindowLongPtrA( lppd->hwndOwner, GWLP_HINSTANCE );
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-	struct pd_flags *pflag = pd_flags;
+	const struct pd_flags *pflag = pd_flags;
 	for( ; pflag->name; pflag++) {
 	    if(lppd->Flags & pflag->flag)
 	        strcat(flagstr, pflag->name);
 	}
 	TRACE("(%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
-	      "pp. %d-%d, min p %d, max p %d, copies %d, hinst %p\n"
-	      "flags %08lx (%s)\n",
+              "pp. %d-%d, min p %d, max p %d, copies %d, hinst %p\n"
+              "flags %08x (%s)\n",
 	      lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
 	      lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
 	      lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
@@ -2018,7 +2049,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
 	GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
 	dbuf = HeapAlloc(GetProcessHeap(),0,needed);
 	if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
-	    ERR("GetPrinterDriverA failed, le %ld, fix your config for printer %s!\n",GetLastError(),pbuf->pPrinterName);
+            ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",GetLastError(),pbuf->pPrinterName);
 	    COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE);
 	    return FALSE;
 	}
@@ -2107,24 +2138,29 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
  *
  * See PrintDlgA.
  */
-BOOL WINAPI PrintDlgW(
-		      LPPRINTDLGW lppd /* [in/out] ptr to PRINTDLG32 struct */
-		      )
+BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd)
 {
     BOOL      bRet = FALSE;
-    LPVOID   ptr;
-    HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrW( lppd->hwndOwner, GWLP_HINSTANCE );
+    LPVOID    ptr;
+    HINSTANCE hInst;
 
+    if (!lppd)
+    {
+        COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION);
+        return FALSE;
+    }
+
+    hInst = (HINSTANCE)GetWindowLongPtrW( lppd->hwndOwner, GWLP_HINSTANCE );
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-	struct pd_flags *pflag = pd_flags;
+	const struct pd_flags *pflag = pd_flags;
 	for( ; pflag->name; pflag++) {
 	    if(lppd->Flags & pflag->flag)
 	        strcat(flagstr, pflag->name);
 	}
 	TRACE("(%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
-	      "pp. %d-%d, min p %d, max p %d, copies %d, hinst %p\n"
-	      "flags %08lx (%s)\n",
+              "pp. %d-%d, min p %d, max p %d, copies %d, hinst %p\n"
+              "flags %08x (%s)\n",
 	      lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
 	      lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
 	      lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
@@ -2160,7 +2196,7 @@ BOOL WINAPI PrintDlgW(
 	GetPrinterDriverW(hprn, NULL, 3, NULL, 0, &needed);
 	dbuf = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*needed);
 	if (!GetPrinterDriverW(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
-	    ERR("GetPrinterDriverA failed, le %ld, fix your config for printer %s!\n",GetLastError(),debugstr_w(pbuf->pPrinterName));
+            ERR("GetPrinterDriverA failed, le %d, fix your config for printer %s!\n",GetLastError(),debugstr_w(pbuf->pPrinterName));
 	    COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE);
 	    return FALSE;
 	}
@@ -2265,7 +2301,7 @@ BOOL WINAPI PrintDlgW(
  *          PageSetupDlg
  * rad1 - portrait
  * rad2 - landscape
- * cmb1 - printer select (not in standart dialog template)
+ * cmb1 - printer select (not in standard dialog template)
  * cmb2 - paper size
  * cmb3 - source (tray?)
  * edt4 - border left
@@ -2279,7 +2315,7 @@ typedef struct {
     LPPAGESETUPDLGA	dlga; /* Handler to user defined struct */
     PRINTDLGA		pdlg;
     HWND 		hDlg; /* Page Setup dialog handler */
-    PAGESETUPDLGA	curdlg; /* Struct means cerrent dialog state */
+    PAGESETUPDLGA	curdlg; /* Stores the current dialog state */
     RECT		rtDrawRect; /* Drawing rect for page */
 } PageSetupDataA;
 
@@ -2289,7 +2325,7 @@ typedef struct {
 } PageSetupDataW;
 
 
-static HGLOBAL PRINTDLG_GetPGSTemplateA(PAGESETUPDLGA *lppd)
+static HGLOBAL PRINTDLG_GetPGSTemplateA(const PAGESETUPDLGA *lppd)
 {
     HRSRC hResInfo;
     HGLOBAL hDlgTmpl;
@@ -2307,7 +2343,7 @@ static HGLOBAL PRINTDLG_GetPGSTemplateA(PAGESETUPDLGA *lppd)
     return hDlgTmpl;
 }
 
-static HGLOBAL PRINTDLG_GetPGSTemplateW(PAGESETUPDLGW *lppd)
+static HGLOBAL PRINTDLG_GetPGSTemplateW(const PAGESETUPDLGW *lppd)
 {
     HRSRC hResInfo;
     HGLOBAL hDlgTmpl;
@@ -2354,15 +2390,15 @@ static void
 _c_size2strA(PageSetupDataA *pda,DWORD size,LPSTR strout) {
     strcpy(strout,"<undef>");
     if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) {
-	sprintf(strout,"%ld",(size)/100);
+	sprintf(strout,"%d",(size)/100);
 	return;
     }
     if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) {
-	sprintf(strout,"%ldin",(size)/1000);
+	sprintf(strout,"%din",(size)/1000);
 	return;
     }
     pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
-    sprintf(strout,"%ld",(size)/100);
+    sprintf(strout,"%d",(size)/100);
     return;
 }
 static void
@@ -2385,7 +2421,7 @@ _c_size2strW(PageSetupDataW *pda,DWORD size,LPWSTR strout) {
 }
 
 static DWORD
-_c_str2sizeA(PAGESETUPDLGA *dlga,LPCSTR strin) {
+_c_str2sizeA(const PAGESETUPDLGA *dlga, LPCSTR strin) {
     float	val;
     char	rest[200];
 
@@ -2425,13 +2461,13 @@ _c_str2sizeA(PAGESETUPDLGA *dlga,LPCSTR strin) {
 
 
 static DWORD
-_c_str2sizeW(PAGESETUPDLGW *dlga, LPCWSTR strin) {
+_c_str2sizeW(const PAGESETUPDLGW *dlga, LPCWSTR strin) {
     char	buf[200];
 
     /* this W -> A transition is OK */
     /* we need a unicode version of sscanf to avoid it */
     WideCharToMultiByte(CP_ACP, 0, strin, -1, buf, sizeof(buf), NULL, NULL);
-    return _c_str2sizeA((PAGESETUPDLGA *)dlga, buf);
+    return _c_str2sizeA((const PAGESETUPDLGA *)dlga, buf);
 }
 
 
@@ -2443,8 +2479,8 @@ _c_str2sizeW(PAGESETUPDLGW *dlga, LPCWSTR strin) {
  *
  * PARAMS
  *  hDlg	[in] 	 main window dialog HANDLE
- *  pda 	[in/out] ptr to PageSetupDataA structere
- * 
+ *  pda 	[in/out] ptr to PageSetupDataA structure
+ *
  * RETURNS
  *  TRUE
  */
@@ -2649,7 +2685,7 @@ PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) {
  *  always - TRUE
  */
 static BOOL 
-PRINTDLG_PS_ChangePaperPrev(PageSetupDataA *pda)
+PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda)
 {
     LONG width, height, x, y;
     RECT rtTmp;
@@ -2663,7 +2699,7 @@ PRINTDLG_PS_ChangePaperPrev(PageSetupDataA *pda)
     }
     x = (pda->rtDrawRect.right + pda->rtDrawRect.left - width) / 2;
     y = (pda->rtDrawRect.bottom + pda->rtDrawRect.top - height) / 2;
-    TRACE("rtDrawRect(%ld, %ld, %ld, %ld) x=%ld, y=%ld, w=%ld, h=%ld",
+    TRACE("rtDrawRect(%d, %d, %d, %d) x=%d, y=%d, w=%d, h=%d\n",
 	pda->rtDrawRect.left, pda->rtDrawRect.top, pda->rtDrawRect.right, pda->rtDrawRect.bottom,
 	x, y, width, height);
 
@@ -2707,7 +2743,7 @@ PRINTDLG_PS_WMCommandA(
     WORD id  = LOWORD(wParam);
     char buf[200];
 	
-    TRACE("loword (lparam) %d, wparam 0x%x, lparam %08lx\n",
+    TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n",
 	    LOWORD(lParam),wParam,lParam);
     switch (id)  {
     case IDOK:
@@ -2845,7 +2881,7 @@ static BOOL
 PRINTDLG_PS_WMCommandW(
     HWND hDlg, WPARAM wParam, LPARAM lParam, PageSetupDataW *pda
 ) {
-    TRACE("loword (lparam) %d, wparam 0x%x, lparam %08lx\n",
+    TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n",
 	    LOWORD(lParam),wParam,lParam);
     switch (LOWORD(wParam))  {
     case IDOK:
@@ -2877,7 +2913,8 @@ PRINTDLG_PS_WMCommandW(
 */
 
 static UINT_PTR
-PRINTDLG_DefaultPagePaintHook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, PageSetupDataA *pda)
+PRINTDLG_DefaultPagePaintHook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam,
+                              const PageSetupDataA *pda)
 {
     LPRECT lprc = (LPRECT) lParam;
     HDC hdc = (HDC) wParam;
@@ -3086,7 +3123,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 	memcpy(&pda->curdlg, pda->dlga, sizeof(pda->curdlg));
 	
 	hDrawWnd = GetDlgItem(hDlg, rct1); 
-        TRACE("set property to %p", pda);
+        TRACE("set property to %p\n", pda);
 	SetPropA(hDlg, "__WINE_PAGESETUPDLGDATA", pda);
 	SetPropA(hDrawWnd, "__WINE_PAGESETUPDLGDATA", pda);
 	GetWindowRect(hDrawWnd, &pda->rtDrawRect); /* Calculating rect in client coordinates where paper draws */
@@ -3172,7 +3209,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                 pda->curdlg.ptPaperSize.x = tmp;
             }
 	} else 
-	    WARN("GlobalLock(pda->pdlg.hDevMode) fail? hDevMode=%p", pda->pdlg.hDevMode);
+	    WARN("GlobalLock(pda->pdlg.hDevMode) fail? hDevMode=%p\n", pda->pdlg.hDevMode);
 	/* Drawing paper prev */
 	PRINTDLG_PS_ChangePaperPrev(pda);
 	return TRUE;
@@ -3311,7 +3348,7 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
     /* TRACE */
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-	struct pd_flags *pflag = psd_flags;
+	const struct pd_flags *pflag = psd_flags;
 	for( ; pflag->name; pflag++) {
 	    if(setupdlg->Flags & pflag->flag) {
 	        strcat(flagstr, pflag->name);
@@ -3319,7 +3356,7 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
 	    }
 	}
 	TRACE("(%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
-	      "hinst %p, flags %08lx (%s)\n",
+              "hinst %p, flags %08x (%s)\n",
 	      setupdlg, setupdlg->hwndOwner, setupdlg->hDevMode,
 	      setupdlg->hDevNames,
 	      setupdlg->hInstance, setupdlg->Flags, flagstr);
@@ -3413,7 +3450,7 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) {
     FIXME("Unicode implementation is not done yet\n");
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-	struct pd_flags *pflag = psd_flags;
+	const struct pd_flags *pflag = psd_flags;
 	for( ; pflag->name; pflag++) {
 	    if(setupdlg->Flags & pflag->flag) {
 	        strcat(flagstr, pflag->name);
@@ -3421,7 +3458,7 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) {
 	    }
 	}
 	TRACE("(%p): hwndOwner = %p, hDevMode = %p, hDevNames = %p\n"
-	      "hinst %p, flags %08lx (%s)\n",
+              "hinst %p, flags %08x (%s)\n",
 	      setupdlg, setupdlg->hwndOwner, setupdlg->hDevMode,
 	      setupdlg->hDevNames,
 	      setupdlg->hInstance, setupdlg->Flags, flagstr);
diff --git a/reactos/dll/win32/comdlg32/printdlg.h b/reactos/dll/win32/comdlg32/printdlg.h
index 49772977730..77a39f9ec84 100644
--- a/reactos/dll/win32/comdlg32/printdlg.h
+++ b/reactos/dll/win32/comdlg32/printdlg.h
@@ -59,7 +59,7 @@ typedef struct
 } PRINT_PTRW;
 
 /* Debugging info */
-static struct pd_flags {
+static const struct pd_flags {
   DWORD  flag;
   LPCSTR name;
 } pd_flags[] = {
diff --git a/reactos/dll/win32/comdlg32/printdlg16.c b/reactos/dll/win32/comdlg32/printdlg16.c
index 9d5f9dced67..6aa8c6cc64f 100644
--- a/reactos/dll/win32/comdlg32/printdlg16.c
+++ b/reactos/dll/win32/comdlg32/printdlg16.c
@@ -40,7 +40,6 @@
 #include "wine/debug.h"
 #include "cderr.h"
 #include "winspool.h"
-#include "winerror.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
@@ -56,8 +55,8 @@ typedef struct
 
 /* Internal Functions */
 
-static BOOL PRINTDLG_CreateDevNames16(HGLOBAL16 *hmem, char* DeviceDriverName,
-				      char* DeviceName, char* OutputPort)
+static BOOL PRINTDLG_CreateDevNames16(HGLOBAL16 *hmem, const char* DeviceDriverName,
+				      const char* DeviceName, const char* OutputPort)
 {
     long size;
     char*   pDevNamesSpace;
@@ -249,7 +248,7 @@ static HGLOBAL16 PRINTDLG_Get16TemplateFrom32(LPCSTR PrintResourceName)
         if (!hGlobal16)
         {
             COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE);
-            ERR("alloc failure for %ld bytes\n", size);
+            ERR("alloc failure for %d bytes\n", size);
             return 0;
         }
         template = GlobalLock16(hGlobal16);
@@ -260,7 +259,7 @@ static HGLOBAL16 PRINTDLG_Get16TemplateFrom32(LPCSTR PrintResourceName)
             GlobalFree16(hGlobal16);
             return 0;
         }
-        ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template);
+        ConvertDialog32To16(template32, size, template);
         GlobalUnlock16(hGlobal16);
         return hGlobal16;
 }
@@ -291,7 +290,7 @@ static BOOL PRINTDLG_CreateDC16(LPPRINTDLG16 lppd)
  *      PRINTDLG_GetDlgTemplate
  *
  */
-static HGLOBAL16 PRINTDLG_GetDlgTemplate16(PRINTDLG16 *lppd)
+static HGLOBAL16 PRINTDLG_GetDlgTemplate16(const PRINTDLG16 *lppd)
 {
     HGLOBAL16 hDlgTmpl, hResInfo;
 
@@ -349,21 +348,21 @@ BOOL16 WINAPI PrintDlg16(
 
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-	struct pd_flags *pflag = pd_flags;
+	const struct pd_flags *pflag = pd_flags;
 	for( ; pflag->name; pflag++) {
 	    if(lppd->Flags & pflag->flag)
 	        strcat(flagstr, pflag->name);
 	}
 	TRACE("(%p): hwndOwner = %08x, hDevMode = %08x, hDevNames = %08x\n"
-	      "pp. %d-%d, min p %d, max p %d, copies %d, hinst %08x\n"
-	      "flags %08lx (%s)\n",
+              "pp. %d-%d, min p %d, max p %d, copies %d, hinst %08x\n"
+              "flags %08x (%s)\n",
 	      lppd, lppd->hwndOwner, lppd->hDevMode, lppd->hDevNames,
 	      lppd->nFromPage, lppd->nToPage, lppd->nMinPage, lppd->nMaxPage,
 	      lppd->nCopies, lppd->hInstance, lppd->Flags, flagstr);
     }
 
     if(lppd->lStructSize != sizeof(PRINTDLG16)) {
-        ERR("structure size %ld\n",lppd->lStructSize);
+        ERR("structure size %d\n",lppd->lStructSize);
 	COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
 	return FALSE;
     }
@@ -391,7 +390,7 @@ BOOL16 WINAPI PrintDlg16(
 	GetPrinterDriverA(hprn, NULL, 3, NULL, 0, &needed);
 	dbuf = HeapAlloc(GetProcessHeap(),0,needed);
 	if (!GetPrinterDriverA(hprn, NULL, 3, (LPBYTE)dbuf, needed, &needed)) {
-	    ERR("GetPrinterDriverA failed for %s, le %ld, fix your config!\n",
+            ERR("GetPrinterDriverA failed for %s, le %d, fix your config!\n",
 		    pbuf->pPrinterName,GetLastError());
             HeapFree(GetProcessHeap(), 0, dbuf);
 	    COMDLG32_SetCommDlgExtendedError(PDERR_RETDEFFAILURE);