Changeset 3243 for trunk/src/comdlg32

Timestamp:

Mar 26, 2000, 6:34:57 PM (26 years ago)

Author:

cbratschi

Message:

merged with Corel WINE 20000324

Location:

trunk/src/comdlg32

Files:

• cdlg_En.orc (modified) (6 diffs)
• cdlg_xx.orc (modified) (4 diffs)
• filedlg95.c (modified) (68 diffs)
• filedlgbrowser.c (modified) (11 diffs)
• filedlgbrowser.h (modified) (16 diffs)
• filetitle.c (modified) (3 diffs)
• finddlg32.cpp (modified) (11 diffs)
• rsrc.orc (modified) (2 diffs)

trunk/src/comdlg32/cdlg_En.orc

@@ +1 @@
+/* $Id: cdlg_En.orc,v 1.2 2000-03-26 16:31:39 cbratschi Exp $ */
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+/* Corel WINE 20000324 level */
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@@ -108 +111 @@
     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 | WS_TABSTOP | BS_DEFPUSHBUTTON 
+    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
     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", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX        "&Underline", 1041, 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 |
-                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Sample",1073,98,72,160,49,WS_GROUP
     CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
@@ -170 +173 @@
  CONTROL "&Down", 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 | BS_DEFPUSHBUTTON 
- PUSHBUTTON "Cancel", IDCANCEL   , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", pshHelp     , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "&Find Next", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Cancel", IDCANCEL   , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", pshHelp     , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
@@ -188 +191 @@
  CHECKBOX "Match &Case", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
 
- DEFPUSHBUTTON "&Find Next", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
- PUSHBUTTON "&Replace", psh1     , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ DEFPUSHBUTTON "&Find Next", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "&Replace", psh1     , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Replace &All", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Cancel", IDCANCEL   , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Help", pshHelp     , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", IDCANCEL   , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Help", pshHelp     , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
 }
 
@@ -264 +267 @@
     LTEXT           "&Source:",       stc3,  16,128,  36, 8
     COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    
+
     GROUPBOX        "Orientation",    grp1, 180, 92, 100,56, WS_GROUP
     ICON            "",               ico1, 195,112,  18,20, WS_GROUP
@@ -277 +280 @@
 FONT 8, "helv"
 {
-    LTEXT       "Look &in",IDC_LOOKINSTATIC,7,6,41,8, SS_NOTIFY
-    COMBOBOX    IDC_LOOKIN,50,3,138,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-
-    LTEXT       "" , IDC_TOOLBARSTATIC, 188, 2, 82, 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       "File &name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
-    EDITTEXT    IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
-    
-    LTEXT       "Files of &type",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
-    COMBOBOX    IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-
-    CONTROL     "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
-
-    DEFPUSHBUTTON       "&Open",                 IDOK,222,110,50,14
-    PUSHBUTTON          "Cancel",                IDCANCEL,222,128,50,14
-    PUSHBUTTON          "&Help",                 pshHelp,222,145,50,14
-}
-
-STRINGTABLE DISCARDABLE 
-{
-    IDS_ABOUTBOX            "&About FolderPicker Test"
-    IDS_DOCUMENTFOLDERS     "Document Folders"
-    IDS_PERSONAL            "My Documents"
-    IDS_FAVORITES           "My Favorites"
-    IDS_PATH                "System Path"
-    IDS_DESKTOP             "Desktop"
-    IDS_FONTS               "Fonts"
-    IDS_MYCOMPUTER          "My Computer"
-}
-
-STRINGTABLE DISCARDABLE 
-{
-    IDS_SYSTEMFOLDERS       "System Folders"
-    IDS_LOCALHARDRIVES      "Local Hard Drives"
-    IDS_FILENOTFOUND        "File not found"
+    LTEXT       "Look &in",IDC_LOOKINSTATIC,7,6,41,8, SS_NOTIFY
+    COMBOBOX    IDC_LOOKIN,50,3,138,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT       "" , IDC_TOOLBARSTATIC, 188, 2, 82, 17, NOT WS_GROUP | NOT WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN
+    LISTBOX     IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN
+
+    LTEXT       "File &name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    EDITTEXT    IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
+
+    LTEXT       "Files of &type",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    COMBOBOX    IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL     "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+    DEFPUSHBUTTON       "&Open",                 IDOK,222,110,50,14
+    PUSHBUTTON          "Cancel",                IDCANCEL,222,128,50,14
+    PUSHBUTTON          "&Help",                 pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE
+{
     IDS_VERIFYFILE          "Please verify if the correct file name was given"
     IDS_CREATEFILE          "File does not exist\nDo you want to create file"
-}
-
+    IDS_CREATEFOLDER_DENIED "Unable to create the folder \"%s\"\n\nAccess is denied."
+    IDS_FILEOPEN_CAPTION    "Open"
+    IDS_FILENOTFOUND        "File Not Found"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_UPFOLDER         "Up One Level"
+    IDS_NEWFOLDER        "Create New Folder"
+    IDS_LISTVIEW         "List"
+    IDS_REPORTVIEW       "Details"
+}
 
 STRINGTABLE DISCARDABLE

trunk/src/comdlg32/cdlg_xx.orc

@@ +1 @@
+/* $Id: cdlg_xx.orc,v 1.2 2000-03-26 16:31:40 cbratschi Exp $*/
 /*
  * Language neutral resources for Common Dialogs
+ *
+ * Corel WINE 20000324 level
  */
 
@@ -8 +11 @@
 
 1 VERSIONINFO
-FILEVERSION     4, 0, 0, 950    /* Maybe 4.1.0.980 for win98?? */
-PRODUCTVERSION  4, 0, 0, 950    /* id. */
-FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
-FILEOS          VOS_DOS_WINDOWS16
-FILETYPE        VFT_DLL
+FILEVERSION     4, 0, 0, 950    /* Maybe 4.1.0.980 for win98?? */
+PRODUCTVERSION  4, 0, 0, 950    /* id. */
+FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
+FILEOS          VOS_DOS_WINDOWS16
+FILETYPE        VFT_DLL
 {
-        BLOCK "StringFileInfo"
-        {
-                BLOCK "040604B0"
-                {
-                        VALUE "CompanyName", "Wine Developer Team\000"
-                        VALUE "FileDescription", "Common Dialog Boxes\000"
-                        VALUE "FileVersion", "4.00\000"
-                        VALUE "InternalName", "COMDLG32\000"
-                        VALUE "LegalCopyright", "Copyright \251 B. A. Stultiens 1998,1999\000"
-                        VALUE "OriginalFilename", "COMDLG32.DLL\000"
-                        VALUE "ProductName", "Wine\000"
-                        VALUE "ProductVersion", "4.00\000"
-                }
-        }
-
-        /* Do we need this? It isn't a translation, but we have all languages at once... */
+        BLOCK "StringFileInfo"
+        {
+                BLOCK "040604B0"
+                {
+                        VALUE "CompanyName", "Odin Developer Team\000"
+                        VALUE "FileDescription", "Common Dialog Boxes\000"
+                        VALUE "FileVersion", "4.00\000"
+                        VALUE "InternalName", "COMDLG32\000"
+                        VALUE "LegalCopyright", "Copyright \251 B. A. Stultiens 1998,1999\000"
+                        VALUE "OriginalFilename", "COMDLG32.DLL\000"
+                        VALUE "ProductName", "Odin\000"
+                        VALUE "ProductVersion", "4.00\000"
+                }
+        }
+
+        /* Do we need this? It isn't a translation, but we have all languages at once... */
 /*
-        BLOCK "VarFileInfo"
-        {
-                VALUE "Translation", 1030, 1200
-        }
+        BLOCK "VarFileInfo"
+        {
+                VALUE "Translation", 1030, 1200
+        }
 */
 }
@@ -180 +183 @@
 
 /* BINRES pd32_nocollate.ico */
-PD32_NOCOLLATE ICON 
+PD32_NOCOLLATE ICON
 {
  '00 00 01 00 02 00 20 20 10 00 00 00 00 00 E8 02'
@@ -317 +320 @@
  'FF FE 7F F0 00 00'
 }
+
+/******************
+ * Bitmap
+ */
+
+IDB_TOOLBAR     BITMAP DISCARDABLE
+{'
+42 4d 36 08 00 00 00 00 00 00 36 04 00 00 28 00
+00 00 40 00 00 00 10 00 00 00 01 00 08 00 00 00
+00 00 00 04 00 00 00 00 00 00 00 00 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80
+00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80
+00 00 c0 c0 c0 00 c0 dc c0 00 f0 ca a6 00 04 04
+04 00 08 08 08 00 0c 0c 0c 00 11 11 11 00 16 16
+16 00 1c 1c 1c 00 22 22 22 00 29 29 29 00 55 55
+55 00 4d 4d 4d 00 42 42 42 00 39 39 39 00 80 7c
+ff 00 50 50 ff 00 93 00 d6 00 ff ec cc 00 c6 d6
+ef 00 d6 e7 e7 00 90 a9 ad 00 00 00 33 00 00 00
+66 00 00 00 99 00 00 00 cc 00 00 33 00 00 00 33
+33 00 00 33 66 00 00 33 99 00 00 33 cc 00 00 33
+ff 00 00 66 00 00 00 66 33 00 00 66 66 00 00 66
+99 00 00 66 cc 00 00 66 ff 00 00 99 00 00 00 99
+33 00 00 99 66 00 00 99 99 00 00 99 cc 00 00 99
+ff 00 00 cc 00 00 00 cc 33 00 00 cc 66 00 00 cc
+99 00 00 cc cc 00 00 cc ff 00 00 ff 66 00 00 ff
+99 00 00 ff cc 00 33 00 00 00 33 00 33 00 33 00
+66 00 33 00 99 00 33 00 cc 00 33 00 ff 00 33 33
+00 00 33 33 33 00 33 33 66 00 33 33 99 00 33 33
+cc 00 33 33 ff 00 33 66 00 00 33 66 33 00 33 66
+66 00 33 66 99 00 33 66 cc 00 33 66 ff 00 33 99
+00 00 33 99 33 00 33 99 66 00 33 99 99 00 33 99
+cc 00 33 99 ff 00 33 cc 00 00 33 cc 33 00 33 cc
+66 00 33 cc 99 00 33 cc cc 00 33 cc ff 00 33 ff
+33 00 33 ff 66 00 33 ff 99 00 33 ff cc 00 33 ff
+ff 00 66 00 00 00 66 00 33 00 66 00 66 00 66 00
+99 00 66 00 cc 00 66 00 ff 00 66 33 00 00 66 33
+33 00 66 33 66 00 66 33 99 00 66 33 cc 00 66 33
+ff 00 66 66 00 00 66 66 33 00 66 66 66 00 66 66
+99 00 66 66 cc 00 66 99 00 00 66 99 33 00 66 99
+66 00 66 99 99 00 66 99 cc 00 66 99 ff 00 66 cc
+00 00 66 cc 33 00 66 cc 99 00 66 cc cc 00 66 cc
+ff 00 66 ff 00 00 66 ff 33 00 66 ff 99 00 66 ff
+cc 00 cc 00 ff 00 ff 00 cc 00 99 99 00 00 99 33
+99 00 99 00 99 00 99 00 cc 00 99 00 00 00 99 33
+33 00 99 00 66 00 99 33 cc 00 99 00 ff 00 99 66
+00 00 99 66 33 00 99 33 66 00 99 66 99 00 99 66
+cc 00 99 33 ff 00 99 99 33 00 99 99 66 00 99 99
+99 00 99 99 cc 00 99 99 ff 00 99 cc 00 00 99 cc
+33 00 66 cc 66 00 99 cc 99 00 99 cc cc 00 99 cc
+ff 00 99 ff 00 00 99 ff 33 00 99 cc 66 00 99 ff
+99 00 99 ff cc 00 99 ff ff 00 cc 00 00 00 99 00
+33 00 cc 00 66 00 cc 00 99 00 cc 00 cc 00 99 33
+00 00 cc 33 33 00 cc 33 66 00 cc 33 99 00 cc 33
+cc 00 cc 33 ff 00 cc 66 00 00 cc 66 33 00 99 66
+66 00 cc 66 99 00 cc 66 cc 00 99 66 ff 00 cc 99
+00 00 cc 99 33 00 cc 99 66 00 cc 99 99 00 cc 99
+cc 00 cc 99 ff 00 cc cc 00 00 cc cc 33 00 cc cc
+66 00 cc cc 99 00 cc cc cc 00 cc cc ff 00 cc ff
+00 00 cc ff 33 00 99 ff 66 00 cc ff 99 00 cc ff
+cc 00 cc ff ff 00 cc 00 33 00 ff 00 66 00 ff 00
+99 00 cc 33 00 00 ff 33 33 00 ff 33 66 00 ff 33
+99 00 ff 33 cc 00 ff 33 ff 00 ff 66 00 00 ff 66
+33 00 cc 66 66 00 ff 66 99 00 ff 66 cc 00 cc 66
+ff 00 ff 99 00 00 ff 99 33 00 ff 99 66 00 ff 99
+99 00 ff 99 cc 00 ff 99 ff 00 ff cc 00 00 ff cc
+33 00 ff cc 66 00 ff cc 99 00 ff cc cc 00 ff cc
+ff 00 ff ff 33 00 cc ff 66 00 ff ff 99 00 ff ff
+cc 00 66 66 ff 00 66 ff 66 00 66 ff ff 00 ff 66
+66 00 ff 66 ff 00 ff ff 66 00 21 00 a5 00 5f 5f
+5f 00 77 77 77 00 86 86 86 00 96 96 96 00 cb cb
+cb 00 b2 b2 b2 00 d7 d7 d7 00 dd dd dd 00 e3 e3
+e3 00 ea ea ea 00 f1 f1 f1 00 f8 f8 f8 00 f0 fb
+ff 00 a4 a0 a0 00 80 80 80 00 00 00 ff 00 00 ff
+00 00 00 ff ff 00 ff 00 00 00 ff 00 ff 00 ff ff
+00 00 ff ff ff 00 fa fa fa fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa fa 92 92 92 92 92 92 92 92
+92 92 92 92 92 fa fa fa 6d 6d 6d 6d 6d 6d 6d 6d
+6d 6d 6d 6d 6d fa fa fa 00 00 00 fa fa fa fa fa
+fa fa fa fa fa fa fa 00 00 fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa 00 00 00 00 00 00 00 00 00
+00 00 00 00 92 fa fa 00 00 00 00 00 00 00 00 00
+00 00 00 00 6d fa fa fa ff ff 00 fa 00 00 00 00
+00 00 fa fa fa fa fa ff 00 fa 00 00 00 00 fa 00
+00 fa 00 00 00 fa fa 00 ff dd dd dd dd d6 d6 d6
+d6 d6 d6 00 92 fa fa 00 ff dd dd dd dd d6 d6 d6
+d6 d6 d6 00 6d fa fa fa ff ff 00 fa 00 00 00 00
+00 00 fa fa fa fa fa ff 00 fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa 00 ff dd dd dd dd dd dd d6
+d6 d6 d6 00 92 fa fa 00 ff dd dd dd dd dd dd d6
+d6 d6 d6 00 6d fa fa fa ff ff 00 fa fa fa fa fa
+fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa 00 ff dd dd dd dd dd dd dd
+d6 d6 d6 00 92 fa fa 00 ff dd dd dd dd dd dd dd
+d6 d6 d6 00 6d fa fa fa fa fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa 00 00 fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa 00 ff dd dd dd dd 1f 1f 1f
+d6 d6 d6 00 92 fa fa 00 ff dd dd dd dd dd dd dd
+d6 fb d6 00 6d fa fa fa 00 00 00 fa fa fa fa fa
+fa fa fa fa fa fa fa ff 00 fa 00 00 00 00 fa 00
+00 fa 00 00 00 fa fa 00 ff dd dd dd dd dd dd dd
+1f d6 d6 00 92 fa fa 00 ff dd dd dd dd dd dd dd
+d6 fb d6 00 6d fa fa fa ff ff 00 fa 00 00 00 00
+00 00 fa fa fa fa fa ff 00 fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa 00 ff dd dd dd dd dd dd dd
+dd 1f d6 00 92 fa fa 00 ff dd dd dd dd dd fb dd
+dd fb d6 92 fb fa fa fa ff ff 00 fa 00 00 00 00
+00 00 fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa 00 ff ff ff ff ff ff ff ff
+ff 1f c3 00 fa fa fa 00 ff ff ff ff ff ff ff fb
+ff fb c3 fb fa fa fa fa ff ff 00 fa fa fa fa fa
+fa fa fa fa fa fa fa 00 00 fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa 00 d6 d6 d6 d6 d6 d6 d6 00
+00 1f 00 00 fa fa fa 00 d6 d6 d6 d6 d6 d6 d6 92
+fb fb fb 92 92 fa fa fa fa fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa ff 00 fa 00 00 00 00 fa 00
+00 fa 00 00 00 fa fa fa 00 d6 d6 d6 d6 d6 00 fa
+fa 1f fa fa fa fa fa fa 00 d6 d6 d6 d6 fb fb fb
+fb fb fb fb fb fb fa fa 00 00 00 fa fa fa fa fa
+fa fa fa fa fa fa fa ff 00 fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa fa fa 00 00 00 00 00 fa fa
+fa 1f fa fa fa fa fa fa fa 00 00 00 00 00 fa 92
+fb fb fb 92 fa fa fa fa ff ff 00 fa 00 00 00 00
+00 00 fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa 1f
+1f 1f 1f 1f fa fa fa fa fa fa fa fa fa fa ff fb
+fa fb fa fb 92 fa fa fa ff ff 00 fa 00 00 00 00
+00 00 fa fa fa fa 92 92 92 92 92 92 92 92 92 92
+92 92 92 92 92 92 fa fa fa fa fa fa fa fa fa fa
+1f 1f 1f fa fa fa fa fa fa fa fa fa fa fa fb fa
+fa fb fa fa fb fa fa fa ff ff 00 fa fa fa fa fa
+fa fa fa fa fa fa 92 ff ff 92 ff ff ff ff 92 ff
+ff 92 ff ff ff 92 fa fa fa fa fa fa fa fa fa fa
+fa 1f fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+fa fb fa fa fa fa fa fa fa fa fa fa fa fa fa fa
+fa fa fa fa fa fa 92 92 92 92 92 92 92 92 92 92
+92 92 92 92 92 92
+'}
+

trunk/src/comdlg32/filedlg95.c

@@ +1 @@
+/* $Id: filedlg95.c,v 1.4 2000-03-26 16:31:41 cbratschi Exp $*/
 /*
  * COMMDLG - File Open Dialogs Win95 look and feel
  *
+ * Copyright 2000 Christoph Bratschi (cbratschi@datacomm.ch)
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ * Corel WINE 20000324 level
  */
 #ifdef __WIN32OS2__
@@ -48 +53 @@
   CHAR*        szDisplayName;
   INT          iIcon;
+  INT          iSelIcon;
   HIMAGELIST   ilItemImage;
 
@@ -173 +179 @@
 HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
 HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPSTR lpstrFileList, UINT nFileCount, UINT sizeUsed);
+static BOOL BrowseSelectedFolder(HWND hwnd);
 
 /***********************************************************************
@@ -207 +215 @@
     lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
                                   (LPDLGTEMPLATEA) template,
-                                  fodInfos->ofnInfos.hwndOwner,
+                                  fodInfos->ofnInfos->hwndOwner,
                                   (DLGPROC) FileOpenDlgProc95,
                                   (LPARAM) fodInfos);
@@ -229 +237 @@
 BOOL  WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType)
 {
-
   BOOL ret;
   FileOpenDlgInfos *fodInfos;
+  HINSTANCE hInstance;
+  LPCSTR lpstrFilter = NULL;
+  LPSTR lpstrCustomFilter = NULL;
+  LPCSTR lpstrInitialDir = NULL;
+  DWORD dwFlags = 0;
 
   /* Initialise FileOpenDlgInfos structure*/
   fodInfos = (FileOpenDlgInfos*)MemAlloc(sizeof(FileOpenDlgInfos));
-  memset(&fodInfos->ofnInfos,'\0',sizeof(*ofn)); fodInfos->ofnInfos.lStructSize = sizeof(*ofn);
-  fodInfos->ofnInfos.hwndOwner = ofn->hwndOwner;
-  fodInfos->ofnInfos.hInstance = MapHModuleLS(ofn->hInstance);
+
+  /* Pass in the original ofn */
+  fodInfos->ofnInfos = ofn;
+
+  /* Save original hInstance value */
+  hInstance = ofn->hInstance;
+  fodInfos->ofnInfos->hInstance = MapHModuleLS(ofn->hInstance);
+
   if (ofn->lpstrFilter)
   {
     LPSTR s,x;
+    lpstrFilter = ofn->lpstrFilter;
 
     /* filter is a list...  title\0ext\0......\0\0 */
@@ -249 +267 @@
     x = (LPSTR)MemAlloc(s-ofn->lpstrFilter);
     memcpy(x,ofn->lpstrFilter,s-ofn->lpstrFilter);
-    fodInfos->ofnInfos.lpstrFilter = (LPSTR)x;
+    fodInfos->ofnInfos->lpstrFilter = (LPSTR)x;
   }
   if (ofn->lpstrCustomFilter)
   {
     LPSTR s,x;
+    lpstrCustomFilter = ofn->lpstrCustomFilter;
 
     /* filter is a list...  title\0ext\0......\0\0 */
@@ -262 +281 @@
     x = MemAlloc(s-ofn->lpstrCustomFilter);
     memcpy(x,ofn->lpstrCustomFilter,s-ofn->lpstrCustomFilter);
-    fodInfos->ofnInfos.lpstrCustomFilter = (LPSTR)x;
-  }
-  fodInfos->ofnInfos.nMaxCustFilter = ofn->nMaxCustFilter;
-  fodInfos->ofnInfos.nFilterIndex = ofn->nFilterIndex;
-  if (ofn->nMaxFile)
-  {
-      fodInfos->ofnInfos.lpstrFile = (LPSTR)MemAlloc(ofn->nMaxFile);
-      strcpy((LPSTR)fodInfos->ofnInfos.lpstrFile,ofn->lpstrFile);
-  }
-  fodInfos->ofnInfos.nMaxFile = ofn->nMaxFile;
-  fodInfos->ofnInfos.nMaxFileTitle = ofn->nMaxFileTitle;
-    if (fodInfos->ofnInfos.nMaxFileTitle)
-      fodInfos->ofnInfos.lpstrFileTitle = (LPSTR)MemAlloc(ofn->nMaxFileTitle);
-  if (ofn->lpstrInitialDir)
-  {
-      fodInfos->ofnInfos.lpstrInitialDir = (LPSTR)MemAlloc(strlen(ofn->lpstrInitialDir)+1);
-      strcpy((LPSTR)fodInfos->ofnInfos.lpstrInitialDir,ofn->lpstrInitialDir);
-  }
-
-  if (ofn->lpstrTitle)
-  {
-      fodInfos->ofnInfos.lpstrTitle = (LPSTR)MemAlloc(strlen(ofn->lpstrTitle)+1);
-      strcpy((LPSTR)fodInfos->ofnInfos.lpstrTitle,ofn->lpstrTitle);
-  }
-
-  fodInfos->ofnInfos.Flags = ofn->Flags|OFN_WINE;
-  fodInfos->ofnInfos.nFileOffset = ofn->nFileOffset;
-  fodInfos->ofnInfos.nFileExtension = ofn->nFileExtension;
-  if (ofn->lpstrDefExt)
-  {
-      fodInfos->ofnInfos.lpstrDefExt = MemAlloc(strlen(ofn->lpstrDefExt)+1);
-      strcpy((LPSTR)fodInfos->ofnInfos.lpstrDefExt,ofn->lpstrDefExt);
-  }
-  fodInfos->ofnInfos.lCustData = ofn->lCustData;
-  fodInfos->ofnInfos.lpfnHook = (LPOFNHOOKPROC)ofn->lpfnHook;
-
-  if (HIWORD(ofn->lpTemplateName))
-  {
-      fodInfos->ofnInfos.lpTemplateName = MemAlloc(strlen(ofn->lpTemplateName)+1);
-      strcpy ((LPSTR)fodInfos->ofnInfos.lpTemplateName, ofn->lpTemplateName);
-  }
-  else
-  {
-      /* resource id */
-      fodInfos->ofnInfos.lpTemplateName = ofn->lpTemplateName;
-  }
+    fodInfos->ofnInfos->lpstrCustomFilter = (LPSTR)x;
+  }
+
+  dwFlags = ofn->Flags;
+  fodInfos->ofnInfos->Flags = ofn->Flags|OFN_WINE;
 
   /* Replace the NULL lpstrInitialDir by the current folder */
-  if(!ofn->lpstrInitialDir)
-  {
-    fodInfos->ofnInfos.lpstrInitialDir = MemAlloc(MAX_PATH);
-    GetCurrentDirectoryA(MAX_PATH,(LPSTR)fodInfos->ofnInfos.lpstrInitialDir);
+  lpstrInitialDir = ofn->lpstrInitialDir;
+  if(!lpstrInitialDir)
+  {
+    fodInfos->ofnInfos->lpstrInitialDir = MemAlloc(MAX_PATH);
+    GetCurrentDirectoryA(MAX_PATH,(LPSTR)fodInfos->ofnInfos->lpstrInitialDir);
   }
 
@@ -333 +312 @@
   }
 
-  ofn->nFileOffset = fodInfos->ofnInfos.nFileOffset;
-  ofn->nFileExtension = fodInfos->ofnInfos.nFileExtension;
-
-  /*
-     Transfer the combo index in the OPENFILENAME structure;
-     No support for custom filters, so nFilterIndex must be one-based.
-  */
-  ofn->nFilterIndex = fodInfos->ofnInfos.nFilterIndex;
-
-  if (fodInfos->ofnInfos.lpstrFilter)
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrFilter));
-  if (HIWORD(fodInfos->ofnInfos.lpTemplateName))
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpTemplateName));
-  if (fodInfos->ofnInfos.lpstrDefExt)
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrDefExt));
-  if (fodInfos->ofnInfos.lpstrTitle)
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrTitle));
-  if (fodInfos->ofnInfos.lpstrInitialDir)
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrInitialDir));
-  if (fodInfos->ofnInfos.lpstrCustomFilter)
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrCustomFilter));
-
-  if (fodInfos->ofnInfos.lpstrFile)
-  {
-      /*
-       * We have to clear the buffer before we copy the filename since we don't
-       * support selecting multiple files. We have to make sure that the caller won't
-       * attempt to read past the first filename.
-       */
-      memset(ofn->lpstrFile, '\0', ofn->nMaxFile);
-      strcpy(ofn->lpstrFile,fodInfos->ofnInfos.lpstrFile);
-      MemFree((LPVOID)fodInfos->ofnInfos.lpstrFile);
-  }
-  if (fodInfos->ofnInfos.lpstrFileTitle)
-    {
-      if (ofn->lpstrFileTitle)
-          strcpy(ofn->lpstrFileTitle,
-                 fodInfos->ofnInfos.lpstrFileTitle);
-      MemFree((LPVOID)fodInfos->ofnInfos.lpstrFileTitle);
+  if (lpstrInitialDir)
+  {
+    MemFree((LPVOID)(fodInfos->ofnInfos->lpstrInitialDir));
+    fodInfos->ofnInfos->lpstrInitialDir = lpstrInitialDir;
       }
-
+  if (lpstrFilter)
+  {
+    MemFree((LPVOID)(fodInfos->ofnInfos->lpstrFilter));
+    fodInfos->ofnInfos->lpstrFilter = lpstrFilter;
+  }
+  if (lpstrCustomFilter)
+  {
+    MemFree((LPVOID)(fodInfos->ofnInfos->lpstrCustomFilter));
+    fodInfos->ofnInfos->lpstrCustomFilter = lpstrCustomFilter;
+  }
+
+  ofn->Flags = dwFlags;
+  ofn->hInstance = hInstance;
   MemFree((LPVOID)(fodInfos));
   return ret;
@@ -391 +347 @@
   BOOL ret;
   FileOpenDlgInfos *fodInfos;
+  HINSTANCE hInstance;
+  LPCSTR lpstrFilter = NULL;
+  LPSTR lpstrCustomFilter = NULL;
+  DWORD dwFlags;
 
   /* Initialise FileOpenDlgInfos structure*/
   fodInfos = (FileOpenDlgInfos*)MemAlloc(sizeof(FileOpenDlgInfos));
-  memset(&fodInfos->ofnInfos,'\0',sizeof(*ofn));
-  fodInfos->ofnInfos.lStructSize = sizeof(*ofn);
-  fodInfos->ofnInfos.hwndOwner = ofn->hwndOwner;
-  fodInfos->ofnInfos.hInstance = MapHModuleLS(ofn->hInstance);
+
+  /*  Pass in the original ofn */
+  fodInfos->ofnInfos = (LPOPENFILENAMEA)ofn;
+
+  /* Save hInstance */
+  hInstance = fodInfos->ofnInfos->hInstance;
+  fodInfos->ofnInfos->hInstance = MapHModuleLS(ofn->hInstance);
+
+  /* Save lpstrFilter */
   if (ofn->lpstrFilter)
   {
@@ -403 +368 @@
     LPSTR x,y;
     int n;
+
+    lpstrFilter = fodInfos->ofnInfos->lpstrFilter;
 
     /* filter is a list...  title\0ext\0......\0\0 */
@@ -419 +386 @@
     }
     *x=0;
-    fodInfos->ofnInfos.lpstrFilter = (LPSTR)y;
-  }
-  if (ofn->lpstrCustomFilter) {
+    fodInfos->ofnInfos->lpstrFilter = (LPSTR)y;
+  }
+  /* Save lpstrCustomFilter */
+  if (ofn->lpstrCustomFilter)
+  {
     LPWSTR  s;
     LPSTR x,y;
     int n;
 
+    lpstrCustomFilter = fodInfos->ofnInfos->lpstrCustomFilter;
     /* filter is a list...  title\0ext\0......\0\0 */
     s = (LPWSTR)ofn->lpstrCustomFilter;
@@ -440 +410 @@
     }
     *x=0;
-    fodInfos->ofnInfos.lpstrCustomFilter = (LPSTR)y;
-  }
-  fodInfos->ofnInfos.nMaxCustFilter = ofn->nMaxCustFilter;
-  fodInfos->ofnInfos.nFilterIndex = ofn->nFilterIndex;
-  if (ofn->nMaxFile)
-     fodInfos->ofnInfos.lpstrFile = (LPSTR)MemAlloc(ofn->nMaxFile);
-  fodInfos->ofnInfos.nMaxFile = ofn->nMaxFile;
-  fodInfos->ofnInfos.nMaxFileTitle = ofn->nMaxFileTitle;
-  if (ofn->nMaxFileTitle)
-    fodInfos->ofnInfos.lpstrFileTitle = (LPSTR)MemAlloc(ofn->nMaxFileTitle);
-  if (ofn->lpstrInitialDir)
-  {
-    fodInfos->ofnInfos.lpstrInitialDir = (LPSTR)MemAlloc(lstrlenW(ofn->lpstrInitialDir)+1);
-    lstrcpyWtoA((LPSTR)fodInfos->ofnInfos.lpstrInitialDir,ofn->lpstrInitialDir);
-  }
-  if (ofn->lpstrTitle)
-  {
-    fodInfos->ofnInfos.lpstrTitle = (LPSTR)MemAlloc(lstrlenW(ofn->lpstrTitle)+1);
-    lstrcpyWtoA((LPSTR)fodInfos->ofnInfos.lpstrTitle,ofn->lpstrTitle);
-  }
-  fodInfos->ofnInfos.Flags = ofn->Flags|OFN_WINE|OFN_UNICODE;
-  fodInfos->ofnInfos.nFileOffset = ofn->nFileOffset;
-  fodInfos->ofnInfos.nFileExtension = ofn->nFileExtension;
-  if (ofn->lpstrDefExt)
-  {
-    fodInfos->ofnInfos.lpstrDefExt = (LPSTR)MemAlloc(lstrlenW(ofn->lpstrDefExt)+1);
-    lstrcpyWtoA((LPSTR)fodInfos->ofnInfos.lpstrDefExt,ofn->lpstrDefExt);
-  }
-  fodInfos->ofnInfos.lCustData = ofn->lCustData;
-  fodInfos->ofnInfos.lpfnHook = (LPOFNHOOKPROC)ofn->lpfnHook;
-
-  if (HIWORD(ofn->lpTemplateName))
-  {
-    fodInfos->ofnInfos.lpTemplateName = (LPSTR)MemAlloc(lstrlenW(ofn->lpTemplateName)+1);
-    lstrcpyWtoA((LPSTR)fodInfos->ofnInfos.lpTemplateName,ofn->lpTemplateName);
-  }
-  else
-  {
-      /* resource id */
-      fodInfos->ofnInfos.lpTemplateName = (LPSTR)ofn->lpTemplateName;
-  }
+    fodInfos->ofnInfos->lpstrCustomFilter = (LPSTR)y;
+  }
+
+  /* Save Flags */
+  dwFlags = fodInfos->ofnInfos->Flags;
+  fodInfos->ofnInfos->Flags = ofn->Flags|OFN_WINE|OFN_UNICODE;
+
   /* Initialise the dialog property */
   fodInfos->DlgInfos.dwDlgProp = 0;
@@ -498 +434 @@
 
   /* Cleaning */
-  ofn->nFileOffset = fodInfos->ofnInfos.nFileOffset;
-  ofn->nFileExtension = fodInfos->ofnInfos.nFileExtension;
-
-  /*
-     Transfer the combo index in the OPENFILENAME structure;
-     No support for custom filters, so nFilterIndex must be one-based.
-  */
-  ofn->nFilterIndex = fodInfos->ofnInfos.nFilterIndex;
-
-  if (fodInfos->ofnInfos.lpstrFilter)
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpstrFilter));
-  if (HIWORD(fodInfos->ofnInfos.lpTemplateName))
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpTemplateName));
-  if (fodInfos->ofnInfos.lpstrDefExt)
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpstrDefExt));
-  if (fodInfos->ofnInfos.lpstrTitle)
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpstrTitle));
-  if (fodInfos->ofnInfos.lpstrInitialDir)
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpstrInitialDir));
-  if (fodInfos->ofnInfos.lpstrCustomFilter)
-    MemFree((LPVOID)(fodInfos->ofnInfos.lpstrCustomFilter));
-
-  if (fodInfos->ofnInfos.lpstrFile)
-  {
-      /*
-       * We have to clear the buffer before we copy the filename since we don't
-       * support selecting multiple files. We have to make sure that the caller won't
-       * attempt to read past the first filename.
-       */
-      memset(ofn->lpstrFile, '\0', ofn->nMaxFile * sizeof(WCHAR) );
-      lstrcpyAtoW(ofn->lpstrFile,(fodInfos->ofnInfos.lpstrFile));
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrFile));
-  }
-
-  if (fodInfos->ofnInfos.lpstrFileTitle) {
-      if (ofn->lpstrFileTitle)
-                lstrcpyAtoW(ofn->lpstrFileTitle,
-      (fodInfos->ofnInfos.lpstrFileTitle));
-      MemFree((LPVOID)(fodInfos->ofnInfos.lpstrFileTitle));
-  }
+  /* Restore Flags */
+  fodInfos->ofnInfos->Flags = dwFlags;
+
+  /* Restore lpstrFilter */
+  if (fodInfos->ofnInfos->lpstrFilter)
+  {
+    MemFree((LPVOID)(fodInfos->ofnInfos->lpstrFilter));
+    fodInfos->ofnInfos->lpstrFilter = lpstrFilter;
+  }
+  if (fodInfos->ofnInfos->lpstrCustomFilter)
+  {
+    MemFree((LPVOID)(fodInfos->ofnInfos->lpstrCustomFilter));
+    fodInfos->ofnInfos->lpstrCustomFilter = lpstrCustomFilter;
+  }
+
+  /* Restore hInstance */
+  fodInfos->ofnInfos->hInstance = hInstance;
   MemFree((LPVOID)(fodInfos));
   return ret;
-
 }
 
@@ -688 +600 @@
                 lParam = (LPARAM) &fodInfos->ofnInfos;
                 ArrangeCtrlPositions(hwnd,GetParent(hwnd));
-            if(fodInfos && (fodInfos->ofnInfos.Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos.lpfnHook)
-                 return CallWindowProcA((WNDPROC)fodInfos->ofnInfos.lpfnHook,hwnd,uMsg,wParam,lParam);
+            if(fodInfos && (fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook)
+                 return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
                 return 0;
         }
     }
-    if(fodInfos && (fodInfos->ofnInfos.Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos.lpfnHook )
-        return CallWindowProcA((WNDPROC)fodInfos->ofnInfos.lpfnHook,hwnd,uMsg,wParam,lParam);
+    if(fodInfos && (fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook )
+        return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
   return DefWindowProcA(hwnd,uMsg,wParam,lParam);
 }
@@ -704 +616 @@
     HANDLE hDlgTmpl = 0;
     HWND hChildDlg = 0;
-   if (fodInfos->ofnInfos.Flags & OFN_ENABLETEMPLATE || fodInfos->ofnInfos.Flags & OFN_ENABLETEMPLATEHANDLE)
+   if (fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATE || fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATEHANDLE)
    {
-        if (fodInfos->ofnInfos.Flags  & OFN_ENABLETEMPLATEHANDLE)
+        if (fodInfos->ofnInfos->Flags  & OFN_ENABLETEMPLATEHANDLE)
         {
-           if( !(template = LockResource( fodInfos->ofnInfos.hInstance)))
+           if( !(template = LockResource( fodInfos->ofnInfos->hInstance)))
                 {
                 COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
@@ -717 +629 @@
         else
         {
-         if (!(hRes = FindResourceA(MapHModuleSL(fodInfos->ofnInfos.hInstance),
-            (fodInfos->ofnInfos.lpTemplateName), RT_DIALOGA)))
+         if (!(hRes = FindResourceA(MapHModuleSL(fodInfos->ofnInfos->hInstance),
+            (fodInfos->ofnInfos->lpTemplateName), RT_DIALOGA)))
         {
                 COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
                  return (HWND)NULL;
         }
-        if (!(hDlgTmpl = LoadResource( MapHModuleSL(fodInfos->ofnInfos.hInstance),
+        if (!(hDlgTmpl = LoadResource( MapHModuleSL(fodInfos->ofnInfos->hInstance),
              hRes )) ||
                  !(template = LockResource( hDlgTmpl )))
@@ -732 +644 @@
         }
 
-        hChildDlg= CreateDialogIndirectParamA(fodInfos->ofnInfos.hInstance,template,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+        hChildDlg= CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,template,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
         if(hChildDlg)
         {
@@ -739 +651 @@
         }
  }
- else if(fodInfos->ofnInfos.Flags & OFN_ENABLEHOOK && fodInfos->ofnInfos.lpfnHook)
+ else if(fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK && fodInfos->ofnInfos->lpfnHook)
  {
         RECT rectHwnd;
@@ -752 +664 @@
         tmplate.cy = rectHwnd.bottom-rectHwnd.top;
 
-        return CreateDialogIndirectParamA(fodInfos->ofnInfos.hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+        return CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
  }
 return (HWND)NULL;
@@ -774 +686 @@
         ofnNotify.hdr.idFrom=0;
         ofnNotify.hdr.code = uCode;
-        ofnNotify.lpOFN = &fodInfos->ofnInfos;
+        ofnNotify.lpOFN = fodInfos->ofnInfos;
         return SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
     }
@@ -788 +700 @@
 {
     LPSTR lpstrFileSpec;
-    int reqSize;
-    char lpstrPath[MAX_PATH];
+    char lpstrCurrentDir[MAX_PATH]="";
     FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
     if(!fodInfos)
-        return -1;
+        return TRUE;
     switch(uMsg)
     {
         case CDM_GETFILEPATH:
+        {
+            char lpstrPathSpec[MAX_PATH]="";
+            GetDlgItemTextA(hwnd,IDC_FILENAME,(LPSTR)lParam, (int)wParam);
+            lpstrFileSpec = (LPSTR)COMDLG32_PathFindFilenameA((LPSTR)lParam);
+            strcpy(lpstrPathSpec,(LPSTR)lParam);
+            COMDLG32_PathRemoveFileSpecA(lpstrPathSpec);
+            if(!lpstrPathSpec[0])
+                COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,
+                lpstrPathSpec);
+            strcat(lpstrPathSpec,"\\");
+            strcat(lpstrPathSpec,(LPSTR)lParam);
+            strcpy((LPSTR)lParam,(LPSTR)lpstrPathSpec);
+        }
+            return TRUE;
+        case CDM_GETFOLDERPATH:
+            if(lParam)
             {
-            GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
-            lpstrFileSpec = (LPSTR)COMDLG32_PathFindFilenameA(lpstrPath);
-            if (lpstrFileSpec==lpstrPath) {
-                char lpstrCurrentDir[MAX_PATH];
-                /* Prepend the current path */
-                COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrCurrentDir);
-                if ((LPSTR)lParam!=NULL)
-                    wsnprintfA((LPSTR)lParam,(int)wParam,"%s\\%s",lpstrCurrentDir,lpstrPath);
-                reqSize=strlen(lpstrCurrentDir)+1+strlen(lpstrPath)+1;
-            } else {
-                lstrcpynA((LPSTR)lParam,(LPSTR)lpstrPath,(int)wParam);
-                reqSize=strlen(lpstrPath);
+                if(fodInfos)
+                {
+                    COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,
+                    lpstrCurrentDir);
+                    strncpy((LPSTR)lParam,lpstrCurrentDir,(int)wParam);
                 }
+                else
+                *((LPSTR)lParam)=0;
             }
-            /* return the required buffer size */
-            return reqSize;
-        case CDM_GETFOLDERPATH:
-            COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
-            if ((LPSTR)lParam!=NULL)
-                lstrcpynA((LPSTR)lParam,lpstrPath,(int)wParam);
-            return strlen(lpstrPath);
+            return TRUE;
     case CDM_GETSPEC:
-            reqSize=GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
-            lpstrFileSpec = (LPSTR)COMDLG32_PathFindFilenameA(lpstrPath);
-            if ((LPSTR)lParam!=NULL)
-                lstrcpynA((LPSTR)lParam, lpstrFileSpec, (int)wParam);
-            return strlen(lpstrFileSpec);
+            if(lParam)
+            {
+                GetDlgItemTextA(hwnd,IDC_FILENAME,(LPSTR)lParam, (int)wParam);
+                lpstrFileSpec = (LPSTR)COMDLG32_PathFindFilenameA((LPSTR)lParam);
+                if(lpstrFileSpec)
+                   strcpy((LPSTR)lParam, lpstrFileSpec);
+                else
+                    *((LPSTR)lParam)=0;
+            }
+            return TRUE;
+        case CDM_SETCONTROLTEXT:
+          if ( 0 != lParam )
+            SetDlgItemTextA( hwnd, (UINT) wParam, (LPSTR) lParam );
+          return TRUE;
         case CDM_HIDECONTROL:
-        case CDM_SETCONTROLTEXT:
         case CDM_SETDEFEXT:
         FIXME("CDM_HIDECONTROL,CDM_SETCONTROLTEXT,CDM_SETDEFEXT not implemented\n");
         return TRUE;
     }
-    return -1;
+    return TRUE;
 }
 
@@ -869 +793 @@
 
   case WM_DESTROY:
-      RemovePropA(hwnd, FileOpenDlgInfosStr);
+        FILEDLG95_Clean(hwnd);
+        RemovePropA(hwnd, FileOpenDlgInfosStr);
+        return FALSE;
+
+    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;
+            }
+            lpdi->hinst = COMMDLG_hInstance32;
+            lpdi->lpszText =  (LPSTR) stringId;
+        }
+        return FALSE;
+    }
 
     default :
@@ -887 +847 @@
   LPITEMIDLIST pidlItemId;
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) lParam;
+  DWORD count;
 
   TRACE("\n");
@@ -894 +855 @@
   InitCommonControls();
 #endif
-
+//MessageBox(hwnd,"WM_INITDIALOG",NULL,MB_OK);
+dprintf(("CB: FILEDLG95_SHELL_Init"));
+count = GetTickCount();
   /* Initialise shell objects */
   FILEDLG95_SHELL_Init(hwnd);
-
+dprintf(("CB: FILEDLG95_InitUI %d ms",GetTickCount()-count));
+count = GetTickCount();
   /* Initialise dialog UI */
   FILEDLG95_InitUI(hwnd);
-
+dprintf(("CB: FILEDLG95_LOOKIN_Init %d",GetTickCount()-count));
+count = GetTickCount();
   /* Initialize the Look In combo box*/
   FILEDLG95_LOOKIN_Init(fodInfos->DlgInfos.hwndLookInCB);
-
+dprintf(("CB: FILEDLG95_FILETYPE_Init %d",GetTickCount()-count));
+count = GetTickCount();
   /* Initialize the filter combo box */
   FILEDLG95_FILETYPE_Init(hwnd);
-
+dprintf(("CB: FILEDLG95_FILETYPE_Init done %d",GetTickCount()-count));
+count = GetTickCount();
   /* Get the initial directory pidl */
 
-  if(!(pidlItemId = GetPidlFromName(fodInfos->Shell.FOIShellFolder,fodInfos->ofnInfos.lpstrInitialDir)))
+  if(!(pidlItemId = GetPidlFromName(fodInfos->Shell.FOIShellFolder,fodInfos->ofnInfos->lpstrInitialDir)))
   {
     char path[MAX_PATH];
@@ -918 +885 @@
 
   }
-
+dprintf(("CB: IShellBrowser_BrowseObject %d",GetTickCount()-count));
+count = GetTickCount();
   /* Browse to the initial directory */
   IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser,pidlItemId,SBSP_RELATIVE);
-
+dprintf(("CB: done WM_INITDIALOG %d",GetTickCount()-count));
   /* Free pidlItem memory */
   COMDLG32_SHFree(pidlItemId);
@@ -958 +926 @@
     /* Cancel button */
   case IDCANCEL:
-      FILEDLG95_Clean(hwnd);
       EndDialog(hwnd, FALSE);
     break;
@@ -1064 +1031 @@
 
   /* Set the window text with the text specified in the OPENFILENAME structure */
-  if(fodInfos->ofnInfos.lpstrTitle)
-  {
-      SetWindowTextA(hwnd,fodInfos->ofnInfos.lpstrTitle);
+  if(fodInfos->ofnInfos->lpstrTitle)
+  {
+      SetWindowTextA(hwnd,fodInfos->ofnInfos->lpstrTitle);
   }
   else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
@@ -1074 +1041 @@
 
   /* Initialise the file name edit control */
-  if(fodInfos->ofnInfos.lpstrFile)
-  {
-      SetDlgItemTextA(hwnd,IDC_FILENAME,fodInfos->ofnInfos.lpstrFile);
-  }
+  if(fodInfos->ofnInfos->lpstrFile)
+  {
+      /**
+       * When passed a fully qualified filename, windows removes
+       * the path component, before showing it in the control
+       */
+      LPSTR lpstrFileName = NULL;
+
+      lpstrFileName = (LPSTR)COMDLG32_PathFindFilenameA(fodInfos->ofnInfos->lpstrFile);
+      if(NULL != lpstrFileName)
+          SetDlgItemTextA(hwnd,IDC_FILENAME,lpstrFileName);
+      else
+          SetDlgItemTextA(hwnd,IDC_FILENAME,"");
+  }
+
   /* Must the open as read only check box be checked ?*/
-  if(fodInfos->ofnInfos.Flags & OFN_READONLY)
+  if(fodInfos->ofnInfos->Flags & OFN_READONLY)
   {
     SendDlgItemMessageA(hwnd,IDC_OPENREADONLY,BM_SETCHECK,(WPARAM)TRUE,0);
   }
   /* Must the open as read only check box be hid ?*/
-  if(fodInfos->ofnInfos.Flags & OFN_HIDEREADONLY)
+  if(fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY)
   {
     ShowWindow(GetDlgItem(hwnd,IDC_OPENREADONLY),SW_HIDE);
+  }
+  /* Must the help button be hid ?*/
+  if (!(fodInfos->ofnInfos->Flags & OFN_SHOWHELP))
+  {
+    ShowWindow(GetDlgItem(hwnd, pshHelp), SW_HIDE);
+  }
+  /* Resize the height, if open as read only checkbox ad help button
+     are hidden */
+  if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
+       (!(fodInfos->ofnInfos->Flags & OFN_SHOWHELP)) )
+  {
+    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 */
@@ -1092 +1090 @@
   {
       SetDlgItemTextA(hwnd,IDOK,"Save");
+      SetDlgItemTextA(hwnd,IDC_LOOKINSTATIC,"Save &in");
   }
   return 0;
@@ -1097 +1096 @@
 
 /***********************************************************************
+ *      FILEDLG95_OnOpenMultipleFiles
+ *
+ * Handles the opening of multiple files.
+ *
+*/
+BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPSTR lpstrFileList, UINT nFileCount, UINT sizeUsed)
+{
+  CHAR   lpstrPathSpec[MAX_PATH] = "";
+  CHAR   lpstrTempFileList[MAX_PATH] = "";
+  LPSTR  lpstrFile;
+  UINT   sizePath;
+  UINT   nCount;
+  FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
+
+  TRACE("\n");
+
+  lpstrFile = fodInfos->ofnInfos->lpstrFile;
+
+  COMDLG32_SHGetPathFromIDListA( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec );
+  sizePath = lstrlenA( lpstrPathSpec );
+
+  memset( lpstrFile, 0x0, fodInfos->ofnInfos->nMaxFile * sizeof(CHAR) );
+
+  if ( fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST ||
+          !(fodInfos->ofnInfos->Flags & OFN_EXPLORER ))
+          {
+      LPSTR lpstrTemp = lpstrFileList;
+
+      for ( nCount = 0; nCount < nFileCount; nCount++ )
+      {
+          WIN32_FIND_DATAA findData;
+          CHAR lpstrFindFile[MAX_PATH];
+
+          memset( lpstrFindFile, 0x0, MAX_PATH * sizeof(CHAR) );
+
+          lstrcpyA( lpstrFindFile, lpstrPathSpec );
+          lstrcatA( lpstrFindFile, "\\" );
+          lstrcatA( lpstrFindFile, lpstrTemp );
+
+          if ( FindFirstFileA( lpstrFindFile, &findData ) == INVALID_HANDLE_VALUE )
+          {
+              CHAR lpstrNotFound[100];
+              CHAR lpstrMsg[100];
+              CHAR tmp[400];
+
+              LoadStringA(COMMDLG_hInstance32, IDS_FILENOTFOUND, lpstrNotFound, 100);
+              LoadStringA(COMMDLG_hInstance32, IDS_VERIFYFILE, lpstrMsg, 100);
+
+              strcpy(tmp, lpstrFindFile);
+              strcat(tmp, "\n");
+              strcat(tmp, lpstrNotFound);
+              strcat(tmp, "\n");
+              strcat(tmp, lpstrMsg);
+
+              MessageBoxA(hwnd,
+                      tmp,
+                      fodInfos->ofnInfos->lpstrTitle,
+                      MB_OK | MB_ICONEXCLAMATION);
+              return FALSE;
+  }
+
+          if (!(fodInfos->ofnInfos->Flags & OFN_EXPLORER ))
+  {
+              lstrcatA( lpstrTempFileList, findData.cAlternateFileName);
+              if ( nCount + 1 < nFileCount)
+                  lstrcatA( lpstrTempFileList, " ");
+  }
+          lpstrTemp += strlen(lpstrFileList) + 1;
+      }
+  }
+
+      if ( fodInfos->ofnInfos->Flags & OFN_EXPLORER )
+      {
+      lstrcpyA( lpstrFile, lpstrPathSpec);
+      memcpy( lpstrFile + sizePath + 1, lpstrFileList, sizeof(CHAR) * sizeUsed );
+      }
+      else
+      {
+      memcpy( lpstrFile, lpstrTempFileList, sizeof(CHAR) * strlen(lpstrTempFileList));
+      }
+
+      fodInfos->ofnInfos->nFileOffset = sizePath + 1;
+      fodInfos->ofnInfos->nFileExtension = 0;
+
+  /* clean and exit */
+  return EndDialog(hwnd,TRUE);
+}
+
+/***********************************************************************
  *      FILEDLG95_OnOpen
  *
@@ -1105 +1193 @@
 BOOL FILEDLG95_OnOpen(HWND hwnd)
 {
-  char lpstrSpecifiedByUser[MAX_PATH];
+  CHAR lpstrSpecifiedByUser[MAX_PATH] = "";
+  CHAR lpstrFileList[MAX_PATH] = "";
+  LPSTR lpstrFile;
+  UINT nStrCharCount = 0;
+  UINT nFileCount = 0;
+  UINT nFileIndex = 0;
+  UINT sizeUsed = 0;
+  UINT nStrLen = 0;
+
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
-  LPITEMIDLIST pidlSelection;
-
-  lpstrSpecifiedByUser[0]='\0';
 
   TRACE("\n");
-
-  /* Check if there is a selected item in the listview */
-  if(fodInfos->DlgInfos.dwDlgProp & FODPROP_USEVIEW)
-  {
-      pidlSelection = GetSelectedPidl(fodInfos->Shell.FOIShellView);
-      GetName(fodInfos->Shell.FOIShellFolder,pidlSelection,SHGDN_NORMAL,lpstrSpecifiedByUser);
-      COMDLG32_SHFree((LPVOID)pidlSelection);
-  }
-  else
-      /* Get the text from the filename edit */
-      GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrSpecifiedByUser,MAX_PATH);
-
-  if(strlen(lpstrSpecifiedByUser))
+//CB: optimize this function!
+  /* If a folder is selected browse folder */
+  if (BrowseSelectedFolder(hwnd))
+      return FALSE;
+
+  lpstrFile = fodInfos->ofnInfos->lpstrFile;
+
+  GetDlgItemTextA(hwnd, IDC_FILENAME, lpstrSpecifiedByUser, MAX_PATH);
+  nStrLen = strlen(lpstrSpecifiedByUser);
+
+  while ( nStrCharCount <= nStrLen )
+  {
+      if ( lpstrSpecifiedByUser[nStrCharCount]=='"' )
+      {
+          nStrCharCount++;
+
+          while ((lpstrSpecifiedByUser[nStrCharCount]!='"') &&
+              (nStrCharCount <= nStrLen))
+  {
+              lpstrFileList[nFileIndex++] = lpstrSpecifiedByUser[nStrCharCount];
+              nStrCharCount++;
+              sizeUsed++;
+  }
+          lpstrFileList[nFileIndex++] = '\0';
+          sizeUsed++;
+          nFileCount++;
+      }
+      nStrCharCount++;
+  }
+
+  if(nFileCount > 0)
+      return FILEDLG95_OnOpenMultipleFiles(hwnd, lpstrFileList, nFileCount, sizeUsed);
+
+  if (nStrLen)
   {
       LPSHELLFOLDER psfDesktop;
@@ -1130 +1244 @@
       LPSTR lpstrFileSpec;
       LPSTR lpstrTemp;
-      char lpstrPathSpec[MAX_PATH];
-      char lpstrCurrentDir[MAX_PATH];
-      char lpstrPathAndFile[MAX_PATH];
-
-      lpstrPathSpec[0]    = '\0';
-      lpstrCurrentDir[0]  = '\0';
-      lpstrPathAndFile[0] = '\0';
+      char lpstrPathSpec[MAX_PATH] = "";
+      char lpstrCurrentDir[MAX_PATH] = "";
+      char lpstrPathAndFile[MAX_PATH] = "";
 
       /* Separate the file spec from the path spec
@@ -1143 +1253 @@
               C:\TEXT1\TEXT2        C:\TEXT1          TEXT2
       */
+      if (nFileCount == 0)
+      {
       lpstrFileSpec = (LPSTR)COMDLG32_PathFindFilenameA(lpstrSpecifiedByUser);
       strcpy(lpstrPathSpec,lpstrSpecifiedByUser);
       COMDLG32_PathRemoveFileSpecA(lpstrPathSpec);
+      }
 
       /* Get the index of the selected item in the filetype combo box */
-      fodInfos->ofnInfos.nFilterIndex = (DWORD) CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
+      fodInfos->ofnInfos->nFilterIndex = (DWORD) CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
       /* nFilterIndex is 1 based while combo GetCurSel return zero based index */
-      fodInfos->ofnInfos.nFilterIndex++;
+      fodInfos->ofnInfos->nFilterIndex++;
 
       /* Get the current directory name */
@@ -1164 +1277 @@
           case '\\':
               {
-              int lenPathSpec=strlen(lpstrPathSpec);
-              INT iCopy = (lenPathSpec!=0?2:3);
-              memmove(lpstrPathSpec+iCopy,lpstrPathSpec,lenPathSpec);
-              strncpy(lpstrPathSpec,lpstrCurrentDir,iCopy);
+                  INT iCopy = 2;
+                  char lpstrTmp[MAX_PATH] = "";
+                  if(!strlen(lpstrPathSpec))
+                      iCopy = 3;
+                  strncpy(lpstrTmp,lpstrCurrentDir,iCopy);
+                  strcat(lpstrTmp,lpstrPathSpec);
+                  strcpy(lpstrPathSpec,lpstrTmp);
               }
               break;
@@ -1174 +1290 @@
               {
                   INT iSize;
-                  char lpstrTmp2[MAX_PATH];
+                  char lpstrTmp2[MAX_PATH] = "";
                   LPSTR lpstrTmp = strrchr(lpstrCurrentDir,'\\');
-
                   iSize = lpstrTmp - lpstrCurrentDir;
                   strncpy(lpstrTmp2,lpstrCurrentDir,iSize + 1);
                   if(strlen(lpstrSpecifiedByUser) <= 3)
-                  *lpstrFileSpec='\0';
+                      strcpy(lpstrFileSpec,"");
                   if(strcmp(lpstrPathSpec,".."))
                       strcat(lpstrTmp2,&lpstrPathSpec[3]);
@@ -1188 +1303 @@
           default:
   {
-                  char lpstrTmp[MAX_PATH];
-
+                  char lpstrTmp[MAX_PATH] = "";
                   if(strcmp(&lpstrCurrentDir[strlen(lpstrCurrentDir)-1],"\\"))
                       strcat(lpstrCurrentDir,"\\");
@@ -1216 +1330 @@
           {
               /* Path does not exist */
-              if(fodInfos->ofnInfos.Flags & OFN_PATHMUSTEXIST)
+              if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST)
               {
                   MessageBoxA(hwnd,
                               "Path does not exist",
-                              fodInfos->ofnInfos.lpstrTitle,
+                              fodInfos->ofnInfos->lpstrTitle,
                               MB_OK | MB_ICONEXCLAMATION);
                   return FALSE;
@@ -1273 +1387 @@
     }
 
+      {
+       HANDLE hFile;
+       WIN32_FIND_DATAA stffile;
       /* browse if the user specified a directory */
+       hFile = FindFirstFileA(lpstrFileSpec, &stffile);
+       if ( hFile != INVALID_HANDLE_VALUE )
+       {
+        FindClose (hFile);
+        if (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
       browsePidl = GetPidlFromName(fodInfos->Shell.FOIShellFolder,
               lpstrFileSpec);
+        else
+        {
+         // if there is an extention, then get the Pidl otherwise
+         // we are going to need to add the extention
+         if(strrchr(lpstrFileSpec,'.'))
+          browsePidl = GetPidlFromName(fodInfos->Shell.FOIShellFolder,
+                lpstrFileSpec);
+         else
+          browsePidl=NULL;
+        }
+       }
+       else
+        browsePidl=NULL;
+      }
+
       if (!browsePidl) /* not a directory check the specified file exists */
       {
+       int i;
           int iExt;
           char lpstrFileSpecTemp[MAX_PATH] = "";
@@ -1285 +1423 @@
           iExt = CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
           lpOrg = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, iExt);
+          if (lpOrg == (LPSTR)-1)
+              lpOrg = NULL;     // we get -1 if the filetype LB is empty
+
           lpstrExt = lpOrg;
 
           /*
-             add user specified extentions to the file one by one and
-             check if the file exists
+          Simply take the first one of the list as default.
+          Otherwise the user must specify which extention they want.
+          Also, make sure we don't have a .*, in this case simply
+          forget about the extention
          */
-          while(lpOrg)
-         {
-             int i;
              lpstrExt = strchr(lpOrg, ';');
              if (lpstrExt)
@@ -1309 +1449 @@
                  if (strchr(lpBuf, '.'))
                      strcat(lpstrFileSpecTemp, (strchr(lpBuf, '.')) + 1);
-             } else {
-                 if (strchr(lpBuf, '.'))
-                     strcat(lpstrFileSpecTemp, strchr(lpBuf, '.'));
              }
+             else
+                 strcat(lpstrFileSpecTemp, strchr(lpBuf, '.'));
              browsePidl = GetPidlFromName(fodInfos->Shell.FOIShellFolder,
                      lpstrFileSpecTemp);
              MemFree((void *)lpBuf);
              if (browsePidl)
-             {
                  strcpy(lpstrFileSpec,lpstrFileSpecTemp);
-                 break;
-             }
              if (lpstrExt)
                  lpOrg = lpstrExt+1;
              else
                  lpOrg = NULL;
-         }
       }
 
@@ -1346 +1481 @@
                                                    SBSP_RELATIVE)))
         {
-                  if(fodInfos->ofnInfos.Flags & OFN_PATHMUSTEXIST)
+                  if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST)
         {
                       MessageBoxA(hwnd,
                                   "Path does not exist",
-                                  fodInfos->ofnInfos.lpstrTitle,
+                                  fodInfos->ofnInfos->lpstrTitle,
                                   MB_OK | MB_ICONEXCLAMATION);
                       COMDLG32_SHFree(browsePidl);
@@ -1362 +1497 @@
           /* The file does exist, so ask the user if we should overwrite it */
           if((fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) &&
-             (fodInfos->ofnInfos.Flags & OFN_OVERWRITEPROMPT))
+             (fodInfos->ofnInfos->Flags & OFN_OVERWRITEPROMPT))
           {
                 strcpy(lpstrFileExist, lpstrFileSpec);
@@ -1369 +1504 @@
                 nMsgBoxRet = MessageBoxA(hwnd,
                                         lpstrFileExist,
-                                        fodInfos->ofnInfos.lpstrTitle,
+                                        fodInfos->ofnInfos->lpstrTitle,
                                         MB_YESNO | MB_ICONEXCLAMATION);
                 if (nMsgBoxRet == IDNO)
@@ -1385 +1520 @@
           /* The selected file does not exist */
       /* Tell the user the selected does not exist */
-      if(fodInfos->ofnInfos.Flags & OFN_FILEMUSTEXIST)
+      if(fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST)
       {
         char lpstrNotFound[100];
@@ -1400 +1535 @@
                           100);
 
-        strcpy(tmp,fodInfos->ofnInfos.lpstrFile);
+        strcpy(tmp,fodInfos->ofnInfos->lpstrFile);
         strcat(tmp,"\n");
         strcat(tmp,lpstrNotFound);
@@ -1408 +1543 @@
               MessageBoxA(hwnd,
                           tmp,
-                          fodInfos->ofnInfos.lpstrTitle,
+                          fodInfos->ofnInfos->lpstrTitle,
                           MB_OK | MB_ICONEXCLAMATION);
         return FALSE;
       }
       /* Ask the user if he wants to create the file*/
-      if(fodInfos->ofnInfos.Flags & OFN_CREATEPROMPT)
+      if(fodInfos->ofnInfos->Flags & OFN_CREATEPROMPT)
       {
         char tmp[100];
@@ -1419 +1554 @@
         LoadStringA(COMMDLG_hInstance32,IDS_CREATEFILE,tmp,100);
 
-              if(IDYES == MessageBoxA(hwnd,tmp,fodInfos->ofnInfos.lpstrTitle,
+              if(IDYES == MessageBoxA(hwnd,tmp,fodInfos->ofnInfos->lpstrTitle,
                                       MB_YESNO | MB_ICONQUESTION))
         {
             /* Create the file, clean and exit */
-            FILEDLG95_Clean(hwnd);
             return EndDialog(hwnd,TRUE);
         }
@@ -1429 +1563 @@
       }
     }
+      /* check the write access to the current directory before opening the selected file */
+      if((fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && (fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST))
+      {
+          HANDLE hfile;
+          char testFile[MAX_PATH];
+
+          strcpy(testFile,lpstrPathSpec);
+          strcat(testFile,"_tes_13.579");
+
+          hfile = CreateFileA(testFile,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,0);
+
+          switch(GetLastError())
+          {
+          case ERROR_ACCESS_DENIED:
+          case ERROR_WRITE_PROTECT:
+          case ERROR_PATH_NOT_FOUND:
+          case ERROR_FILE_NOT_FOUND:
+              {
+                  char strAccessDenied[MAX_PATH + 100];
+                  strcpy(strAccessDenied,lpstrPathSpec);
+                  strcat(strAccessDenied,lpstrFileSpec);
+                  strcat(strAccessDenied,"\nWrite access denied for this file !");
+                  MessageBoxA(hwnd,strAccessDenied,fodInfos->ofnInfos->lpstrTitle,MB_OK | MB_ICONEXCLAMATION);
+                  return FALSE;
+              }
+          }
+
+          if (hfile != INVALID_HANDLE_VALUE)
+          {
+              CloseHandle(hfile);
+              DeleteFileA(testFile);
+          }
+
+      }
 
       /* Open the selected file */
@@ -1457 +1625 @@
               }
 
-              if(!strcmp(&lpstrExt[1],"*") && fodInfos->ofnInfos.lpstrDefExt)
-              {
-                  lpstrExt = MemAlloc(strlen(fodInfos->ofnInfos.lpstrDefExt)+2);
-                  strcat(lpstrExt,".");
-                  strcat(lpstrExt,(LPSTR) fodInfos->ofnInfos.lpstrDefExt);
+               if(strcmp(lpstrExt,".*") != 0)
+               {
+                  /* OPEN DIALOG: Let's see if the file exists with the current extention,
+                     if not return the file without the extention.
+                     SAVE DIALOG: Concatenate the extention to the file.
+                  */
+
+                  if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG))
+                  {
+                        LPSTR lpstrFindFile;
+                        WIN32_FIND_DATAA fd;
+
+                        lpstrFindFile = MemAlloc(strlen(lpstrPathAndFile)+strlen(lpstrExt));
+                        strcpy(lpstrFindFile, lpstrPathAndFile);
+                        strcat(lpstrFindFile, lpstrExt);
+                        if(FindFirstFileA(lpstrFindFile, &fd) != INVALID_HANDLE_VALUE)
+                                strcat(lpstrPathAndFile,lpstrExt);
+                        MemFree(lpstrFindFile);
+                  }
+                  else
+                        strcat(lpstrPathAndFile,lpstrExt);
               }
-              strcat(lpstrPathAndFile,lpstrExt);
+              MemFree( lpstrExt );
           }
       }
       /* Check that size size of the file does not exceed buffer size */
-      if(strlen(lpstrPathAndFile) > fodInfos->ofnInfos.nMaxFile)
+      if(strlen(lpstrPathAndFile) > fodInfos->ofnInfos->nMaxFile)
       {
           /* set error FNERR_BUFFERTOSMALL */
-          FILEDLG95_Clean(hwnd);
           return EndDialog(hwnd,FALSE);
       }
-      strcpy(fodInfos->ofnInfos.lpstrFile,lpstrPathAndFile);
+      strcpy(fodInfos->ofnInfos->lpstrFile,lpstrPathAndFile);
+         fodInfos->ofnInfos->lpstrFile[strlen(lpstrPathAndFile)] = '\0';
+         fodInfos->ofnInfos->lpstrFile[strlen(lpstrPathAndFile)+1] = '\0';
 
       /* Set the lpstrFileTitle of the OPENFILENAME structure */
-      if(fodInfos->ofnInfos.lpstrFileTitle)
-          strncpy(fodInfos->ofnInfos.lpstrFileTitle,
+      if(fodInfos->ofnInfos->lpstrFileTitle)
+          strncpy(fodInfos->ofnInfos->lpstrFileTitle,
                   lpstrFileSpec,
-                  fodInfos->ofnInfos.nMaxFileTitle);
+                  fodInfos->ofnInfos->nMaxFileTitle);
 
       /* Check if the file is to be opened as read only */
@@ -1485 +1670 @@
                                             IDC_OPENREADONLY,
                                             BM_GETSTATE,0,0))
-          SetFileAttributesA(fodInfos->ofnInfos.lpstrFile,
+          SetFileAttributesA(fodInfos->ofnInfos->lpstrFile,
                              FILE_ATTRIBUTE_READONLY);
 
       /*  nFileExtension and nFileOffset of OPENFILENAME structure */
-      lpstrTemp = strrchr(fodInfos->ofnInfos.lpstrFile,'\\');
-      fodInfos->ofnInfos.nFileOffset = lpstrTemp - fodInfos->ofnInfos.lpstrFile + 1;
-      lpstrTemp = strrchr(fodInfos->ofnInfos.lpstrFile,'.');
-      fodInfos->ofnInfos.nFileExtension = lpstrTemp - fodInfos->ofnInfos.lpstrFile + 1;
+      lpstrTemp = strrchr(fodInfos->ofnInfos->lpstrFile,'\\');
+      fodInfos->ofnInfos->nFileOffset = lpstrTemp - fodInfos->ofnInfos->lpstrFile + 1;
+      lpstrTemp = strrchr(fodInfos->ofnInfos->lpstrFile,'.');
+      fodInfos->ofnInfos->nFileExtension = lpstrTemp - fodInfos->ofnInfos->lpstrFile + 1;
 
 
     /* clean and exit */
-    FILEDLG95_Clean(hwnd);
     return EndDialog(hwnd,TRUE);
   }
@@ -1527 +1711 @@
   fodInfos->ShellInfos.hwndOwner = hwnd;
 
-  fodInfos->ShellInfos.folderSettings.fFlags = FWF_AUTOARRANGE | FWF_ALIGNLEFT;
+  fodInfos->ShellInfos.folderSettings.fFlags = 0;
+  /* Disable multi-select if flag not set */
+  if (!(fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT))
+  {
+     fodInfos->ShellInfos.folderSettings.fFlags |= FWF_SINGLESEL;
+  }
+  fodInfos->ShellInfos.folderSettings.fFlags |= FWF_AUTOARRANGE | FWF_ALIGNLEFT;
   fodInfos->ShellInfos.folderSettings.ViewMode = FVM_LIST;
 
@@ -1654 +1844 @@
       char lpstrText[128+MAX_PATH];
       char lpstrTempText[128];
-      char lpstrCaption[256];
+      char lpstrCaption[32];
 
       /* Cannot Create folder because of permissions */
@@ -1695 +1885 @@
   TRACE("\n");
 
-  if(fodInfos->ofnInfos.lpstrFilter)
+  if(fodInfos->ofnInfos->lpstrFilter)
   {
     int iStrIndex = 0;
@@ -1712 +1902 @@
 
       /* Get the title */
-      lpstrTmp = (&((LPBYTE)fodInfos->ofnInfos.lpstrFilter)[iStrIndex]);
+      lpstrTmp = (&((LPBYTE)fodInfos->ofnInfos->lpstrFilter)[iStrIndex]);
       if(!strlen(lpstrTmp))
         break;
       iStrIndex += strlen(lpstrTmp) +1;
       /* Get the extension */
-      lpstrExtTmp = (&((LPBYTE)fodInfos->ofnInfos.lpstrFilter)[iStrIndex]);
+      lpstrExtTmp = (&((LPBYTE)fodInfos->ofnInfos->lpstrFilter)[iStrIndex]);
       if(!lpstrExtTmp)
           break;
@@ -1738 +1928 @@
 
       /* set default filter index */
-      if(fodInfos->ofnInfos.nFilterIndex == 0 && fodInfos->ofnInfos.lpstrCustomFilter == NULL)
-        fodInfos->ofnInfos.nFilterIndex = 1;
+      if(fodInfos->ofnInfos->nFilterIndex == 0 && fodInfos->ofnInfos->lpstrCustomFilter == NULL)
+        fodInfos->ofnInfos->nFilterIndex = 1;
       /* First, check to make sure our index isn't out of bounds. */
-      if ( fodInfos->ofnInfos.nFilterIndex > iPos )
-        fodInfos->ofnInfos.nFilterIndex = iPos;
+      if ( fodInfos->ofnInfos->nFilterIndex > iPos )
+        fodInfos->ofnInfos->nFilterIndex = iPos;
 
 
       /* Get the current index selection. */
       CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB,
-                  fodInfos->ofnInfos.nFilterIndex-1);
+                  fodInfos->ofnInfos->nFilterIndex-1);
 
       /* Get the corresponding text string from the combo box. */
       lpstrFilter = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
-                                             fodInfos->ofnInfos.nFilterIndex-1);
+                                             fodInfos->ofnInfos->nFilterIndex-1);
+
+      if ((INT)lpstrFilter == -1)
+        lpstrFilter = NULL;     // we get -1 if the control is empty
 
     if(lpstrFilter)
@@ -1774 +1967 @@
   switch(wNotifyCode)
   {
-    case CBN_CLOSEUP:
+    case CBN_SELENDOK:
     {
       LPSTR lpstrFilter;
@@ -1780 +1973 @@
       /* Get the current item of the filetype combo box */
       int iItem = CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
+
+      /* set the current filter index - indexed from 1 */
+      fodInfos->ofnInfos->nFilterIndex = iItem + 1;
 
       /* Set the current filter with the current selection */
@@ -1870 +2066 @@
   CBSetItemHeight(hwndCombo,0,GetSystemMetrics(SM_CYSMICON));
 
+#ifndef SHELL_NO_DESKTOP
   /* Initialise data of Desktop folder */
   COMDLG32_SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidlTmp);
   FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
   COMDLG32_SHFree(pidlTmp);
+#endif
 
   COMDLG32_SHGetSpecialFolderLocation(0,CSIDL_DRIVES,&pidlDrives);
@@ -1934 +2132 @@
   int iIndentation;
   LPSFOLDER tmpFolder;
+  INT iIcon;
 
   LookInInfos *liInfos = (LookInInfos *)GetPropA(pDIStruct->hwndItem,LookInInfosStr);
@@ -1942 +2141 @@
     return 0;
 
-  if(!(tmpFolder = (LPSFOLDER) CBGetItemDataPtr(pDIStruct->hwndItem,
+  if((LPSFOLDER)CB_ERR == (tmpFolder = (LPSFOLDER) CBGetItemDataPtr(pDIStruct->hwndItem,
                             pDIStruct->itemID)))
     return 0;
@@ -1957 +2156 @@
                                                   &sfi,
                                                   sizeof (SHFILEINFOA),
-                                                  SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME);
+                                                  SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME);
     len = strlen(sfi.szDisplayName)+1;
     tmpFolder->szDisplayName = MemAlloc(len);
@@ -1963 +2162 @@
     tmpFolder->iIcon = sfi.iIcon;
   }
+
+  if((pDIStruct->itemID == liInfos->uSelectedItem) || (pDIStruct->itemState & ODS_COMBOBOXEDIT))
+  {
+    if (!tmpFolder->iSelIcon)
+    {
+      SHFILEINFOA sfi2;
+
+      COMDLG32_SHGetFileInfoA((LPCSTR)tmpFolder->pidlItem,0,&sfi2,sizeof(SHFILEINFOA),
+                              SHGFI_PIDL | SHGFI_SMALLICON |
+                              SHGFI_OPENICON | SHGFI_SYSICONINDEX);
+      tmpFolder->iSelIcon = sfi2.iIcon;
+    }
+    iIcon = tmpFolder->iSelIcon;
+  } else iIcon = tmpFolder->iIcon;
+
 
   /* Is this item selected ?*/
@@ -2001 +2215 @@
   /* Draw the icon from the image list */
   COMDLG32_ImageList_Draw(tmpFolder->ilItemImage,
-                 tmpFolder->iIcon,
+                 iIcon,
                  pDIStruct->hDC,
                  rectIcon.left,
@@ -2029 +2243 @@
   switch(wNotifyCode)
   {
-  case CBN_CLOSEUP:
+  case CBN_SELENDOK:
     {
       LPSFOLDER tmpFolder;
@@ -2064 +2278 @@
   LPITEMIDLIST pidlNext;
   SHFILEINFOA sfi;
-  SFOLDER *tmpFolder = MemAlloc(sizeof(SFOLDER));
+  SFOLDER *tmpFolder;
   LookInInfos *liInfos;
 
   TRACE("\n");
+
+  if(!pidl)
+    return -1;
 
   if(!(liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr)))
     return -1;
 
+  tmpFolder = MemAlloc(sizeof(SFOLDER));
   tmpFolder->m_iIndent = 0;
   tmpFolder->szDisplayName = NULL;
-
-  if(!pidl)
-    return -1;
 
   /* Calculate the indentation of the item in the lookin*/
@@ -2094 +2309 @@
                   &sfi,
                   sizeof(sfi),
-                  SHGFI_ATTRIBUTES);
+                  SHGFI_PIDL | SHGFI_ATTRIBUTES);
 
   if((sfi.dwAttributes & SFGAO_FILESYSANCESTOR) || (sfi.dwAttributes & SFGAO_FILESYSTEM))
@@ -2115 +2330 @@
   }
 
+  MemFree(tmpFolder);
   return -1;
-
 }
 
@@ -2433 +2648 @@
     }
 }
+
+/***********************************************************************
+ *      BrowseSelectedFolder
+ *
+ */
+static BOOL BrowseSelectedFolder(HWND hwnd)
+{
+  BOOL bBrowseSelFolder = FALSE;
+
+  FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
+
+  if (GetNumSelected(fodInfos->Shell.FOIShellView) == 1)
+  {
+      LPITEMIDLIST pidlSelection;
+      ULONG uAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
+
+      /* get the file selected */
+      EnumSelectedPidls( fodInfos->Shell.FOIShellView, 0, &pidlSelection );
+      IShellFolder_GetAttributesOf( fodInfos->Shell.FOIShellFolder, 1, &pidlSelection, &uAttr );
+      if ( uAttr & SFGAO_FOLDER )
+      {
+          if ( FAILED( IShellBrowser_BrowseObject( fodInfos->Shell.FOIShellBrowser,
+                          pidlSelection, SBSP_RELATIVE ) ) )
+          {
+               MessageBoxA( hwnd, "Path does not exist", fodInfos->ofnInfos->lpstrTitle,
+                       MB_OK | MB_ICONEXCLAMATION );
+          }
+
+          bBrowseSelFolder = TRUE;
+      }
+      COMDLG32_SHFree( pidlSelection );
+  }
+
+  return bBrowseSelFolder;
+}
+

trunk/src/comdlg32/filedlgbrowser.c

@@ +1 @@
+/* $Id: filedlgbrowser.c,v 1.3 2000-03-26 16:31:42 cbratschi Exp $ */
 /*
  *  Implementation of IShellBrowser for the File Open common dialog
  *
+ * Copyright 2000 Christoph Bratschi (cbratschi@datacomm.ch)
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ *  Corel WINE 20000324 level
  */
 
@@ -41 +46 @@
 static ICOM_VTABLE(IShellBrowser) IShellBrowserImpl_Vtbl =
 {
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
         /* IUnknown */
         IShellBrowserImpl_QueryInterface,
@@ -66 +72 @@
 static ICOM_VTABLE(ICommDlgBrowser) IShellBrowserImpl_ICommDlgBrowser_Vtbl =
 {
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
         /* IUnknown */
         IShellBrowserImpl_ICommDlgBrowser_QueryInterface,
@@ -327 +334 @@
         return NOERROR;
     }
+#ifdef SHELL_NO_DESKTOP
+
+    if(pidlTmp->mkid.cb == 0x00)
+    {
+        IShellFolder_Release(psfTmp);
+                COMDLG32_SHFree(pidlTmp);
+        return NOERROR;
+    }
+#endif
 
     /* Release the current fodInfos->Shell.FOIShellFolder and update its value */
@@ -339 +355 @@
     {
         HWND hwndView;
+        HWND hDlgWnd;
+        BOOL bViewHasFocus;
+
+        /* Check if listview has focus */
+        bViewHasFocus = IsChild(fodInfos->ShellInfos.hwndView,GetFocus());
+
         /* Get the foldersettings from the old view */
         if(fodInfos->Shell.FOIShellView)
@@ -383 +405 @@
             fodInfos->ShellInfos.hwndView = hwndView;
 
+            /* changes the tab order of the ListView to reflect the window's File Dialog */
+            hDlgWnd = GetDlgItem(GetParent(hwndView), IDC_LOOKIN);
+            SetWindowPos(hwndView, hDlgWnd, 0,0,0,0, SWP_NOMOVE | SWP_NOSIZE);
+
+            /* Since we destroyed the old view if it had focus set focus
+               to the newly created view */
+            if (bViewHasFocus)
+                SetFocus(fodInfos->ShellInfos.hwndView);
+
             return NOERROR;
         }
@@ -662 +693 @@
         else
         {
-            hRes = FILEDLG95_OnOpen(This->hwndOwner);
+            hRes = PostMessageA(This->hwndOwner, WM_COMMAND, IDOK, 0L);
         }
 
@@ -689 +720 @@
     {
         case CDBOSC_SETFOCUS:
+             /* FIXME: Reset the default button.
+                This should be taken care of by defdlg. If control
+                other than button receives focus the default button
+                should be restored. */
+             SendMessageA(This->hwndOwner, DM_SETDEFID, IDOK, 0);
             break;
         case CDBOSC_KILLFOCUS:
@@ -754 +790 @@
 HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv)
 {
-    LPITEMIDLIST pidl;
+    ULONG             uAttr;
     FileOpenDlgInfos *fodInfos;
+    UINT              nFiles = 0;                  /* Intial to zero */
+    UINT              nCurrLength;
+    UINT              nFileToOpen;
+    UINT              nAllLength = 2;              /* Include intial '"' and final NULL */
+    UINT              nSize = MAX_PATH;
+    UINT              nFileSelected = 0;
+    LPITEMIDLIST      pidlSelection;
+    LPSTR             lpstrTemp = NULL;
+    LPSTR             lpstrAllFile = NULL;
+    char              lpstrCurrFile[MAX_PATH];
+
     _ICOM_THIS_FromICommDlgBrowser(IShellBrowserImpl,iface);
 
@@ -761 +808 @@
     TRACE("(%p)\n", This);
 
-    pidl = GetSelectedPidl(ppshv);
-    if (pidl)
-    {
-        HRESULT hRes = E_FAIL;
-        char lpstrFileName[MAX_PATH];
-        ULONG  ulAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
-
-        IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, &pidl, &ulAttr);
-        if (!ulAttr)
+    /* Locate memory and Get selected item counter */
+    if((lpstrAllFile = (LPSTR)SHAlloc(nSize * sizeof(char))) != NULL)
+    {
+        ZeroMemory(lpstrAllFile, nSize * sizeof(char));
+        *lpstrAllFile =  '\"';
+        lpstrTemp = lpstrAllFile + 1;
+        nFileSelected = GetNumSelected(fodInfos->Shell.FOIShellView);     /* Get all selected counter */
+    }
+
+    /* Count all selected files we have */
+    for(nFileToOpen = 0; nFileToOpen < nFileSelected; nFileToOpen++)
+    {   /* get the file selected */
+        pidlSelection = NULL;
+        uAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
+        ZeroMemory(lpstrCurrFile, MAX_PATH * sizeof(char));
+        EnumSelectedPidls(fodInfos->Shell.FOIShellView, nFileToOpen, &pidlSelection);
+
+        /* get the file name and attrib of the selected files*/
+        GetName(fodInfos->Shell.FOIShellFolder, pidlSelection, SHGDN_NORMAL, lpstrCurrFile);
+        IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, &pidlSelection, &uAttr);
+        COMDLG32_SHFree((LPVOID) pidlSelection);
+
+        if(!uAttr)
+        {   /* Get the new file name */
+            nCurrLength = lstrlenA(lpstrCurrFile);
+            if(nAllLength + nCurrLength + 3 > nSize)
+            {   /* increase the memory and transfer string to new location */
+                nSize += MAX_PATH;
+                if((lpstrTemp = (LPSTR)SHAlloc(nSize * sizeof(char))) != NULL)
+                {   /* Transfer old file names */
+                    ZeroMemory(lpstrTemp, nSize * sizeof(char));
+                    lstrcpyA(lpstrTemp, lpstrAllFile);
+                    SHFree(lpstrAllFile);
+                    lpstrAllFile = lpstrTemp;
+                    lpstrTemp = lpstrAllFile + nAllLength - 1;
+                }
+                else
+                {   /* if failure, stop the loop to get filename */
+                    nFileSelected = 0;
+                }
+            }
+
+            if(lpstrTemp != NULL)
+            {   /* Add the new file name */
+                nFiles++;
+                lstrcpyA(lpstrTemp, lpstrCurrFile);
+                *(lpstrTemp + nCurrLength) = '\"';
+                *(lpstrTemp + nCurrLength + 1) = ' ';
+                *(lpstrTemp + nCurrLength + 2) = '\"';
+                nAllLength += nCurrLength + 3;
+                lpstrTemp = lpstrAllFile + nAllLength - 1;
+            }
+        }
+    }
+
+    if(lpstrAllFile)
+    {
+        if(nFiles > 1)
         {
-            if(SUCCEEDED(hRes = GetName(fodInfos->Shell.FOIShellFolder,pidl,SHGDN_NORMAL,lpstrFileName)))
-                SetWindowTextA(fodInfos->DlgInfos.hwndFileName,lpstrFileName);
-            if(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
-                    SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner,IDOK,"&Save");
+            *(lpstrTemp - 2) = '\0';
+            SetWindowTextA(fodInfos->DlgInfos.hwndFileName, lpstrAllFile);
         }
         else
-            SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner,IDOK,"&Open");
+        {
+            *(lpstrTemp - 3) = '\0';
+            SetWindowTextA(fodInfos->DlgInfos.hwndFileName, lpstrAllFile + 1);
+        }
 
         fodInfos->DlgInfos.dwDlgProp |= FODPROP_USEVIEW;
-
-        COMDLG32_SHFree((LPVOID)pidl);
         SendCustomDlgNotificationMessage(This->hwndOwner, CDN_SELCHANGE);
-        return hRes;
-    }
+        SHFree( lpstrAllFile );
+    }
+    else
+    {
+        SetWindowTextA(fodInfos->DlgInfos.hwndFileName, "");
+    }
+
     if(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
-        SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner,IDOK,"&Save");
+        SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner, IDOK, "&Save");
+    else
+        SetDlgItemTextA(fodInfos->ShellInfos.hwndOwner, IDOK, "&Open");
 
     fodInfos->DlgInfos.dwDlgProp &= ~FODPROP_USEVIEW;
-    return E_FAIL;
+
+    return nFileSelected ? S_OK : E_FAIL;
 }
 
@@ -841 +944 @@
 }
 
-
-
-
-
+/***********************************************************************
+ *          EnumSelectedPidls
+ *
+ * Return the pidl(s) of the selected item(s) in the view.
+ *
+*/
+BOOL EnumSelectedPidls( IShellView *ppshv,  /*[in]*/
+                        UINT nPidlIndex,  /*[in]*/
+                        LPITEMIDLIST *pidlSelected /*[out]*/ )
+{
+
+    IDataObject *doSelected;
+    BOOL retVal = TRUE;
+
+    /* Get an IDataObject from the view */
+    if(SUCCEEDED(IShellView_GetItemObject(ppshv,
+                                          SVGIO_SELECTION,
+                                          &IID_IDataObject,
+                                          (LPVOID *)&doSelected)))
+    {
+        STGMEDIUM medium;
+        FORMATETC formatetc;
+
+        /* Set the FORMATETC structure*/
+        SETDefFormatEtc(formatetc,
+                        RegisterClipboardFormatA(CFSTR_SHELLIDLIST),
+                        TYMED_HGLOBAL);
+
+        /* Get the pidls from IDataObject */
+        if(SUCCEEDED(IDataObject_GetData(doSelected,&formatetc,&medium)))
+        {
+            LPIDA cida = GlobalLock(medium.u.hGlobal);
+            if(nPidlIndex < cida->cidl)
+            {
+                *pidlSelected = COMDLG32_PIDL_ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[nPidlIndex + 1]]));
+            }
+            else
+            {
+                retVal = FALSE;
+            }
+
+            if(medium.pUnkForRelease)
+            {
+                IUnknown_Release(medium.pUnkForRelease);
+            }
+            else
+            {
+                GlobalUnlock(medium.u.hGlobal);
+                GlobalFree(medium.u.hGlobal);
+            }
+        }
+        IDataObject_Release(doSelected);
+        return retVal;
+    }
+    return FALSE;
+}
+
+/***********************************************************************
+ *          GetNumSelected
+ *
+ * Return the number of selected items in the view.
+ *
+*/
+UINT GetNumSelected( IShellView *ppshv )
+{
+    IDataObject *doSelected;
+    UINT retVal = 0;
+
+       /* Get an IDataObject from the view */
+    if(SUCCEEDED(IShellView_GetItemObject(ppshv,
+                                          SVGIO_SELECTION,
+                                          &IID_IDataObject,
+                                          (LPVOID *)&doSelected)))
+    {
+        STGMEDIUM medium;
+        FORMATETC formatetc;
+
+        /* Set the FORMATETC structure*/
+        SETDefFormatEtc(formatetc,
+                        RegisterClipboardFormatA(CFSTR_SHELLIDLIST),
+                        TYMED_HGLOBAL);
+
+        /* Get the pidls from IDataObject */
+        if(SUCCEEDED(IDataObject_GetData(doSelected,&formatetc,&medium)))
+        {
+            LPIDA cida = GlobalLock(medium.u.hGlobal);
+            retVal = cida->cidl;
+
+            if(medium.pUnkForRelease)
+                IUnknown_Release(medium.pUnkForRelease);
+            else
+            {
+                GlobalUnlock(medium.u.hGlobal);
+                GlobalFree(medium.u.hGlobal);
+            }
+        }
+        IDataObject_Release(doSelected);
+        return retVal;
+    }
+
+    return 0;
+}
+
+
+

trunk/src/comdlg32/filedlgbrowser.h

@@ -1 +1 @@
 /*
  *  Implementation of IShellBrowser for the File Open common dialog
- * 
  *
+ *  Corel WINE 20000324 level
  */
 
@@ -21 +21 @@
 
 #define FODPROP_SAVEDLG 0x0001  /* File dialog is a Save file dialog */
-#define FODPROP_USEVIEW 0x0002  /* Indicates the user selection must be taken 
-                                   from the IShellView */
+#define FODPROP_USEVIEW 0x0002  /* Indicates the user selection must be taken
+                                   from the IShellView */
 
 /***********************************************************************
@@ -41 +41 @@
 typedef struct
 {
-    
-    OPENFILENAMEA ofnInfos;
+
+    LPOPENFILENAMEA ofnInfos;
     struct {
-        IShellBrowser *FOIShellBrowser; 
+        IShellBrowser *FOIShellBrowser;
         IShellFolder *FOIShellFolder;
         IShellView *FOIShellView;
@@ -62 +62 @@
         HWND hwndLookInCB;
         HWND hwndFileName;
-        HWND hwndTB;
+        HWND hwndTB;
         HWND hwndCustomDlg;
-        DWORD dwDlgProp;
+        DWORD dwDlgProp;
     } DlgInfos;
 
@@ -72 +72 @@
  * Control ID's
  */
-#define IDS_ABOUTBOX                    101
-#define IDS_DOCUMENTFOLDERS             102
-#define IDS_PERSONAL                    103
-#define IDS_FAVORITES                   104
-#define IDS_PATH                        105
-#define IDS_DESKTOP                     106
-
-#define IDS_FONTS                       108
-#define IDS_MYCOMPUTER                  110
-#define IDS_SYSTEMFOLDERS               112
-#define IDS_LOCALHARDRIVES              113
 #define IDS_FILENOTFOUND                114
 #define IDS_VERIFYFILE                  115
@@ -89 +78 @@
 #define IDS_FILEOPEN_CAPTION            118
 
+/* File Dialog Tooltips string IDs */
+
+#define IDS_UPFOLDER                    150
+#define IDS_NEWFOLDER                   151
+#define IDS_LISTVIEW                    152
+#define IDS_REPORTVIEW                  153
+
 #define IDC_OPENREADONLY                chx1
 
-#define IDC_TOOLBARSTATIC               stc1
+#define IDC_TOOLBARSTATIC               stc1
 #define IDC_FILETYPESTATIC              stc2
 #define IDC_FILENAMESTATIC              stc3
@@ -103 +99 @@
 #define IDC_FILENAME                    edt1
 
-#define IDC_TOOLBAR                     ctl1
+#define IDC_TOOLBAR                     ctl1
 
 /***********************************************************************
@@ -113 +109 @@
 /* IUnknown */
 HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface,
-                                            REFIID riid, 
+                                            REFIID riid,
                                             LPVOID *ppvObj);
 
@@ -121 +117 @@
 
 /* IOleWindow */
-HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface,  
+HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface,
                                            HWND * phwnd);
 
@@ -129 +125 @@
 /* IShellBrowser */
 
-HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, 
-                                          LPCITEMIDLIST pidl,   
+HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
+                                          LPCITEMIDLIST pidl,
                                           UINT wFlags);
 
-HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface,    
+HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface,
                                               BOOL fEnable);
-                                              
-HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface,    
-                                              UINT id,    
+
+HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface,
+                                              UINT id,
                                               HWND *lphwnd);
 
 HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
-                                                DWORD grfMode,    
+                                                DWORD grfMode,
                                                 LPSTREAM *ppStrm);
 
@@ -150 +146 @@
 HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface,
                                                 IShellView *ppshv);
-                                              
+
 
 HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface,
@@ -158 +154 @@
                                            HMENU hmenuShared);
 
-HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,    
-                                            UINT id,    
-                                            UINT uMsg,    
-                                            WPARAM wParam,    
+HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,
+                                            UINT id,
+                                            UINT uMsg,
+                                            WPARAM wParam,
                                             LPARAM lParam,
                                             LRESULT *pret);
 
 HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface,
-                                       HMENU hmenuShared,    
+                                       HMENU hmenuShared,
                                        HOLEMENU holemenuReserved,
                                        HWND hwndActiveObject);
@@ -172 +168 @@
 HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface,
                                              LPCOLESTR lpszStatusText);
-                                                
+
 
 HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface,
-                                             LPTBBUTTON lpButtons,    
-                                             UINT nButtons,    
+                                             LPTBBUTTON lpButtons,
+                                             UINT nButtons,
                                              UINT uFlags);
-                                              
+
 HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface,
-                                                    LPMSG lpmsg,    
+                                                    LPMSG lpmsg,
                                                     WORD wID);
 
@@ -187 +183 @@
 
 HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface(ICommDlgBrowser *iface,
-                                            REFIID riid, 
+                                            REFIID riid,
                                             LPVOID *ppvObj);
 
@@ -201 +197 @@
                                                                ULONG uChange);
 
-HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *iface, 
+HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *iface,
                                                                IShellView * ppshv,
                                                                LPCITEMIDLIST pidl);
@@ -208 +204 @@
 
 LPITEMIDLIST GetSelectedPidl(IShellView *ppshv);
+BOOL EnumSelectedPidls(IShellView *ppshv, UINT nPidlIndex, LPITEMIDLIST *pidlSelected);
+UINT GetNumSelected(IShellView *ppshv);
 
 #endif /*SHBROWSER_H*/

trunk/src/comdlg32/filetitle.c

@@ -4 +4 @@
  * Copyright 1994 Martin Ayotte
  * Copyright 1996 Albrecht Kleine
+ *
+ * Corel WINE 20000324 level
  */
 
@@ -13 +15 @@
 #include "debugtools.h"
 
-#include "heap.h"       /* Has to go */
+#include "heap.h"       /* Has to go */
 
 DEFAULT_DEBUG_CHANNEL(commdlg)
@@ -24 +26 @@
 
 /***********************************************************************
- *      GetFileTitleA           (COMDLG32.8)
+ *      GetFileTitleA           (COMDLG32.8)
  *
  */
 short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf)
 {
-        int i, len;
+        int i, len;
 
-        TRACE("(%p %p %d); \n", lpFile, lpTitle, cbBuf);
+        TRACE("(%p %p %d); \n", lpFile, lpTitle, cbBuf);
 
-        if(lpFile == NULL || (lpTitle == NULL && cbBuf != 0))
-                return -1;
+        if(lpFile == NULL || (lpTitle == NULL))
+                return -1;
 
-        len = strlen(lpFile);
+        len = strlen(lpFile);
 
-        if (len == 0)
-                return -1;
+        if (len == 0)
+                return -1;
 
-        if(strpbrk(lpFile, "*[]"))
-                return -1;
+        if(strpbrk(lpFile, "*[]"))
+                return -1;
 
-        len--;
+        len--;
 
-        if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':')
-                return -1;
+        if(lpFile[len] == '/' || lpFile[len] == '\\' || lpFile[len] == ':')
+                return -1;
 
-        for(i = len; i >= 0; i--)
-        {
-                if (lpFile[i] == '/' ||  lpFile[i] == '\\' ||  lpFile[i] == ':')
-                {
-                        i++;
-                        break;
-                }
-        }
+        for(i = len; i >= 0; i--)
+        {
+                if (lpFile[i] == '/' ||  lpFile[i] == '\\' ||  lpFile[i] == ':')
+                {
+                        i++;
+                        break;
+                }
+        }
 
-        if(i == -1)
-                i++;
+        if(i == -1)
+                i++;
 
-        TRACE("---> '%s' \n", &lpFile[i]);
-    
-        len = strlen(lpFile+i)+1;
-        if(cbBuf < len)
-                return len;
+        TRACE("---> '%s' \n", &lpFile[i]);
 
-       /* The lpTitle buffer is big enough, perform a simple copy */
-        strcpy(lpTitle, &lpFile[i]);
-        return 0;
+        len = strlen(lpFile+i)+1;
+        if(cbBuf < len)
+                return len;
+
+        strncpy(lpTitle,&lpFile[i],len);
+        return 0;
 }
 
 
 /***********************************************************************
- *      GetFileTitleW           (COMDLG32.9)
+ *      GetFileTitleW           (COMDLG32.9)
  *
  */
 short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf)
 {
-        LPSTR file = HEAP_strdupWtoA(GetProcessHeap(), 0, lpFile);      /* Has to go */
-        LPSTR title = HeapAlloc(GetProcessHeap(), 0, cbBuf);
-        short   ret;
+        LPSTR file = HEAP_strdupWtoA(GetProcessHeap(), 0, lpFile);      /* Has to go */
+        LPSTR title = HeapAlloc(GetProcessHeap(), 0, cbBuf);
+        short   ret;
 
-        ret = GetFileTitleA(file, title, cbBuf);
+        ret = GetFileTitleA(file, title, cbBuf);
 
-        lstrcpynAtoW(lpTitle, title, cbBuf);
-        HeapFree(GetProcessHeap(), 0, file);
-        HeapFree(GetProcessHeap(), 0, title);
-        return ret;
+        lstrcpynAtoW(lpTitle, title, cbBuf);
+        HeapFree(GetProcessHeap(), 0, file);
+        HeapFree(GetProcessHeap(), 0, title);
+        return ret;
 }
 
 
 /***********************************************************************
- *      GetFileTitle16          (COMMDLG.27)
+ *      GetFileTitle16          (COMMDLG.27)
  */
 short WINAPI GetFileTitle16(LPCSTR lpFile, LPSTR lpTitle, UINT16 cbBuf)
 {
-        return GetFileTitleA(lpFile, lpTitle, cbBuf);
+        return GetFileTitleA(lpFile, lpTitle, cbBuf);
 }
 

trunk/src/comdlg32/finddlg32.cpp

@@ -1 @@
-/* $Id: finddlg32.cpp,v 1.2 1999-11-02 20:37:43 sandervl Exp $ */
+/* $Id: finddlg32.cpp,v 1.3 2000-03-26 16:31:44 cbratschi Exp $ */
 /*
  *  Common Dialog Boxes interface (32 bit) (990815)
@@ -5 +5 @@
  *
  * Copyright 1998,1999 Bertho A. Stultiens
+ *
+ * Corel WINE 20000324 level
  */
 
@@ -24 +26 @@
 /*-----------------------------------------------------------------------*/
 
-static UINT             FindReplaceMessage;
-static UINT             HelpMessage;
-
-#define FR_MASK (FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD | FR_REPLACEALL | FR_REPLACE | FR_FINDNEXT | FR_DIALOGTERM)
+static UINT             FindReplaceMessage;
+static UINT             HelpMessage;
+
+#define FR_MASK (FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD | FR_REPLACEALL | FR_REPLACE | FR_FINDNEXT | FR_DIALOGTERM)
 /* CRITICAL_SECTION COMDLG32_CritSect; */
 
@@ -49 +51 @@
 
 /***********************************************************************
- *      COMDLG32_FR_GetFlags                    [internal]
+ *      COMDLG32_FR_GetFlags                    [internal]
  * Returns the button state that needs to be reported to the caller.
- *      RETURNS
- *              Current state of check and radio buttons
+ *      RETURNS
+ *              Current state of check and radio buttons
  */
 static DWORD COMDLG32_FR_GetFlags(HWND hDlgWnd)
 {
-        DWORD flags = 0;
-        if(IsDlgButtonChecked(hDlgWnd, rad2) == BST_CHECKED)
-                flags |= FR_DOWN;
-        if(IsDlgButtonChecked(hDlgWnd, chx1) == BST_CHECKED)
-                flags |= FR_WHOLEWORD;
-        if(IsDlgButtonChecked(hDlgWnd, chx2) == BST_CHECKED)
-                flags |= FR_MATCHCASE;
+        DWORD flags = 0;
+        if(IsDlgButtonChecked(hDlgWnd, rad2) == BST_CHECKED)
+                flags |= FR_DOWN;
+        if(IsDlgButtonChecked(hDlgWnd, chx1) == BST_CHECKED)
+                flags |= FR_WHOLEWORD;
+        if(IsDlgButtonChecked(hDlgWnd, chx2) == BST_CHECKED)
+                flags |= FR_MATCHCASE;
         return flags;
 }
 
 /***********************************************************************
- *      COMDLG32_FR_HandleWMCommand             [internal]
+ *      COMDLG32_FR_HandleWMCommand             [internal]
  * Handle WM_COMMAND messages...
  */
 static void COMDLG32_FR_HandleWMCommand(HWND hDlgWnd, COMDLG32_FR_Data *pData, int Id, int NotifyCode)
 {
-        DWORD flag;
-
-        pData->user_fr.fra->Flags &= ~FR_MASK;  /* Clear return flags */
-        if(pData->fr.Flags & FR_WINE_REPLACE)   /* Replace always goes down... */
-                pData->user_fr.fra->Flags |= FR_DOWN;
-
-        if(NotifyCode == BN_CLICKED)
-        {
-                switch(Id)
-                {
-                case IDOK: /* Find Next */
-                        if(GetDlgItemTextA(hDlgWnd, edt1, pData->fr.lpstrFindWhat, pData->fr.wFindWhatLen) > 0)
+        DWORD flag;
+
+        pData->user_fr.fra->Flags &= ~FR_MASK;  /* Clear return flags */
+        if(pData->fr.Flags & FR_WINE_REPLACE)   /* Replace always goes down... */
+                pData->user_fr.fra->Flags |= FR_DOWN;
+
+        if(NotifyCode == BN_CLICKED)
+        {
+                switch(Id)
+                {
+                case IDOK: /* Find Next */
+                        if(GetDlgItemTextA(hDlgWnd, edt1, pData->fr.lpstrFindWhat, pData->fr.wFindWhatLen) > 0)
                         {
-                                pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | FR_FINDNEXT;
+                                pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | FR_FINDNEXT;
                                 if(pData->fr.Flags & FR_WINE_UNICODE)
                                 {
-                                        lstrcpyAtoW(pData->user_fr.frw->lpstrFindWhat, pData->fr.lpstrFindWhat);
+                                        lstrcpyAtoW(pData->user_fr.frw->lpstrFindWhat, pData->fr.lpstrFindWhat);
                                 }
                                 else
                                 {
-                                        lstrcpyA(pData->user_fr.fra->lpstrFindWhat, pData->fr.lpstrFindWhat);
+                                        lstrcpyA(pData->user_fr.fra->lpstrFindWhat, pData->fr.lpstrFindWhat);
                                 }
-                                SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
+                                SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
                         }
-                        break;
-
-                case IDCANCEL:
-                        pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | FR_DIALOGTERM;
-                        SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
-                        DestroyWindow(hDlgWnd);
-                        break;
+                        break;
+
+                case IDCANCEL:
+                        pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | FR_DIALOGTERM;
+                        SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
+                        DestroyWindow(hDlgWnd);
+                        break;
 
                 case psh2: /* Replace All */
-                        flag = FR_REPLACEALL;
+                        flag = FR_REPLACEALL;
                         goto Replace;
 
                 case psh1: /* Replace */
-                        flag = FR_REPLACE;
+                        flag = FR_REPLACE;
 Replace:
-                        if((pData->fr.Flags & FR_WINE_REPLACE)
+                        if((pData->fr.Flags & FR_WINE_REPLACE)
                         && GetDlgItemTextA(hDlgWnd, edt1, pData->fr.lpstrFindWhat, pData->fr.wFindWhatLen) > 0)
                         {
-                                pData->fr.lpstrReplaceWith[0] = 0; /* In case the next GetDlgItemText Fails */
-                                GetDlgItemTextA(hDlgWnd, edt2, pData->fr.lpstrReplaceWith, pData->fr.wReplaceWithLen);
-                                pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | flag;
+                                pData->fr.lpstrReplaceWith[0] = 0; /* In case the next GetDlgItemText Fails */
+                                GetDlgItemTextA(hDlgWnd, edt2, pData->fr.lpstrReplaceWith, pData->fr.wReplaceWithLen);
+                                pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd) | flag;
                                 if(pData->fr.Flags & FR_WINE_UNICODE)
                                 {
-                                        lstrcpyAtoW(pData->user_fr.frw->lpstrFindWhat, pData->fr.lpstrFindWhat);
-                                        lstrcpyAtoW(pData->user_fr.frw->lpstrReplaceWith, pData->fr.lpstrReplaceWith);
+                                        lstrcpyAtoW(pData->user_fr.frw->lpstrFindWhat, pData->fr.lpstrFindWhat);
+                                        lstrcpyAtoW(pData->user_fr.frw->lpstrReplaceWith, pData->fr.lpstrReplaceWith);
                                 }
                                 else
                                 {
-                                        lstrcpyA(pData->user_fr.fra->lpstrFindWhat, pData->fr.lpstrFindWhat);
-                                        lstrcpyA(pData->user_fr.fra->lpstrReplaceWith, pData->fr.lpstrReplaceWith);
+                                        lstrcpyA(pData->user_fr.fra->lpstrFindWhat, pData->fr.lpstrFindWhat);
+                                        lstrcpyA(pData->user_fr.fra->lpstrReplaceWith, pData->fr.lpstrReplaceWith);
                                 }
-                                SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
+                                SendMessageA(pData->fr.hwndOwner, FindReplaceMessage, 0, (LPARAM)pData->user_fr.fra);
                         }
-                        break;
-
-                case pshHelp:
-                        pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd);
-                        SendMessageA(pData->fr.hwndOwner, HelpMessage, (WPARAM)hDlgWnd, (LPARAM)pData->user_fr.fra);
-                        break;
+                        break;
+
+                case pshHelp:
+                        pData->user_fr.fra->Flags |= COMDLG32_FR_GetFlags(hDlgWnd);
+                        SendMessageA(pData->fr.hwndOwner, HelpMessage, (WPARAM)hDlgWnd, (LPARAM)pData->user_fr.fra);
+                        break;
                 }
         }
         else if(NotifyCode == EN_CHANGE && Id == edt1)
-        {
-                BOOL enable = SendDlgItemMessageA(hDlgWnd, edt1, WM_GETTEXTLENGTH, 0, 0) > 0;
-                EnableWindow(GetDlgItem(hDlgWnd, IDOK), enable);
+        {
+                BOOL enable = SendDlgItemMessageA(hDlgWnd, edt1, WM_GETTEXTLENGTH, 0, 0) > 0;
+                EnableWindow(GetDlgItem(hDlgWnd, IDOK), enable);
                 if(pData->fr.Flags & FR_WINE_REPLACE)
                 {
-                        EnableWindow(GetDlgItem(hDlgWnd, psh1), enable);
-                        EnableWindow(GetDlgItem(hDlgWnd, psh2), enable);
-                }
-        }
-}
-
-/***********************************************************************
- *      COMDLG32_FindReplaceDlgProc             [internal]
+                        EnableWindow(GetDlgItem(hDlgWnd, psh1), enable);
+                        EnableWindow(GetDlgItem(hDlgWnd, psh2), enable);
+                }
+        }
+}
+
+/***********************************************************************
+ *      COMDLG32_FindReplaceDlgProc             [internal]
  * [Find/Replace]Text32[A/W] window procedure.
  */
 static BOOL CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
 {
-        COMDLG32_FR_Data *pdata = (COMDLG32_FR_Data *)GetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom);
-        BOOL retval = TRUE;;
-
-        if(iMsg == WM_INITDIALOG)
+        COMDLG32_FR_Data *pdata = (COMDLG32_FR_Data *)GetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom);
+        BOOL retval = TRUE;;
+
+        if(iMsg == WM_INITDIALOG)
         {
                 pdata = (COMDLG32_FR_Data *)lParam;
-                if(!SetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom, (HANDLE)pdata))
-                {
-                        ERR("Could not Set prop; invent a gracefull exit?...\n");
-                        DestroyWindow(hDlgWnd);
+                if(!SetPropA(hDlgWnd, (LPSTR)COMDLG32_Atom, (HANDLE)pdata))
+                {
+                        ERR("Could not Set prop; invent a gracefull exit?...\n");
+                        DestroyWindow(hDlgWnd);
                         return FALSE;
                 }
-                SendDlgItemMessageA(hDlgWnd, edt1, EM_SETLIMITTEXT, (WPARAM)pdata->fr.wFindWhatLen, 0);
-                SendDlgItemMessageA(hDlgWnd, edt1, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrFindWhat);
+                SendDlgItemMessageA(hDlgWnd, edt1, EM_SETLIMITTEXT, (WPARAM)pdata->fr.wFindWhatLen, 0);
+                SendDlgItemMessageA(hDlgWnd, edt1, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrFindWhat);
                 if(pdata->fr.Flags & FR_WINE_REPLACE)
                 {
-                        SendDlgItemMessageA(hDlgWnd, edt2, EM_SETLIMITTEXT, (WPARAM)pdata->fr.wReplaceWithLen, 0);
-                        SendDlgItemMessageA(hDlgWnd, edt2, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrReplaceWith);
-                }
-
-                if(!(pdata->fr.Flags & FR_SHOWHELP))
-                        ShowWindow(GetDlgItem(hDlgWnd, pshHelp), SW_HIDE);
-                if(pdata->fr.Flags & FR_HIDEUPDOWN)
-                {
-                        ShowWindow(GetDlgItem(hDlgWnd, rad1), SW_HIDE);
-                        ShowWindow(GetDlgItem(hDlgWnd, rad2), SW_HIDE);
-                        ShowWindow(GetDlgItem(hDlgWnd, grp1), SW_HIDE);
-                }
-                else if(pdata->fr.Flags & FR_NOUPDOWN)
-                {
-                        EnableWindow(GetDlgItem(hDlgWnd, rad1), FALSE);
-                        EnableWindow(GetDlgItem(hDlgWnd, rad2), FALSE);
-                        EnableWindow(GetDlgItem(hDlgWnd, grp1), FALSE);
-                }
+                        SendDlgItemMessageA(hDlgWnd, edt2, EM_SETLIMITTEXT, (WPARAM)pdata->fr.wReplaceWithLen, 0);
+                        SendDlgItemMessageA(hDlgWnd, edt2, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrReplaceWith);
+                }
+
+                if(!(pdata->fr.Flags & FR_SHOWHELP))
+                        ShowWindow(GetDlgItem(hDlgWnd, pshHelp), SW_HIDE);
+                if(pdata->fr.Flags & FR_HIDEUPDOWN)
+                {
+                        ShowWindow(GetDlgItem(hDlgWnd, rad1), SW_HIDE);
+                        ShowWindow(GetDlgItem(hDlgWnd, rad2), SW_HIDE);
+                        ShowWindow(GetDlgItem(hDlgWnd, grp1), SW_HIDE);
+                }
+                else if(pdata->fr.Flags & FR_NOUPDOWN)
+                {
+                        EnableWindow(GetDlgItem(hDlgWnd, rad1), FALSE);
+                        EnableWindow(GetDlgItem(hDlgWnd, rad2), FALSE);
+                        EnableWindow(GetDlgItem(hDlgWnd, grp1), FALSE);
+                }
                 else
                 {
-                        SendDlgItemMessageA(hDlgWnd, rad1, BM_SETCHECK, pdata->fr.Flags & FR_DOWN ? 0 : BST_CHECKED, 0);
-                        SendDlgItemMessageA(hDlgWnd, rad2, BM_SETCHECK, pdata->fr.Flags & FR_DOWN ? BST_CHECKED : 0, 0);
-                }
-
-                if(pdata->fr.Flags & FR_HIDEMATCHCASE)
-                        ShowWindow(GetDlgItem(hDlgWnd, chx2), SW_HIDE);
-                else if(pdata->fr.Flags & FR_NOMATCHCASE)
-                        EnableWindow(GetDlgItem(hDlgWnd, chx2), FALSE);
+                        SendDlgItemMessageA(hDlgWnd, rad1, BM_SETCHECK, pdata->fr.Flags & FR_DOWN ? 0 : BST_CHECKED, 0);
+                        SendDlgItemMessageA(hDlgWnd, rad2, BM_SETCHECK, pdata->fr.Flags & FR_DOWN ? BST_CHECKED : 0, 0);
+                }
+
+                if(pdata->fr.Flags & FR_HIDEMATCHCASE)
+                        ShowWindow(GetDlgItem(hDlgWnd, chx2), SW_HIDE);
+                else if(pdata->fr.Flags & FR_NOMATCHCASE)
+                        EnableWindow(GetDlgItem(hDlgWnd, chx2), FALSE);
                 else
-                        SendDlgItemMessageA(hDlgWnd, chx2, BM_SETCHECK, pdata->fr.Flags & FR_MATCHCASE ? BST_CHECKED : 0, 0);
-
-                if(pdata->fr.Flags & FR_HIDEWHOLEWORD)
-                        ShowWindow(GetDlgItem(hDlgWnd, chx1), SW_HIDE);
-                else if(pdata->fr.Flags & FR_NOWHOLEWORD)
-                        EnableWindow(GetDlgItem(hDlgWnd, chx1), FALSE);
+                        SendDlgItemMessageA(hDlgWnd, chx2, BM_SETCHECK, pdata->fr.Flags & FR_MATCHCASE ? BST_CHECKED : 0, 0);
+
+                if(pdata->fr.Flags & FR_HIDEWHOLEWORD)
+                        ShowWindow(GetDlgItem(hDlgWnd, chx1), SW_HIDE);
+                else if(pdata->fr.Flags & FR_NOWHOLEWORD)
+                        EnableWindow(GetDlgItem(hDlgWnd, chx1), FALSE);
                 else
-                        SendDlgItemMessageA(hDlgWnd, chx1, BM_SETCHECK, pdata->fr.Flags & FR_WHOLEWORD ? BST_CHECKED : 0, 0);
-
-                /* We did the init here, now call the hook if requested */
+                        SendDlgItemMessageA(hDlgWnd, chx1, BM_SETCHECK, pdata->fr.Flags & FR_WHOLEWORD ? BST_CHECKED : 0, 0);
+
+                /* We did the init here, now call the hook if requested */
 #ifdef __WIN32OS2__
-                //SvL: If hooked and hook returns TRUE, then show dialog
-                //     -> if not hooked, just display it!
-                if(!(pdata->fr.Flags & FR_ENABLEHOOK) ||
-                     pdata->fr.lpfnHook(hDlgWnd, iMsg, wParam, pdata->fr.lCustData))
+                //SvL: If hooked and hook returns TRUE, then show dialog
+                //     -> if not hooked, just display it!
+                if(!(pdata->fr.Flags & FR_ENABLEHOOK) ||
+                     pdata->fr.lpfnHook(hDlgWnd, iMsg, wParam, pdata->fr.lCustData))
 #else
-                if((pdata->fr.Flags & FR_ENABLEHOOK)
-                     && pdata->fr.lpfnHook(hDlgWnd, iMsg, wParam, pdata->fr.lCustData))
+                if((pdata->fr.Flags & FR_ENABLEHOOK)
+                     && pdata->fr.lpfnHook(hDlgWnd, iMsg, wParam, pdata->fr.lCustData))
 #endif
-                {
-                        ShowWindow(hDlgWnd, SW_SHOWNORMAL);
-                        UpdateWindow(hDlgWnd);
-                }
-                /* else the caller is responsible for showing */
+                {
+                        ShowWindow(hDlgWnd, SW_SHOWNORMAL);
+                        UpdateWindow(hDlgWnd);
+                }
+                /* else the caller is responsible for showing */
                 return TRUE;
         }
 
-        if(pdata && (pdata->fr.Flags & FR_ENABLEHOOK))
-        {
-                retval = pdata->fr.lpfnHook(hDlgWnd, iMsg, wParam, lParam);
-        }
-        else
-                retval = FALSE;
-
-        if(pdata && !retval)
-        {
-                retval = TRUE;
-                switch(iMsg)
-                {
-                case WM_COMMAND:
-                        COMDLG32_FR_HandleWMCommand(hDlgWnd, pdata, LOWORD(wParam), HIWORD(wParam));
-                        break;
-
-                case WM_CLOSE:
-                        COMDLG32_FR_HandleWMCommand(hDlgWnd, pdata, IDCANCEL, BN_CLICKED);
-                        break;
-
-                case WM_HELP:
-                        /* Heeeeelp! */
-                        FIXME("Got WM_HELP. Who is gonna supply it?\n");
-                        break;
-
-                case WM_CONTEXTMENU:
-                        /* Heeeeelp! */
-                        FIXME("Got WM_CONTEXTMENU. Who is gonna supply it?\n");
-                        break;
-                /* FIXME: Handle F1 help */
-
-                default:
-                        retval = FALSE; /* We did not handle the message */
-                }
+        if(pdata && (pdata->fr.Flags & FR_ENABLEHOOK))
+        {
+                retval = pdata->fr.lpfnHook(hDlgWnd, iMsg, wParam, lParam);
+        }
+        else
+                retval = FALSE;
+
+        if(pdata && !retval)
+        {
+                retval = TRUE;
+                switch(iMsg)
+                {
+                case WM_COMMAND:
+                        COMDLG32_FR_HandleWMCommand(hDlgWnd, pdata, LOWORD(wParam), HIWORD(wParam));
+                        break;
+
+                case WM_CLOSE:
+                        COMDLG32_FR_HandleWMCommand(hDlgWnd, pdata, IDCANCEL, BN_CLICKED);
+                        break;
+
+                case WM_HELP:
+                        /* Heeeeelp! */
+                        FIXME("Got WM_HELP. Who is gonna supply it?\n");
+                        break;
+
+                case WM_CONTEXTMENU:
+                        /* Heeeeelp! */
+                        FIXME("Got WM_CONTEXTMENU. Who is gonna supply it?\n");
+                        break;
+                /* FIXME: Handle F1 help */
+
+                default:
+                        retval = FALSE; /* We did not handle the message */
+                }
         }
 
@@ -269 +271 @@
         if(iMsg == WM_DESTROY)
         {
-                RemovePropA(hDlgWnd, (LPSTR)COMDLG32_Atom);
-                HeapFree(GetProcessHeap(), 0, pdata);
+                RemovePropA(hDlgWnd, (LPSTR)COMDLG32_Atom);
+                HeapFree(GetProcessHeap(), 0, pdata);
         }
 
@@ -277 +279 @@
 
 /***********************************************************************
- *      COMDLG32_FR_CheckPartial                [internal]
+ *      COMDLG32_FR_CheckPartial                [internal]
  * Check various fault conditions in the supplied parameters that
  * cause an extended error to be reported.
- *      RETURNS
- *              TRUE: Succes
- *              FALSE: Failure
+ *      RETURNS
+ *              TRUE: Succes
+ *              FALSE: Failure
  */
 static BOOL COMDLG32_FR_CheckPartial(
-        LPFINDREPLACEA pfr,     /* [in] Find structure */
-        BOOL Replace            /* [in] True if called as replace */
+        LPFINDREPLACEA pfr,     /* [in] Find structure */
+        BOOL Replace            /* [in] True if called as replace */
 ) {
-        if(!pfr)
-        {
-                COMDLG32_SetCommDlgExtendedError(CDERR_GENERALCODES);
-                return FALSE;
-        }
+        if(!pfr)
+        {
+                COMDLG32_SetCommDlgExtendedError(CDERR_GENERALCODES);
+                return FALSE;
+        }
 
         if(pfr->lStructSize != sizeof(FINDREPLACEA))
         {
-                COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
-                return FALSE;
+                COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
+                return FALSE;
         }
 
         if(!IsWindow(pfr->hwndOwner))
         {
-                COMDLG32_SetCommDlgExtendedError(CDERR_DIALOGFAILURE);
-                return FALSE;
+                COMDLG32_SetCommDlgExtendedError(CDERR_DIALOGFAILURE);
+                return FALSE;
         }
 
 #ifdef __WIN32OS2__
-        //SvL: Notepad set this to 32
-        if((!pfr->lpstrFindWhat)
+        //SvL: Notepad set this to 32
+        if((!pfr->lpstrFindWhat)
 #else
-        if((pfr->wFindWhatLen < 80 || !pfr->lpstrFindWhat)
+        if((pfr->wFindWhatLen < 80 || !pfr->lpstrFindWhat)
 #endif
            ||(Replace && (pfr->wReplaceWithLen < 80 || !pfr->lpstrReplaceWith)))
         {
-                COMDLG32_SetCommDlgExtendedError(FRERR_BUFFERLENGTHZERO);
-                return FALSE;
-        }
-
-        if((FindReplaceMessage = RegisterWindowMessageA(FINDMSGSTRING)) == 0)
-        {
-                COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
-                return FALSE;
-        }
-        if((HelpMessage = RegisterWindowMessageA(HELPMSGSTRING)) == 0)
-        {
-                COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
+                COMDLG32_SetCommDlgExtendedError(FRERR_BUFFERLENGTHZERO);
+                return FALSE;
+        }
+
+        if((FindReplaceMessage = RegisterWindowMessageA(FINDMSGSTRING)) == 0)
+        {
+                COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
+                return FALSE;
+        }
+        if((HelpMessage = RegisterWindowMessageA(HELPMSGSTRING)) == 0)
+        {
+                COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
                 return FALSE;
         }
@@ -331 +333 @@
         if((pfr->Flags & FR_ENABLEHOOK) && !pfr->lpfnHook)
         {
-                COMDLG32_SetCommDlgExtendedError(CDERR_NOHOOK);
+                COMDLG32_SetCommDlgExtendedError(CDERR_NOHOOK);
                 return FALSE;
         }
@@ -337 +339 @@
         if((pfr->Flags & (FR_ENABLETEMPLATE | FR_ENABLETEMPLATEHANDLE)) && !pfr->hInstance)
         {
-                COMDLG32_SetCommDlgExtendedError(CDERR_NOHINSTANCE);
+                COMDLG32_SetCommDlgExtendedError(CDERR_NOHINSTANCE);
                 return FALSE;
         }
@@ -343 +345 @@
         if((pfr->Flags & FR_ENABLETEMPLATE) && !pfr->lpTemplateName)
         {
-                COMDLG32_SetCommDlgExtendedError(CDERR_NOTEMPLATE);
-                return FALSE;
-        }
-
-        return TRUE;
-}
-
-/***********************************************************************
- *      COMDLG32_FR_DoFindReplace               [internal]
+                COMDLG32_SetCommDlgExtendedError(CDERR_NOTEMPLATE);
+                return FALSE;
+        }
+
+        return TRUE;
+}
+
+/***********************************************************************
+ *      COMDLG32_FR_DoFindReplace               [internal]
  * Actual load and creation of the Find/Replace dialog.
- *      RETURNS
- *              Window handle to created dialog:Succes
- *              NULL:Failure
+ *      RETURNS
+ *              Window handle to created dialog:Succes
+ *              NULL:Failure
  */
 static HWND COMDLG32_FR_DoFindReplace(
-        COMDLG32_FR_Data *pdata /* [in] Internal data structure */
+        COMDLG32_FR_Data *pdata /* [in] Internal data structure */
 ) {
-        HWND hdlgwnd = 0;
+        HWND hdlgwnd = 0;
         HGLOBAL loadrc;
         DWORD error;
         LPDLGTEMPLATEW rcs;
 
-        TRACE("hInst=%08x, Flags=%08lx\n", pdata->fr.hInstance, pdata->fr.Flags);
+        TRACE("hInst=%08x, Flags=%08lx\n", pdata->fr.hInstance, pdata->fr.Flags);
 
         if(!(pdata->fr.Flags & FR_ENABLETEMPLATEHANDLE))
         {
-                HMODULE hmod = COMDLG32_hInstance;
-                HRSRC htemplate;
-                if(pdata->fr.Flags & FR_ENABLETEMPLATE)
-                {
-                        hmod = (HMODULE)pdata->fr.hInstance;
+                HMODULE hmod = COMDLG32_hInstance;
+                HRSRC htemplate;
+                if(pdata->fr.Flags & FR_ENABLETEMPLATE)
+                {
+                        hmod = (HMODULE)pdata->fr.hInstance;
                         if(pdata->fr.Flags & FR_WINE_UNICODE)
                         {
-                                htemplate = FindResourceW(hmod, (LPWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOGA);
+                                htemplate = FindResourceW(hmod, (LPWSTR)pdata->fr.lpTemplateName, (LPWSTR)RT_DIALOGA);
                         }
                         else
                         {
-                                htemplate = FindResourceA(hmod, pdata->fr.lpTemplateName, (LPCSTR)RT_DIALOGA);
+                                htemplate = FindResourceA(hmod, pdata->fr.lpTemplateName, (LPCSTR)RT_DIALOGA);
                         }
-                }
-                else
-                {
-                        int rcid = pdata->fr.Flags & FR_WINE_REPLACE ? REPLACEDLGORD
-                                                                     : FINDDLGORD;
-                        htemplate = FindResourceA(hmod, MAKEINTRESOURCEA(rcid), (LPCSTR)RT_DIALOGA);
-                }
-                if(!htemplate)
-                {
-                        error = CDERR_FINDRESFAILURE;
-                        goto cleanup;
-                }
-
-                loadrc = LoadResource(hmod, htemplate);
+                }
+                else
+                {
+                        int rcid = pdata->fr.Flags & FR_WINE_REPLACE ? REPLACEDLGORD
+                                                                     : FINDDLGORD;
+                        htemplate = FindResourceA(hmod, MAKEINTRESOURCEA(rcid), (LPCSTR)RT_DIALOGA);
+                }
+                if(!htemplate)
+                {
+                        error = CDERR_FINDRESFAILURE;
+                        goto cleanup;
+                }
+
+                loadrc = LoadResource(hmod, htemplate);
         }
         else
         {
-                loadrc = (HGLOBAL)pdata->fr.hInstance;
+                loadrc = (HGLOBAL)pdata->fr.hInstance;
         }
 
         if(!loadrc)
         {
-                error = CDERR_LOADRESFAILURE;
-                goto cleanup;
-        }
+                error = CDERR_LOADRESFAILURE;
+                goto cleanup;
+        }
 
         if((rcs = (LPDLGTEMPLATEW)LockResource(loadrc)) == NULL)
         {
-                error = CDERR_LOCKRESFAILURE;
-                goto cleanup;
+                error = CDERR_LOCKRESFAILURE;
+                goto cleanup;
         }
 
         hdlgwnd = CreateDialogIndirectParamA(COMDLG32_hInstance,
-                                             rcs,
+                                             rcs,
                                              pdata->fr.hwndOwner,
                                              (DLGPROC)COMDLG32_FindReplaceDlgProc,
                                              (LPARAM)pdata);
-        if(!hdlgwnd)
-        {
-                error = CDERR_DIALOGFAILURE;
+        if(!hdlgwnd)
+        {
+                error = CDERR_DIALOGFAILURE;
 cleanup:
-                COMDLG32_SetCommDlgExtendedError(error);
+                COMDLG32_SetCommDlgExtendedError(error);
                 HeapFree(GetProcessHeap(), 0, pdata);
         }
@@ -430 +432 @@
 
 /***********************************************************************
- *      FindText32A                             [COMDLG32.6]
- *      RETURNS
- *              Window handle to created dialog: Succes
- *              NULL: Failure
+ *      FindText32A                             [COMDLG32.6]
+ *      RETURNS
+ *              Window handle to created dialog: Succes
+ *              NULL: Failure
  */
 HWND WINAPI FindTextA(
-        LPFINDREPLACEA pfr      /* [in] Find/replace structure*/
+        LPFINDREPLACEA pfr      /* [in] Find/replace structure*/
 ) {
-        COMDLG32_FR_Data *pdata;
+        COMDLG32_FR_Data *pdata;
 
         dprintf(("FindTextA: LPFINDREPLACE=%p\n", pfr));
 
-        if(!COMDLG32_FR_CheckPartial(pfr, FALSE))
-                return 0;
-
-        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL)
-                return 0; /* Error has been set */
+        if(!COMDLG32_FR_CheckPartial(pfr, FALSE))
+                return 0;
+
+        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL)
+                return 0; /* Error has been set */
 
         pdata->user_fr.fra = pfr;
         pdata->fr = *pfr;
-        return COMDLG32_FR_DoFindReplace(pdata);
-}
-
-/***********************************************************************
- *      ReplaceText32A                          [COMDLG32.19]
- *      RETURNS
- *              Window handle to created dialog: Succes
- *              NULL: Failure
+        return COMDLG32_FR_DoFindReplace(pdata);
+}
+
+/***********************************************************************
+ *      ReplaceText32A                          [COMDLG32.19]
+ *      RETURNS
+ *              Window handle to created dialog: Succes
+ *              NULL: Failure
  */
 HWND WINAPI ReplaceTextA(
-        LPFINDREPLACEA pfr      /* [in] Find/replace structure*/
+        LPFINDREPLACEA pfr      /* [in] Find/replace structure*/
 ) {
-        COMDLG32_FR_Data *pdata;
+        COMDLG32_FR_Data *pdata;
 
         dprintf(("ReplaceTextA: LPFINDREPLACE=%p\n", pfr));
 
-        if(!COMDLG32_FR_CheckPartial(pfr, TRUE))
-                return 0;
-
-        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL)
-                return 0; /* Error has been set */
+        if(!COMDLG32_FR_CheckPartial(pfr, TRUE))
+                return 0;
+
+        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data))) == NULL)
+                return 0; /* Error has been set */
 
         pdata->user_fr.fra = pfr;
         pdata->fr = *pfr;
-        pdata->fr.Flags |= FR_WINE_REPLACE;
-        return COMDLG32_FR_DoFindReplace(pdata);
-}
-
-/***********************************************************************
- *      FinfText32W                             [COMDLG32.7]
- *      RETURNS
- *              Window handle to created dialog: Succes
- *              NULL: Failure
+        pdata->fr.Flags |= FR_WINE_REPLACE;
+        return COMDLG32_FR_DoFindReplace(pdata);
+}
+
+/***********************************************************************
+ *      FinfText32W                             [COMDLG32.7]
+ *      RETURNS
+ *              Window handle to created dialog: Succes
+ *              NULL: Failure
  */
 HWND WINAPI FindTextW(
-        LPFINDREPLACEW pfr      /* [in] Find/replace structure*/
+        LPFINDREPLACEW pfr      /* [in] Find/replace structure*/
 ) {
-        COMDLG32_FR_Data *pdata;
+        COMDLG32_FR_Data *pdata;
 
         dprintf(("FindTextW: LPFINDREPLACE=%p\n", pfr));
 
-        if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE))
-                return 0;
-
-        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data)
-                                                           + pfr->wFindWhatLen)) == NULL)
-                return 0; /* Error has been set */
+        if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE))
+                return 0;
+
+        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data)
+                                                           + pfr->wFindWhatLen)) == NULL)
+                return 0; /* Error has been set */
 
         pdata->user_fr.frw = pfr;
-        pdata->fr = *(LPFINDREPLACEA)pfr;       /* FINDREPLACEx have same size */
-        pdata->fr.Flags |= FR_WINE_UNICODE;
-        pdata->fr.lpstrFindWhat = (LPSTR)(((LPFINDREPLACEA)(pdata+1))+1);       /* Set string pointer */
+        pdata->fr = *(LPFINDREPLACEA)pfr;       /* FINDREPLACEx have same size */
+        pdata->fr.Flags |= FR_WINE_UNICODE;
+        pdata->fr.lpstrFindWhat = (LPSTR)(((LPFINDREPLACEA)(pdata+1))+1);       /* Set string pointer */
         lstrcpynWtoA(pdata->fr.lpstrFindWhat, pfr->lpstrFindWhat, pfr->wFindWhatLen);
         return COMDLG32_FR_DoFindReplace(pdata);
@@ -507 +509 @@
 
 /***********************************************************************
- *      ReplaceTextW                            [COMDLG32.20]
- *      RETURNS
- *              Window handle to created dialog: Succes
- *              NULL: Failure
+ *      ReplaceTextW                            [COMDLG32.20]
+ *      RETURNS
+ *              Window handle to created dialog: Succes
+ *              NULL: Failure
  */
 HWND WINAPI ReplaceTextW(
-        LPFINDREPLACEW pfr      /* [in] Find/replace structure*/
+        LPFINDREPLACEW pfr      /* [in] Find/replace structure*/
 ) {
-        COMDLG32_FR_Data *pdata;
+        COMDLG32_FR_Data *pdata;
 
         dprintf(("ReplaceTextW: LPFINDREPLACE=%p\n", pfr));
 
-        if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE))
-                return 0;
-
-        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data)
-                                                           + pfr->wFindWhatLen
-                                                           + pfr->wReplaceWithLen)) == NULL)
-
-                return 0; /* Error has been set */
+        if(!COMDLG32_FR_CheckPartial((LPFINDREPLACEA)pfr, FALSE))
+                return 0;
+
+        if((pdata = (COMDLG32_FR_Data *)COMDLG32_AllocMem(sizeof(COMDLG32_FR_Data)
+                                                           + pfr->wFindWhatLen
+                                                           + pfr->wReplaceWithLen)) == NULL)
+
+                return 0; /* Error has been set */
 
         pdata->user_fr.frw = pfr;
-        pdata->fr = *(LPFINDREPLACEA)pfr;       /* FINDREPLACEx have same size */
-        pdata->fr.Flags |= FR_WINE_REPLACE | FR_WINE_UNICODE;
-        pdata->fr.lpstrFindWhat = (LPSTR)(((LPFINDREPLACEA)(pdata+1))+1);       /* Set string pointers */
+        pdata->fr = *(LPFINDREPLACEA)pfr;       /* FINDREPLACEx have same size */
+        pdata->fr.Flags |= FR_WINE_REPLACE | FR_WINE_UNICODE;
+        pdata->fr.lpstrFindWhat = (LPSTR)(((LPFINDREPLACEA)(pdata+1))+1);       /* Set string pointers */
         pdata->fr.lpstrReplaceWith = (LPSTR)(((LPFINDREPLACEA)(pdata+1))+1) + pfr->wFindWhatLen;
         lstrcpynWtoA(pdata->fr.lpstrFindWhat, pfr->lpstrFindWhat, pfr->wFindWhatLen);

trunk/src/comdlg32/rsrc.orc

@@ -1 @@
-/* $Id: rsrc.orc,v 1.2 2000-03-06 23:48:25 bird Exp $ */
+/* $Id: rsrc.orc,v 1.3 2000-03-26 16:31:45 cbratschi Exp $ */
 /*
  * Top level resource file for Common Dialogs
@@ -26 +26 @@
  * get localized bitmaps for example.
  */
-//#include "cdlg_Ca.orc"
-//#include "cdlg_Cs.orc"
-//#include "cdlg_Da.orc"
-//#include "cdlg_De.orc"
+
+/* TODO TODO FIXME
+ * The localized resources have be pulled out due to
+ * the time required to move some strings from here to
+ * shell32.dll.  This is something to deal with
+ * after release
+ */
+#if 0
+#include "cdlg_Ca.orc"
+#include "cdlg_Cs.orc"
+#include "cdlg_Da.orc"
+#include "cdlg_De.orc"
+#endif
 #include "cdlg_En.orc"
-//#include "cdlg_Eo.orc"
-//#include "cdlg_Es.orc"
-//#include "cdlg_Fi.orc"
-//#include "cdlg_Fr.orc"
-//#include "cdlg_Hu.orc"
-//#include "cdlg_It.orc"
-//#include "cdlg_Ko.orc"
-//#include "cdlg_Nl.orc"
-//#include "cdlg_No.orc"
-//#include "cdlg_Pl.orc"
-//#include "cdlg_Pt.orc"
-//#include "cdlg_Ru.orc"
-//#include "cdlg_Sv.orc"
-//#include "cdlg_Wa.orc"
+#if 0
+#include "cdlg_Eo.orc"
+#include "cdlg_Es.orc"
+#include "cdlg_Fi.orc"
+#include "cdlg_Fr.orc"
+#include "cdlg_Hu.orc"
+#include "cdlg_It.orc"
+#include "cdlg_Ko.orc"
+#include "cdlg_Nl.orc"
+#include "cdlg_No.orc"
+#include "cdlg_Pl.orc"
+#include "cdlg_Pt.orc"
+#include "cdlg_Ru.orc"
+#include "cdlg_Sv.orc"
+#include "cdlg_Wa.orc"
+#endif