Changeset 1864 for trunk/src

Timestamp:

Nov 28, 1999, 1:32:28 PM (26 years ago)

Author:

sandervl

Message:

Merge with latest wine code

Location:

trunk/src/comdlg32

Files:

• cdlg.h (modified) (2 diffs)
• cdlg_En.rc (modified) (4 diffs)
• cdlg_xx.rc (modified) (3 diffs)
• filedlg95.cpp (modified) (77 diffs)
• filedlgbrowser.cpp (modified) (4 diffs)
• filedlgbrowser.h (modified) (2 diffs)
• rsrc.rc (modified) (3 diffs)

trunk/src/comdlg32/cdlg.h

@@ -1 @@
-/* $Id: cdlg.h,v 1.2 1999-11-02 20:37:42 sandervl Exp $ */
+/* $Id: cdlg.h,v 1.3 1999-11-28 12:32:27 sandervl Exp $ */
 /*
  *  Common Dialog Boxes interface (32 bit)
@@ -9 +9 @@
 #define _WINE_DLL_CDLG_H
 
+#include "dlgs.h"
+
 extern HINSTANCE        COMDLG32_hInstance;
+#define COMMDLG_hInstance32 COMDLG32_hInstance
 
 /*---------------- 32-bit ----------------*/

trunk/src/comdlg32/cdlg_En.rc

@@ -1 @@
-/* $Id: cdlg_En.rc,v 1.1 1999-11-02 19:09:41 sandervl Exp $ */
-/* (990815) */
+/* $Id: cdlg_En.rc,v 1.2 1999-11-28 12:32:27 sandervl Exp $ */
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
@@ -198 +197 @@
 
 
-/* NOTE: Please, do not translate the PRINT32 dialog box yet! */
 PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
@@ -239 +237 @@
 }
 
-
-IDD_OPENDIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 159
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Print32 Setup"
+FONT 8, "Helv"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
+    PUSHBUTTON      "Cancel",IDCANCEL,232,156,48,14
+/*    PUSHBUTTON      "Network...", psh5, 284,156,48,14 */
+
+    GROUPBOX        "Printer",        grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "&Properties",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Name:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Status:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Type:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Where:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Comment:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Paper",          grp2,   8, 92, 164,56, WS_GROUP
+    LTEXT           "Si&ze:",         stc2,  16,108,  36, 8
+    COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    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
+    CONTROL         "P&ortrait",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "L&andscape",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+END
+
+
+NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Open"
 FONT 8, "helv"
 {
-    DEFPUSHBUTTON   "&Open",             IDOK,219,111,50,14
-    PUSHBUTTON      "Cancel",            IDCANCEL,219,128,50,14
-
-    CONTROL         "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,109,9
-    COMBOBOX        IDC_FILETYPE,54,128,157,102,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_FILENAME,54,110,158,15,ES_AUTOHSCROLL
-    LTEXT           "File &name:",IDC_FILENAMESTATIC,3,111,36,10
-    LTEXT           "Files of &type",IDC_FILETYPESTATIC,3,128,41,10
-    LTEXT           "", IDC_SHELLSTATIC,3,21,273,84,SS_SUNKEN | NOT WS_VISIBLE | NOT WS_GROUP |WS_EX_TRANSPARENT
-    LTEXT           "Look &in",IDC_LOOKINSTATIC,3,5,29,10
-    COMBOBOX        IDC_LOOKIN,50,1,137,93,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Up",IDC_UPFOLDER,194,1,15,15,BS_ICON | BS_CENTER | BS_VCENTER
-    PUSHBUTTON      "New",IDC_NEWFOLDER,213,1,15,15,BS_ICON | BS_CENTER | BS_VCENTER
-    CONTROL         "I",IDC_LIST,"Button",BS_AUTORADIOBUTTON | BS_ICON | BS_CENTER | BS_VCENTER | BS_PUSHLIKE,233,1,15,15
-    CONTROL         "L",IDC_DETAILS,"Button",BS_AUTORADIOBUTTON | BS_ICON | BS_CENTER | BS_VCENTER | BS_PUSHLIKE,249,1,15,15
-
-}
-
-IDD_SAVEDIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 159
-STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Save As"
-FONT 8, "helv"
-{
-    DEFPUSHBUTTON   "&Save",             IDOK,219,111,50,14
-    PUSHBUTTON      "Cancel",            IDCANCEL,219,128,50,14
-
-    CONTROL         "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,109,9
-    COMBOBOX        IDC_FILETYPE,54,128,157,102,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_FILENAME,54,110,158,15,ES_AUTOHSCROLL
-    LTEXT           "File &name:",IDC_FILENAMESTATIC,3,111,36,10
-    LTEXT           "Save as &type",IDC_FILETYPESTATIC,3,128,41,10
-    LTEXT           "", IDC_SHELLSTATIC,3,21,273,84,SS_SUNKEN | NOT WS_VISIBLE | NOT WS_GROUP |WS_EX_TRANSPARENT
-    LTEXT           "Save &in",IDC_LOOKINSTATIC,3,5,29,10
-    COMBOBOX        IDC_LOOKIN,50,1,137,93,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Up",IDC_UPFOLDER,194,1,15,15,BS_ICON | BS_CENTER | BS_VCENTER
-    PUSHBUTTON      "New",IDC_NEWFOLDER,213,1,15,15,BS_ICON | BS_CENTER | BS_VCENTER
-    CONTROL         "I",IDC_LIST,"Button",BS_AUTORADIOBUTTON | BS_ICON | BS_CENTER | BS_VCENTER | BS_PUSHLIKE,233,1,15,15
-    CONTROL         "L",IDC_DETAILS,"Button",BS_AUTORADIOBUTTON | BS_ICON | BS_CENTER | BS_VCENTER | BS_PUSHLIKE,249,1,15,15
-
-}
+    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 
 {
@@ -307 +319 @@
 
 
-/******************
- * Bitmap
- */
-
-IDB_TOOLBAR     BITMAP DISCARDABLE
-{'
-42 4d b6 02 00 00 00 00 00 00 76 00 00 00 28 00
-00 00 41 00 00 00 10 00 00 00 01 00 04 00 00 00
-00 00 40 02 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 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 aa aa aa aa aa aa aa aa aa aa
-aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-aa aa aa aa aa aa a3 00 b6 01 aa aa aa 88 88 8a
-aa aa 00 00 00 00 00 0a aa aa 44 4a aa aa aa aa
-aa aa 88 80 00 0f 00 0f 00 0f ab 00 db 02 aa aa
-a0 00 00 8a aa aa 0b bb bb bb bb 0a aa aa 4f 4a
-00 0a aa aa aa aa f7 8f ff ff ff ff ff ff a9 02
-2a 02 aa aa a0 77 70 8a aa aa 0b bb bb bb bb 9a
-aa aa 44 aa aa aa aa aa aa aa f7 80 00 0f 00 0f
-00 0f a2 00 02 00 aa aa a0 77 70 8a aa aa 0b bb
-bb bb bb 9a aa aa aa aa aa aa aa aa aa aa f7 8f
-ff ff ff ff ff ff a4 f8 15 00 aa aa a0 77 70 8a
-aa aa 0b bb bb b9 bb 9a a9 aa aa aa aa aa aa aa
-aa aa f7 80 00 0f 00 0f 00 0f a2 00 02 00 aa aa
-a0 77 70 8a aa aa 0b bb bb bb 9b 9a 9a aa 44 4a
-aa aa 44 4a aa aa f7 8f ff ff ff ff ff ff a0 00
-ad 00 aa aa a0 77 70 8a aa aa 0b bb bb bb b9 99
-aa aa 4f 4a 00 0a 4f 4a 00 0a f7 80 00 0f 00 0f
-00 0f a1 00 b5 00 aa aa a0 77 70 88 8a aa 00 00
-00 99 99 99 99 9a 44 aa aa aa 44 aa aa aa f7 8f
-ff ff ff ff ff ff ad 01 0b 02 aa 00 00 77 70 00
-0a aa a0 bb bb 0a a9 99 aa aa aa aa aa aa aa aa
-aa aa f7 80 00 0f 00 0f 00 0f a9 01 5d 01 aa a0
-f7 77 77 70 aa aa aa 00 00 aa 9a 9a 9a aa aa aa
-aa aa aa aa aa aa f7 8f ff ff ff ff ff ff a0 01
-63 01 aa aa 0f 77 77 0a aa aa aa aa aa a9 aa 9a
-a9 aa 44 4a aa aa 44 4a aa aa 88 88 88 88 88 88
-88 88 ab 01 0f 01 aa aa a0 f7 70 aa aa aa aa aa
-aa aa aa 9a aa aa 4f 4a 00 0a 4f 4a 00 0a f7 8f
-77 78 f7 78 f7 78 a8 01 7d 01 aa aa aa 0f 0a aa
-aa aa aa aa aa aa aa 9a aa aa 44 aa aa aa 44 aa
-aa aa f7 8f 77 78 f7 78 f7 78 ae 01 62 02 aa aa
-aa a0 aa aa aa aa aa aa aa aa aa 9a aa aa aa aa
-aa aa aa aa aa aa ff ff ff ff ff ff ff f7 a2 01
-b9 01 aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa
-aa aa a2 00 43 02'}
-
-
-
-
-
-/* NOTE: Please, do not translate these texts yet! */
 STRINGTABLE DISCARDABLE
 {
-    PD32_PRINT_ALL_X_PAGES "&All %d pages"
     PD32_PRINT_TITLE       "Print"
+
+    PD32_VALUE_UREADABLE                  "Unreadable Entry"
     PD32_INVALID_PAGE_RANGE "This value lies not within Page range\n\
 Please enter a value between %d and %d"
-    PRINTER_STATUS_PAUSED            "Paused"
-    PRINTER_STATUS_ERROR             "Error"
-    PRINTER_STATUS_PENDING_DELETION  "Pending deletion"
-    PRINTER_STATUS_PAPER_JAM         "Paper jam"
-    PRINTER_STATUS_PAPER_OUT         "Out of paper"
-    PRINTER_STATUS_MANUAL_FEED       "Feed paper manual"
-    PRINTER_STATUS_PAPER_PROBLEM     "Paper problem"
-    PRINTER_STATUS_OFFLINE           "Printer offline"
-    PRINTER_STATUS_IO_ACTIVE         "I/O Active"
-    PRINTER_STATUS_BUSY              "Busy"
-    PRINTER_STATUS_PRINTING          "Printing"
-    PRINTER_STATUS_OUTPUT_BIN_FULL   "Output tray is full"
-    PRINTER_STATUS_NOT_AVAILABLE     "Not available"
-    PRINTER_STATUS_WAITING           "Waiting"
-    PRINTER_STATUS_PROCESSING        "Processing"
-    PRINTER_STATUS_INITIALIZING      "Initialising"
-    PRINTER_STATUS_WARMING_UP        "Warming up"
-    PRINTER_STATUS_TONER_LOW         "Toner low"
-    PRINTER_STATUS_NO_TONER          "No toner"
-    PRINTER_STATUS_PAGE_PUNT         "Page punt"
-    PRINTER_STATUS_USER_INTERVENTION "User intervention required"
-    PRINTER_STATUS_OUT_OF_MEMORY     "Out of memory"
-    PRINTER_STATUS_DOOR_OPEN         "The printer door is open"
-    PRINTER_STATUS_SERVER_UNKNOWN    "Print server unknown"
-    PRINTER_STATUS_POWER_SAVE        "Power safe mode"
-}
+    PD32_FROM_NOT_ABOVE_TO                "The FROM entry cannot exceed TO:"
+    PD32_MARGINS_OVERLAP                  "Margins overlap or fall outside \
+Paper boundaries.\nPlease reenter margins"
+    PD32_NR_OF_COPIES_EMPTY               "The NumberOfCopies entry cannot \
+be empty"
+    PD32_TOO_LARGE_COPIES                 "This large amount of prints is not \
+supported by your printer.\nPlease enter a value between 1 and %d"
+    PD32_PRINT_ERROR                      "A printer error occurred"
+    PD32_NO_DEFAULT_PRINTER               "There is not default printer"
+    PD32_CANT_FIND_PRINTER                "Cannot find the printer"
+    PD32_OUT_OF_MEMORY                    "Out of memory"
+    PD32_GENERIC_ERROR                    "Some error occurred"
+    PD32_DRIVER_UNKNOWN                   "Unknown printer driver"
+
+    PD32_DEFAULT_PRINTER                  "Default Printer; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "There are %d documents in queue"
+    PD32_PRINT_ALL_X_PAGES                "&All %d pages"
+    PD32_MARGINS_IN_INCHES                "Margins [inches]"
+    PD32_MARGINS_IN_MILIMETERS            "Margins [mm]"
+    PD32_MILIMETERS                       "mm"
+
+    PD32_PRINTER_STATUS_READY             "Ready"
+    PD32_PRINTER_STATUS_PAUSED            "Paused; "
+    PD32_PRINTER_STATUS_ERROR             "Error; "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "Pending deletion; "
+    PD32_PRINTER_STATUS_PAPER_JAM         "Paper jam; "
+    PD32_PRINTER_STATUS_PAPER_OUT         "Out of paper; "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "Feed paper manual; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Paper problem; "
+    PD32_PRINTER_STATUS_OFFLINE           "Printer offline; "
+    PD32_PRINTER_STATUS_IO_ACTIVE         "I/O Active; "
+    PD32_PRINTER_STATUS_BUSY              "Busy; "
+    PD32_PRINTER_STATUS_PRINTING          "Printing; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Output tray is full; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Not available; "
+    PD32_PRINTER_STATUS_WAITING           "Waiting; "
+    PD32_PRINTER_STATUS_PROCESSING        "Processing; "
+    PD32_PRINTER_STATUS_INITIALIZING      "Initialising; "
+    PD32_PRINTER_STATUS_WARMING_UP        "Warming up; "
+    PD32_PRINTER_STATUS_TONER_LOW         "Toner low; "
+    PD32_PRINTER_STATUS_NO_TONER          "No toner; "
+    PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Out of memory; "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "The printer door is open; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Print server unknown; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "Power safe mode; "
+}

trunk/src/comdlg32/cdlg_xx.rc

@@ -1 @@
-/* $Id: cdlg_xx.rc,v 1.1 1999-11-02 19:09:41 sandervl Exp $ */
+/* $Id: cdlg_xx.rc,v 1.2 1999-11-28 12:32:27 sandervl Exp $ */
 /*
  * Language neutral resources for Common Dialogs
- * (990815) 
  */
 
@@ -40 +39 @@
 }
 
+/* BINRES pd32_collate.ico */
 PD32_COLLATE ICON DISCARDABLE LOADONCALL
 {
@@ -178 +178 @@
 }
 
+
+
+/* BINRES pd32_nocollate.ico */
 PD32_NOCOLLATE ICON 
 {

trunk/src/comdlg32/filedlg95.cpp

@@ -1 @@
-/* $Id: filedlg95.cpp,v 1.4 1999-11-13 15:41:44 sandervl Exp $ */
+/* $Id: filedlg95.cpp,v 1.5 1999-11-28 12:32:27 sandervl Exp $ */
 /*
  * COMMDLG - File Open Dialogs Win95 look and feel
  *
  */
+#ifdef __WIN32OS2__
+#include <os2win.h>
+#include <heapstring.h>
+// ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
+#define CINTERFACE 1
+
+#define MapHModuleSL(a) a
+#define MapHModuleLS(a) a
+
+#endif
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef __WIN32OS2__
-// ><DJR 17.05.99 Force to use C-interfaces for now to prevent CALLBACK definition compiler error
-#define CINTERFACE 1
-#include <os2win.h>
-#else
 #include "winbase.h"
-#include "tweak.h"
-#endif
 #include "ldt.h"
 #include "heap.h"
@@ -22 +25 @@
 #include "debugtools.h"
 #include "cderr.h"
+#include "tweak.h"
 #include "winnls.h"
 #include "shellapi.h"
@@ -28 +32 @@
 #include "wine/obj_contextmenu.h"
 
-#ifdef __WIN32OS2__
-#include <heapstring.h>
-
-#define MapHModuleSL(a) a
-#define MapHModuleLS(a) a
-#endif
-
 DEFAULT_DEBUG_CHANNEL(commdlg)
-
 
 /***********************************************************************
@@ -46 +42 @@
   HIMAGELIST hImgList;
   int m_iIndent;      /* Indentation index */
-  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */ 
+  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */
 
 } SFOLDER,*LPSFOLDER;
@@ -164 +160 @@
 
 /* Shell memory allocation */
-char *MemAlloc(UINT size);
+void *MemAlloc(UINT size);
 void MemFree(void *mem);
 
-BOOL WINAPI GetOpenFileName95(FileOpenDlgInfos *fodInfos);
-BOOL WINAPI GetSaveFileName95(FileOpenDlgInfos *fodInfos);
+BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos);
 HRESULT WINAPI FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-/***********************************************************************
- *      GetOpenFileName95
- *
- * Creates an Open common dialog box that lets the user select 
+HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
+HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+/***********************************************************************
+ *      GetFileName95
+ *
+ * Creates an Open common dialog box that lets the user select
  * the drive, directory, and the name of a file or set of files to open.
  *
@@ -181 +178 @@
  *       FALSE on cancel, error, close or filename-does-not-fit-in-buffer.
  */
-BOOL WINAPI GetOpenFileName95(FileOpenDlgInfos *fodInfos)
+BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos)
 {
 
     LRESULT lRes;
-    LPCVOID templateDlg;
+    LPCVOID lpTemplate;
     HRSRC hRes;
     HANDLE hDlgTmpl = 0;
@@ -191 +188 @@
     /* Create the dialog from a template */
 
-    if(!(hRes = FindResourceA(COMDLG32_hInstance,MAKEINTRESOURCEA(IDD_OPENDIALOG),RT_DIALOGA)))
+    if(!(hRes = FindResourceA(COMMDLG_hInstance32,MAKEINTRESOURCEA(NEWFILEOPENORD),RT_DIALOGA)))
     {
         COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
         return FALSE;
     }
-    if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) ||
-        !(templateDlg = LockResource( hDlgTmpl )))
+    if (!(hDlgTmpl = LoadResource(COMMDLG_hInstance32, hRes )) ||
+        !(lpTemplate = LockResource( hDlgTmpl )))
     {
         COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
         return FALSE;
     }
-    lRes = DialogBoxIndirectParamA(COMDLG32_hInstance,
-                                  (LPDLGTEMPLATEA) templateDlg,
+    lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
+                                  (LPDLGTEMPLATEA) lpTemplate,
                                   fodInfos->ofnInfos.hwndOwner,
                                   (DLGPROC) FileOpenDlgProc95,
@@ -211 +208 @@
     if( lRes == -1)
         return FALSE;
-    
+
     return lRes;
 }
 
 /***********************************************************************
- *      GetSaveFileName95
- *
- * Creates an Save as common dialog box that lets the user select
- * the drive, directory, and the name of a file or set of files to open.
- *
- * IN  : The FileOpenDlgInfos structure associated with the dialog
- * OUT : TRUE on success
- *       FALSE on cancel, error, close or filename-does-not-fit-in-buffer.
- */
-BOOL WINAPI GetSaveFileName95(FileOpenDlgInfos *fodInfos)
-{
-
-    LRESULT lRes;
-    LPCVOID templateDlg;
-    HRSRC hRes;
-    HANDLE hDlgTmpl = 0;
-
-    /* Create the dialog from a template */
-
-    if(!(hRes = FindResourceA(COMDLG32_hInstance,MAKEINTRESOURCEA(IDD_SAVEDIALOG),RT_DIALOGA)))
-    {
-        COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
-        return FALSE;
-    }
-    if (!(hDlgTmpl = LoadResource(COMDLG32_hInstance, hRes )) ||
-        !(templateDlg = LockResource( hDlgTmpl )))
-    {
-        COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-        return FALSE;
-    }
-    lRes = DialogBoxIndirectParamA(COMDLG32_hInstance,
-                                  (LPDLGTEMPLATEA) templateDlg,
-                                  fodInfos->ofnInfos.hwndOwner,
-                                  (DLGPROC) FileOpenDlgProc95,
-                                  (LPARAM) fodInfos);
-    /* Unable to create the dialog*/
-    if( lRes == -1)
-        return FALSE;
-    
-    return lRes;
-}
-
-/***********************************************************************
  *      GetFileDialog95A
  *
  * Copy the OPENFILENAMEA structure in a FileOpenDlgInfos structure.
- * Call GetOpenFileName95 with this structure and clean the memory.
+ * Call GetFileName95 with this structure and clean the memory.
  *
  * IN  : The OPENFILENAMEA initialisation structure passed to
@@ -272 +226 @@
   BOOL ret;
   FileOpenDlgInfos *fodInfos;
-  
-  /* Initialise FileOpenDlgInfos structure*/  
+
+  /* Initialise FileOpenDlgInfos structure*/
   fodInfos = (FileOpenDlgInfos*)MemAlloc(sizeof(FileOpenDlgInfos));
   memset(&fodInfos->ofnInfos,'\0',sizeof(*ofn)); fodInfos->ofnInfos.lStructSize = sizeof(*ofn);
@@ -300 +254 @@
       s = s+strlen(s)+1;
     s++;
-    x = MemAlloc(s-ofn->lpstrCustomFilter);
+    x = (LPSTR)MemAlloc(s-ofn->lpstrCustomFilter);
     memcpy(x,ofn->lpstrCustomFilter,s-ofn->lpstrCustomFilter);
     fodInfos->ofnInfos.lpstrCustomFilter = (LPSTR)x;
@@ -333 +287 @@
   if (ofn->lpstrDefExt)
   {
-      fodInfos->ofnInfos.lpstrDefExt = MemAlloc(strlen(ofn->lpstrDefExt)+1);
+      fodInfos->ofnInfos.lpstrDefExt = (LPSTR)MemAlloc(strlen(ofn->lpstrDefExt)+1);
       strcpy((LPSTR)fodInfos->ofnInfos.lpstrDefExt,ofn->lpstrDefExt);
   }
@@ -339 +293 @@
   fodInfos->ofnInfos.lpfnHook = (LPOFNHOOKPROC)ofn->lpfnHook;
 
-  //SvL: Bugfix; can be resource id
   if (HIWORD(ofn->lpTemplateName))
   {
+      fodInfos->ofnInfos.lpTemplateName = (LPSTR)MemAlloc(strlen(ofn->lpTemplateName)+1);
+      strcpy ((LPSTR)fodInfos->ofnInfos.lpTemplateName, ofn->lpTemplateName);
+  }
+  else
+  {
+      /* resource id */
       fodInfos->ofnInfos.lpTemplateName = ofn->lpTemplateName;
   }
@@ -348 +307 @@
   if(!ofn->lpstrInitialDir)
   {
-    fodInfos->ofnInfos.lpstrInitialDir = MemAlloc(MAX_PATH);
+    fodInfos->ofnInfos.lpstrInitialDir = (LPSTR)MemAlloc(MAX_PATH);
     GetCurrentDirectoryA(MAX_PATH,(LPSTR)fodInfos->ofnInfos.lpstrInitialDir);
   }
@@ -354 +313 @@
   /* Initialise the dialog property */
   fodInfos->DlgInfos.dwDlgProp = 0;
-  
+  fodInfos->DlgInfos.hwndCustomDlg = (HWND)NULL;
+
   switch(iDlgType)
   {
   case OPEN_DIALOG :
-      ret = GetOpenFileName95(fodInfos);
+      ret = GetFileName95(fodInfos);
       break;
   case SAVE_DIALOG :
       fodInfos->DlgInfos.dwDlgProp |= FODPROP_SAVEDLG;
-      ret = GetSaveFileName95(fodInfos);
+      ret = GetFileName95(fodInfos);
       break;
   default :
@@ -370 +330 @@
   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 + 1;
+
   if (fodInfos->ofnInfos.lpstrFilter)
       MemFree((LPVOID)(fodInfos->ofnInfos.lpstrFilter));
-  if (fodInfos->ofnInfos.lpTemplateName)
+  if (HIWORD(fodInfos->ofnInfos.lpTemplateName))
       MemFree((LPVOID)(fodInfos->ofnInfos.lpTemplateName));
   if (fodInfos->ofnInfos.lpstrDefExt)
@@ -383 +350 @@
       MemFree((LPVOID)(fodInfos->ofnInfos.lpstrCustomFilter));
 
-  if (fodInfos->ofnInfos.lpstrFile) 
+  if (fodInfos->ofnInfos.lpstrFile)
     {
       strcpy(ofn->lpstrFile,fodInfos->ofnInfos.lpstrFile);
       MemFree((LPVOID)fodInfos->ofnInfos.lpstrFile);
     }
-  if (fodInfos->ofnInfos.lpstrFileTitle) 
+  if (fodInfos->ofnInfos.lpstrFileTitle)
     {
       if (ofn->lpstrFileTitle)
@@ -404 +371 @@
  *
  * Copy the OPENFILENAMEW structure in a FileOpenDlgInfos structure.
- * Call GetOpenFileName95 with this structure and clean the memory.
+ * Call GetFileName95 with this structure and clean the memory.
  *
  * IN  : The OPENFILENAMEW initialisation structure passed to
@@ -428 +395 @@
     /* filter is a list...  title\0ext\0......\0\0 */
     s = (LPWSTR)ofn->lpstrFilter;
-    
+
     while (*s)
       s = s+lstrlenW(s)+1;
@@ -492 +459 @@
   fodInfos->ofnInfos.lCustData = ofn->lCustData;
   fodInfos->ofnInfos.lpfnHook = (LPOFNHOOKPROC)ofn->lpfnHook;
-  //SvL: Bugfix
+
   if (HIWORD(ofn->lpTemplateName))
-  { 
+  {
     fodInfos->ofnInfos.lpTemplateName = (LPSTR)MemAlloc(lstrlenW(ofn->lpTemplateName)+1);
     lstrcpyWtoA((LPSTR)fodInfos->ofnInfos.lpTemplateName,(LPWSTR)ofn->lpTemplateName);
   }
+  else
+  {
+      /* resource id */
+      fodInfos->ofnInfos.lpTemplateName = (LPSTR)ofn->lpTemplateName;
+  }
   /* Initialise the dialog property */
   fodInfos->DlgInfos.dwDlgProp = 0;
-  
+
   switch(iDlgType)
   {
   case OPEN_DIALOG :
-      ret = GetOpenFileName95(fodInfos);
+      ret = GetFileName95(fodInfos);
       break;
   case SAVE_DIALOG :
       fodInfos->DlgInfos.dwDlgProp |= FODPROP_SAVEDLG;
-      ret = GetSaveFileName95(fodInfos);
+      ret = GetFileName95(fodInfos);
       break;
   default :
       ret = 0;
   }
-      
+
   /* 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 + 1;
+
   if (fodInfos->ofnInfos.lpstrFilter)
     MemFree((LPVOID)(fodInfos->ofnInfos.lpstrFilter));
-  if (fodInfos->ofnInfos.lpTemplateName)
+  if (HIWORD(fodInfos->ofnInfos.lpTemplateName))
     MemFree((LPVOID)(fodInfos->ofnInfos.lpTemplateName));
   if (fodInfos->ofnInfos.lpstrDefExt)
@@ -549 +528 @@
 {
 
-        HWND hwndChild,hwndStc32;
-        RECT rectParent,rectChild,rectCtrl,rectStc32;
-        POINT ptMoveCtl;
-        HDWP handle;
-        POINT ptParentClient;
-
-        ptMoveCtl.x = ptMoveCtl.y = 0;
-        hwndStc32=GetDlgItem(hwndChildDlg,stc32);
-        GetClientRect(hwndParentDlg,&rectParent);
-        GetClientRect(hwndChildDlg,&rectChild);
-        if(hwndStc32)
-        {
-                RECT rectTemp;
-                GetWindowRect(hwndStc32,&rectStc32);
-                MapWindowPoints(0, hwndChildDlg,(LPPOINT)&rectStc32,2);
-                CopyRect(&rectTemp,&rectStc32);
-
-                SetRect(&rectStc32,rectStc32.left,rectStc32.top,rectStc32.left + (rectParent.right-rectParent.left),rectStc32.top+(rectParent.bottom-rectParent.top));
-                SetWindowPos(hwndStc32,0,rectStc32.left,rectStc32.top,rectStc32.right-rectStc32.left,rectStc32.bottom-rectStc32.top,SWP_NOMOVE|SWP_NOZORDER | SWP_NOACTIVATE);
-                if(rectStc32.right < rectTemp.right)
-                {
-                        ptParentClient.x = max((rectParent.right-rectParent.left),(rectChild.right-rectChild.left));
-                        ptMoveCtl.x = 0;
-                }
-                else
-                {
-                        ptMoveCtl.x = (rectStc32.right - rectTemp.right);
-                        ptParentClient.x = max((rectParent.right-rectParent.left),((rectChild.right-rectChild.left)+rectStc32.right-rectTemp.right));
-                }
-                if(rectStc32.bottom < rectTemp.bottom)
-                {
-                        ptParentClient.y = max((rectParent.bottom-rectParent.top),(rectChild.bottom-rectChild.top));
-                        ptMoveCtl.y = 0;
-                }
-                else
-                {
-                        ptMoveCtl.y = (rectStc32.bottom - rectTemp.bottom);
-                        ptParentClient.y = max((rectParent.bottom-rectParent.top),((rectChild.bottom-rectChild.top)+rectStc32.bottom-rectTemp.bottom));
-                }
-        }
-        else
-        {
-                if( (GetWindow(hwndChildDlg,GW_CHILD)) == (HWND) NULL)
+    HWND hwndChild,hwndStc32;
+    RECT rectParent, rectChild, rectCtrl, rectStc32, rectTemp;
+    POINT ptMoveCtl;
+    HDWP handle;
+    POINT ptParentClient;
+
+    ptMoveCtl.x = ptMoveCtl.y = 0;
+    hwndStc32=GetDlgItem(hwndChildDlg,stc32);
+    GetClientRect(hwndParentDlg,&rectParent);
+    GetClientRect(hwndChildDlg,&rectChild);
+    if(hwndStc32)
+    {
+        GetWindowRect(hwndStc32,&rectStc32);
+        MapWindowPoints(0, hwndChildDlg,(LPPOINT)&rectStc32,2);
+        CopyRect(&rectTemp,&rectStc32);
+
+        SetRect(&rectStc32,rectStc32.left,rectStc32.top,rectStc32.left + (rectParent.right-rectParent.left),rectStc32.top+(rectParent.bottom-rectParent.top));
+        SetWindowPos(hwndStc32,0,rectStc32.left,rectStc32.top,rectStc32.right-rectStc32.left,rectStc32.bottom-rectStc32.top,SWP_NOMOVE|SWP_NOZORDER | SWP_NOACTIVATE);
+
+        if(rectStc32.right < rectTemp.right)
+        {
+            ptParentClient.x = max((rectParent.right-rectParent.left),(rectChild.right-rectChild.left));
+            ptMoveCtl.x = 0;
+        }
+        else
+        {
+            ptMoveCtl.x = (rectStc32.right - rectTemp.right);
+            ptParentClient.x = max((rectParent.right-rectParent.left),((rectChild.right-rectChild.left)+rectStc32.right-rectTemp.right));
+        }
+        if(rectStc32.bottom < rectTemp.bottom)
+        {
+            ptParentClient.y = max((rectParent.bottom-rectParent.top),(rectChild.bottom-rectChild.top));
+            ptMoveCtl.y = 0;
+        }
+        else
+        {
+            ptMoveCtl.y = (rectStc32.bottom - rectTemp.bottom);
+            ptParentClient.y = max((rectParent.bottom-rectParent.top),((rectChild.bottom-rectChild.top)+rectStc32.bottom-rectTemp.bottom));
+        }
+    }
+    else
+    {
+        if( (GetWindow(hwndChildDlg,GW_CHILD)) == (HWND) NULL)
                    return;
-                ptParentClient.x = rectParent.right-rectParent.left;
-                ptParentClient.y = (rectParent.bottom-rectParent.top) + (rectChild.bottom-rectChild.top);
-                ptMoveCtl.y = rectParent.bottom-rectParent.top;
-                ptMoveCtl.x=0;
-        }
-        SetRect(&rectParent,rectParent.left,rectParent.top,rectParent.left+ptParentClient.x,rectParent.top+ptParentClient.y);
-        AdjustWindowRectEx( &rectParent,GetWindowLongA(hwndParentDlg,GWL_STYLE),FALSE,GetWindowLongA(hwndParentDlg,GWL_EXSTYLE));
-
-        SetWindowPos(hwndChildDlg, 0, 0,0, ptParentClient.x,ptParentClient.y,
-                 SWP_NOZORDER );
-        SetWindowPos(hwndParentDlg, 0, rectParent.left,rectParent.top, (rectParent.right- rectParent.left),
-                (rectParent.bottom-rectParent.top),SWP_NOMOVE | SWP_NOZORDER);
-        
-        hwndChild = GetWindow(hwndChildDlg,GW_CHILD);
-        handle = BeginDeferWindowPos( 1 );
-        if(hwndStc32)
-        {
-                GetWindowRect(hwndStc32,&rectStc32);
-                MapWindowPoints( 0, hwndChildDlg,(LPPOINT)&rectStc32,2);
-        }
-        else
-                SetRect(&rectStc32,0,0,0,0);
-        if (hwndChild && handle)
-        {
-                do
-                {
-                        if(hwndChild != hwndStc32)
-                        {
-                        if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
-                                continue;
-                        GetWindowRect(hwndChild,&rectCtrl);
-                        MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
-                        if(rectCtrl.top > rectStc32.top)
-                        {
-                                  
-                                if(ptMoveCtl.x > 0)
-                                        rectCtrl.left += ptMoveCtl.x;
-                                rectCtrl.top  += ptMoveCtl.y;
-                                handle = DeferWindowPos(handle, hwndChild, 0, rectCtrl.left, rectCtrl.top, 
-                                rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
-                                SWP_NOSIZE | SWP_NOZORDER );
-                                }
-                        }
-                }
-                while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL && handle);
-        }               
-        if(handle)
-                EndDeferWindowPos( handle );
-        handle = BeginDeferWindowPos( 1 );
-        hwndChild = GetWindow(hwndParentDlg,GW_CHILD);
-        if(hwndStc32)
-        {
-                GetWindowRect(hwndStc32,&rectStc32);
-                MapWindowPoints( 0, hwndChildDlg,(LPPOINT)&rectStc32,2);
-                ptMoveCtl.x = rectStc32.left - 0;
-                ptMoveCtl.y = rectStc32.top - 0;
-                if (hwndChild && handle)
-                {
-                        do
-                        {
-                                if(hwndChild != hwndChildDlg)
-                                {
-
-                                        if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
-                                                continue;
-                                        GetWindowRect(hwndChild,&rectCtrl);
-                                        MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
-
-                                        rectCtrl.left += ptMoveCtl.x;
-                                        rectCtrl.top += ptMoveCtl.y;
-
-                                        handle = DeferWindowPos(        handle, hwndChild, 0, rectCtrl.left, rectCtrl.top, 
-                                        rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
-                                        SWP_NOSIZE |SWP_NOZORDER );
-                                }
-                        }
-                        while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
-                }               
-                if(handle)
-                EndDeferWindowPos( handle );
-        }
+        ptParentClient.x = rectParent.right-rectParent.left;
+        ptParentClient.y = (rectParent.bottom-rectParent.top) + (rectChild.bottom-rectChild.top);
+        ptMoveCtl.y = rectParent.bottom-rectParent.top;
+        ptMoveCtl.x=0;
+    }
+    SetRect(&rectParent,rectParent.left,rectParent.top,rectParent.left+ptParentClient.x,rectParent.top+ptParentClient.y);
+    AdjustWindowRectEx( &rectParent,GetWindowLongA(hwndParentDlg,GWL_STYLE),FALSE,GetWindowLongA(hwndParentDlg,GWL_EXSTYLE));
+
+    SetWindowPos(hwndChildDlg, 0, 0,0, ptParentClient.x,ptParentClient.y,
+         SWP_NOZORDER );
+    SetWindowPos(hwndParentDlg, 0, rectParent.left,rectParent.top, (rectParent.right- rectParent.left),
+        (rectParent.bottom-rectParent.top),SWP_NOMOVE | SWP_NOZORDER);
+
+    hwndChild = GetWindow(hwndChildDlg,GW_CHILD);
+    handle = BeginDeferWindowPos( 1 );
+    if(hwndStc32)
+    {
+        GetWindowRect(hwndStc32,&rectStc32);
+        MapWindowPoints( 0, hwndChildDlg,(LPPOINT)&rectStc32,2);
+    }
+    else
+        SetRect(&rectStc32,0,0,0,0);
+
+    if (hwndChild && handle)
+    {
+        do
+        {
+            if(hwndChild != hwndStc32)
+            {
+            if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
+                continue;
+            GetWindowRect(hwndChild,&rectCtrl);
+            MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
+
+                /*
+                   Check the initial position of the controls relative to the initial
+                   position and size of stc32 (before it is expanded).
+                */
+                if (rectCtrl.left > rectTemp.right && rectCtrl.top > rectTemp.bottom)
+                {
+                    rectCtrl.left += ptMoveCtl.x;
+                rectCtrl.top  += ptMoveCtl.y;
+                }
+                else if (rectCtrl.left > rectTemp.right)
+                    rectCtrl.left += ptMoveCtl.x;
+                else if (rectCtrl.top > rectTemp.bottom)
+                    rectCtrl.top  += ptMoveCtl.y;
+
+                handle = DeferWindowPos(handle, hwndChild, 0, rectCtrl.left, rectCtrl.top,
+                rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
+                SWP_NOSIZE | SWP_NOZORDER );
+                }
+            }
+        while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL && handle);
+    }
+    if(handle)
+        EndDeferWindowPos( handle );
+    handle = BeginDeferWindowPos( 1 );
+    hwndChild = GetWindow(hwndParentDlg,GW_CHILD);
+
+    if(hwndStc32)
+    {
+        GetWindowRect(hwndStc32,&rectStc32);
+        MapWindowPoints( 0, hwndChildDlg,(LPPOINT)&rectStc32,2);
+        ptMoveCtl.x = rectStc32.left - 0;
+        ptMoveCtl.y = rectStc32.top - 0;
+        if (hwndChild && handle)
+        {
+            do
+            {
+                if(hwndChild != hwndChildDlg)
+                {
+
+                    if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
+                        continue;
+                    GetWindowRect(hwndChild,&rectCtrl);
+                    MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
+
+                    rectCtrl.left += ptMoveCtl.x;
+                    rectCtrl.top += ptMoveCtl.y;
+
+                    handle = DeferWindowPos(    handle, hwndChild, 0, rectCtrl.left, rectCtrl.top,
+                    rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
+                    SWP_NOSIZE |SWP_NOZORDER );
+                }
+            }
+            while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
+        }
+        if(handle)
+        EndDeferWindowPos( handle );
+    }
 
 }
@@ -683 +672 @@
   switch(uMsg)
   {
-        case WM_INITDIALOG:
-        {         
-                FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *)lParam;
-                procUserHook=NULL;
+    case WM_INITDIALOG:
+    {
+        FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *)lParam;
+        procUserHook=NULL;
                 lParam = (LPARAM) &fodInfos->ofnInfos;
-                ArrangeCtrlPositions(hwnd,GetParent(hwnd));
+        ArrangeCtrlPositions(hwnd,GetParent(hwnd));
                 if(fodInfos->ofnInfos.Flags & OFN_ENABLEHOOK)
-                        procUserHook = (WNDPROC) fodInfos->ofnInfos.lpfnHook;
-                if(procUserHook)
-                         return CallWindowProcA(procUserHook,hwnd,uMsg,wParam,lParam);
-                return 0;       
-        } }
+                    procUserHook = (WNDPROC) fodInfos->ofnInfos.lpfnHook;
+        if(procUserHook)
+                 return CallWindowProcA(procUserHook,hwnd,uMsg,wParam,lParam);
+            return 0;
+    } }
  if(procUserHook)
-      return CallWindowProcA(procUserHook,hwnd,uMsg,wParam,lParam); 
-  return DefWindowProcA(hwnd,uMsg,wParam,lParam); 
+      return CallWindowProcA(procUserHook,hwnd,uMsg,wParam,lParam);
+  return DefWindowProcA(hwnd,uMsg,wParam,lParam);
 }
 
 HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos,HWND hwnd)
 {
-    LPCVOID templateDlg;
+    LPCVOID lpTemplate;
     HRSRC hRes;
     HANDLE hDlgTmpl = 0;
@@ -708 +697 @@
    if (fodInfos->ofnInfos.Flags & OFN_ENABLETEMPLATE || fodInfos->ofnInfos.Flags & OFN_ENABLETEMPLATEHANDLE)
    {
-        if (fodInfos->ofnInfos.Flags  & OFN_ENABLETEMPLATEHANDLE)
-        {
-           if( !(templateDlg = LockResource( fodInfos->ofnInfos.hInstance)))
-                {
-                COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-                return (HWND)NULL;
-                }
-                
-        }
-        else
-        {
-         if (!(hRes = FindResourceA(MapHModuleSL(fodInfos->ofnInfos.hInstance),
+    if (fodInfos->ofnInfos.Flags  & OFN_ENABLETEMPLATEHANDLE)
+    {
+           if( !(lpTemplate = LockResource( fodInfos->ofnInfos.hInstance)))
+            {
+            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+            return (HWND)NULL;
+            }
+
+    }
+    else
+    {
+     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),
+        {
+            COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE);
+             return (HWND)NULL;
+        }
+        if (!(hDlgTmpl = LoadResource( MapHModuleSL(fodInfos->ofnInfos.hInstance),
              hRes )) ||
-                 !(templateDlg = LockResource( hDlgTmpl )))
-        {
-                COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-                return (HWND)NULL;
-        }
-        }
-
-        hChildDlg= CreateDialogIndirectParamA(fodInfos->ofnInfos.hInstance,(LPCDLGTEMPLATEA)templateDlg,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
-        if(hChildDlg)
-        {
-                ShowWindow(hChildDlg,SW_SHOW); 
-                return hChildDlg;
-        }
+                 !(lpTemplate = LockResource( hDlgTmpl )))
+        {
+            COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+            return (HWND)NULL;
+        }
+    }
+
+    hChildDlg= CreateDialogIndirectParamA(fodInfos->ofnInfos.hInstance,(LPCDLGTEMPLATEA)lpTemplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+    if(hChildDlg)
+    {
+        ShowWindow(hChildDlg,SW_SHOW);
+            return hChildDlg;
+    }
  }
  else if(fodInfos->ofnInfos.Flags & OFN_ENABLEHOOK && fodInfos->ofnInfos.lpfnHook)
  {
-        RECT rectHwnd;
-        DLGTEMPLATE tmplate;
-        GetClientRect(hwnd,&rectHwnd);
-        tmplate.style = WS_CHILD | WS_CLIPSIBLINGS;
-        tmplate.dwExtendedStyle = 0;
-        tmplate.cdit = 0;
-        tmplate.x = 0;
-        tmplate.y = 0;
-        tmplate.cx = rectHwnd.right-rectHwnd.left;
-        tmplate.cy = rectHwnd.bottom-rectHwnd.top;
-       
-        return CreateDialogIndirectParamA(fodInfos->ofnInfos.hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+    RECT rectHwnd;
+    DLGTEMPLATE tmplate;
+    GetClientRect(hwnd,&rectHwnd);
+    tmplate.style = WS_CHILD | WS_CLIPSIBLINGS;
+    tmplate.dwExtendedStyle = 0;
+    tmplate.cdit = 0;
+    tmplate.x = 0;
+    tmplate.y = 0;
+    tmplate.cx = rectHwnd.right-rectHwnd.left;
+    tmplate.cy = rectHwnd.bottom-rectHwnd.top;
+
+    return CreateDialogIndirectParamA(fodInfos->ofnInfos.hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
  }
 return (HWND)NULL;
@@ -760 +749 @@
 
 /***********************************************************************
+*          SendCustomDlgNotificationMessage
+*
+* Send CustomDialogNotification (CDN_FIRST -- CDN_LAST) message to the custom template dialog
+*/
+
+HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode)
+{
+    FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwndParentDlg,FileOpenDlgInfosStr);
+    if(!fodInfos)
+        return 0;
+    if(fodInfos->DlgInfos.hwndCustomDlg)
+    {
+        OFNOTIFYA ofnNotify;
+        ofnNotify.hdr.hwndFrom=hwndParentDlg;
+        ofnNotify.hdr.idFrom=0;
+        ofnNotify.hdr.code = uCode;
+        ofnNotify.lpOFN = &fodInfos->ofnInfos;
+        return SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
+    }
+    return TRUE;
+}
+
+/***********************************************************************
+*         FILEDLG95_HandleCustomDialogMessages
+*
+* Handle Custom Dialog Messages (CDM_FIRST -- CDM_LAST) messages
+*/
+HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    LPSTR lpstrFileSpec;
+    char lpstrCurrentDir[MAX_PATH]="";
+    FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
+    if(!fodInfos)
+        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)
+            {
+                if(fodInfos)
+                {
+                    COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,
+                    lpstrCurrentDir);
+                    strncpy((LPSTR)lParam,lpstrCurrentDir,(int)wParam);
+                }
+                else
+                *((LPSTR)lParam)=0;
+            }
+            return TRUE;
+    case CDM_GETSPEC:
+            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_HIDECONTROL:
+        case CDM_SETCONTROLTEXT:
+        case CDM_SETDEFEXT:
+        FIXME("CDM_HIDECONTROL,CDM_SETCONTROLTEXT,CDM_SETDEFEXT not implemented\n");
+        return TRUE;
+    }
+    return TRUE;
+}
+
+/***********************************************************************
  *          FileOpenDlgProc95
  *
@@ -766 +840 @@
 HRESULT WINAPI FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-
   switch(uMsg)
   {
     case WM_INITDIALOG :
-        CreateTemplateDialog((FileOpenDlgInfos *)lParam,hwnd);
-      return FILEDLG95_OnWMInitDialog(hwnd, wParam, lParam);
+
+         /* Adds the FileOpenDlgInfos in the property list of the dialog
+            so it will be easily accessible through a GetPropA(...) */
+         SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) lParam);
+
+         ((FileOpenDlgInfos *)lParam)->DlgInfos.hwndCustomDlg =
+        CreateTemplateDialog((FileOpenDlgInfos *)lParam,hwnd);
+         FILEDLG95_OnWMInitDialog(hwnd, wParam, lParam);
+         SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE);
+         return 0;
     case WM_COMMAND:
       return FILEDLG95_OnWMCommand(hwnd, wParam, lParam);
@@ -784 +865 @@
       }
       return FALSE;
-          
+
     case WM_GETISHELLBROWSER:
       return FILEDLG95_OnWMGetIShellBrowser(hwnd);
@@ -792 +873 @@
 
     default :
+      if(uMsg >= CDM_FIRST && uMsg <= CDM_LAST)
+        return FILEDLG95_HandleCustomDialogMessages(hwnd, uMsg, wParam, lParam);
       return FALSE;
   }
@@ -808 +891 @@
   TRACE("\n");
 
-  /* Adds the FileOpenDlgInfos in the property list of the dialog 
-     so it will be easily accessible through a GetPropA(...) */
-  SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos);
-
+  /* Make sure the common control DLL is loaded */
 #ifndef __WIN32OS2__
-  /* Make sure the common control DLL is loaded */      
   InitCommonControls();
 #endif
@@ -875 +954 @@
     /* OK button */
   case IDOK:
-      FILEDLG95_OnOpen(hwnd);
+      if(FILEDLG95_OnOpen(hwnd))
+        SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK);
     break;
     /* Cancel button */
@@ -885 +965 @@
   case IDC_FILETYPE:
     FILEDLG95_FILETYPE_OnCommand(hwnd,wNotifyCode);
+    SendCustomDlgNotificationMessage(hwnd,CDN_TYPECHANGE);
     break;
     /* LookIn combo box */
@@ -890 +971 @@
     FILEDLG95_LOOKIN_OnCommand(hwnd,wNotifyCode);
     break;
+
+  /* --- toolbar --- */
     /* Up folder button */
-  case IDC_UPFOLDER:
+  case FCIDM_TB_UPFOLDER:
     FILEDLG95_SHELL_UpFolder(hwnd);
     break;
+    /* New folder button */
+  case FCIDM_TB_NEWFOLDER:
+    FILEDLG95_SHELL_NewFolder(hwnd);
+    break;
     /* List option button */
-  case IDC_LIST:
+  case FCIDM_TB_SMALLICON:
     FILEDLG95_SHELL_ExecuteCommand(hwnd,CMDSTR_VIEWLIST);
     break;
     /* Details option button */
-  case IDC_DETAILS:
+  case FCIDM_TB_REPORTVIEW:
     FILEDLG95_SHELL_ExecuteCommand(hwnd,CMDSTR_VIEWDETAILS);
     break;
-    /* New folder button */
-  case IDC_NEWFOLDER:
-    FILEDLG95_SHELL_NewFolder(hwnd);
-    break;
 
   case IDC_FILENAME:
@@ -913 +996 @@
   /* Do not use the listview selection anymore */
   fodInfos->DlgInfos.dwDlgProp &= ~FODPROP_USEVIEW;
-  return 0; 
+  return 0;
 }
 
@@ -930 +1013 @@
   SetWindowLongA(hwnd,DWL_MSGRESULT,(LONG)fodInfos->Shell.FOIShellBrowser);
 
-  return TRUE; 
+  return TRUE;
 }
 
@@ -940 +1023 @@
 static LRESULT FILEDLG95_InitUI(HWND hwnd)
 {
-  HIMAGELIST himlToolbar;
-  HICON hicon;
+  TBBUTTON tbb[] =
+  {{VIEW_PARENTFOLDER, FCIDM_TB_UPFOLDER,   TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 },
+   {0,                 0,                   TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0 },
+   {VIEW_NEWFOLDER,    FCIDM_TB_NEWFOLDER,  TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 },
+   {0,                 0,                   TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0 },
+   {VIEW_LIST,         FCIDM_TB_SMALLICON,  TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 },
+   {VIEW_DETAILS,      FCIDM_TB_REPORTVIEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 },
+  };
+  TBADDBITMAP tba = { HINST_COMMCTRL, IDB_VIEW_SMALL_COLOR };
+  RECT rectTB;
+
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
 
@@ -951 +1043 @@
   fodInfos->DlgInfos.hwndLookInCB = GetDlgItem(hwnd,IDC_LOOKIN);
 
-    ShowWindow(GetDlgItem(hwnd,IDC_SHELLSTATIC),SW_HIDE);
-  /* Load the icons bitmaps */
-
-  if((himlToolbar = COMDLG32_ImageList_LoadImageA(COMDLG32_hInstance,
-                                     MAKEINTRESOURCEA(IDB_TOOLBAR),
-                                     0,
-                                     1,
-                                     CLR_DEFAULT,
-                                     IMAGE_BITMAP,
-                                     0)))
-  {
-    /* Up folder icon */
-    if((hicon = COMDLG32_ImageList_GetIcon(himlToolbar,0,ILD_NORMAL)))
-      SendDlgItemMessageA(hwnd,IDC_UPFOLDER,BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hicon);
-    /* New folder icon */
-    if((hicon = COMDLG32_ImageList_GetIcon(himlToolbar,1,ILD_NORMAL)))
-      SendDlgItemMessageA(hwnd,IDC_NEWFOLDER,BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hicon);
-    /* List view icon */
-    if((hicon = COMDLG32_ImageList_GetIcon(himlToolbar,2,ILD_NORMAL)))
-      SendDlgItemMessageA(hwnd,IDC_LIST,BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hicon);
-    /* Detail view icon */
-    if((hicon = COMDLG32_ImageList_GetIcon(himlToolbar,3,ILD_NORMAL)))
-      SendDlgItemMessageA(hwnd,IDC_DETAILS,BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hicon);
-    /* Cleanup */
-    COMDLG32_ImageList_Destroy(himlToolbar);
-  }
-
-
+  /* construct the toolbar */
+  GetWindowRect(GetDlgItem(hwnd,IDC_TOOLBARSTATIC),&rectTB);
+  MapWindowPoints( 0, hwnd,(LPPOINT)&rectTB,2);
+
+  fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL,
+        WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
+        0, 0, 150, 26,
+    hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL);
+
+  SetWindowPos(fodInfos->DlgInfos.hwndTB, 0,
+    rectTB.left,rectTB.top, rectTB.right-rectTB.left, rectTB.bottom-rectTB.top,
+    SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER );
+
+  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
+
+/* fixme: use TB_LOADIMAGES when implemented */
+/*  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_LOADIMAGES, (WPARAM) IDB_VIEW_SMALL_COLOR, HINST_COMMCTRL);*/
+  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, (WPARAM) 12, (LPARAM) &tba);
+
+  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSA, (WPARAM) 6,(LPARAM) &tbb);
+  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0);
 
   /* Set the window text with the text specified in the OPENFILENAME structure */
   if(fodInfos->ofnInfos.lpstrTitle)
-    SetWindowTextA(hwnd,fodInfos->ofnInfos.lpstrTitle);
+  {
+      SetWindowTextA(hwnd,fodInfos->ofnInfos.lpstrTitle);
+  }
+  else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
+  {
+      SetWindowTextA(hwnd,"Save");
+  }
 
   /* Initialise the file name edit control */
@@ -1000 +1091 @@
     ShowWindow(GetDlgItem(hwnd,IDC_OPENREADONLY),SW_HIDE);
   }
-
-  /* List View is selected by default */
-  SendDlgItemMessageA(hwnd, IDC_LIST, BM_SETCHECK,(WPARAM) BST_CHECKED,0);
-
+  /* change Open to Save */
+  if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
+  {
+      SetDlgItemTextA(hwnd,IDOK,"Save");
+  }
   return 0;
 }
@@ -1011 +1103 @@
  *
  * Ok button WM_COMMAND message handler
- * 
+ *
  * If the function succeeds, the return value is nonzero.
  */
@@ -1043 +1135 @@
       char lpstrPathAndFile[MAX_PATH] = "";
 
-      /* Separate the file spec from the path spec 
-         e.g.: 
-              lpstrSpecifiedByUser  lpstrPathSpec  lpstrFileSpec
-              C:\TEXT1\TEXT2        C:\TEXT1          TEXT2
-      */      
+      /* Separate the file spec from the path spec
+     e.g.:
+          lpstrSpecifiedByUser  lpstrPathSpec  lpstrFileSpec
+          C:\TEXT1\TEXT2        C:\TEXT1          TEXT2
+      */
       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);
+
       /* Get the current directory name */
       COMDLG32_SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,
-                                    lpstrCurrentDir);
-
-      /* Create an absolute path name */ 
+                    lpstrCurrentDir);
+
+      /* Create an absolute path name */
       if(lpstrSpecifiedByUser[1] != ':')
       {
           switch(lpstrSpecifiedByUser[0])
           {
-          /* Add drive spec  \TEXT => C:\TEXT */
-          case '\\':
-              {
-                  INT iCopy = 2;
-                  char lpstrTmp[MAX_PATH] = "";
-                  if(!strlen(lpstrPathSpec))
-                      iCopy = 3;
-                  strncpy(lpstrTmp,lpstrCurrentDir,iCopy);
-                  strcat(lpstrTmp,lpstrPathSpec);
-                  strcpy(lpstrPathSpec,lpstrTmp);
-              }
-              break;           
-          /* Go to parent ..\TEXT */ 
-          case '.':
-              {
-                  INT iSize;
-                  char lpstrTmp2[MAX_PATH] = "";
-                  LPSTR lpstrTmp = strrchr(lpstrCurrentDir,'\\');
-                  iSize = lpstrTmp - lpstrCurrentDir;
-                  strncpy(lpstrTmp2,lpstrCurrentDir,iSize + 1);
-                  if(strlen(lpstrSpecifiedByUser) <= 3)
-                      strcpy(lpstrFileSpec,"");
-                  if(strcmp(lpstrPathSpec,".."))
-                      strcat(lpstrTmp2,&lpstrPathSpec[3]);
-                  strcpy(lpstrPathSpec,lpstrTmp2);
-              }
-              break;
-          default:
-  {
-                  char lpstrTmp[MAX_PATH] = "";
-                  if(strcmp(&lpstrCurrentDir[strlen(lpstrCurrentDir)-1],"\\"))
-                      strcat(lpstrCurrentDir,"\\");
-                  strcpy(lpstrTmp,lpstrCurrentDir);
-                  strcat(lpstrTmp,lpstrPathSpec);
-                  strcpy(lpstrPathSpec,lpstrTmp);
-              }
-                 
+          /* Add drive spec  \TEXT => C:\TEXT */
+          case '\\':
+              {
+              INT iCopy = 2;
+              char lpstrTmp[MAX_PATH] = "";
+              if(!strlen(lpstrPathSpec))
+                  iCopy = 3;
+              strncpy(lpstrTmp,lpstrCurrentDir,iCopy);
+              strcat(lpstrTmp,lpstrPathSpec);
+              strcpy(lpstrPathSpec,lpstrTmp);
+              }
+              break;
+          /* Go to parent ..\TEXT */
+      case '.':
+          {
+              INT iSize;
+              char lpstrTmp2[MAX_PATH] = "";
+              LPSTR lpstrTmp = strrchr(lpstrCurrentDir,'\\');
+              iSize = lpstrTmp - lpstrCurrentDir;
+              strncpy(lpstrTmp2,lpstrCurrentDir,iSize + 1);
+          if(strlen(lpstrSpecifiedByUser) <= 3)
+              strcpy(lpstrFileSpec,"");
+              if(strcmp(lpstrPathSpec,".."))
+                  strcat(lpstrTmp2,&lpstrPathSpec[3]);
+          strcpy(lpstrPathSpec,lpstrTmp2);
+              }
+              break;
+          default:
+  {
+              char lpstrTmp[MAX_PATH] = "";
+              if(strcmp(&lpstrCurrentDir[strlen(lpstrCurrentDir)-1],"\\"))
+                  strcat(lpstrCurrentDir,"\\");
+              strcpy(lpstrTmp,lpstrCurrentDir);
+              strcat(lpstrTmp,lpstrPathSpec);
+              strcpy(lpstrPathSpec,lpstrTmp);
+              }
+
           } /* end switch */
       }
@@ -1103 +1198 @@
       if(strlen(lpstrPathSpec))
       {
-          /* Browse to the right directory */
-          COMDLG32_SHGetDesktopFolder(&psfDesktop); 
-          if((browsePidl = GetPidlFromName(psfDesktop,lpstrPathSpec)))
-          {
-              /* Browse to directory */
-              IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser,
-                                         browsePidl,
-                                         SBSP_ABSOLUTE);
-              COMDLG32_SHFree(browsePidl);
-          }
-          else
-          {
-              /* Path does not exist */
-              if(fodInfos->ofnInfos.Flags & OFN_PATHMUSTEXIST)
-              {
-                  MessageBoxA(hwnd,
-                              "Path does not exist",
-                              fodInfos->ofnInfos.lpstrTitle,
-                              MB_OK | MB_ICONEXCLAMATION);
-                  return FALSE;
-              }
-          }
-          
-          strcat(lpstrPathAndFile,lpstrPathSpec);
-          IShellFolder_Release(psfDesktop);
+      /* Browse to the right directory */
+      COMDLG32_SHGetDesktopFolder(&psfDesktop);
+      if((browsePidl = GetPidlFromName(psfDesktop,lpstrPathSpec)))
+      {
+          /* Browse to directory */
+          IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser,
+                     browsePidl,
+                     SBSP_ABSOLUTE);
+          COMDLG32_SHFree(browsePidl);
       }
       else
       {
-          strcat(lpstrPathAndFile,lpstrCurrentDir);
+          /* Path does not exist */
+          if(fodInfos->ofnInfos.Flags & OFN_PATHMUSTEXIST)
+          {
+          MessageBoxA(hwnd,
+                  "Path does not exist",
+                  fodInfos->ofnInfos.lpstrTitle,
+                  MB_OK | MB_ICONEXCLAMATION);
+          return FALSE;
+          }
+      }
+
+      strcat(lpstrPathAndFile,lpstrPathSpec);
+      IShellFolder_Release(psfDesktop);
+      }
+      else
+      {
+      strcat(lpstrPathAndFile,lpstrCurrentDir);
       }
 
@@ -1137 +1232 @@
       COMDLG32_PathAddBackslashA(lpstrPathAndFile);
       strcat(lpstrPathAndFile,lpstrFileSpec);
-      
+
       /* Update the edit field */
       SetDlgItemTextA(hwnd,IDC_FILENAME,lpstrFileSpec);
       SendDlgItemMessageA(hwnd,IDC_FILENAME,EM_SETSEL,0,-1);
-      
+
       /* Don't go further if we dont have a file spec */
       if(!strlen(lpstrFileSpec) || !strcmp(lpstrFileSpec,lpstrPathSpec))
-          return FALSE;
-
-      /* Time to check lpstrFileSpec         */ 
+      return FALSE;
+
+      /* Time to check lpstrFileSpec         */
       /* search => contains * or ?           */
       /* browse => contains a directory name */
@@ -1160 +1255 @@
          MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
 
-          fodInfos->ShellInfos.lpstrCurrentFilter = (LPWSTR)MemAlloc((strlen(lpstrFileSpec)+1)*2);
-          lstrcpyAtoW(fodInfos->ShellInfos.lpstrCurrentFilter,
-                      (LPSTR)strlwr((LPSTR)lpstrFileSpec));
-      
+      fodInfos->ShellInfos.lpstrCurrentFilter = (LPWSTR)MemAlloc((strlen(lpstrFileSpec)+1)*2);
+      lstrcpyAtoW(fodInfos->ShellInfos.lpstrCurrentFilter,
+              (LPSTR)strlwr((LPSTR)lpstrFileSpec));
+
       IShellView_Refresh(fodInfos->Shell.FOIShellView);
 
-          if(-1 < (iPos = FILEDLG95_FILETYPE_SearchExt(fodInfos->DlgInfos.hwndFileTypeCB,
-                                                       lpstrFileSpec)))
+      if(-1 < (iPos = FILEDLG95_FILETYPE_SearchExt(fodInfos->DlgInfos.hwndFileTypeCB,
+                               lpstrFileSpec)))
         CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB,iPos);
 
@@ -1175 +1270 @@
       /* browse if the user specified a directory */
       if((browsePidl = GetPidlFromName(fodInfos->Shell.FOIShellFolder,
-                                       lpstrFileSpec)))
+                       lpstrFileSpec)))
     {
           ULONG  ulAttr = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
-          IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 
-                                       1, 
-                                       &browsePidl, 
-                                       &ulAttr);
-
-          /* Browse to directory */
-          if(ulAttr)
+      int    nMsgBoxRet;
+      char   lpstrFileExist[MAX_PATH + 50];
+
+          IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder,
+                       1,
+                       &browsePidl,
+                       &ulAttr);
+
+      /* The file does exist, so ask the user if we should overwrite it */
+      if(fodInfos->ofnInfos.Flags & OFN_OVERWRITEPROMPT)
+      {
+        strcpy(lpstrFileExist, lpstrFileSpec);
+        strcat(lpstrFileExist, " already exists.\nDo you want to replace it?");
+
+        nMsgBoxRet = MessageBoxA(hwnd,
+                        lpstrFileExist,
+                        fodInfos->ofnInfos.lpstrTitle,
+                        MB_YESNO | MB_ICONEXCLAMATION);
+        if(nMsgBoxRet == IDNO) return FALSE;
+      }
+
+      /* Browse to directory */
+      if(ulAttr)
         {
-              if(FAILED(IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser,
-                                                   browsePidl,
-                                                   SBSP_RELATIVE)))
+          if(FAILED(IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser,
+                           browsePidl,
+                           SBSP_RELATIVE)))
         {
-                  if(fodInfos->ofnInfos.Flags & OFN_PATHMUSTEXIST)
+          if(fodInfos->ofnInfos.Flags & OFN_PATHMUSTEXIST)
         {
-                      MessageBoxA(hwnd,
-                                  "Path does not exist",
-                                  fodInfos->ofnInfos.lpstrTitle,
-                                  MB_OK | MB_ICONEXCLAMATION);
-                      COMDLG32_SHFree(browsePidl);
-                      return FALSE;
+              MessageBoxA(hwnd,
+                  "Path does not exist",
+                  fodInfos->ofnInfos.lpstrTitle,
+                  MB_OK | MB_ICONEXCLAMATION);
+              COMDLG32_SHFree(browsePidl);
+              return FALSE;
         }
     }
-              COMDLG32_SHFree(browsePidl);
-              return FALSE;
-    }
-          COMDLG32_SHFree(browsePidl);
+          COMDLG32_SHFree(browsePidl);
+          return FALSE;
+    }
+      COMDLG32_SHFree(browsePidl);
       }
       else
     {
-          /* File does not exist in current directory */
-
-          /* The selected file does not exist */
+      /* File does not exist in current directory */
+
+      /* The selected file does not exist */
       /* Tell the user the selected does not exist */
       if(fodInfos->ofnInfos.Flags & OFN_FILEMUSTEXIST)
@@ -1217 +1328 @@
         char tmp[400];
 
-              LoadStringA(COMDLG32_hInstance,
-                          IDS_FILENOTFOUND,
-                          lpstrNotFound,
-                          100);
-              LoadStringA(COMDLG32_hInstance,
-                          IDS_VERIFYFILE,
-                          lpstrMsg,
-                          100);
+          LoadStringA(COMMDLG_hInstance32,
+              IDS_FILENOTFOUND,
+              lpstrNotFound,
+              100);
+          LoadStringA(COMMDLG_hInstance32,
+              IDS_VERIFYFILE,
+              lpstrMsg,
+              100);
 
         strcpy(tmp,fodInfos->ofnInfos.lpstrFile);
@@ -1232 +1343 @@
         strcat(tmp,lpstrMsg);
 
-              MessageBoxA(hwnd,
-                          tmp,
-                          fodInfos->ofnInfos.lpstrTitle,
-                          MB_OK | MB_ICONEXCLAMATION);
-        return FALSE;
+          MessageBoxA(hwnd,
+              tmp,
+              fodInfos->ofnInfos.lpstrTitle,
+              MB_OK | MB_ICONEXCLAMATION);
+    return FALSE;
       }
       /* Ask the user if he wants to create the file*/
@@ -1243 +1354 @@
         char tmp[100];
 
-        LoadStringA(COMDLG32_hInstance,IDS_CREATEFILE,tmp,100);
-
-              if(IDYES == MessageBoxA(hwnd,tmp,fodInfos->ofnInfos.lpstrTitle,
-                                      MB_YESNO | MB_ICONQUESTION))
+        LoadStringA(COMMDLG_hInstance32,IDS_CREATEFILE,tmp,100);
+
+          if(IDYES == MessageBoxA(hwnd,tmp,fodInfos->ofnInfos.lpstrTitle,
+                      MB_YESNO | MB_ICONQUESTION))
         {
             /* Create the file, clean and exit */
@@ -1252 +1363 @@
             return EndDialog(hwnd,TRUE);
         }
-        return FALSE;        
+    return FALSE;
       }
     }
@@ -1261 +1372 @@
       if(!strrchr(lpstrPathAndFile,'.'))
       {
-          /* if the file has no extension, append the selected
-             extension of the filetype combo box */
-          int iExt; 
-          LPSTR lpstrExt;
-          iExt = CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
-          lpstrTemp = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,iExt);
+          /* if the file has no extension, append the selected
+             extension of the filetype combo box */
+          int iExt;
+          LPSTR lpstrExt;
+          iExt = CBGetCurSel(fodInfos->DlgInfos.hwndFileTypeCB);
+          lpstrTemp = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,iExt);
 
           //SvL: Check pointer first
           if(lpstrTemp != (LPSTR)-1) {
-                if((lpstrExt = strchr(lpstrTemp,';')))
-                {
-                      int i = lpstrExt - lpstrTemp;
-                      lpstrExt = MemAlloc(i);
-                      strncpy(lpstrExt,&lpstrTemp[1],i-1);
-                }
-                else
-                {
-                      lpstrExt = MemAlloc(strlen(lpstrTemp));
-                      strcpy(lpstrExt,&lpstrTemp[1]);
-                }
-                  
-                if(!strcmp(&lpstrExt[1],"*") && fodInfos->ofnInfos.lpstrDefExt)
-                {
-                        lpstrExt = MemAlloc(strlen(fodInfos->ofnInfos.lpstrDefExt)+2);
-                        strcat(lpstrExt,".");
-                        strcat(lpstrExt,(LPSTR) fodInfos->ofnInfos.lpstrDefExt);
-                }
-                strcat(lpstrPathAndFile,lpstrExt);
-          }
+            if((lpstrExt = strchr(lpstrTemp,';')))
+            {
+              int i = lpstrExt - lpstrTemp;
+              lpstrExt = (LPSTR)MemAlloc(i);
+              strncpy(lpstrExt,&lpstrTemp[1],i-1);
+            }
+            else
+            {
+              lpstrExt = (LPSTR)MemAlloc(strlen(lpstrTemp));
+              strcpy(lpstrExt,&lpstrTemp[1]);
+            }
+
+            if(!strcmp(&lpstrExt[1],"*") && fodInfos->ofnInfos.lpstrDefExt)
+            {
+              lpstrExt = (LPSTR)MemAlloc(strlen(fodInfos->ofnInfos.lpstrDefExt)+2);
+              strcat(lpstrExt,".");
+              strcat(lpstrExt,(LPSTR) fodInfos->ofnInfos.lpstrDefExt);
+            }
+            strcat(lpstrPathAndFile,lpstrExt);
+        }
       }
       /* Check that size size of the file does not exceed buffer size */
       if(strlen(lpstrPathAndFile) > fodInfos->ofnInfos.nMaxFile)
       {
-          /* set error FNERR_BUFFERTOSMALL */
-          FILEDLG95_Clean(hwnd);
-          return EndDialog(hwnd,FALSE);
+      /* set error FNERR_BUFFERTOSMALL */
+      FILEDLG95_Clean(hwnd);
+          return EndDialog(hwnd,FALSE);
       }
       strcpy(fodInfos->ofnInfos.lpstrFile,lpstrPathAndFile);
@@ -1302 +1413 @@
       /* Set the lpstrFileTitle of the OPENFILENAME structure */
       if(fodInfos->ofnInfos.lpstrFileTitle)
-          strncpy(fodInfos->ofnInfos.lpstrFileTitle,
-                  lpstrFileSpec,
-                  fodInfos->ofnInfos.nMaxFileTitle);
-
-      /* Check if the file is to be opened as read only */            
+          strncpy(fodInfos->ofnInfos.lpstrFileTitle,
+              lpstrFileSpec,
+              fodInfos->ofnInfos.nMaxFileTitle);
+
+      /* Check if the file is to be opened as read only */
       if(BST_CHECKED == SendDlgItemMessageA(hwnd,
-                                            IDC_OPENREADONLY,
-                                            BM_GETSTATE,0,0))
-          SetFileAttributesA(fodInfos->ofnInfos.lpstrFile,
-                             FILE_ATTRIBUTE_READONLY);
+                        IDC_OPENREADONLY,
+                        BM_GETSTATE,0,0))
+      SetFileAttributesA(fodInfos->ofnInfos.lpstrFile,
+                 FILE_ATTRIBUTE_READONLY);
 
       /*  nFileExtension and nFileOffset of OPENFILENAME structure */
@@ -1319 +1430 @@
       fodInfos->ofnInfos.nFileExtension = lpstrTemp - fodInfos->ofnInfos.lpstrFile + 1;
 
-    
+
     /* clean and exit */
     FILEDLG95_Clean(hwnd);
@@ -1340 +1451 @@
 
   /*
-   * Initialisation of the FileOpenDialogInfos structure 
+   * Initialisation of the FileOpenDialogInfos structure
    */
 
@@ -1360 +1471 @@
 
   /* Construct the IShellBrowser interface */
-  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);  
-    
+  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);
+
   return NOERROR;
 }
@@ -1380 +1491 @@
 
   if(SUCCEEDED(IShellView_GetItemObject(fodInfos->Shell.FOIShellView,
-                                        SVGIO_BACKGROUND,
-                                        &IID_IContextMenu,
-                                        (LPVOID*)&pcm)))
+                    SVGIO_BACKGROUND,
+                    &IID_IContextMenu,
+                    (LPVOID*)&pcm)))
   {
     ci.cbSize = sizeof(CMINVOKECOMMANDINFO);
@@ -1419 +1530 @@
  *      FILEDLG95_SHELL_NewFolder
  *
- * Creates a new directory with New folder as name 
+ * Creates a new directory with New folder as name
  * If the function succeeds, the return value is nonzero.
  * FIXME: let the contextmenu (CMDSTR_NEWFOLDER) do this thing
@@ -1467 +1578 @@
  *      FILEDLG95_FILETYPE_Init
  *
- * Initialisation of the file type combo box 
+ * Initialisation of the file type combo box
  */
 static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
@@ -1502 +1613 @@
       if(!lpstrExt)
           break;
-      
+
       strcpy(lpstrExt,lpstrExtTmp);
 
       iStrIndex += strlen(lpstrExt) +1;
-            
+
       /* Add the item at the end of the combo */
       CBAddString(fodInfos->DlgInfos.hwndFileTypeCB,lpstrTmp);
@@ -1552 +1663 @@
       lpstrFilter = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
                                              iItem);
-      if((INT)lpstrFilter != CB_ERR)
+      if(lpstrFilter)
       {
         fodInfos->ShellInfos.lpstrCurrentFilter = (LPWSTR)MemAlloc((strlen(lpstrFilter)+1)*2);
@@ -1614 +1725 @@
 
 }
-    
+
 /***********************************************************************
  *      FILEDLG95_LOOKIN_Init
  *
- * Initialisation of the look in combo box 
+ * Initialisation of the look in combo box
  */
 static HRESULT FILEDLG95_LOOKIN_Init(HWND hwndCombo)
 {
-  IShellFolder  *psfRoot, *psfDrives;
-  IEnumIDList   *lpeRoot, *lpeDrives;
-  LPITEMIDLIST  pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp;
-
-  LookInInfos *liInfos = (LookInInfos*)MemAlloc(sizeof(LookInInfos));
+  IShellFolder  *psfRoot, *psfDrives;
+  IEnumIDList   *lpeRoot, *lpeDrives;
+  LPITEMIDLIST  pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp;
+
+  LookInInfos *liInfos = (LookInInfos *)MemAlloc(sizeof(LookInInfos));
 
   TRACE("\n");
@@ -1651 +1762 @@
       while (S_OK == IEnumIDList_Next(lpeRoot, 1, &pidlTmp, NULL))
       {
-        FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
-
-        /* special handling for CSIDL_DRIVES */
-        if (COMDLG32_PIDL_ILIsEqual(pidlTmp, pidlDrives))
-        {
-          if(SUCCEEDED(IShellFolder_BindToObject(psfRoot, pidlTmp, NULL, &IID_IShellFolder, (LPVOID*)&psfDrives)))
-          {
-            /* enumerate the drives */
-            if(SUCCEEDED(IShellFolder_EnumObjects(psfDrives, hwndCombo,SHCONTF_FOLDERS, &lpeDrives)))
-            {
-              while (S_OK == IEnumIDList_Next(lpeDrives, 1, &pidlTmp1, NULL))
-              {
-                pidlAbsTmp = COMDLG32_PIDL_ILCombine(pidlTmp, pidlTmp1);
-                FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlAbsTmp,LISTEND);
-                COMDLG32_SHFree(pidlAbsTmp);
-                COMDLG32_SHFree(pidlTmp1);
-              }
-              IEnumIDList_Release(lpeDrives);
-            }
-            IShellFolder_Release(psfDrives);
-          }
-        }
+    FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
+
+    /* special handling for CSIDL_DRIVES */
+    if (COMDLG32_PIDL_ILIsEqual(pidlTmp, pidlDrives))
+    {
+      if(SUCCEEDED(IShellFolder_BindToObject(psfRoot, pidlTmp, NULL, &IID_IShellFolder, (LPVOID*)&psfDrives)))
+      {
+        /* enumerate the drives */
+        if(SUCCEEDED(IShellFolder_EnumObjects(psfDrives, hwndCombo,SHCONTF_FOLDERS, &lpeDrives)))
+        {
+          while (S_OK == IEnumIDList_Next(lpeDrives, 1, &pidlTmp1, NULL))
+          {
+            pidlAbsTmp = COMDLG32_PIDL_ILCombine(pidlTmp, pidlTmp1);
+            FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlAbsTmp,LISTEND);
+            COMDLG32_SHFree(pidlAbsTmp);
+            COMDLG32_SHFree(pidlTmp1);
+          }
+          IEnumIDList_Release(lpeDrives);
+        }
+        IShellFolder_Release(psfDrives);
+      }
+    }
         COMDLG32_SHFree(pidlTmp);
       }
@@ -1718 +1829 @@
   {
     ilItemImage = (HIMAGELIST) COMDLG32_SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                               0,    
-                                               &sfi,    
-                                               sizeof (SHFILEINFOA),   
-                                               SHGFI_PIDL | SHGFI_SMALLICON |    
-                                               SHGFI_OPENICON | SHGFI_SYSICONINDEX    | 
-                                               SHGFI_DISPLAYNAME );   
+                                               0,
+                                               &sfi,
+                                               sizeof (SHFILEINFOA),
+                                               SHGFI_PIDL | SHGFI_SMALLICON |
+                                               SHGFI_OPENICON | SHGFI_SYSICONINDEX    |
+                                               SHGFI_DISPLAYNAME );
   }
   else
   {
     ilItemImage = (HIMAGELIST) COMDLG32_SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                                  0, 
-                                                  &sfi, 
+                                                  0,
+                                                  &sfi,
                                                   sizeof (SHFILEINFOA),
-                                                  SHGFI_PIDL | SHGFI_SMALLICON | 
-                                                  SHGFI_SYSICONINDEX | 
+                                                  SHGFI_PIDL | SHGFI_SMALLICON |
+                                                  SHGFI_SYSICONINDEX |
                                                   SHGFI_DISPLAYNAME);
   }
@@ -1755 +1866 @@
     iIndentation = 0;
     ilItemImage = (HIMAGELIST) COMDLG32_SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
-                                                0, 
-                                                &sfi, 
-                                                sizeof (SHFILEINFOA), 
-                                                SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON 
+                                                0,
+                                                &sfi,
+                                                sizeof (SHFILEINFOA),
+                                                SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON
                                                 | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME  );
 
@@ -1780 +1891 @@
   rectText.bottom = pDIStruct->rcItem.bottom;
 
- 
+
   /* Draw the icon from the image list */
   COMDLG32_ImageList_Draw(ilItemImage,
                  sfi.iIcon,
-                 pDIStruct->hDC,  
-                 rectIcon.left,  
-                 rectIcon.top,  
-                 ILD_TRANSPARENT );  
+                 pDIStruct->hDC,
+                 rectIcon.left,
+                 rectIcon.top,
+                 ILD_TRANSPARENT );
 
   /* Draw the associated text */
@@ -1814 +1925 @@
     {
       LPSFOLDER tmpFolder;
-      int iItem; 
+      int iItem;
 
       iItem = CBGetCurSel(fodInfos->DlgInfos.hwndLookInCB);
@@ -1820 +1931 @@
       if(!(tmpFolder = (LPSFOLDER) CBGetItemDataPtr(fodInfos->DlgInfos.hwndLookInCB,
                                                iItem)))
-        return FALSE;
+    return FALSE;
 
 
@@ -1831 +1942 @@
       break;
     }
-      
+
   }
   return FALSE;
@@ -1846 +1957 @@
   LPITEMIDLIST pidlNext;
   SHFILEINFOA sfi;
-  SFOLDER *tmpFolder = (SFOLDER*)MemAlloc(sizeof(SFOLDER));
+  SFOLDER *tmpFolder = (SFOLDER *)MemAlloc(sizeof(SFOLDER));
   LookInInfos *liInfos;
 
@@ -1853 +1964 @@
   if(!(liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr)))
     return -1;
-    
+
   tmpFolder->m_iIndent = 0;
 
@@ -1870 +1981 @@
   if(tmpFolder->m_iIndent > liInfos->iMaxIndentation)
     liInfos->iMaxIndentation = tmpFolder->m_iIndent;
-  
+
   COMDLG32_SHGetFileInfoA((LPSTR)pidl,
                   0,
                   &sfi,
                   sizeof(sfi),
-                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX 
+                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX
                   | SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_ATTRIBUTES);
 
@@ -1904 +2015 @@
  *      FILEDLG95_LOOKIN_InsertItemAfterParent
  *
- * Insert an item below its parent 
+ * Insert an item below its parent
  */
 static int FILEDLG95_LOOKIN_InsertItemAfterParent(HWND hwnd,LPITEMIDLIST pidl)
 {
-  
+
   LPITEMIDLIST pidlParent = GetParentPidl(pidl);
   int iParentPos;
@@ -1963 +2074 @@
     }
   }
-  
+
   CBSetCurSel(hwnd,iItemPos);
   liInfos->uSelectedItem = iItemPos;
@@ -2057 +2168 @@
  *      GetName
  *
- * Get the pidl's display name (relative to folder) and 
+ * Get the pidl's display name (relative to folder) and
  * put it in lpstrFileName.
- * 
+ *
  * Return NOERROR on success,
  * E_FAIL otherwise
@@ -2082 +2193 @@
   /* Get the display name of the pidl relative to the folder */
   if (SUCCEEDED(hRes = IShellFolder_GetDisplayNameOf(lpsf,
-                                                     pidl, 
-                                                     dwFlags, 
+                                                     pidl,
+                                                     dwFlags,
                                                      &str)))
   {
@@ -2094 +2205 @@
  *      GetShellFolderFromPidl
  *
- * pidlRel is the item pidl relative 
+ * pidlRel is the item pidl relative
  * Return the IShellFolder of the absolute pidl
  */
@@ -2110 +2221 @@
       if(SUCCEEDED(IShellFolder_BindToObject(psfParent, pidlAbs, NULL, &IID_IShellFolder, (LPVOID*)&psf)))
       {
-        IShellFolder_Release(psfParent);
+    IShellFolder_Release(psfParent);
         return psf;
       }
@@ -2133 +2244 @@
   pidlParent = COMDLG32_PIDL_ILClone(pidl);
   COMDLG32_PIDL_ILRemoveLastID(pidlParent);
-     
+
   return pidlParent;
 }
@@ -2140 +2251 @@
  *      GetPidlFromName
  *
- * returns the pidl of the file name relative to folder 
+ * returns the pidl of the file name relative to folder
  * NULL if an error occured
  */
@@ -2154 +2265 @@
   if(!lpcstrFileName)
     return NULL;
-    
+
   MultiByteToWideChar(CP_ACP,
-                      MB_PRECOMPOSED,   
-                      lpcstrFileName,  
-                      -1,  
-                      (LPWSTR)lpwstrDirName,  
-                      MAX_PATH);  
+                      MB_PRECOMPOSED,
+                      lpcstrFileName,
+                      -1,
+                      (LPWSTR)lpwstrDirName,
+                      MAX_PATH);
 
   IShellFolder_ParseDisplayName(psf,                                0,
@@ -2167 +2278 @@
                                              &ulEaten,
                                              &pidl,
-                                NULL);   
+                                NULL);
 
     return pidl;
@@ -2197 +2308 @@
 /*
  * Memory allocation methods */
-char *MemAlloc(UINT size)
-{
-    return (char *)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,size);
+void *MemAlloc(UINT size)
+{
+    return HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,size);
 }
 

trunk/src/comdlg32/filedlgbrowser.cpp

@@ -1 @@
-/* $Id: filedlgbrowser.cpp,v 1.3 1999-11-02 20:38:15 sandervl Exp $ */
+/* $Id: filedlgbrowser.cpp,v 1.4 1999-11-28 12:32:28 sandervl Exp $ */
 /*
  *  Implementation of IShellBrowser for the File Open common dialog
@@ -103 +103 @@
 extern int     FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl);
 extern BOOL    FILEDLG95_OnOpen(HWND hwnd);
+extern HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
 
 
@@ -512 +513 @@
 {
     ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
+    LRESULT lres;
+    
+//    TRACE("(%p)->(0x%08x 0x%08x 0x%08x 0x%08lx %p)\n", This, id, uMsg, wParam, lParam, pret);
+
+    switch (id)
+    {
+      case FCW_TOOLBAR:
+        lres = SendDlgItemMessageA( This->hwndOwner, IDC_TOOLBAR, uMsg, wParam, lParam);
+        break;
+      default:
+        FIXME("ctrl id: %x\n", id);
+        return E_NOTIMPL;
+    }
+    if (pret) *pret = lres;
+    return S_OK;
 }
 /**************************************************************************
@@ -769 +780 @@
 
         COMDLG32_SHFree((LPVOID)pidl);
+        SendCustomDlgNotificationMessage(This->hwndOwner, CDN_SELCHANGE);
         return hRes;
     }

trunk/src/comdlg32/filedlgbrowser.h

@@ -1 @@
-/* $Id: filedlgbrowser.h,v 1.2 1999-11-02 20:37:43 sandervl Exp $ */
+/* $Id: filedlgbrowser.h,v 1.3 1999-11-28 12:32:28 sandervl Exp $ */
 /*
  *  Implementation of IShellBrowser for the File Open common dialog
@@ -63 +63 @@
         HWND hwndLookInCB;
         HWND hwndFileName;
+        HWND hwndTB;
+        HWND hwndCustomDlg;
         DWORD dwDlgProp;
     } DlgInfos;
 
 } FileOpenDlgInfos;
+
+/***********************************************************************
+ * 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
+#define IDS_CREATEFILE                  116
+
+#define IDC_OPENREADONLY                chx1
+
+#define IDC_TOOLBARSTATIC               stc1
+#define IDC_FILETYPESTATIC              stc2
+#define IDC_FILENAMESTATIC              stc3
+#define IDC_LOOKINSTATIC                stc4
+
+#define IDC_SHELLSTATIC                 lst1
+
+#define IDC_FILETYPE                    cmb1
+#define IDC_LOOKIN                      cmb2
+
+#define IDC_FILENAME                    edt1
+
+#define IDC_TOOLBAR                     ctl1
 
 /***********************************************************************

trunk/src/comdlg32/rsrc.rc

@@ -1 @@
-/* $Id: rsrc.rc,v 1.1 1999-11-02 19:09:43 sandervl Exp $ */
+/* $Id: rsrc.rc,v 1.2 1999-11-28 12:32:28 sandervl Exp $ */
 /*
- * Top level resource file for Common Dialogs (990815)
+ * Top level resource file for Common Dialogs
  *
  */
@@ -7 +7 @@
 #include "winuser.h"
 #include "winnls.h"
-#include "dlgs.h"
 #include "cdlg.h"
 #include "winspool.h"
+#include "filedlgbrowser.h"
 
 /*
@@ -26 +26 @@
  * get localized bitmaps for example.
  */
+//#include "cdlg_Ca.rc"
+//#include "cdlg_Cs.rc"
+//#include "cdlg_Da.rc"
+//#include "cdlg_De.rc"
 #include "cdlg_En.rc"
+//#include "cdlg_Eo.rc"
+//#include "cdlg_Es.rc"
+//#include "cdlg_Fi.rc"
+//#include "cdlg_Fr.rc"
+//#include "cdlg_Hu.rc"
+//#include "cdlg_It.rc"
+//#include "cdlg_Ko.rc"
+//#include "cdlg_Nl.rc"
+//#include "cdlg_No.rc"
+//#include "cdlg_Pl.rc"
+//#include "cdlg_Pt.rc"
+//#include "cdlg_Ru.rc"
+//#include "cdlg_Sv.rc"
+//#include "cdlg_Wa.rc"