Index: trunk/src/comdlg32/cdlg_De.orc
===================================================================
--- trunk/src/comdlg32/cdlg_De.orc	(revision 6707)
+++ trunk/src/comdlg32/cdlg_De.orc	(revision 6708)
@@ -18,5 +18,5 @@
  DEFPUSHBUTTON "Öffnen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
  CHECKBOX "&Schreibgeschützt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
@@ -40,5 +40,5 @@
  DEFPUSHBUTTON "Speichern als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
  CHECKBOX "&Schreibgeschützt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
@@ -53,10 +53,10 @@
  LTEXT "", 1089, 60, 6, 150, 9
  GROUPBOX "Druckbereicht", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&Alles", 1056, 16, 45, 60, 12
- RADIOBUTTON "A&uswahl", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Seiten", 1058, 16, 75, 60, 12
+ RADIOBUTTON "&Alles", rad1, 16, 45, 60, 12
+ RADIOBUTTON "A&uswahl", rad2, 16, 60, 60, 12
+ RADIOBUTTON "&Seiten", rad3, 16, 75, 60, 12
  DEFPUSHBUTTON "Drucken", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Einrichten", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Einrichten", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
  LTEXT "&Von:", 1090, 60, 80, 30, 9
  LTEXT "&Bis:", 1091, 120, 80, 30, 9
@@ -74,14 +74,14 @@
 {
  GROUPBOX "Drucker", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Standarddrucker", 1056, 16, 20, 80, 12
+ RADIOBUTTON "&Standarddrucker", rad1, 16, 20, 80, 12
  LTEXT "[keiner]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Bestimmter &Drucker", 1057, 16, 50, 80, 12
+ RADIOBUTTON "Bestimmter &Drucker", rad2, 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 "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Einrichten", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Einrichten", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
  GROUPBOX "Orientierung", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Hochformat", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Querformat", 1059, 50, 115, 40, 12
+ RADIOBUTTON "&Hochformat", rad3, 50, 100, 40, 12
+ RADIOBUTTON "&Querformat", rad4, 50, 115, 40, 12
  ICON "LANDSCAP", 1097, 10, 95, 32, 32
  ICON "PORTRAIT", 1098, 10, 95, 32, 32
@@ -140,6 +140,6 @@
     DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
     PUSHBUTTON      "Abbrechen",IDCANCEL,218,23,40,14,WS_GROUP
-    PUSHBUTTON      "&Zuweisen", 1026,218,40,40,14,WS_GROUP
-    PUSHBUTTON      "&Hilfe" , 1038,218,57,40,14,WS_GROUP
+    PUSHBUTTON      "&Zuweisen", psh3,218,40,40,14,WS_GROUP
+    PUSHBUTTON      "&Hilfe" , pshHelp,218,57,40,14,WS_GROUP
     GROUPBOX        "Darstellung",1072,6,72,84,34,WS_GROUP
     CHECKBOX	    "&Durchgestrichen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
@@ -180,5 +180,5 @@
  DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Abbrechen", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", 1038,100,166, 44, 14
+ PUSHBUTTON "&Hilfe", pshHelp,100,166, 44, 14
  PUSHBUTTON "Farbe hin&zufügen",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Farben &definieren >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
@@ -197,9 +197,9 @@
  CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
  GROUPBOX "Richtung", 1072, 107, 26, 68, 28
- CONTROL "H&och", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Runter", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ CONTROL "H&och", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Runter", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
  DEFPUSHBUTTON "&Nächsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Abbrechen", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
@@ -217,8 +217,8 @@
  CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
  DEFPUSHBUTTON "&Nächsten finden", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Ersetzen", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Alle ersetzen", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ersetzen", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Alle ersetzen", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Abbrechen", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Hilfe", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Hilfe", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
Index: trunk/src/comdlg32/cdlg_En.orc
===================================================================
--- trunk/src/comdlg32/cdlg_En.orc	(revision 6707)
+++ trunk/src/comdlg32/cdlg_En.orc	(revision 6708)
@@ -7,5 +7,5 @@
 {
  LTEXT "File &Name:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ 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 "&Directories:", -1, 110, 6, 92, 9
@@ -13,11 +13,11 @@
  LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
  LTEXT "List Files of &Type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  LTEXT "Dri&ves:", 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
+ 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
  PUSHBUTTON "Cancel", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Read Only", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Read Only", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
@@ -29,5 +29,5 @@
 {
  LTEXT "File &Name:", 1090, 6, 6, 76, 9
- EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ 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 "&Directories:", -1, 110, 6, 92, 9
@@ -35,11 +35,11 @@
  LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
  LTEXT "List Files of &Type:", 1089, 6, 104, 90, 9
- COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  LTEXT "Dri&ves:", 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
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  DEFPUSHBUTTON "Save As", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancel", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
- CHECKBOX "&Read Only", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Read Only", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
@@ -52,17 +52,17 @@
  LTEXT "Printer:", 1088, 6, 6, 40, 9
  LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Print Range", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "&All", 1056, 16, 45, 60, 12
- RADIOBUTTON "S&election", 1057, 16, 60, 60, 12
- RADIOBUTTON "&Pages", 1058, 16, 75, 60, 12
+ GROUPBOX "Print Range", grp1, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&All", rad1, 16, 45, 60, 12
+ RADIOBUTTON "S&election", rad2, 16, 60, 60, 12
+ RADIOBUTTON "&Pages", rad3, 16, 75, 60, 12
  DEFPUSHBUTTON "Print", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancel", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setup", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
  LTEXT "&From:", 1090, 60, 80, 30, 9
  LTEXT "&To:", 1091, 120, 80, 30, 9
  LTEXT "Print &Quality:", 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 "Print to Fi&le", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Print to Fi&le", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Condensed", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
 
@@ -73,22 +73,22 @@
 FONT 8, "Helv"
 {
- GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Default Printer", 1056, 16, 20, 80, 12
+ GROUPBOX "Printer", grp1, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Default Printer", rad1, 16, 20, 80, 12
  LTEXT "[none]", 1088, 35, 35, 120, 9
- RADIOBUTTON "Specific &Printer", 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", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancel", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- GROUPBOX "Orientation", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "Po&rtrait", 1058, 50, 100, 40, 12
- RADIOBUTTON "&Landscape", 1059, 50, 115, 40, 12
- ICON "LANDSCAP", 1097, 10, 95, 32, 32
- ICON "PORTRAIT", 1098, 10, 95, 32, 32
- GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX
+ RADIOBUTTON "Specific &Printer", 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 "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setup", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientation", grp2, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "Po&rtrait", rad3, 50, 100, 40, 12
+ RADIOBUTTON "&Landscape", rad4, 50, 115, 40, 12
+ ICON "LANDSCAP", stc10, 10, 95, 32, 32
+ ICON "PORTRAIT", stc11, 10, 95, 32, 32
+ GROUPBOX "Paper", grp3, 120, 85, 180, 50, BS_GROUPBOX
  LTEXT "Si&ze", 1089, 130, 95, 30, 9
  LTEXT "&Source", 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
+ 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
 }
 
@@ -100,21 +100,21 @@
 {
     LTEXT           "&Font:",1088 ,6,3,40,9
-    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+    COMBOBOX        cmb1, 6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
     LTEXT           "Font St&yle:",1089 ,108,3,44,9
-    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+    COMBOBOX        cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
                     WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
     LTEXT           "&Size:",1090,179,3,30,9
-    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+    COMBOBOX        cmb3,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 | WS_TABSTOP | BS_DEFPUSHBUTTON 
     PUSHBUTTON      "Cancel",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Apply", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
-    PUSHBUTTON      "&Help" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Apply", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Help" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
     GROUPBOX        "Effects",1072,6,72,84,34,WS_GROUP
-    CHECKBOX	    "Stri&keout", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
-    CHECKBOX 	    "&Underline", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    CHECKBOX	    "Stri&keout", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX 	    "&Underline", chx2, 10,94,50,10, BS_AUTOCHECKBOX 
     LTEXT           "&Color:", 1091 ,6,110,30,9
-    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+    COMBOBOX        cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
 		    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Sample",1073,98,72,160,49,WS_GROUP
@@ -150,5 +150,5 @@
  DEFPUSHBUTTON "OK",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Cancel", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Help", 1038,100,166, 44, 14
+ PUSHBUTTON "Help", pshHelp,100,166, 44, 14
  PUSHBUTTON "&Add to Custom Colors",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "&Define Custom Colors >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
@@ -163,10 +163,10 @@
 {
  LTEXT "Fi&nd What:", -1, 4, 8, 42, 8
- EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Match &Whole Word Only", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Match &Case", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
- GROUPBOX "Direction", 1072, 107, 26, 68, 28
- CONTROL "&Up", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
- CONTROL "&Down", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+ EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Match &Case", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direction", grp1, 107, 26, 68, 28
+ CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&Down", rad2, "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 | BS_DEFPUSHBUTTON 
@@ -182,9 +182,9 @@
 {
  LTEXT "Fi&nd What:", -1, 4, 9, 48, 8
- EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
  LTEXT "Re&place With:", -1, 4, 26, 48, 8
- EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
- CHECKBOX "Match &Whole Word Only", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Match &Case", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Match &Whole Word Only", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Match &Case", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 
  DEFPUSHBUTTON "&Find Next", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
Index: trunk/src/comdlg32/colordlg.c
===================================================================
--- trunk/src/comdlg32/colordlg.c	(revision 6707)
+++ trunk/src/comdlg32/colordlg.c	(revision 6708)
@@ -1,3 +1,2 @@
-/* $Id: colordlg.c,v 1.4 2001-09-05 12:11:59 bird Exp $ */
 /*
  * COMMDLG - Color Dialog
Index: trunk/src/comdlg32/filedlg.c
===================================================================
--- trunk/src/comdlg32/filedlg.c	(revision 6707)
+++ trunk/src/comdlg32/filedlg.c	(revision 6708)
@@ -1,3 +1,2 @@
-/* $Id: filedlg.c,v 1.6 2001-09-05 12:12:00 bird Exp $ */
 /*
  * COMMDLG - File Dialogs
Index: trunk/src/comdlg32/filedlg95.c
===================================================================
--- trunk/src/comdlg32/filedlg95.c	(revision 6707)
+++ trunk/src/comdlg32/filedlg95.c	(revision 6708)
@@ -1,13 +1,12 @@
-/* $Id: filedlg95.c,v 1.24 2001-09-05 12:12:00 bird Exp $ */
 /*
  * COMMDLG - File Open Dialogs Win95 look and feel
  *
  * FIXME: The whole concept of handling unicode is badly broken.
- *  many hook-messages expecting a pointer to a
- *  OPENFILENAMEA or W structure. With the current architecture
- *  we would have to convert the beast at every call to a hook.
- *  we have to find a better solution but if would likely cause
- *  a complete rewrite with after we shouldhandle the
- *  OPENFILENAME structure without any converting (jsch).
+ *	many hook-messages expecting a pointer to a
+ *	OPENFILENAMEA or W structure. With the current architecture
+ *	we would have to convert the beast at every call to a hook.
+ *	we have to find a better solution but if would likely cause
+ *	a complete rewrite with after we shouldhandle the
+ *	OPENFILENAME structure without any converting (jsch).
  *
  * FIXME: any hook gets a OPENFILENAMEA structure
@@ -78,5 +77,5 @@
 
 #define IsHooked(fodInfos) \
-    ((fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook)
+	((fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook)
 /***********************************************************************
  * Data structure and global variables
@@ -87,5 +86,5 @@
   HIMAGELIST hImgList;
   int m_iIndent;      /* Indentation index */
-  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */
+  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */ 
 
 } SFOLDER,*LPSFOLDER;
@@ -217,5 +216,5 @@
  *      GetFileName95
  *
- * Creates an Open common dialog box that lets the user select
+ * Creates an Open common dialog box that lets the user select 
  * the drive, directory, and the name of a file or set of files to open.
  *
@@ -252,5 +251,5 @@
         return FALSE;
     }
-
+    
     /* old style hook messages */
     if (IsHooked(fodInfos))
@@ -261,5 +260,5 @@
       fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRINGA);
     }
-
+    
     lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
                                   (LPDLGTEMPLATEA) template,
@@ -271,5 +270,5 @@
     if( lRes == -1)
         return FALSE;
-
+    
     return lRes;
 }
@@ -292,12 +291,12 @@
   LPSTR lpstrSavDir = NULL;
   DWORD dwFlags = 0;
-
-  /* Initialise FileOpenDlgInfos structure*/
+  
+  /* Initialise FileOpenDlgInfos structure*/  
   fodInfos = (FileOpenDlgInfos*)MemAlloc(sizeof(FileOpenDlgInfos));
   ZeroMemory(fodInfos, sizeof(FileOpenDlgInfos));
-
+  
   /* Pass in the original ofn */
   fodInfos->ofnInfos = ofn;
-
+  
   /* Save original hInstance value */
   hInstance = ofn->hInstance;
@@ -317,5 +316,5 @@
   fodInfos->DlgInfos.dwDlgProp = 0;
   fodInfos->DlgInfos.hwndCustomDlg = (HWND)NULL;
-
+  
   switch(iDlgType)
   {
@@ -401,5 +400,5 @@
   FileOpenDlgInfos *fodInfos;
   HINSTANCE hInstance;
-
+  
   /* out arguments */
   LPWSTR lpstrFile = NULL;
@@ -438,5 +437,5 @@
     /* filter is a list...  title\0ext\0......\0\0 */
     s = ofn->lpstrFilter;
-
+    
     while (*s) s = s+strlenW(s)+1;
     s++;
@@ -521,5 +520,5 @@
   }
 #endif
-
+      
   /* restore saved IN arguments and convert OUT arguments back */
   ofn->Flags = dwFlags;
@@ -599,5 +598,5 @@
     SetWindowPos(hwndParentDlg, 0, rectParent.left,rectParent.top, (rectParent.right- rectParent.left),
         (rectParent.bottom-rectParent.top),SWP_NOMOVE | SWP_NOZORDER);
-
+	
     hwndChild = GetWindow(hwndChildDlg,GW_CHILD);
     if(hwndStc32)
@@ -616,8 +615,8 @@
         {
           if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
-                continue;
+				continue;
           GetWindowRect(hwndChild,&rectCtrl);
           MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
-
+                                  
           /*
             Check the initial position of the controls relative to the initial
@@ -630,20 +629,20 @@
           }
           else if (rectCtrl.left >= rectTemp.right)
-      {
+	  {
             rectCtrl.left += ptMoveCtl.x;
-      }
+	  }
           else if (rectCtrl.top >= rectTemp.bottom)
           {
-        rectCtrl.top  += ptMoveCtl.y;
-      }
-
-          SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
-                rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
-                SWP_NOSIZE | SWP_NOZORDER );
+	    rectCtrl.top  += ptMoveCtl.y;
+	  }
+					
+          SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
+				rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
+				SWP_NOSIZE | SWP_NOZORDER );
         }
       } while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
     }
     hwndChild = GetWindow(hwndParentDlg,GW_CHILD);
-
+	
     if(hwndStc32)
     {
@@ -666,10 +665,10 @@
             rectCtrl.top += ptMoveCtl.y;
 
-            SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
+            SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
                 rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
                 SWP_NOSIZE |SWP_NOZORDER );
           }
         } while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
-      }
+      }		
     }
 }
@@ -687,5 +686,5 @@
     {
       case WM_INITDIALOG:
-      {
+      {         
         fodInfos = (FileOpenDlgInfos *)lParam;
         lParam = (LPARAM) fodInfos->ofnInfos;
@@ -694,12 +693,12 @@
         if(fodInfos && IsHooked(fodInfos))
           return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
-        return 0;
-      }
+        return 0;	
+      } 
     }
 
     if(fodInfos && IsHooked(fodInfos))
-      return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
-
-    return DefWindowProcA(hwnd,uMsg,wParam,lParam);
+      return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam); 
+
+    return DefWindowProcA(hwnd,uMsg,wParam,lParam); 
 }
 
@@ -737,5 +736,5 @@
           COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
           return (HWND)NULL;
-        }
+    	}
       }
 
@@ -743,5 +742,5 @@
       if(hChildDlg)
       {
-        ShowWindow(hChildDlg,SW_SHOW);
+        ShowWindow(hChildDlg,SW_SHOW); 
         return hChildDlg;
       }
@@ -759,10 +758,10 @@
       tmplate.cx = rectHwnd.right-rectHwnd.left;
       tmplate.cy = rectHwnd.bottom-rectHwnd.top;
-
+       
       return CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
     }
     return (HWND)NULL;
 }
-
+ 
 /***********************************************************************
 *          SendCustomDlgNotificationMessage
@@ -785,13 +784,13 @@
     {
         OFNOTIFYA ofnNotify;
-    HRESULT ret;
+	HRESULT ret;
         ofnNotify.hdr.hwndFrom=hwndParentDlg;
         ofnNotify.hdr.idFrom=0;
         ofnNotify.hdr.code = uCode;
         ofnNotify.lpOFN = fodInfos->ofnInfos;
-    TRACE("CALL NOTIFY for %x\n", uCode);
-    ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
-    TRACE("RET NOTIFY\n");
-    return ret;
+	TRACE("CALL NOTIFY for %x\n", uCode);
+	ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
+	TRACE("RET NOTIFY\n");
+	return ret;
     }
     return TRUE;
@@ -816,6 +815,6 @@
             GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
             lpstrFileSpec = (LPSTR)PathFindFileNameA(lpstrPath);
-            if (lpstrFileSpec==lpstrPath)
-        {
+            if (lpstrFileSpec==lpstrPath) 
+	    {
                 char lpstrCurrentDir[MAX_PATH];
                 /* Prepend the current path */
@@ -824,7 +823,7 @@
                     snprintf((LPSTR)lParam,(int)wParam,"%s\\%s",lpstrCurrentDir,lpstrPath);
                 reqSize=strlen(lpstrCurrentDir)+1+strlen(lpstrPath)+1;
-            }
-        else
-        {
+            } 
+	    else 
+	    {
                 lstrcpynA((LPSTR)lParam,(LPSTR)lpstrPath,(int)wParam);
                 reqSize=strlen(lpstrPath);
@@ -834,5 +833,5 @@
 
         case CDM_GETFOLDERPATH:
-        SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
+	    SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
             if ((LPSTR)lParam!=NULL)
                 lstrcpynA((LPSTR)lParam,lpstrPath,(int)wParam);
@@ -840,5 +839,5 @@
 
         case CDM_GETSPEC:
-        reqSize=GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
+	    reqSize=GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
             lpstrFileSpec = (LPSTR)PathFindFileNameA(lpstrPath);
             if ((LPSTR)lParam!=NULL)
@@ -847,7 +846,7 @@
 
         case CDM_SETCONTROLTEXT:
-        if ( 0 != lParam )
-            SetDlgItemTextA( hwnd, (UINT) wParam, (LPSTR) lParam );
-        return TRUE;
+	    if ( 0 != lParam )
+	        SetDlgItemTextA( hwnd, (UINT) wParam, (LPSTR) lParam );
+	    return TRUE;
 
         case CDM_HIDECONTROL:
@@ -858,5 +857,5 @@
     return TRUE;
 }
-
+ 
 /***********************************************************************
  *          FileOpenDlgProc95
@@ -869,5 +868,5 @@
   TRACE("0x%04x 0x%04x\n", hwnd, uMsg);
 #endif
-
+  
   switch(uMsg)
   {
@@ -876,14 +875,14 @@
          FileOpenDlgInfos * fodInfos = (FileOpenDlgInfos *)lParam;
 
-     /* Adds the FileOpenDlgInfos in the property list of the dialog
+	 /* Adds the FileOpenDlgInfos in the property list of the dialog 
             so it will be easily accessible through a GetPropA(...) */
-         SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos);
-
-         fodInfos->DlgInfos.hwndCustomDlg =
-           CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd);
+      	 SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos);
+
+      	 fodInfos->DlgInfos.hwndCustomDlg = 
+     	   CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd);
 
          FILEDLG95_InitControls(hwnd);
          SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE);
-         FILEDLG95_FillControls(hwnd, wParam, lParam);
+      	 FILEDLG95_FillControls(hwnd, wParam, lParam);
          SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE);
          SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM,
@@ -903,5 +902,5 @@
       }
       return FALSE;
-
+          
     case WM_GETISHELLBROWSER:
       return FILEDLG95_OnWMGetIShellBrowser(hwnd);
@@ -913,39 +912,39 @@
     case WM_NOTIFY:
     {
-    LPNMHDR lpnmh = (LPNMHDR)lParam;
-    UINT stringId = -1;
-
-    /* set up the button tooltips strings */
-    if(TTN_GETDISPINFOA == lpnmh->code )
-    {
-        LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
-        switch(lpnmh->idFrom )
-        {
-        /* Up folder button */
-        case FCIDM_TB_UPFOLDER:
-            stringId = IDS_UPFOLDER;
-            break;
-        /* New folder button */
-        case FCIDM_TB_NEWFOLDER:
-            stringId = IDS_NEWFOLDER;
-            break;
-        /* List option button */
-        case FCIDM_TB_SMALLICON:
-            stringId = IDS_LISTVIEW;
-            break;
-        /* Details option button */
-        case FCIDM_TB_REPORTVIEW:
-            stringId = IDS_REPORTVIEW;
-            break;
-        /* Desktop button */
-        case FCIDM_TB_DESKTOP:
-            stringId = IDS_TODESKTOP;
-            break;
-        default:
-            stringId = 0;
-        }
-        lpdi->hinst = COMMDLG_hInstance32;
-        lpdi->lpszText =  (LPSTR) stringId;
-    }
+	LPNMHDR lpnmh = (LPNMHDR)lParam;
+	UINT stringId = -1;
+
+	/* set up the button tooltips strings */
+	if(TTN_GETDISPINFOA == lpnmh->code )
+	{
+	    LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam; 
+	    switch(lpnmh->idFrom )
+	    {
+		/* Up folder button */
+		case FCIDM_TB_UPFOLDER:
+		    stringId = IDS_UPFOLDER;
+		    break;
+		/* New folder button */
+		case FCIDM_TB_NEWFOLDER:
+		    stringId = IDS_NEWFOLDER;
+		    break;
+		/* List option button */
+		case FCIDM_TB_SMALLICON:
+		    stringId = IDS_LISTVIEW;
+		    break;
+		/* Details option button */
+		case FCIDM_TB_REPORTVIEW:
+		    stringId = IDS_REPORTVIEW;
+		    break;
+		/* Desktop button */
+		case FCIDM_TB_DESKTOP:
+		    stringId = IDS_TODESKTOP;
+		    break;
+		default:
+		    stringId = 0;
+	    }
+	    lpdi->hinst = COMMDLG_hInstance32; 
+	    lpdi->lpszText =  (LPSTR) stringId;
+	}
         return FALSE;
     }
@@ -979,9 +978,9 @@
   {
    { HINST_COMMCTRL, IDB_VIEW_SMALL_COLOR },
-   { COMDLG32_hInstance, 800 }          // desktop icon
+   { COMDLG32_hInstance, 800 } 			// desktop icon
   };
-
+  
   RECT rectTB;
-
+  
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
 
@@ -997,11 +996,11 @@
   MapWindowPoints( 0, hwnd,(LPPOINT)&rectTB,2);
 
-  fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL,
+  fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL, 
         WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
-        0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL);
-
-  SetWindowPos(fodInfos->DlgInfos.hwndTB, 0,
-    rectTB.left,rectTB.top, rectTB.right-rectTB.left, rectTB.bottom-rectTB.top,
-    SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER );
+        0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL); 
+ 
+  SetWindowPos(fodInfos->DlgInfos.hwndTB, 0, 
+  	rectTB.left,rectTB.top, rectTB.right-rectTB.left, rectTB.bottom-rectTB.top,
+	SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER );
 
   SendMessageA(fodInfos->DlgInfos.hwndTB, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
@@ -1013,5 +1012,5 @@
 
   SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSA, (WPARAM) 9,(LPARAM) &tbb);
-  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0);
+  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0); 
 
   /* Set the window text with the text specified in the OPENFILENAME structure */
@@ -1053,5 +1052,5 @@
      are hidden and we are not using a custom template */
   if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
-       (!(fodInfos->ofnInfos->Flags &
+       (!(fodInfos->ofnInfos->Flags & 
          (OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE))))
   {
@@ -1062,6 +1061,6 @@
     /* 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),
+    SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left, 
+                 (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom), 
                  SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
   }
@@ -1084,8 +1083,8 @@
 {
   LPITEMIDLIST pidlItemId = NULL;
-
+  
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) lParam;
 
-  TRACE("dir=%s file=%s\n",
+  TRACE("dir=%s file=%s\n", 
   fodInfos->ofnInfos->lpstrInitialDir, fodInfos->ofnInfos->lpstrFile);
 
@@ -1188,5 +1187,5 @@
   /* Do not use the listview selection anymore */
   fodInfos->DlgInfos.dwDlgProp &= ~FODPROP_USEVIEW;
-  return 0;
+  return 0; 
 }
 
@@ -1205,5 +1204,5 @@
   SetWindowLongA(hwnd,DWL_MSGRESULT,(LONG)fodInfos->Shell.FOIShellBrowser);
 
-  return TRUE;
+  return TRUE; 
 }
 
@@ -1211,5 +1210,5 @@
 /***********************************************************************
  *      FILEDLG95_OnOpenMultipleFiles
- *
+ *      
  * Handles the opening of multiple files.
  *
@@ -1228,5 +1227,5 @@
   lpstrFile = fodInfos->ofnInfos->lpstrFile;
   lpstrFile[0] = '\0';
-
+  
   SHGetPathFromIDListA( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec );
 
@@ -1234,5 +1233,5 @@
       ( fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST))
   {
-    LPSTR lpstrTemp = lpstrFileList;
+    LPSTR lpstrTemp = lpstrFileList; 
 
     for ( nCount = 0; nCount < nFileCount; nCount++ )
@@ -1259,5 +1258,5 @@
         return FALSE;
       }
-
+  
       /* move to the next file in the list of files */
       lpstrTemp += strlen(lpstrTemp) + 1;
@@ -1282,5 +1281,5 @@
  *
  * Ok button WM_COMMAND message handler
- *
+ * 
  * If the function succeeds, the return value is nonzero.
  */
@@ -1323,5 +1322,5 @@
       return FALSE;
   }
-
+ 
   if(nFileCount > 1)
   {
@@ -1382,5 +1381,5 @@
   to a folder if the path points to a directory or the last
   valid element is a directory.
-
+  
   valid variables:
     lpstrPathAndFile: cleaned up path
@@ -1432,10 +1431,10 @@
                                lpwstrTemp, sizeof(lpwstrTemp)/sizeof(WCHAR) );
 
-    /* if the last element is a wildcard do a search */
+	/* if the last element is a wildcard do a search */
         if(strpbrk(lpszTemp1, "*?") != NULL)
         {
-      nOpenAction = ONOPEN_SEARCH;
-      break;
-    }
+	  nOpenAction = ONOPEN_SEARCH;
+	  break;
+	}
       }
       lpszTemp1 = lpszTemp;
@@ -1465,32 +1464,32 @@
           TRACE("value\n");
 
-      /* end dialog, return value */
+	  /* end dialog, return value */
           nOpenAction = ONOPEN_OPEN;
-      break;
+	  break;
         }
-    COMDLG32_SHFree(pidl);
-    pidl = NULL;
+	COMDLG32_SHFree(pidl);
+	pidl = NULL;
       }
       else
       {
-    if(*lpszTemp)   /* points to trailing null for last path element */
+	if(*lpszTemp)	/* points to trailing null for last path element */
         {
-      if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST)
-      {
+	  if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST)
+	  {
             FILEDLG95_OnOpenMessage(hwnd, 0, IDS_PATHNOTEXISTING);
-        break;
-      }
-    }
+	    break;
+	  }
+	}
         else
-    {
+	{
           if(fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST)
-      {
+	  {
             FILEDLG95_OnOpenMessage(hwnd, 0, IDS_FILENOTEXISTING);
-        break;
-      }
-    }
-    /* change to the current folder */
+	    break;
+	  }
+	}
+	/* change to the current folder */
         nOpenAction = ONOPEN_OPEN;
-    break;
+	break;
       }
     }
@@ -1528,5 +1527,5 @@
         /* replace the current filter */
         if(fodInfos->ShellInfos.lpstrCurrentFilter)
-      MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
+	  MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
         len = MultiByteToWideChar( CP_ACP, 0, lpszTemp, -1, NULL, 0 );
         fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc(len * sizeof(WCHAR));
@@ -1542,5 +1541,5 @@
       TRACE("ONOPEN_BROWSE\n");
       {
-    IPersistFolder2 * ppf2;
+	IPersistFolder2 * ppf2;
         if(SUCCEEDED(IShellFolder_QueryInterface( lpsf, &IID_IPersistFolder2, (LPVOID*)&ppf2)))
         {
@@ -1548,12 +1547,12 @@
           IPersistFolder2_GetCurFolder(ppf2, &pidlCurrent);
           IPersistFolder2_Release(ppf2);
-      if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent))
-      {
-        IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE);
-      }
-      else if( nOpenAction == ONOPEN_SEARCH )
-      {
+	  if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent))
+	  {
+	    IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE);
+	  }
+	  else if( nOpenAction == ONOPEN_SEARCH )
+	  {
             IShellView_Refresh(fodInfos->Shell.FOIShellView);
-      }
+	  }
           COMDLG32_SHFree(pidlCurrent);
         }
@@ -1564,13 +1563,17 @@
       TRACE("ONOPEN_OPEN %s\n", lpstrPathAndFile);
       {
-    /* add default extension */
-    if (fodInfos->ofnInfos->lpstrDefExt)
-    {
-      if (! *PathFindExtensionA(lpstrPathAndFile))
-      {
-        strcat(lpstrPathAndFile, ".");
-        strcat(lpstrPathAndFile, fodInfos->ofnInfos->lpstrDefExt);
-      }
-    }
+	/* add default extension */
+	if (fodInfos->ofnInfos->lpstrDefExt)
+	{
+	  if (! *PathFindExtensionA(lpstrPathAndFile))
+	  {
+	    /* only add "." in case a default extension does exist */
+	    if (*fodInfos->ofnInfos->lpstrDefExt != '\0')
+	    {
+	        strcat(lpstrPathAndFile, ".");
+	        strcat(lpstrPathAndFile, fodInfos->ofnInfos->lpstrDefExt);
+	    }
+	  }
+	}
 
         /* Check that the size of the file does not exceed buffer size.
@@ -1580,5 +1583,5 @@
         {
           LPSTR lpszTemp;
-
+	  
           /* fill destination buffer */
           strcpy(fodInfos->ofnInfos->lpstrFile, lpstrPathAndFile);
@@ -1590,38 +1593,38 @@
           lpszTemp = PathFindFileNameA(lpstrPathAndFile);
           fodInfos->ofnInfos->nFileOffset = lpszTemp - lpstrPathAndFile;
-
+ 
           /* set extension offset */
           lpszTemp = PathFindExtensionA(lpstrPathAndFile);
           fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? lpszTemp - lpstrPathAndFile + 1 : 0;
-
+    
           /* set the lpstrFileTitle */
           if(fodInfos->ofnInfos->lpstrFileTitle)
-      {
+	  {
             LPSTR lpstrFileTitle = PathFindFileNameA(lpstrPathAndFile);
-        strncpy(fodInfos->ofnInfos->lpstrFileTitle, lpstrFileTitle, fodInfos->ofnInfos->nMaxFileTitle);
-      }
+	    strncpy(fodInfos->ofnInfos->lpstrFileTitle, lpstrFileTitle, fodInfos->ofnInfos->nMaxFileTitle);
+	  }
 
           /* ask the hook if we can close */
           if(IsHooked(fodInfos))
-      {
-        /* FIXME we are sending ASCII-structures. Does not work with NT */
-        /* first old style */
-        TRACE("---\n");
+	  {
+	    /* FIXME we are sending ASCII-structures. Does not work with NT */
+	    /* first old style */
+	    TRACE("---\n");
             CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,
                             fodInfos->DlgInfos.hwndCustomDlg,
                             fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos);
-        if (GetWindowLongA(hwnd, DWL_MSGRESULT))
-        {
-          TRACE("cancled\n");
-          ret = FALSE;
-          goto ret;
-        }
-      }
+	    if (GetWindowLongA(hwnd, DWL_MSGRESULT))
+	    {
+	      TRACE("cancled\n");
+	      ret = FALSE;
+	      goto ret;
+	    }
+	  }
 
           TRACE("close\n");
-      FILEDLG95_Clean(hwnd);
+	  FILEDLG95_Clean(hwnd);
           ret = EndDialog(hwnd, TRUE);
-    }
-    else
+	}
+	else
         {
           /* FIXME set error FNERR_BUFFERTOSMALL */
@@ -1651,5 +1654,5 @@
 
   /*
-   * Initialisation of the FileOpenDialogInfos structure
+   * Initialisation of the FileOpenDialogInfos structure 
    */
 
@@ -1662,5 +1665,5 @@
   if (!(fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT))
   {
-     fodInfos->ShellInfos.folderSettings.fFlags |= FWF_SINGLESEL;
+     fodInfos->ShellInfos.folderSettings.fFlags |= FWF_SINGLESEL; 
   }
   fodInfos->ShellInfos.folderSettings.fFlags |= FWF_AUTOARRANGE | FWF_ALIGNLEFT;
@@ -1672,6 +1675,6 @@
 
   /* Construct the IShellBrowser interface */
-  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);
-
+  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);  
+    
   return NOERROR;
 }
@@ -1691,7 +1694,7 @@
 
   if(SUCCEEDED(IShellView_GetItemObject(fodInfos->Shell.FOIShellView,
-                    SVGIO_BACKGROUND,
-                    &IID_IContextMenu,
-                    (LPVOID*)&pcm)))
+					SVGIO_BACKGROUND,
+					&IID_IContextMenu,
+					(LPVOID*)&pcm)))
   {
     CMINVOKECOMMANDINFO ci;
@@ -1740,5 +1743,5 @@
   LPITEMIDLIST pidl;
   HRESULT hres;
-
+  
   TRACE("\n");
 
@@ -1773,5 +1776,5 @@
  *      FILEDLG95_FILETYPE_Init
  *
- * Initialisation of the file type combo box
+ * Initialisation of the file type combo box 
  */
 static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
@@ -1783,5 +1786,5 @@
   if(fodInfos->ofnInfos->lpstrFilter)
   {
-    int nFilters = 0;   /* number of filters */
+    int nFilters = 0;	/* number of filters */
     LPSTR lpstrFilter;
     LPCSTR lpstrPos = fodInfos->ofnInfos->lpstrFilter;
@@ -1789,5 +1792,5 @@
     for(;;)
     {
-      /* filter is a list...  title\0ext\0......\0\0
+      /* filter is a list...  title\0ext\0......\0\0 
        * Set the combo item text to the title and the item data
        *  to the ext
@@ -1797,14 +1800,14 @@
 
       /* Get the title */
-      if(! *lpstrPos) break;    /* end */
+      if(! *lpstrPos) break;	/* end */
       lpstrDisplay = lpstrPos;
       lpstrPos += strlen(lpstrPos) + 1;
 
       /* Copy the extensions */
-      if (! *lpstrPos) return E_FAIL;   /* malformed filter */
+      if (! *lpstrPos) return E_FAIL;	/* malformed filter */
       if (!(lpstrExt = (LPSTR) MemAlloc(strlen(lpstrPos)+1))) return E_FAIL;
       strcpy(lpstrExt,lpstrPos);
       lpstrPos += strlen(lpstrPos) + 1;
-
+            
       /* Add the item at the end of the combo */
       CBAddString(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay);
@@ -1817,5 +1820,5 @@
      * FIXME: lpstrCustomFilter not handled at all
      */
-
+  
     /* set default filter index */
     if(fodInfos->ofnInfos->nFilterIndex == 0 && fodInfos->ofnInfos->lpstrCustomFilter == NULL)
@@ -1825,8 +1828,8 @@
     if ( fodInfos->ofnInfos->nFilterIndex > nFilters )
       fodInfos->ofnInfos->nFilterIndex = nFilters;
-
+ 
     /* Set the current index selection. */
     CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->ofnInfos->nFilterIndex-1);
-
+  
     /* Get the corresponding text string from the combo box. */
     lpstrFilter = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
@@ -1834,10 +1837,10 @@
 
     if ((INT)lpstrFilter == CB_ERR)  /* control is empty */
-      lpstrFilter = NULL;
+      lpstrFilter = NULL;	
 
     if(lpstrFilter)
     {
       DWORD len;
-      _strlwr(lpstrFilter); /* lowercase */
+      _strlwr(lpstrFilter);	/* lowercase */
       len = MultiByteToWideChar( CP_ACP, 0, lpstrFilter, -1, NULL, 0 );
       fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) );
@@ -1943,15 +1946,15 @@
 
 }
-
+    
 /***********************************************************************
  *      FILEDLG95_LOOKIN_Init
  *
- * Initialisation of the look in combo box
+ * Initialisation of the look in combo box 
  */
 static HRESULT FILEDLG95_LOOKIN_Init(HWND hwndCombo)
 {
-  IShellFolder  *psfRoot, *psfDrives;
-  IEnumIDList   *lpeRoot, *lpeDrives;
-  LPITEMIDLIST  pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp;
+  IShellFolder	*psfRoot, *psfDrives;
+  IEnumIDList	*lpeRoot, *lpeDrives;
+  LPITEMIDLIST	pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp;
 
   LookInInfos *liInfos = MemAlloc(sizeof(LookInInfos));
@@ -1983,26 +1986,26 @@
       while (S_OK == IEnumIDList_Next(lpeRoot, 1, &pidlTmp, NULL))
       {
-    FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
-
-    /* special handling for CSIDL_DRIVES */
-    if (COMDLG32_PIDL_ILIsEqual(pidlTmp, pidlDrives))
-    {
-      if(SUCCEEDED(IShellFolder_BindToObject(psfRoot, pidlTmp, NULL, &IID_IShellFolder, (LPVOID*)&psfDrives)))
-      {
-        /* enumerate the drives */
-        if(SUCCEEDED(IShellFolder_EnumObjects(psfDrives, hwndCombo,SHCONTF_FOLDERS, &lpeDrives)))
-        {
-          while (S_OK == IEnumIDList_Next(lpeDrives, 1, &pidlTmp1, NULL))
-          {
-            pidlAbsTmp = COMDLG32_PIDL_ILCombine(pidlTmp, pidlTmp1);
-            FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlAbsTmp,LISTEND);
-            COMDLG32_SHFree(pidlAbsTmp);
-            COMDLG32_SHFree(pidlTmp1);
-          }
-          IEnumIDList_Release(lpeDrives);
-        }
-        IShellFolder_Release(psfDrives);
-      }
-    }
+	FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
+
+	/* special handling for CSIDL_DRIVES */
+	if (COMDLG32_PIDL_ILIsEqual(pidlTmp, pidlDrives))
+	{
+	  if(SUCCEEDED(IShellFolder_BindToObject(psfRoot, pidlTmp, NULL, &IID_IShellFolder, (LPVOID*)&psfDrives)))
+	  {
+	    /* enumerate the drives */
+	    if(SUCCEEDED(IShellFolder_EnumObjects(psfDrives, hwndCombo,SHCONTF_FOLDERS, &lpeDrives)))
+	    {
+	      while (S_OK == IEnumIDList_Next(lpeDrives, 1, &pidlTmp1, NULL))
+	      {
+	        pidlAbsTmp = COMDLG32_PIDL_ILCombine(pidlTmp, pidlTmp1);
+	        FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlAbsTmp,LISTEND);
+	        COMDLG32_SHFree(pidlAbsTmp);
+	        COMDLG32_SHFree(pidlTmp1);
+	      }
+	      IEnumIDList_Release(lpeDrives);
+	    }
+	    IShellFolder_Release(psfDrives);
+	  }
+	}
         COMDLG32_SHFree(pidlTmp);
       }
@@ -2050,19 +2053,19 @@
   {
     ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                               0,
-                                               &sfi,
-                                               sizeof (SHFILEINFOA),
-                                               SHGFI_PIDL | SHGFI_SMALLICON |
-                                               SHGFI_OPENICON | SHGFI_SYSICONINDEX    |
-                                               SHGFI_DISPLAYNAME );
+                                               0,    
+                                               &sfi,    
+                                               sizeof (SHFILEINFOA),   
+                                               SHGFI_PIDL | SHGFI_SMALLICON |    
+                                               SHGFI_OPENICON | SHGFI_SYSICONINDEX    | 
+                                               SHGFI_DISPLAYNAME );   
   }
   else
   {
     ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                                  0,
-                                                  &sfi,
+                                                  0, 
+                                                  &sfi, 
                                                   sizeof (SHFILEINFOA),
-                                                  SHGFI_PIDL | SHGFI_SMALLICON |
-                                                  SHGFI_SYSICONINDEX |
+                                                  SHGFI_PIDL | SHGFI_SMALLICON | 
+                                                  SHGFI_SYSICONINDEX | 
                                                   SHGFI_DISPLAYNAME);
   }
@@ -2087,8 +2090,8 @@
     iIndentation = 0;
     ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                                0,
-                                                &sfi,
-                                                sizeof (SHFILEINFOA),
-                                                SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON
+                                                0, 
+                                                &sfi, 
+                                                sizeof (SHFILEINFOA), 
+                                                SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON 
                                                 | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME  );
 
@@ -2110,16 +2113,16 @@
   rectText.left = rectIcon.right;
   rectText.top =
-      (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2;
+	  (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2;
   rectText.right = pDIStruct->rcItem.right + XTEXTOFFSET;
   rectText.bottom =
-      (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2;
-
+	  (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2;
+ 
   /* Draw the icon from the image list */
   ImageList_Draw(ilItemImage,
                  sfi.iIcon,
-                 pDIStruct->hDC,
-                 rectIcon.left,
-                 rectIcon.top,
-                 ILD_TRANSPARENT );
+                 pDIStruct->hDC,  
+                 rectIcon.left,  
+                 rectIcon.top,  
+                 ILD_TRANSPARENT );  
 
   /* Draw the associated text */
@@ -2148,5 +2151,5 @@
     {
       LPSFOLDER tmpFolder;
-      int iItem;
+      int iItem; 
 
       iItem = CBGetCurSel(fodInfos->DlgInfos.hwndLookInCB);
@@ -2154,5 +2157,5 @@
       if(!(tmpFolder = (LPSFOLDER) CBGetItemDataPtr(fodInfos->DlgInfos.hwndLookInCB,
                                                iItem)))
-    return FALSE;
+	return FALSE;
 
 
@@ -2165,5 +2168,5 @@
       break;
     }
-
+      
   }
   return FALSE;
@@ -2190,5 +2193,5 @@
   if(!(liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr)))
     return -1;
-
+    
   tmpFolder = MemAlloc(sizeof(SFOLDER));
   tmpFolder->m_iIndent = 0;
@@ -2205,5 +2208,5 @@
   if(tmpFolder->m_iIndent > liInfos->iMaxIndentation)
     liInfos->iMaxIndentation = tmpFolder->m_iIndent;
-
+  
   sfi.dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM;
   SHGetFileInfoA((LPSTR)pidl,
@@ -2211,5 +2214,5 @@
                   &sfi,
                   sizeof(sfi),
-                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX
+                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX 
                   | SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED);
 
@@ -2219,5 +2222,5 @@
   {
     int iItemID;
-
+  
     TRACE("-- Add %s at %u\n", sfi.szDisplayName, tmpFolder->m_iIndent);
 
@@ -2245,9 +2248,9 @@
  *      FILEDLG95_LOOKIN_InsertItemAfterParent
  *
- * Insert an item below its parent
+ * Insert an item below its parent 
  */
 static int FILEDLG95_LOOKIN_InsertItemAfterParent(HWND hwnd,LPITEMIDLIST pidl)
 {
-
+  
   LPITEMIDLIST pidlParent = GetParentPidl(pidl);
   int iParentPos;
@@ -2304,5 +2307,5 @@
     }
   }
-
+  
   CBSetCurSel(hwnd,iItemPos);
   liInfos->uSelectedItem = iItemPos;
@@ -2422,11 +2425,11 @@
     if (nFileSelected >= 1)
     {
-      nLength += 3; /* first and last quotes, trailing \0 */
+      nLength += 3;	/* first and last quotes, trailing \0 */
       for ( nFileToOpen = 0; nFileToOpen < nFileSelected; nFileToOpen++ )
       {
         pidl = GetPidlFromDataObject( fodInfos->Shell.FOIDataObject, nFileToOpen+1 );
-
+    
         if (pidl)
-    {
+	{
           /* get the total length of the selected file names*/
           lpstrTemp[0] = '\0';
@@ -2434,10 +2437,10 @@
 
           if ( ! IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl) ) /* Ignore folders */
-      {
+	  {
             nLength += strlen( lpstrTemp ) + 3;
             nFiles++;
-      }
+	  }
           COMDLG32_SHFree( pidl );
-    }
+	}
       }
     }
@@ -2457,13 +2460,13 @@
 
         if (pidl)
-    {
-      /* get the file name */
+	{
+	  /* get the file name */
           lpstrTemp[0] = '\0';
           GetName( fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER, lpstrTemp );
 
           if (! IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl)) /* Ignore folders */
-      {
+	  {
             if ( nFiles > 1)
-        {
+	    {
               *lpstrCurrFile++ =  '\"';
               strcpy( lpstrCurrFile, lpstrTemp );
@@ -2471,12 +2474,12 @@
               strcpy( lpstrCurrFile, "\" " );
               lpstrCurrFile += 2;
-        }
-        else
-        {
+	    }
+	    else
+	    {
               strcpy( lpstrAllFile, lpstrTemp );
-        }
-      }
+	    }
+	  }
           COMDLG32_SHFree( (LPVOID) pidl );
-    }
+	}
       }
     }
@@ -2496,28 +2499,28 @@
 static HRESULT COMDLG32_StrRetToStrNA (LPVOID 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);
-        COMDLG32_SHFree(src->u.pOleStr);
-        break;
-
-      case STRRET_CSTRA:
-        lstrcpynA((LPSTR)dest, src->u.cStr, len);
-        break;
-
-      case STRRET_OFFSETA:
-        lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
-        break;
-
-      default:
-        FIXME("unknown type!\n");
-        if (len)
-        {
-          *(LPSTR)dest = '\0';
-        }
-        return(FALSE);
-    }
-    return S_OK;
+	switch (src->uType)
+	{
+	  case STRRET_WSTR:
+	    WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, (LPSTR)dest, len, NULL, NULL);
+	    COMDLG32_SHFree(src->u.pOleStr);
+	    break;
+
+	  case STRRET_CSTRA:
+	    lstrcpynA((LPSTR)dest, src->u.cStr, len);
+	    break;
+
+	  case STRRET_OFFSETA:
+	    lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
+	    break;
+
+	  default:
+	    FIXME("unknown type!\n");
+	    if (len)
+	    {
+	      *(LPSTR)dest = '\0';
+	    }
+	    return(FALSE);
+	}
+	return S_OK;
 }
 
@@ -2529,59 +2532,59 @@
 int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPSTR * lpstrFileList, UINT * sizeUsed)
 {
-    FileOpenDlgInfos *fodInfos  = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
-    UINT nStrCharCount = 0; /* index in src buffer */
-    UINT nFileIndex = 0;    /* index in dest buffer */
-    UINT nFileCount = 0;    /* number of files */
-    UINT nStrLen = 0;   /* length of string in edit control */
-    LPSTR lpstrEdit;    /* buffer for string from edit control */
-
-    TRACE("\n");
-
-    /* get the filenames from the edit control */
-    nStrLen = SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0);
-    lpstrEdit = MemAlloc(nStrLen+1);
-    GetDlgItemTextA(hwnd, IDC_FILENAME, lpstrEdit, nStrLen+1);
-
-    TRACE("nStrLen=%u str=%s\n", nStrLen, lpstrEdit);
-
-    /* we might get single filename without any '"',
-     * so we need nStrLen + terminating \0 + end-of-list \0 */
-    *lpstrFileList = MemAlloc(nStrLen+2);
-    *sizeUsed = 0;
-
-    /* build 0-delimited file list from filenames */
-    while ( nStrCharCount <= nStrLen )
-    {
-      if ( lpstrEdit[nStrCharCount]=='"' )
-      {
-        nStrCharCount++;
-        while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen))
-        {
-          (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount];
-          (*sizeUsed)++;
-          nStrCharCount++;
-        }
-        (*lpstrFileList)[nFileIndex++] = '\0';
-        (*sizeUsed)++;
-        nFileCount++;
-      }
-      nStrCharCount++;
-    }
-
-    /* single, unquoted string */
-    if ((nStrLen > 0) && (*sizeUsed == 0) )
-    {
-      strcpy(*lpstrFileList, lpstrEdit);
-      nFileIndex = strlen(lpstrEdit) + 1;
-      (*sizeUsed) = nFileIndex;
-      nFileCount = 1;
-    }
-
-    /* trailing \0 */
-    (*lpstrFileList)[nFileIndex] = '\0';
-    (*sizeUsed)++;
-
-    MemFree(lpstrEdit);
-    return nFileCount;
+	FileOpenDlgInfos *fodInfos  = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
+	UINT nStrCharCount = 0;	/* index in src buffer */
+	UINT nFileIndex = 0;	/* index in dest buffer */
+	UINT nFileCount = 0;	/* number of files */
+	UINT nStrLen = 0;	/* length of string in edit control */
+	LPSTR lpstrEdit;	/* buffer for string from edit control */
+
+	TRACE("\n");
+
+	/* get the filenames from the edit control */
+	nStrLen = SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0);
+	lpstrEdit = MemAlloc(nStrLen+1);
+	GetDlgItemTextA(hwnd, IDC_FILENAME, lpstrEdit, nStrLen+1);
+
+	TRACE("nStrLen=%u str=%s\n", nStrLen, lpstrEdit);
+	
+	/* we might get single filename without any '"',
+	 * so we need nStrLen + terminating \0 + end-of-list \0 */
+	*lpstrFileList = MemAlloc(nStrLen+2);
+	*sizeUsed = 0;
+
+	/* build 0-delimited file list from filenames */
+	while ( nStrCharCount <= nStrLen )
+	{
+	  if ( lpstrEdit[nStrCharCount]=='"' )
+	  {
+	    nStrCharCount++;
+	    while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen))
+	    {
+	      (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount];
+	      (*sizeUsed)++;
+	      nStrCharCount++;
+	    }
+	    (*lpstrFileList)[nFileIndex++] = '\0';
+	    (*sizeUsed)++;
+	    nFileCount++;
+	  } 
+	  nStrCharCount++;
+	}
+
+	/* single, unquoted string */
+	if ((nStrLen > 0) && (*sizeUsed == 0) )
+	{
+	  strcpy(*lpstrFileList, lpstrEdit);
+	  nFileIndex = strlen(lpstrEdit) + 1;
+	  (*sizeUsed) = nFileIndex;
+	  nFileCount = 1;
+	}
+
+	/* trailing \0 */
+	(*lpstrFileList)[nFileIndex] = '\0';
+	(*sizeUsed)++;
+
+	MemFree(lpstrEdit);
+	return nFileCount;
 }
 
@@ -2626,11 +2629,11 @@
 LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex)
 {
-
+     
     STGMEDIUM medium;
     FORMATETC formatetc;
     LPITEMIDLIST pidl = NULL;
-
+    
     TRACE("sv=%p index=%u\n", doSelected, nPidlIndex);
-
+    
     /* Set the FORMATETC structure*/
     SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL);
@@ -2686,7 +2689,7 @@
  *      GetName
  *
- * Get the pidl's display name (relative to folder) and
+ * Get the pidl's display name (relative to folder) and 
  * put it in lpstrFileName.
- *
+ * 
  * Return NOERROR on success,
  * E_FAIL otherwise
@@ -2720,5 +2723,5 @@
  *      GetShellFolderFromPidl
  *
- * pidlRel is the item pidl relative
+ * pidlRel is the item pidl relative 
  * Return the IShellFolder of the absolute pidl
  */
@@ -2736,5 +2739,5 @@
       if(SUCCEEDED(IShellFolder_BindToObject(psfParent, pidlAbs, NULL, &IID_IShellFolder, (LPVOID*)&psf)))
       {
-    IShellFolder_Release(psfParent);
+	IShellFolder_Release(psfParent);
         return psf;
       }
@@ -2756,8 +2759,8 @@
 
   TRACE("%p\n", pidl);
-
+  
   pidlParent = COMDLG32_PIDL_ILClone(pidl);
   COMDLG32_PIDL_ILRemoveLastID(pidlParent);
-
+     
   return pidlParent;
 }
@@ -2766,5 +2769,5 @@
  *      GetPidlFromName
  *
- * returns the pidl of the file name relative to folder
+ * returns the pidl of the file name relative to folder 
  * NULL if an error occurred
  */
@@ -2780,5 +2783,5 @@
   if(!*lpcstrFileName) return NULL;
 
-  MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,lpcstrFileName,-1,(LPWSTR)lpwstrDirName,MAX_PATH);
+  MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,lpcstrFileName,-1,(LPWSTR)lpwstrDirName,MAX_PATH);  
 
   if(!lpsf)
@@ -2790,5 +2793,5 @@
   else
   {
-    IShellFolder_ParseDisplayName(lpsf, 0, NULL, (LPWSTR)lpwstrDirName, &ulEaten, &pidl, NULL);
+    IShellFolder_ParseDisplayName(lpsf, 0, NULL, (LPWSTR)lpwstrDirName, &ulEaten, &pidl, NULL); 
   }
   return pidl;
@@ -2799,13 +2802,13 @@
 BOOL IsPidlFolder (LPSHELLFOLDER psf, LPITEMIDLIST pidl)
 {
-    ULONG uAttr  = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
-    HRESULT ret;
-
-    TRACE("%p, %p\n", psf, pidl);
-
-    ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
-
-    TRACE("-- 0x%08lx 0x%08lx\n", uAttr, ret);
-    /* see documentation shell 4.1*/
+	ULONG uAttr  = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
+	HRESULT ret;
+	
+	TRACE("%p, %p\n", psf, pidl);
+	
+  	ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
+	
+	TRACE("-- 0x%08lx 0x%08lx\n", uAttr, ret);
+	/* see documentation shell 4.1*/
         return uAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER);
 }
@@ -2842,5 +2845,5 @@
 
   return bBrowseSelFolder;
-}
+} 
 
 /*
Index: trunk/src/comdlg32/filedlgbrowser.c
===================================================================
--- trunk/src/comdlg32/filedlgbrowser.c	(revision 6707)
+++ trunk/src/comdlg32/filedlgbrowser.c	(revision 6708)
@@ -1,3 +1,2 @@
-/* $Id: filedlgbrowser.c,v 1.9 2001-09-05 12:12:01 bird Exp $ */
 /*
  *  Implementation of IShellBrowser for the File Open common dialog
Index: trunk/src/comdlg32/filetitle.c
===================================================================
--- trunk/src/comdlg32/filetitle.c	(revision 6707)
+++ trunk/src/comdlg32/filetitle.c	(revision 6708)
@@ -1,3 +1,2 @@
-/* $Id: filetitle.c,v 1.5 2001-09-05 12:12:01 bird Exp $ */
 /*
  * COMMDLG - File Dialogs
Index: trunk/src/comdlg32/finddlg32.c
===================================================================
--- trunk/src/comdlg32/finddlg32.c	(revision 6707)
+++ trunk/src/comdlg32/finddlg32.c	(revision 6708)
@@ -1,3 +1,2 @@
-/* $Id: finddlg32.c,v 1.4 2001-09-05 12:12:01 bird Exp $ */
 /*
  *  Common Dialog Boxes interface (32 bit)
Index: trunk/src/comdlg32/fontdlg.c
===================================================================
--- trunk/src/comdlg32/fontdlg.c	(revision 6707)
+++ trunk/src/comdlg32/fontdlg.c	(revision 6708)
@@ -1,3 +1,2 @@
-/* $Id: fontdlg.c,v 1.4 2001-09-05 12:12:02 bird Exp $ */
 /*
  * COMMDLG - Font Dialog
Index: trunk/src/comdlg32/printdlg.c
===================================================================
--- trunk/src/comdlg32/printdlg.c	(revision 6707)
+++ trunk/src/comdlg32/printdlg.c	(revision 6708)
@@ -1,3 +1,2 @@
-/* $Id: printdlg.c,v 1.2 2001-09-05 12:12:02 bird Exp $ */
 /*
  * COMMDLG - Print Dialog
