Changeset 4561 for trunk/src

Timestamp:

Nov 6, 2000, 11:20:56 AM (25 years ago)

Author:

sandervl

Message:

merged with latest Wine (11-05-2000)

Location:

trunk/src

Files:

• comdlg32/WINE.LEVEL (modified) (1 diff)
• comdlg32/cdlg_Sk.orc (modified) (9 diffs)
• comdlg32/filedlg95.c (modified) (42 diffs)
• comdlg32/filedlgbrowser.c (modified) (5 diffs)
• comdlg32/filedlgbrowser.h (modified) (4 diffs)
• shell32/shell32.def (modified) (3 diffs)
• shell32/shelllink.c (modified) (17 diffs)
• shell32/shellord.c (modified) (2 diffs)
• shell32/shellpath.c (modified) (6 diffs)

trunk/src/comdlg32/WINE.LEVEL

@@ -1 @@
-Wine 20001002 level (10-21-2000)
+Wine 20001002 level (11-05-2000)

trunk/src/comdlg32/cdlg_Sk.orc

@@ -1 +1 @@
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+
+/* Slovak strings in CP1250 */
 
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
@@ -25 +27 @@
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ulož pod menom..."
+CAPTION "Uloži pod menom..."
 FONT 8, "Helv"
 {
@@ -53 +55 @@
  LTEXT "", 1089, 60, 6, 150, 9
  GROUPBOX "Rozsah tlaèe", 1072, 6, 30, 160, 65, BS_GROUPBOX
- RADIOBUTTON "Vytlaè &všetko", 1056, 16, 45, 60, 12
- RADIOBUTTON "Vytlaè vý&ber", 1057, 16, 60, 60, 12
- RADIOBUTTON "Vytlaè &zadané strany", 1058, 16, 75, 60, 12
+ RADIOBUTTON "Vytlaèi &všetko", 1056, 16, 45, 60, 12
+ RADIOBUTTON "Vytlaèi vý&ber", 1057, 16, 60, 60, 12
+ RADIOBUTTON "Vytlaèi &zadané strany", 1058, 16, 75, 60, 12
  DEFPUSHBUTTON "Tlaè", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Zruši", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
@@ -63 +65 @@
  LTEXT "&Kvalita tlaèe:", 1092, 6, 100, 76, 9
  COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- CHECKBOX "Tlaè do &súboru", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Tlaèi do &súboru", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  CHECKBOX "Kondenzované", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
 }
@@ -75 +77 @@
  GROUPBOX "Tlaèiareò", 1072, 6, 10, 180, 65, BS_GROUPBOX
  RADIOBUTTON "&Predvolená tlaèiareò", 1056, 16, 20, 80, 12
- LTEXT "[none]", 1088, 35, 35, 120, 9
+ LTEXT "[žiadna]", 1088, 35, 35, 120, 9
  RADIOBUTTON "Špecifická &tlaèiareò", 1057, 16, 50, 80, 12
  COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
  DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Zruši", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Ïa&lšie voŸby...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÏaŸši&e voŸby...", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
  GROUPBOX "Orientácia", 1073, 6, 85, 100, 50, BS_GROUPBOX
  RADIOBUTTON "Na &výšku", 1058, 50, 100, 40, 12
@@ -94 +96 @@
 
 
-CHOOSE_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Písmo"
-FONT 8, "Helv"
-{
- LTEXT "Písmo:", 1088, 6, 6, 40, 9
- LTEXT "", 1089, 60, 6, 150, 9
- DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Zruši", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
-}
-
-
-CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 185
+CHOOSE_FONT DIALOG DISCARDABLE  13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "Helv"
+{
+    LTEXT           "&Font:",1088 ,6,3,40,9
+    COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "Š&týl fontu:",1089 ,108,3,44,9
+    COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+    LTEXT           "&VeŸkos:",1090,179,3,30,9
+    COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON 
+    PUSHBUTTON      "Zruši",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Aplikova", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
+    PUSHBUTTON      "&Pomoc" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
+    GROUPBOX        "Efekty",1072,6,72,84,34,WS_GROUP
+    CHECKBOX        "P&reèiarknuté", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+    CHECKBOX        "&Podèiarknuté", 1041, 10,94,50,10, BS_AUTOCHECKBOX 
+    LTEXT           "&Farba:", 1091 ,6,110,30,9
+    COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Vzorka",1073,98,72,160,49,WS_GROUP
+    CTEXT           "AaBbYyZz",1093,104,81,149,37,SS_NOPREFIX | WS_VISIBLE
+}
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Farby"
 FONT 8, "Helv"
 {
- LTEXT "&Základné farby:", 1088, 6, 6, 40, 9
- LTEXT "&Farby na zakázku:", 1089, 6, 126, 40, 9
- LTEXT "Farba|Spoj&itá", 1090, 100, 146, 40, 9
- LTEXT "&Odtieò:", 1091, 150, 126, 40, 9
- LTEXT "&Sýtos:", 1092, 150, 146, 40, 9
- LTEXT "&Jas:", 1093, 150, 166, 40, 9
- LTEXT "Èe&rvená:", 1094, 150, 126, 40, 9
- LTEXT "&Zelená:", 1095, 150, 146, 40, 9
- LTEXT "&Modrá:", 1096, 150, 166, 40, 9
- DEFPUSHBUTTON "Ok", IDOK, 6, 182, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Prida farbu", 1024, 120, 182, 100, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "&Vyradi farbu", 1025, 6, 164, 56, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Zruši", IDCANCEL, 76, 182, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Základné farby:",   1088, 4,    4,  140, 10
+ LTEXT "&UžívateŸské farby:",  1089, 4,   106, 140, 10
+ LTEXT "Farba |  Spoj&itá",  1090, 150, 151,  48, 10
+ LTEXT   "Èe&rvená:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Zelená:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT   "&Modrá:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Hue:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Sat:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT  "&Lum:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "OK",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Zruši", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Pomoc", 1038,100,166, 44, 14
+ PUSHBUTTON "&Prida k užívateŸovým farbám",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Definova užívateŸské farby >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON  "&i",713,300,200,4,14   /* just a dummy:  'i' is  like  &i  in "sol&id"  */
 }
 
@@ -139 +170 @@
  CONTROL "H&ore", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
  CONTROL "&Dole", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
  DEFPUSHBUTTON "Nájs ï&alšie", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Zavrie", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
@@ -156 +188 @@
  CHECKBOX "Len &celé slová", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
  CHECKBOX "&Rozlišova malá a veŸké písmená", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
  DEFPUSHBUTTON "Nájs ï&alšie", 1, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
  PUSHBUTTON "Za&meni", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
@@ -162 +195 @@
  PUSHBUTTON "&Pomoc", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
 }
+
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Tlaè"
+FONT 8, "Helv"
+{
+    DEFPUSHBUTTON   "OK",     IDOK,     180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+    PUSHBUTTON      "Zruši", IDCANCEL, 232,164, 48,14, WS_GROUP
+    PUSHBUTTON      "&Pomoc",  pshHelp,  50, 161, 48,14, WS_GROUP
+
+    GROUPBOX        "Tlaèiareò",        grp4,   8,  4, 272,84, WS_GROUP
+    CONTROL         "tlaèi do &súboru", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+    PUSHBUTTON      "&Vlastnosti",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Meno:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb4,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Stav:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Typ:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Typ",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Kam:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Komentár:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Kópie",         grp2, 160, 92, 120,64, WS_GROUP
+    LTEXT           "Poèet &kópií:",stc5,168,108,68,8
+    ICON            "",               ico3, 162,124,  76,24, WS_GROUP | SS_CENTERIMAGE
+    CONTROL         "C&ollate",       chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+    EDITTEXT                          edt3, 240,106,  32,12, WS_GROUP | ES_NUMBER
+
+    GROUPBOX        "Rozsah tlaèe",    grp1,   8,92,  144,64, WS_GROUP
+    CONTROL         "&Všetky",           rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+    CONTROL         "St&rany",         rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+    CONTROL         "Vý&ber",     rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+    EDITTEXT                          edt1,  74,122,  26,12, WS_GROUP | ES_NUMBER
+    EDITTEXT                          edt2, 118,122,  26,12, WS_GROUP | ES_NUMBER
+    RTEXT           "&od:",         stc2,  52,124,  20,8
+    RTEXT           "&do:",           stc3, 100,124,  16,8
+}
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE  32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+      DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Nastavenie tlaèe"
+FONT 8, "Helv"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,180,156,48,14,WS_GROUP
+    PUSHBUTTON      "Zruši",IDCANCEL,232,156,48,14
+/*    PUSHBUTTON      "Sie...", psh5, 284,156,48,14 */
+
+    GROUPBOX        "Tlaèiareò",        grp4,   8,  4, 272,84, WS_GROUP
+    PUSHBUTTON      "&Vlastnosti",    psh2, 212, 17,  60,14, WS_GROUP
+    LTEXT           "&Meno:",         stc6,  16, 20,  36,8
+    COMBOBOX                          cmb1,  52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "Stav:",        stc8,  16, 36,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy State",    stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Typ:",          stc7,  16, 48,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Type",     stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Kam:",         stc10, 16, 60,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+    LTEXT           "Komentár:",       stc9,  16, 72,  36,10, SS_NOPREFIX
+    LTEXT           "Dummy Remark",   stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+    GROUPBOX        "Papier",          grp2,   8, 92, 164,56, WS_GROUP
+    LTEXT           "&VeŸkos:",         stc2,  16,108,  36, 8
+    COMBOBOX                          cmb2,  52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    LTEXT           "&Zdroj:",       stc3,  16,128,  36, 8
+    COMBOBOX                          cmb3,  52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    
+    GROUPBOX        "Orientácia",    grp1, 180, 92, 100,56, WS_GROUP
+    ICON            "",               ico1, 195,112,  18,20, WS_GROUP
+    CONTROL         "&Na výšku",      rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+    CONTROL         "Na ší&rku",     rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+END
+
+
+NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 287, 165
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Otvori"
+FONT 8, "helv"
+{
+    LTEXT       "HŸada &v",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
+    COMBOBOX    IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+
+    LTEXT       "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
+    LISTBOX     IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+    
+    LTEXT       "&Meno súboru:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+    EDITTEXT    IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
+    
+    LTEXT       "&Typ súborov",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+    COMBOBOX    IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+
+    CONTROL     "Otvo&ri iba na èítanie",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+    DEFPUSHBUTTON       "&Otvori",              IDOK,222,110,50,14
+    PUSHBUTTON          "Zruši",                IDCANCEL,222,128,50,14
+    PUSHBUTTON          "&Pomoc",                pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE 
+{
+    IDS_ABOUTBOX            "&O teste uchopovania adresárov"
+    IDS_DOCUMENTFOLDERS     "Adresár dokumentov"
+    IDS_PERSONAL            "Moje dokumenty"
+    IDS_FAVORITES           "Moji favoriti"
+    IDS_PATH                "Systémová cesta"
+    IDS_DESKTOP             "Pracovná plocha"
+    IDS_FONTS               "Fonty"
+    IDS_MYCOMPUTER          "Môj poèítaè"
+}
+
+STRINGTABLE DISCARDABLE 
+{
+    IDS_SYSTEMFOLDERS       "Systémové adresáre"
+    IDS_LOCALHARDRIVES      "Lokálne pevné disky"
+    IDS_FILENOTFOUND        "Súbor nenájdený"
+    IDS_VERIFYFILE          "Please verify if the correct file name was given"
+    IDS_CREATEFILE          "File does not exist\nDo you want to create file"
+    IDL_OVERWRITEFILE       "File does already exist.\nDo you want to replace it?"
+    IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path"
+    IDS_INVALID_FILENAME    "A filename cannot contain any of the following characters: \n                          / : < > |"
+    IDS_PATHNOTEXISTING     "Cesta neexistuje"
+    IDS_FILENOTEXISTING     "Súbor neexistuje"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_UPFOLDER         "O úroveò vyššie"
+    IDS_NEWFOLDER        "Vytvori nový adresár"
+    IDS_LISTVIEW         "Zoznam"
+    IDS_REPORTVIEW       "Detaily"
+    IDS_TODESKTOP        "Listova pracovnú plochu"
+} 
+
+STRINGTABLE DISCARDABLE
+{
+    PD32_PRINT_TITLE       "Tlaè"
+
+    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"
+    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               "Nie je nastavená implicitná tlaèiareò"
+    PD32_CANT_FIND_PRINTER                "Cannot find the printer"
+    PD32_OUT_OF_MEMORY                    "Nedostatok pamäte"
+    PD32_GENERIC_ERROR                    "Vyskytla sa chyba"
+    PD32_DRIVER_UNKNOWN                   "Neznámy ovládaè tlaèiarne"
+
+    PD32_DEFAULT_PRINTER                  "Implicitná tlaèiareò; "
+    PD32_NR_OF_DOCUMENTS_IN_QUEUE         "There are %d documents in queue"
+    PD32_PRINT_ALL_X_PAGES                "&Všetky %d strany"
+    PD32_MARGINS_IN_INCHES                "Okraje [palce]"
+    PD32_MARGINS_IN_MILIMETERS            "Okraje [mm]"
+    PD32_MILIMETERS                       "mm"
+
+    PD32_PRINTER_STATUS_READY             "Pripravená"
+    PD32_PRINTER_STATUS_PAUSED            "Pozastavená; "
+    PD32_PRINTER_STATUS_ERROR             "Chyba; "
+    PD32_PRINTER_STATUS_PENDING_DELETION  "Pending deletion; "
+    PD32_PRINTER_STATUS_PAPER_JAM         "Paper jam; "
+    PD32_PRINTER_STATUS_PAPER_OUT         "Chýba papier; "
+    PD32_PRINTER_STATUS_MANUAL_FEED       "Feed paper manual; "
+    PD32_PRINTER_STATUS_PAPER_PROBLEM     "Paper problem; "
+    PD32_PRINTER_STATUS_OFFLINE           "Tlaèiareò v stave offline; "
+    PD32_PRINTER_STATUS_IO_ACTIVE         "I/O Active; "
+    PD32_PRINTER_STATUS_BUSY              "Zaneprázdnená; "
+    PD32_PRINTER_STATUS_PRINTING          "Prebieha tlaè; "
+    PD32_PRINTER_STATUS_OUTPUT_BIN_FULL   "Output tray is full; "
+    PD32_PRINTER_STATUS_NOT_AVAILABLE     "Nie je k dispozícii; "
+    PD32_PRINTER_STATUS_WAITING           "Waiting; "
+    PD32_PRINTER_STATUS_PROCESSING        "Prebieha spracovanie; "
+    PD32_PRINTER_STATUS_INITIALIZING      "Inicializácia; "
+    PD32_PRINTER_STATUS_WARMING_UP        "Warming up; "
+    PD32_PRINTER_STATUS_TONER_LOW         "Primálo toneru; "
+    PD32_PRINTER_STATUS_NO_TONER          "Chýba toner; "
+    PD32_PRINTER_STATUS_PAGE_PUNT         "Page punt; "
+    PD32_PRINTER_STATUS_USER_INTERVENTION "Prerušenie užívateŸom; "
+    PD32_PRINTER_STATUS_OUT_OF_MEMORY     "Nedostatok pamäte; "
+    PD32_PRINTER_STATUS_DOOR_OPEN         "Dvierka tlaèiarne sú otvorené; "
+    PD32_PRINTER_STATUS_SERVER_UNKNOWN    "Neznámy print server; "
+    PD32_PRINTER_STATUS_POWER_SAVE        "Power safe mode; "
+}

trunk/src/comdlg32/filedlg95.c

@@ -2 +2 @@
  * COMMDLG - File Open Dialogs Win95 look and feel
  *
+ * FIXME: The whole concept of handling unicode is badly broken.
+ *      many hook-messages expecting a pointer to a
+ *      OPENFILENAMEA or W structure. With the current architecture
+ *      we would have to convert the beast at every call to a hook.
+ *      we have to find a better solution but if would likely cause
+ *      a complete rewrite with after we shouldhandle the
+ *      OPENFILENAME structure without any converting (jsch).
+ *
+ * FIXME: any hook gets a OPENFILENAMEA structure
+ *
+ * FIXME: CDN_FILEOK is wrong implemented, other CDN_ messages likely too
+ *
+ * FIXME: old style hook messages are not implemented (except FILEOKSTRING)
+ *
  * FIXME: lpstrCustomFilter not handled
  *
- * FIXME: if the size of lpstrFile (nMaxFile) is to small the first
+ * FIXME: if the size of lpstrFile (nMaxFile) is too small the first
  * two bytes of lpstrFile should contain the needed size
  *
@@ -13 +27 @@
  * FIXME: flags not implemented: OFN_CREATEPROMPT, OFN_DONTADDTORECENT,
  * OFN_ENABLEINCLUDENOTIFY, OFN_ENABLESIZING, OFN_EXTENSIONDIFFERENT,
- * OFN_NOCHANGEDIR, OFN_NODEREFERENCELINKS, OFN_READONLYRETURN,
+ * OFN_NOCHANGEDIR, OFN_NODEREFERENCELINKS, OFN_NOREADONLYRETURN,
  * OFN_NOTESTFILECREATE, OFN_OVERWRITEPROMPT, OFN_USEMONIKERS
  *
@@ -31 +45 @@
 #define MapHModuleSL(a) a
 #define MapHModuleLS(a) a
-
 #endif
 
@@ -59 +72 @@
 DEFAULT_DEBUG_CHANNEL(commdlg);
 
+#define UNIMPLEMENTED_FLAGS \
+(OFN_CREATEPROMPT | OFN_DONTADDTORECENT |\
+OFN_ENABLEINCLUDENOTIFY | OFN_ENABLESIZING | OFN_EXTENSIONDIFFERENT |\
+OFN_NOCHANGEDIR | OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN |\
+OFN_NOTESTFILECREATE | OFN_OVERWRITEPROMPT /*| OFN_USEMONIKERS*/)
+
+#define IsHooked(fodInfos) \
+        ((fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook)
 /***********************************************************************
  * Data structure and global variables
@@ -84 +105 @@
 /* Draw item constant */
 #define ICONWIDTH 18
-#define YTEXTOFFSET 2
 #define XTEXTOFFSET 3
 
@@ -100 +120 @@
 /* NOTE
  * Those macros exist in windowsx.h. However, you can't really use them since
- * they rely on the UNICODE defines and can't be use inside Wine itself.
+ * they rely on the UNICODE defines and can't be used inside Wine itself.
  */
 
@@ -146 +166 @@
 
 /* Internal functions used by the dialog */
-static LRESULT FILEDLG95_OnWMInitDialog(HWND hwnd, WPARAM wParam, LPARAM lParam);
+static LRESULT FILEDLG95_FillControls(HWND hwnd, WPARAM wParam, LPARAM lParam);
 static LRESULT FILEDLG95_OnWMCommand(HWND hwnd, WPARAM wParam, LPARAM lParam);
 static LRESULT FILEDLG95_OnWMGetIShellBrowser(HWND hwnd);
        BOOL    FILEDLG95_OnOpen(HWND hwnd);
-static LRESULT FILEDLG95_InitUI(HWND hwnd);
+static LRESULT FILEDLG95_InitControls(HWND hwnd);
 static void    FILEDLG95_Clean(HWND hwnd);
 
@@ -213 +233 @@
     HANDLE hDlgTmpl = 0;
 
+    /* test for missing functionality */
+    if (fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS)
+    {
+      FIXME("Flags 0x%08lx not yet implemented\n",
+         fodInfos->ofnInfos->Flags & UNIMPLEMENTED_FLAGS);
+    }
+
     /* Create the dialog from a template */
 
@@ -226 +253 @@
         return FALSE;
     }
+    
+    /* old style hook messages */
+    if (IsHooked(fodInfos))
+    {
+      fodInfos->HookMsg.fileokstring = RegisterWindowMessageA(FILEOKSTRING);
+      fodInfos->HookMsg.lbselchstring = RegisterWindowMessageA(LBSELCHSTRING);
+      fodInfos->HookMsg.helpmsgstring = RegisterWindowMessageA(HELPMSGSTRING);
+      fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRING);
+    }
+    
     lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
                                   (LPDLGTEMPLATEA) template,
@@ -232 +269 @@
                                   (LPARAM) fodInfos);
 
-    /* Unable to create the dialog*/
+    /* Unable to create the dialog */
     if( lRes == -1)
         return FALSE;
@@ -270 +307 @@
   ofn->Flags = ofn->Flags|OFN_WINE;
 
-  /* Replace the NULL lpstrInitialDir by the current folder */
-  if(!ofn->lpstrInitialDir)
-  {
-    lpstrInitialDir = ofn->lpstrInitialDir;
-    ofn->lpstrInitialDir = MemAlloc(MAX_PATH);
-    GetCurrentDirectoryA(MAX_PATH,(LPSTR)ofn->lpstrInitialDir);
-  }
-
   /* Initialise the dialog property */
   fodInfos->DlgInfos.dwDlgProp = 0;
@@ -313 +342 @@
  * Call GetFileName95 with this structure and clean the memory.
  *
- * IN  : The OPENFILENAMEW initialisation structure passed to
- *       GetOpenFileNameW win api function (see filedlg.c)
- *
- * FIXME:
- *   some more strings are needing to be convertet AtoW
- */
+ * FIXME: lpstrCustomFilter has to converted back
+ *
+ */
+
+/* converting IN arguments */
+#define AllocInArgWtoA(arg, save) \
+  if(arg) \
+  { \
+    save = arg; \
+    arg =  MemAlloc(lstrlenW(arg)); \
+    lstrcpyWtoA((LPSTR)arg, save); \
+  }
+
+#define FreeInArg(arg, save) \
+  if(arg) \
+  { \
+    MemFree((LPSTR)arg); \
+    arg = save; \
+  }
+
+/* converting OUT arguments */
+#define AllocOutArgWtoA(arg, save, len) \
+  if(arg) \
+  { \
+    save = arg; \
+    arg = MemAlloc(len); \
+  }
+
+#define FreeOutArg(arg, save, len) \
+  if(arg) \
+  { \
+    lstrcpynAtoW(save, (LPCSTR)arg, len); \
+    MemFree(arg); \
+    arg = save; \
+  }
+
 BOOL  WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType)
 {
@@ -324 +383 @@
   FileOpenDlgInfos *fodInfos;
   HINSTANCE hInstance;
-  LPCSTR lpstrFilter = NULL;
-  LPSTR lpstrCustomFilter = NULL;
-#ifdef __WIN32OS2__
-  LPWSTR lpstrInitialDir = NULL; 
-  LPWSTR lpstrTitle = NULL;
-#endif
+  
+  /* out arguments */
   LPWSTR lpstrFile = NULL;
+  LPWSTR lpstrFileTitle = NULL;
+
+  /* in/out arguments */
+  LPWSTR lpstrCustomFilter = NULL;
+
+  /* input arguments */
+  LPCWSTR lpstrFilter = NULL;
+  LPCWSTR lpstrInitialDir = NULL;
+  LPCWSTR lpstrTitle = NULL;
+  LPCWSTR lpstrDefExt = NULL;
+  LPCWSTR lpTemplateName = NULL;
   DWORD dwFlags;
 
@@ -340 +406 @@
   fodInfos->ofnInfos = (LPOPENFILENAMEA) ofn;
 
-  /* Save hInstance */
-  hInstance = fodInfos->ofnInfos->hInstance;
-  fodInfos->ofnInfos->hInstance = MapHModuleLS(ofn->hInstance);
-
-  /* Save lpstrFilter */
+  /* convert lpstrFilter */
   if (ofn->lpstrFilter)
   {
-    LPWSTR  s;
-    LPSTR x,y;
+    LPCWSTR  s;
+    LPSTR x, y;
     int n;
 
-    lpstrFilter = fodInfos->ofnInfos->lpstrFilter;
+    lpstrFilter = ofn->lpstrFilter;
 
     /* filter is a list...  title\0ext\0......\0\0 */
-    s = (LPWSTR)ofn->lpstrFilter;
+    s = ofn->lpstrFilter;
     
-    while (*s)
-      s = s+lstrlenW(s)+1;
+    while (*s) s = s+lstrlenW(s)+1;
     s++;
     n = s - ofn->lpstrFilter; /* already divides by 2. ptr magic */
     x = y = (LPSTR)MemAlloc(n);
     s = (LPWSTR)ofn->lpstrFilter;
-    while (*s) {
+    while (*s)
+    {
       lstrcpyWtoA(x,s);
       x+=strlen(x)+1;
@@ -368 +430 @@
     }
     *x=0;
-    fodInfos->ofnInfos->lpstrFilter = (LPSTR)y;
-  }
-  /* Save lpstrCustomFilter */
+#ifdef __WIN32OS2__
+    ofn->lpstrFilter = (LPWSTR)y;
+#else
+    (LPSTR)ofn->lpstrFilter = y;
+#endif
+  }
+
+  /* convert lpstrCustomFilter */
   if (ofn->lpstrCustomFilter)
   {
@@ -377 +444 @@
     int n;
 
-    lpstrCustomFilter = fodInfos->ofnInfos->lpstrCustomFilter;
+    lpstrCustomFilter = ofn->lpstrCustomFilter;
     /* filter is a list...  title\0ext\0......\0\0 */
-    s = (LPWSTR)ofn->lpstrCustomFilter;
-    while (*s)
-      s = s+lstrlenW(s)+1;
+    s = ofn->lpstrCustomFilter;
+    while (*s) s = s+lstrlenW(s)+1;
     s++;
     n = s - ofn->lpstrCustomFilter;
     x = y = (LPSTR)MemAlloc(n);
-    s = (LPWSTR)ofn->lpstrCustomFilter;
-    while (*s) {
+    s = ofn->lpstrCustomFilter;
+    while (*s)
+    {
       lstrcpyWtoA(x,s);
       x+=strlen(x)+1;
@@ -392 +459 @@
     }
     *x=0;
-    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;
-  
-  /* allocate ansi filename buffer */
-  lpstrFile = ofn->lpstrFile;  
-  ofn->lpstrFile = MemAlloc(ofn->nMaxFile);
-
 #ifdef __WIN32OS2__
-  // convert initial dir & title (if necessary)
-  lpstrInitialDir = (LPWSTR)ofn->lpstrInitialDir;
-  if(lpstrInitialDir && *lpstrInitialDir != 0) {
-        ofn->lpstrInitialDir = MemAlloc(lstrlenW(ofn->lpstrInitialDir)+1);
-        lstrcpyWtoA((LPSTR)ofn->lpstrInitialDir, lpstrInitialDir);
-  }
-  else
-  /* Replace the NULL lpstrInitialDir by the current folder */
-  if(!lpstrInitialDir || *lpstrInitialDir == 0)
-  {
-        ofn->lpstrInitialDir = MemAlloc(MAX_PATH);
-        GetCurrentDirectoryA(MAX_PATH,(LPSTR)ofn->lpstrInitialDir);
-  }
-
-  lpstrTitle = (LPWSTR)ofn->lpstrTitle;
-  if(lpstrTitle) {
-        ofn->lpstrTitle = MemAlloc(lstrlenW(ofn->lpstrTitle)+1);
-        lstrcpyWtoA((LPSTR)ofn->lpstrTitle, lpstrTitle);
-  }
-
+    ofn->lpstrCustomFilter = (LPWSTR)y;
+#else
+    (LPSTR)ofn->lpstrCustomFilter = y;
 #endif
-  
+  }
+
+  /* convert string arguments, save others */
+  AllocOutArgWtoA(ofn->lpstrFile, lpstrFile, ofn->nMaxFile);
+  AllocOutArgWtoA(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle);
+  AllocInArgWtoA(ofn->lpstrInitialDir, lpstrInitialDir);
+  AllocInArgWtoA(ofn->lpstrTitle, lpstrTitle);
+  AllocInArgWtoA(ofn->lpstrDefExt, lpstrDefExt);
+  AllocInArgWtoA(ofn->lpTemplateName, lpTemplateName);
+  dwFlags = ofn->Flags;
+  hInstance = ofn->hInstance;
+
+  ofn->Flags = ofn->Flags|OFN_WINE|OFN_UNICODE;
+  ofn->hInstance = MapHModuleLS(ofn->hInstance);
+
   switch(iDlgType)
   {
@@ -442 +492 @@
   }
       
-  /* Cleaning */
-  /* 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;
+  /* restore saved IN arguments and convert OUT arguments back */
+  ofn->Flags = dwFlags;
+  ofn->hInstance = hInstance;
+  FreeInArg(ofn->lpstrFilter, lpstrFilter);
+  FreeInArg(ofn->lpstrCustomFilter, lpstrCustomFilter);
+  FreeOutArg(ofn->lpstrFile, lpstrFile, ofn->nMaxFile);
+  FreeOutArg(ofn->lpstrFileTitle, lpstrFileTitle, ofn->nMaxFileTitle);
+  FreeInArg(ofn->lpstrInitialDir, lpstrInitialDir);
+  FreeInArg(ofn->lpstrTitle, lpstrTitle);
+  FreeInArg(ofn->lpstrDefExt, lpstrDefExt);
+  FreeInArg(ofn->lpTemplateName, lpTemplateName);
+
   MemFree((LPVOID)(fodInfos));
-
-  /* filename */
-  lstrcpynAtoW(lpstrFile, (LPCSTR)ofn->lpstrFile, ofn->nMaxFile);
-  MemFree(ofn->lpstrFile);
-  ofn->lpstrFile = lpstrFile;
-
-#ifdef __WIN32OS2__
-  //free converted initial dir & title strings
-  if(lpstrInitialDir) {
-        MemFree((LPVOID)ofn->lpstrInitialDir);
-        ofn->lpstrInitialDir = (LPCWSTR)lpstrInitialDir;
-  }
-  if(lpstrTitle) {
-        MemFree((LPVOID)ofn->lpstrTitle);
-        ofn->lpstrTitle = (LPCWSTR)lpstrTitle;
-  }
-#endif
-
   return ret;
 }
@@ -484 +510 @@
 void ArrangeCtrlPositions( HWND hwndChildDlg, HWND hwndParentDlg)
 {
-
-        HWND hwndChild,hwndStc32;
-        RECT rectParent, rectChild, rectCtrl, rectStc32, rectTemp;
-        POINT ptMoveCtl;
-        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;
-                SetRectEmpty(&rectTemp);
-                ptParentClient.x = max((rectParent.right-rectParent.left),(rectChild.right-rectChild.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);
+    HWND hwndChild,hwndStc32;
+    RECT rectParent, rectChild, rectCtrl, rectStc32, rectTemp;
+    POINT ptMoveCtl;
+    POINT ptParentClient;
+
+    TRACE("\n");
+
+    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;
+
+      SetRectEmpty(&rectTemp);
+      ptParentClient.x = max((rectParent.right-rectParent.left),(rectChild.right-rectChild.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);
-        if(hwndStc32)
-        {
-                GetWindowRect(hwndStc32,&rectStc32);
-                MapWindowPoints( 0, hwndChildDlg,(LPPOINT)&rectStc32,2);
-        }
-        else
-                SetRect(&rectStc32,0,0,0,0);
-
-        if (hwndChild )
-        {
-                do
-                {
-                        if(hwndChild != hwndStc32)
-                        {
-                        if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
+    hwndChild = GetWindow(hwndChildDlg,GW_CHILD);
+    if(hwndStc32)
+    {
+      GetWindowRect(hwndStc32,&rectStc32);
+      MapWindowPoints( 0, hwndChildDlg,(LPPOINT)&rectStc32,2);
+    }
+    else
+      SetRect(&rectStc32,0,0,0,0);
+
+    if (hwndChild )
+    {
+      do
+      {
+        if(hwndChild != hwndStc32)
+        {
+          if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
                                 continue;
-                        GetWindowRect(hwndChild,&rectCtrl);
-                        MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
+          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;
+          /*
+            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;
+          }
                                         
-                                SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
+          SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
                                 rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
                                 SWP_NOSIZE | SWP_NOZORDER );
-                                }
-                        }
-                while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
-        }               
-        hwndChild = GetWindow(hwndParentDlg,GW_CHILD);
+        }
+      } while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
+    }
+    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 )
-                {
-                        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;
-
-                                        SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
-                                        rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
-                                        SWP_NOSIZE |SWP_NOZORDER );
-                                }
-                        }
-                        while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
-                }               
-        }
-
+    if(hwndStc32)
+    {
+      GetWindowRect(hwndStc32,&rectStc32);
+      MapWindowPoints( 0, hwndChildDlg,(LPPOINT)&rectStc32,2);
+      ptMoveCtl.x = rectStc32.left - 0;
+      ptMoveCtl.y = rectStc32.top - 0;
+      if (hwndChild )
+      {
+        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;
+
+            SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
+                rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
+                SWP_NOSIZE |SWP_NOZORDER );
+          }
+        } while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
+      }         
+    }
 }
 
@@ -621 +649 @@
 {
     FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(GetParent(hwnd),FileOpenDlgInfosStr);
-  switch(uMsg)
-  {
-        case WM_INITDIALOG:
-        {         
-            fodInfos = (FileOpenDlgInfos *)lParam;
-                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);
-                return 0;       
-        } 
-    }
-    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); 
-}
-
-HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos,HWND hwnd)
+
+#if 0
+    TRACE("0x%04x\n", uMsg);
+#endif
+
+    switch(uMsg)
+    {
+      case WM_INITDIALOG:
+      {         
+        fodInfos = (FileOpenDlgInfos *)lParam;
+        lParam = (LPARAM) fodInfos->ofnInfos;
+        ArrangeCtrlPositions(hwnd,GetParent(hwnd));
+
+        if(fodInfos && IsHooked(fodInfos))
+          return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
+        return 0;       
+      } 
+    }
+
+    if(fodInfos && IsHooked(fodInfos))
+      return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam); 
+
+    return DefWindowProcA(hwnd,uMsg,wParam,lParam); 
+}
+
+HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
 {
     LPCVOID template;
@@ -644 +680 @@
     HANDLE hDlgTmpl = 0;
     HWND hChildDlg = 0;
-   if (fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATE || fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATEHANDLE)
-   {
-        if (fodInfos->ofnInfos->Flags  & OFN_ENABLETEMPLATEHANDLE)
-        {
-           if( !(template = 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;
+
+    TRACE("\n");
+
+    if (fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATE ||
+        fodInfos->ofnInfos->Flags & OFN_ENABLETEMPLATEHANDLE)
+    {
+      if (fodInfos->ofnInfos->Flags  & OFN_ENABLETEMPLATEHANDLE)
+      {
+        if( !(template = 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),
+             hRes )) || !(template = LockResource( hDlgTmpl )))
+        {
+          COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
+          return (HWND)NULL;
         }
-        if (!(hDlgTmpl = LoadResource( MapHModuleSL(fodInfos->ofnInfos->hInstance),
-             hRes )) ||
-                 !(template = LockResource( hDlgTmpl )))
-        {
-                COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
-                return (HWND)NULL;
-        }
-        }
-
-        hChildDlg= CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,template,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;
+      }
+
+      hChildDlg= CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,template,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+      if(hChildDlg)
+      {
+        ShowWindow(hChildDlg,SW_SHOW); 
+        return hChildDlg;
+      }
+    }
+    else if( IsHooked(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;
+      return CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
+    }
+    return (HWND)NULL;
 }
  
@@ -706 +744 @@
 {
     FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwndParentDlg,FileOpenDlgInfosStr);
-    if(!fodInfos)
-        return 0;
+
+    TRACE("0x%04x 0x%04x\n",hwndParentDlg, uCode);
+
+    if(!fodInfos) return 0;
+
+    if(fodInfos->ofnInfos->Flags & OFN_UNICODE)
+      FIXME("sending OPENFILENAMEA structure. Hook is expecting OPENFILENAMEW!");
+
     if(fodInfos->DlgInfos.hwndCustomDlg)
     {
         OFNOTIFYA ofnNotify;
+        HRESULT ret;
         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);
+        TRACE("CALL NOTIFY for %x\n", uCode);
+        ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
+        TRACE("RET NOTIFY\n");
+        return ret;
     }
     return TRUE;
@@ -788 +836 @@
 HRESULT WINAPI FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+#if 0
+  TRACE("0x%04x 0x%04x\n", hwnd, uMsg);
+#endif
+  
   switch(uMsg)
   {
     case WM_INITDIALOG:
-         /* Adds the FileOpenDlgInfos in the property list of the dialog 
+      {
+         FileOpenDlgInfos * fodInfos = (FileOpenDlgInfos *)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);
-
-         FILEDLG95_OnWMInitDialog(hwnd, wParam, lParam);
-         ((FileOpenDlgInfos *)lParam)->DlgInfos.hwndCustomDlg = 
-        CreateTemplateDialog((FileOpenDlgInfos *)lParam,hwnd);
+         SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos);
+
+         fodInfos->DlgInfos.hwndCustomDlg = 
+           CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd);
+
+         FILEDLG95_InitControls(hwnd);
          SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE);
+         FILEDLG95_FillControls(hwnd, wParam, lParam);
          return 0;
+       }
     case WM_COMMAND:
       return FILEDLG95_OnWMCommand(hwnd, wParam, lParam);
@@ -867 +925 @@
 
 /***********************************************************************
- *      FILEDLG95_OnWMInitDialog
- *
- * WM_INITDIALOG message handler
- */
-static LRESULT FILEDLG95_OnWMInitDialog(HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-  LPITEMIDLIST pidlItemId;
+ *      FILEDLG95_InitControls
+ *
+ * WM_INITDIALOG message handler (before hook notification)
+ */
+static LRESULT FILEDLG95_InitControls(HWND hwnd)
+{
+  TBBUTTON tbb[] =
+  {
+   {0,                 0,                   TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0 },
+   {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+1,  FCIDM_TB_DESKTOP,    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 },
+   { COMDLG32_hInstance, 800 }                  // desktop icon
+  };
+  
+  RECT rectTB;
+  
+  FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
+
+  TRACE("%p\n", fodInfos);
+
+  /* Get the hwnd of the controls */
+  fodInfos->DlgInfos.hwndFileName = GetDlgItem(hwnd,IDC_FILENAME);
+  fodInfos->DlgInfos.hwndFileTypeCB = GetDlgItem(hwnd,IDC_FILETYPE);
+  fodInfos->DlgInfos.hwndLookInCB = GetDlgItem(hwnd,IDC_LOOKIN);
+
+  /* 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[0]);
+  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, (WPARAM) 1, (LPARAM) &tba[1]);
+
+  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSA, (WPARAM) 9,(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);
+  }
+  else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
+  {
+      SetWindowTextA(hwnd,"Save");
+  }
+
+  /* Initialise the file name edit control */
+  if(fodInfos->ofnInfos->lpstrFile)
+  {
+      LPSTR lpstrFile = COMDLG32_PathFindFileNameA(fodInfos->ofnInfos->lpstrFile);
+      SetDlgItemTextA(hwnd, IDC_FILENAME, lpstrFile);
+  }
+
+  /* Must the open as read only check box be checked ?*/
+  if(fodInfos->ofnInfos->Flags & OFN_READONLY)
+  {
+    SendDlgItemMessageA(hwnd,IDC_OPENREADONLY,BM_SETCHECK,(WPARAM)TRUE,0);
+  }
+
+  /* Must the open as read only check box be hid ?*/
+  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 and we are not using a custom template */
+  if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
+       (!(fodInfos->ofnInfos->Flags & 
+         (OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE))))
+  {
+    RECT rectDlg, rectHelp, rectCancel;
+    GetWindowRect(hwnd, &rectDlg);
+    GetWindowRect(GetDlgItem(hwnd, pshHelp), &rectHelp);
+    GetWindowRect(GetDlgItem(hwnd, IDCANCEL), &rectCancel);
+    /* subtract the height of the help button plus the space between
+       the help button and the cancel button to the height of the dialog */
+    SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left, 
+                 (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom), 
+                 SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
+  }
+
+  /* change Open to Save FIXME: use resources */
+  if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
+  {
+      SetDlgItemTextA(hwnd,IDOK,"&Save");
+      SetDlgItemTextA(hwnd,IDC_LOOKINSTATIC,"Save &in");
+  }
+  return 0;
+}
+
+/***********************************************************************
+ *      FILEDLG95_FillControls
+ *
+ * WM_INITDIALOG message handler (after hook notification)
+ */
+static LRESULT FILEDLG95_FillControls(HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+  LPITEMIDLIST pidlItemId = NULL;
+  
   FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) lParam;
 
@@ -887 +1065 @@
     GetCurrentDirectoryA(MAX_PATH,path);
     pidlItemId = GetPidlFromName(fodInfos->Shell.FOIShellFolder, path);
-
   }
 
@@ -893 +1070 @@
   FILEDLG95_SHELL_Init(hwnd);
 
-  /* Initialise dialog UI */
-  FILEDLG95_InitUI(hwnd);
-
-  /* Initialize the Look In combo box*/
+  /* Initialize the Look In combo box */
   FILEDLG95_LOOKIN_Init(fodInfos->DlgInfos.hwndLookInCB);
 
@@ -1003 +1177 @@
 
 /***********************************************************************
- *      FILEDLG95_InitUI
- *
- */
-static LRESULT FILEDLG95_InitUI(HWND hwnd)
-{
-  TBBUTTON tbb[] =
-  {
-   {0,                 0,                   TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0 },
-   {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+1,  FCIDM_TB_DESKTOP,    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 },
-   { COMDLG32_hInstance, 800 }                  // desktop icon
-  };
-  
-  RECT rectTB;
-  
-  FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
-
-  TRACE("%p\n", fodInfos);
-
-  /* Get the hwnd of the controls */
-  fodInfos->DlgInfos.hwndFileName = GetDlgItem(hwnd,IDC_FILENAME);
-  fodInfos->DlgInfos.hwndFileTypeCB = GetDlgItem(hwnd,IDC_FILETYPE);
-  fodInfos->DlgInfos.hwndLookInCB = GetDlgItem(hwnd,IDC_LOOKIN);
-
-  /* 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[0]);
-  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBITMAP, (WPARAM) 1, (LPARAM) &tba[1]);
-
-  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSA, (WPARAM) 9,(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);
-  }
-  else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
-  {
-      SetWindowTextA(hwnd,"Save");
-  }
-
-  /* Initialise the file name edit control */
-  if(fodInfos->ofnInfos->lpstrFile)
-  {
-      LPSTR lpstrFile = COMDLG32_PathFindFileNameA(fodInfos->ofnInfos->lpstrFile);
-      SetDlgItemTextA(hwnd, IDC_FILENAME, lpstrFile);
-  }
-
-  /* Must the open as read only check box be checked ?*/
-  if(fodInfos->ofnInfos->Flags & OFN_READONLY)
-  {
-    SendDlgItemMessageA(hwnd,IDC_OPENREADONLY,BM_SETCHECK,(WPARAM)TRUE,0);
-  }
-
-  /* Must the open as read only check box be hid ?*/
-  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 FIXME: use resources */
-  if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
-  {
-      SetDlgItemTextA(hwnd,IDOK,"&Save");
-      SetDlgItemTextA(hwnd,IDC_LOOKINSTATIC,"Save &in");
-  }
-  return 0;
-}
-
-/***********************************************************************
  *      FILEDLG95_OnOpenMultipleFiles
  *      
@@ -1171 +1227 @@
       }
   
-      lpstrTemp += strlen(lpstrFileList) + 1;
+      /* move to the next file in the list of files */
+      lpstrTemp += strlen(lpstrTemp) + 1;
       COMDLG32_SHFree(pidl);
     }
@@ -1323 +1380 @@
 
       lpszTemp = COMDLG32_PathFindNextComponentA(lpszTemp);
-      if (*lpszTemp)
+
+      if (!lpszTemp) break; /* end of path */
+
+      if(*lpszTemp)
         lstrcpynAtoW(lpwstrTemp, lpszTemp1, lpszTemp - lpszTemp1);
       else
       {
         lstrcpyAtoW(lpwstrTemp, lpszTemp1);     /* last element */
+
+        /* if the last element is a wildcard do a search */
         if(strpbrk(lpszTemp1, "*?") != NULL)
         {
-          nOpenAction = ONOPEN_SEARCH;
+          nOpenAction = ONOPEN_SEARCH;
+          break;
+        }
+      }
+      lpszTemp1 = lpszTemp;
+
+      TRACE("parse now=%s next=%s sf=%p\n",debugstr_w(lpwstrTemp), debugstr_a(lpszTemp), lpsf);
+
+      if(lstrlenW(lpwstrTemp)==2) COMDLG32_PathAddBackslashW(lpwstrTemp);
+
+      dwAttributes = SFGAO_FOLDER;
+      if(SUCCEEDED(IShellFolder_ParseDisplayName(lpsf, hwnd, NULL, lpwstrTemp, &dwEaten, &pidl, &dwAttributes)))
+      {
+        /* the path component is valid, we have a pidl of the next path component */
+        TRACE("parse OK attr=0x%08lx pidl=%p\n", dwAttributes, pidl);
+        if(dwAttributes & SFGAO_FOLDER)
+        {
+          if(FAILED(IShellFolder_BindToObject(lpsf, pidl, 0, &IID_IShellFolder, (LPVOID*)&lpsfChild)))
+          {
+            ERR("bind to failed\n"); /* should not fail */
+            break;
+          }
+          IShellFolder_Release(lpsf);
+          lpsf = lpsfChild;
+          lpsfChild = NULL;
+        }
+        else
+        {
+          TRACE("value\n");
+
+          /* end dialog, return value */
+          nOpenAction = ONOPEN_OPEN;
           break;
         }
+        COMDLG32_SHFree(pidl);
+        pidl = NULL;
       }
-      lpszTemp1 = lpszTemp;
-
-      TRACE("parse now=%s next=%s sf=%p\n",debugstr_w(lpwstrTemp), debugstr_a(lpszTemp), lpsf);
-
-      if(lstrlenW(lpwstrTemp)==2) COMDLG32_PathAddBackslashW(lpwstrTemp);
-
-      dwAttributes = SFGAO_FOLDER;
-      if(FAILED(IShellFolder_ParseDisplayName(lpsf, hwnd, NULL, lpwstrTemp, &dwEaten, &pidl, &dwAttributes)))
+      else
       {
         if(*lpszTemp)   /* points to trailing null for last path element */
@@ -1363 +1451 @@
         break;
       }
-      else
-      {
-        /* the path component is valid */
-        TRACE("parse OK attr=0x%08lx pidl=%p\n", dwAttributes, pidl);
-        if(dwAttributes & SFGAO_FOLDER)
-        {
-          if(FAILED(IShellFolder_BindToObject(lpsf, pidl, 0, &IID_IShellFolder, (LPVOID*)&lpsfChild)))
-          {
-            ERR("bind to failed\n"); /* should not fail */
-            break;
-          }
-          IShellFolder_Release(lpsf);
-          lpsf = lpsfChild;
-          lpsfChild = NULL;
-        }
-        else
-        {
-          TRACE("value\n");
-
-          /* end dialog, return value */
-          nOpenAction = ONOPEN_OPEN;
-          break;
-        }
-        COMDLG32_SHFree(pidl);
-        pidl = NULL;
-      }
     }
     if(pidl) COMDLG32_SHFree(pidl);
   }
-
-  /* path is valid, clean the edit box */
-  SetDlgItemTextA(hwnd,IDC_FILENAME,"");
 
 /*
@@ -1483 +1542 @@
           }
 
-          FILEDLG95_Clean(hwnd);
+          /* ask the hook if we can close */
+          if(IsHooked(fodInfos))
+          {
+            /* FIXME we are sending ASCII-structures. Does not work with NT */
+            /* first old style */
+            TRACE("---\n");
+            CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook, hwnd,
+                         fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos);
+            if (GetWindowLongA(hwnd, DWL_MSGRESULT))
+            {
+              TRACE("cancled\n");
+              ret = FALSE;
+              goto ret;
+            }
+          }
+
+          TRACE("close\n");
+          FILEDLG95_Clean(hwnd);
           ret = EndDialog(hwnd, TRUE);
         }
@@ -1818 +1894 @@
 
   SetPropA(hwndCombo, LookInInfosStr, (HANDLE) liInfos);
+
+  /* set item height for both text field and listbox */
+  CBSetItemHeight(hwndCombo,-1,GetSystemMetrics(SM_CYSMICON));
   CBSetItemHeight(hwndCombo,0,GetSystemMetrics(SM_CYSMICON));
 
@@ -1884 +1963 @@
   HIMAGELIST ilItemImage;
   int iIndentation;
+  TEXTMETRICA tm;
   LPSFOLDER tmpFolder;
 
@@ -1920 +2000 @@
   }
 
-  /* Is this item selected ?*/
+  /* Is this item selected ? */
   if(pDIStruct->itemState & ODS_SELECTED)
   {
@@ -1934 +2014 @@
   }
 
-  /* Do not indent item  if drawing in the edit of the combo*/
+  /* Do not indent item if drawing in the edit of the combo */
   if(pDIStruct->itemState & ODS_COMBOBOXEDIT)
   {
@@ -1959 +2039 @@
 
   /* Initialise the text display area */
+  GetTextMetricsA(pDIStruct->hDC, &tm);
   rectText.left = rectIcon.right;
-  rectText.top = pDIStruct->rcItem.top + YTEXTOFFSET;
+  rectText.top =
+          (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2;
   rectText.right = pDIStruct->rcItem.right + XTEXTOFFSET;
-  rectText.bottom = pDIStruct->rcItem.bottom;
-
+  rectText.bottom =
+          (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2;
  
   /* Draw the icon from the image list */
@@ -2033 +2115 @@
   LookInInfos *liInfos;
 
-  TRACE("\n");
+  TRACE("%08x\n", iInsertId);
 
   if(!pidl)
@@ -2064 +2146 @@
                   | SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED);
 
+  TRACE("-- Add %s attr=%08lx\n", sfi.szDisplayName, sfi.dwAttributes);
 
   if((sfi.dwAttributes & SFGAO_FILESYSANCESTOR) || (sfi.dwAttributes & SFGAO_FILESYSTEM))
@@ -2069 +2152 @@
     int iItemID;
   
+    TRACE("-- Add %s at %u\n", sfi.szDisplayName, tmpFolder->m_iIndent);
+
     /* Add the item at the end of the list */
     if(iInsertId < 0)
@@ -2200 +2285 @@
   int iCount = CBGetCount(hwnd);
 
-  TRACE("\n");
+  TRACE("0x%08x 0x%x\n",searchArg, iSearchMethod);
 
   if (iCount != CB_ERR)
@@ -2597 +2682 @@
 
   TRACE("%p\n", pidl);
-
+  
   pidlParent = COMDLG32_PIDL_ILClone(pidl);
   COMDLG32_PIDL_ILRemoveLastID(pidlParent);
@@ -2618 +2703 @@
   TRACE("sf=%p file=%s\n", lpsf, lpcstrFileName);
 
+#ifdef __WIN32OS2__
+  if(!lpcstrFileName || *lpcstrFileName == 0) return NULL;
+#else
   if(!lpcstrFileName) return NULL;
-    
+#endif
+
   MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,lpcstrFileName,-1,(LPWSTR)lpwstrDirName,MAX_PATH);  
 

trunk/src/comdlg32/filedlgbrowser.c

@@ -28 +28 @@
 #include "cdlg.h"
 
+#define INITGUID
+#include "initguid.h"
+#include "wine/obj_serviceprovider.h"
+
 DEFAULT_DEBUG_CHANNEL(commdlg);
 
-/**************************************************************************
-*   Structure
-*/
+typedef struct
+{
+
+    ICOM_VTABLE(IShellBrowser)   * lpVtbl;
+    ICOM_VTABLE(ICommDlgBrowser) * lpVtblCommDlgBrowser;
+    ICOM_VTABLE(IServiceProvider)* lpVtblServiceProvider;
+    DWORD ref;                                  /* Reference counter */
+    HWND hwndOwner;                             /* Owner dialog of the interface */
+
+} IShellBrowserImpl;
+
+/**************************************************************************
+*   vtable
+*/
+static ICOM_VTABLE(IShellBrowser) IShellBrowserImpl_Vtbl;
+static ICOM_VTABLE(ICommDlgBrowser) IShellBrowserImpl_ICommDlgBrowser_Vtbl;
+static ICOM_VTABLE(IServiceProvider) IShellBrowserImpl_IServiceProvider_Vtbl;
+
+/**************************************************************************
+*   Local Prototypes
+*/
+
+HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv);
+#if 0
+LPITEMIDLIST GetSelectedPidl(IShellView *ppshv);
+#endif
+
+/**************************************************************************
+*   External Prototypes
+*/
+extern const char *FileOpenDlgInfosStr; 
+
+extern HRESULT          GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName);
+extern HRESULT          GetFileName(HWND hwnd, LPITEMIDLIST pidl, LPSTR lpstrFileName);
+extern IShellFolder*    GetShellFolderFromPidl(LPITEMIDLIST pidlAbs);
+extern LPITEMIDLIST     GetParentPidl(LPITEMIDLIST pidl);
+extern LPITEMIDLIST     GetPidlFromName(IShellFolder *psf,LPCSTR lpcstrFileName);
+
+extern BOOL    FILEDLG95_SHELL_FillIncludedItemList(HWND hwnd,
+                                                        LPITEMIDLIST pidlCurrentFolder,
+                                                        LPSTR lpstrMask);
+
+extern int     FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl);
+extern BOOL    FILEDLG95_OnOpen(HWND hwnd);
+extern HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
+
+
+/*
+ *   Helper functions
+ */
+
+/* copied from shell32 to avoid linking to it */
+static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
+{
+        TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
+
+        switch (src->uType)
+        {
+          case STRRET_WSTR:
+            lstrcpynW((LPWSTR)dest, src->u.pOleStr, len);
+            COMDLG32_SHFree(src->u.pOleStr);
+            break;
+
+          case STRRET_CSTRA:
+            lstrcpynAtoW((LPWSTR)dest, src->u.cStr, len);
+            break;
+
+          case STRRET_OFFSETA:
+            if (pidl)
+            {
+              lstrcpynAtoW((LPWSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
+            }
+            break;
+
+          default:
+            FIXME("unknown type!\n");
+            if (len)
+            { *(LPSTR)dest = '\0';
+            }
+            return(FALSE);
+        }
+        return S_OK;
+}
+
+/*
+ *      IShellBrowser
+ */
+ 
+/**************************************************************************
+*  IShellBrowserImpl_Construct
+*/
+IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner)
+{
+    IShellBrowserImpl *sb;
+    FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwndOwner,FileOpenDlgInfosStr);
+
+    sb=(IShellBrowserImpl*)COMDLG32_SHAlloc(sizeof(IShellBrowserImpl));
+
+    /* Initialisation of the member variables */
+    sb->ref=1;
+    sb->hwndOwner = hwndOwner;
+
+    /* Initialisation of the vTables */
+    sb->lpVtbl = &IShellBrowserImpl_Vtbl;
+    sb->lpVtblCommDlgBrowser = &IShellBrowserImpl_ICommDlgBrowser_Vtbl;
+    sb->lpVtblServiceProvider = &IShellBrowserImpl_IServiceProvider_Vtbl;
+    COMDLG32_SHGetSpecialFolderLocation(hwndOwner, CSIDL_DESKTOP,
+                               &fodInfos->ShellInfos.pidlAbsCurrent);
+
+    TRACE("%p\n", sb);
+
+    return (IShellBrowser *) sb;
+}
+
+/***************************************************************************
+*  IShellBrowserImpl_QueryInterface
+*/
+HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface,
+                                            REFIID riid, 
+                                            LPVOID *ppvObj)
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+#ifndef __WIN32OS2__
+    TRACE("(%p)\n\t%s\n", This, debugstr_guid(riid));
+#endif
+
+    *ppvObj = NULL;
+
+    if(IsEqualIID(riid, &IID_IUnknown))          /*IUnknown*/
+    { *ppvObj = This; 
+    }
+    else if(IsEqualIID(riid, &IID_IOleWindow))  /*IOleWindow*/
+    { *ppvObj = (IOleWindow*)This;
+    }
+
+    else if(IsEqualIID(riid, &IID_IShellBrowser))  /*IShellBrowser*/
+    { *ppvObj = (IShellBrowser*)This;
+    }
+
+    else if(IsEqualIID(riid, &IID_ICommDlgBrowser))  /*ICommDlgBrowser*/
+    { *ppvObj = (ICommDlgBrowser*) &(This->lpVtblCommDlgBrowser);
+    }
+
+    else if(IsEqualIID(riid, &IID_IServiceProvider))  /* IServiceProvider */
+    { *ppvObj = (ICommDlgBrowser*) &(This->lpVtblServiceProvider);
+    }
+
+    if(*ppvObj)
+    { IUnknown_AddRef( (IShellBrowser*) *ppvObj);
+      return S_OK;
+    }
+    FIXME("Unknown interface requested\n");
+    return E_NOINTERFACE;
+}
+
+/**************************************************************************
+*  IShellBrowser::AddRef
+*/
+ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface)
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    return ++(This->ref);
+}
+
+/**************************************************************************
+*  IShellBrowserImpl_Release
+*/
+ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface)
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    if (!--(This->ref)) 
+    { 
+      HeapFree(GetProcessHeap(),0, This);
+      return 0;
+    }
+    return This->ref;
+}
+
+/*
+ * IOleWindow
+ */
+
+/**************************************************************************
+*  IShellBrowserImpl_GetWindow  (IOleWindow)
+*
+*  Inherited from IOleWindow::GetWindow
+*
+*  See Windows documentation for more details
+*
+*  Note : We will never be window less in the File Open dialog
+*  
+*/
+HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface,  
+                                           HWND * phwnd)
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    if(!This->hwndOwner)
+        return E_FAIL;
+
+    *phwnd = This->hwndOwner;
+
+    return (*phwnd) ? S_OK : E_UNEXPECTED; 
+
+}
+
+/**************************************************************************
+*  IShellBrowserImpl_ContextSensitiveHelp
+*/
+HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface,
+                                                      BOOL fEnterMode)
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}
+
+/*
+ * IShellBrowser
+ */
+
+/**************************************************************************
+*  IShellBrowserImpl_BrowseObject
+*
+*  See Windows documentation on IShellBrowser::BrowseObject for more details
+*
+*  This function will override user specified flags and will always 
+*  use SBSP_DEFBROWSER and SBSP_DEFMODE.  
+*/
+HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, 
+                                              LPCITEMIDLIST pidl, 
+                                              UINT wFlags)
+{
+    HRESULT hRes;
+    IShellFolder *psfTmp;
+    IShellView *psvTmp;
+    FileOpenDlgInfos *fodInfos;
+    LPITEMIDLIST pidlTmp;
+    HWND hwndView;
+    HWND hDlgWnd;
+    BOOL bViewHasFocus;
+
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)(%p,0x%08x)\n", This, pidl, wFlags);
+
+    fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
+
+    /* Format the pidl according to its parameter's category */
+    if(wFlags & SBSP_RELATIVE)
+    {
+        
+        /* SBSP_RELATIVE  A relative pidl (relative from the current folder) */
+        if(FAILED(hRes = IShellFolder_BindToObject(fodInfos->Shell.FOIShellFolder,
+             pidl, NULL, &IID_IShellFolder, (LPVOID *)&psfTmp)))
+        {
+            ERR("bind to object failed\n");
+            return hRes;
+        }
+        /* create an absolute pidl */
+        pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent,
+                                                        (LPITEMIDLIST)pidl);
+    }
+    else if(wFlags & SBSP_PARENT)
+    {
+        /* Browse the parent folder (ignores the pidl) */
+        pidlTmp = GetParentPidl(fodInfos->ShellInfos.pidlAbsCurrent);
+        psfTmp = GetShellFolderFromPidl(pidlTmp);
+
+    }
+    else /* SBSP_ABSOLUTE is 0x0000 */
+    {
+        /* An absolute pidl (relative from the desktop) */
+        pidlTmp =  COMDLG32_PIDL_ILClone((LPITEMIDLIST)pidl);
+        psfTmp = GetShellFolderFromPidl(pidlTmp);
+    }
+    
+    if(!psfTmp)
+    {
+      ERR("could not browse to folder\n");
+      return E_FAIL;
+    }
+
+    /* If the pidl to browse to is equal to the actual pidl ... 
+       do nothing and pretend you did it*/
+    if(COMDLG32_PIDL_ILIsEqual(pidlTmp,fodInfos->ShellInfos.pidlAbsCurrent))
+    {
+        IShellFolder_Release(psfTmp);
+        COMDLG32_SHFree(pidlTmp);
+        TRACE("keep current folder\n");
+        return NOERROR;
+    }
+
+    /* Release the current DataObject */
+    if (fodInfos->Shell.FOIDataObject)
+    {
+      IDataObject_Release(fodInfos->Shell.FOIDataObject);
+      fodInfos->Shell.FOIDataObject = NULL;
+    }
+
+    /* Create the associated view */
+    TRACE("create view object\n");
+    if(FAILED(hRes = IShellFolder_CreateViewObject(psfTmp, fodInfos->ShellInfos.hwndOwner,
+           &IID_IShellView, (LPVOID *)&psvTmp))) goto error;
+
+    /* Check if listview has focus */
+    bViewHasFocus = IsChild(fodInfos->ShellInfos.hwndView,GetFocus());
+
+    /* Get the foldersettings from the old view */
+    if(fodInfos->Shell.FOIShellView)
+      IShellView_GetCurrentInfo(fodInfos->Shell.FOIShellView, &fodInfos->ShellInfos.folderSettings);
+
+    /* Release the old fodInfos->Shell.FOIShellView and update its value.
+    We have to update this early since ShellView_CreateViewWindow of native
+    shell32 calls OnStateChange and needs the correct view here.*/
+    if(fodInfos->Shell.FOIShellView)
+    {
+      IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView);
+      IShellView_Release(fodInfos->Shell.FOIShellView);
+    }
+    fodInfos->Shell.FOIShellView = psvTmp;
+
+    /* Release old FOIShellFolder and update its value */
+    if (fodInfos->Shell.FOIShellFolder)
+      IShellFolder_Release(fodInfos->Shell.FOIShellFolder);
+    fodInfos->Shell.FOIShellFolder = psfTmp;
+
+    /* Release old pidlAbsCurrent and update its value */
+    COMDLG32_SHFree((LPVOID)fodInfos->ShellInfos.pidlAbsCurrent);
+    fodInfos->ShellInfos.pidlAbsCurrent = pidlTmp;
+
+    /* Create the window */
+    TRACE("create view window\n");
+    if(FAILED(hRes = IShellView_CreateViewWindow(psvTmp, NULL,
+         &fodInfos->ShellInfos.folderSettings, fodInfos->Shell.FOIShellBrowser,
+         &fodInfos->ShellInfos.rectView, &hwndView))) goto error;
+
+    fodInfos->ShellInfos.hwndView = hwndView;
+
+    /* Select the new folder in the Look In combo box of the Open file dialog */
+    FILEDLG95_LOOKIN_SelectItem(fodInfos->DlgInfos.hwndLookInCB,fodInfos->ShellInfos.pidlAbsCurrent);
+
+    /* 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 hRes; 
+error:
+    ERR("Failed with error 0x%08lx\n", hRes);
+    return hRes;
+}
+
+/**************************************************************************
+*  IShellBrowserImpl_EnableModelessSB
+*/
+HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface,    
+                                              BOOL fEnable)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}
+
+/**************************************************************************
+*  IShellBrowserImpl_GetControlWindow
+*/
+HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface,    
+                                              UINT id,    
+                                              HWND *lphwnd)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}
+/**************************************************************************
+*  IShellBrowserImpl_GetViewStateStream
+*/
+HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
+                                                DWORD grfMode,    
+                                                LPSTREAM *ppStrm)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    FIXME("(%p 0x%08lx %p)\n", This, grfMode, ppStrm);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}       
+/**************************************************************************
+*  IShellBrowserImpl_InsertMenusSB
+*/
+HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface,
+                                           HMENU hmenuShared,
+                                           LPOLEMENUGROUPWIDTHS lpMenuWidths)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}
+/**************************************************************************
+*  IShellBrowserImpl_OnViewWindowActive
+*/
+HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface,
+                                                IShellView *ppshv)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}   
+/**************************************************************************
+*  IShellBrowserImpl_QueryActiveShellView
+*/
+HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface,
+                                                  IShellView **ppshv)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    FileOpenDlgInfos *fodInfos;
+
+    TRACE("(%p)\n", This);
+
+    fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
+
+    if(!(*ppshv = fodInfos->Shell.FOIShellView))
+    {
+        return E_FAIL;
+    }
+    IShellView_AddRef(fodInfos->Shell.FOIShellView);
+    return NOERROR;
+}   
+/**************************************************************************
+*  IShellBrowserImpl_RemoveMenusSB
+*/
+HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface,
+                                           HMENU hmenuShared)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}   
+/**************************************************************************
+*  IShellBrowserImpl_SendControlMsg
+*/
+HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,    
+                                            UINT id,    
+                                            UINT uMsg,    
+                                            WPARAM wParam,    
+                                            LPARAM lParam,
+                                            LRESULT *pret)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+    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;
+}
+/**************************************************************************
+*  IShellBrowserImpl_SetMenuSB
+*/
+HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface,
+                                       HMENU hmenuShared,    
+                                       HOLEMENU holemenuReserved,
+                                       HWND hwndActiveObject)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}   
+/**************************************************************************
+*  IShellBrowserImpl_SetStatusTextSB
+*/
+HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface,
+                                             LPCOLESTR lpszStatusText)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}   
+/**************************************************************************
+*  IShellBrowserImpl_SetToolbarItems
+*/
+HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface,
+                                             LPTBBUTTON lpButtons,    
+                                             UINT nButtons,    
+                                             UINT uFlags)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}   
+/**************************************************************************
+*  IShellBrowserImpl_TranslateAcceleratorSB
+*/
+HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface,
+                                                    LPMSG lpmsg,    
+                                                    WORD wID)
+                                              
+{
+    ICOM_THIS(IShellBrowserImpl, iface);
+
+    TRACE("(%p)\n", This);
+
+    /* Feature not implemented */
+    return E_NOTIMPL;
+}
+
 static ICOM_VTABLE(IShellBrowser) IShellBrowserImpl_Vtbl =
 {
@@ -59 +628 @@
 };
 
-static ICOM_VTABLE(ICommDlgBrowser) IShellBrowserImpl_ICommDlgBrowser_Vtbl =
-{
-        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-        /* IUnknown */
-        IShellBrowserImpl_ICommDlgBrowser_QueryInterface,
-        IShellBrowserImpl_ICommDlgBrowser_AddRef,
-        IShellBrowserImpl_ICommDlgBrowser_Release,
-        /* ICommDlgBrowser */
-        IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand,
-        IShellBrowserImpl_ICommDlgBrowser_OnStateChange,
-        IShellBrowserImpl_ICommDlgBrowser_IncludeObject
-};
-
-
-/**************************************************************************
-*   Local Prototypes
-*/
-
-HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IShellView *ppshv);
-#if 0
-LPITEMIDLIST GetSelectedPidl(IShellView *ppshv);
-#endif
-
-/**************************************************************************
-*   External Prototypes
-*/
-extern const char *FileOpenDlgInfosStr; 
-
-extern HRESULT          GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName);
-extern HRESULT          GetFileName(HWND hwnd, LPITEMIDLIST pidl, LPSTR lpstrFileName);
-extern IShellFolder*    GetShellFolderFromPidl(LPITEMIDLIST pidlAbs);
-extern LPITEMIDLIST     GetParentPidl(LPITEMIDLIST pidl);
-extern LPITEMIDLIST     GetPidlFromName(IShellFolder *psf,LPCSTR lpcstrFileName);
-
-extern BOOL    FILEDLG95_SHELL_FillIncludedItemList(HWND hwnd,
-                                                        LPITEMIDLIST pidlCurrentFolder,
-                                                        LPSTR lpstrMask);
-
-extern int     FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl);
-extern BOOL    FILEDLG95_OnOpen(HWND hwnd);
-extern HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode);
-
-
-/**************************************************************************
-*  IShellBrowserImpl_Construct
-*/
-IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner)
-{
-    IShellBrowserImpl *sb;
-    FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwndOwner,FileOpenDlgInfosStr);
-
-    sb=(IShellBrowserImpl*)COMDLG32_SHAlloc(sizeof(IShellBrowserImpl));
-
-    /* Initialisation of the member variables */
-    sb->ref=1;
-    sb->hwndOwner = hwndOwner;
-
-    /* Initialisation of the vTables */
-    sb->lpVtbl = &IShellBrowserImpl_Vtbl;
-    sb->lpVtbl2 = &IShellBrowserImpl_ICommDlgBrowser_Vtbl;
-
-    COMDLG32_SHGetSpecialFolderLocation(hwndOwner, CSIDL_DESKTOP,
-                               &fodInfos->ShellInfos.pidlAbsCurrent);
-
-    TRACE("%p\n", sb);
-
-    return (IShellBrowser *) sb;
-}
-
-/**************************************************************************
-*
-*
-*  The INTERFACE of the IShellBrowser object
-*
-*/
-
-/*
- * IUnknown
- */
-
-/***************************************************************************
-*  IShellBrowserImpl_QueryInterface
-*/
-HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface,
-                                            REFIID riid, 
-                                            LPVOID *ppvObj)
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    *ppvObj = NULL;
-
-    if(IsEqualIID(riid, &IID_IUnknown))          /*IUnknown*/
-    { *ppvObj = This; 
-    }
-    else if(IsEqualIID(riid, &IID_IOleWindow))  /*IOleWindow*/
-    { *ppvObj = (IOleWindow*)This;
-    }
-
-    else if(IsEqualIID(riid, &IID_IShellBrowser))  /*IShellBrowser*/
-    { *ppvObj = (IShellBrowser*)This;
-    }
-
-    else if(IsEqualIID(riid, &IID_ICommDlgBrowser))  /*ICommDlgBrowser*/
-    { *ppvObj = (ICommDlgBrowser*) &(This->lpVtbl2);
-    }
-
-    if(*ppvObj)
-    { IUnknown_AddRef( (IShellBrowser*) *ppvObj);
-      return S_OK;
-    }
-    return E_NOINTERFACE;
-}
-
-/**************************************************************************
-*  IShellBrowser::AddRef
-*/
-ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface)
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    return ++(This->ref);
-}
-
-/**************************************************************************
-*  IShellBrowserImpl_Release
-*/
-ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface)
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    if (!--(This->ref)) 
-    { 
-      HeapFree(GetProcessHeap(),0, This);
-      return 0;
-    }
-    return This->ref;
-}
-
-/*
- * IOleWindow
- */
-
-/**************************************************************************
-*  IShellBrowserImpl_GetWindow  (IOleWindow)
-*
-*  Inherited from IOleWindow::GetWindow
-*
-*  See Windows documentation for more details
-*
-*  Note : We will never be window less in the File Open dialog
-*  
-*/
-HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface,  
-                                           HWND * phwnd)
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    if(!This->hwndOwner)
-        return E_FAIL;
-
-    *phwnd = This->hwndOwner;
-
-    return (*phwnd) ? S_OK : E_UNEXPECTED; 
-
-}
-
-/**************************************************************************
-*  IShellBrowserImpl_ContextSensitiveHelp
-*/
-HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface,
-                                                      BOOL fEnterMode)
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}
-
-/*
- * IShellBrowser
- */
-
-/**************************************************************************
-*  IShellBrowserImpl_BrowseObject
-*
-*  See Windows documentation on IShellBrowser::BrowseObject for more details
-*
-*  This function will override user specified flags and will always 
-*  use SBSP_DEFBROWSER and SBSP_DEFMODE.  
-*/
-HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, 
-                                              LPCITEMIDLIST pidl, 
-                                              UINT wFlags)
-{
-    HRESULT hRes;
-    IShellFolder *psfTmp;
-    IShellView *psvTmp;
-    FileOpenDlgInfos *fodInfos;
-    LPITEMIDLIST pidlTmp;
-    HWND hwndView;
-    HWND hDlgWnd;
-    BOOL bViewHasFocus;
-
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)(%p,0x%08x)\n", This, pidl, wFlags);
-
-    fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
-
-    /* Format the pidl according to its parameter's category */
-    if(wFlags & SBSP_RELATIVE)
-    {
-        
-        /* SBSP_RELATIVE  A relative pidl (relative from the current folder) */
-        if(FAILED(hRes = IShellFolder_BindToObject(fodInfos->Shell.FOIShellFolder,
-             pidl, NULL, &IID_IShellFolder, (LPVOID *)&psfTmp)))
-        {
-            ERR("bind to object failed\n");
-            return hRes;
-        }
-        /* create an absolute pidl */
-        pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent,
-                                                        (LPITEMIDLIST)pidl);
-    }
-    else if(wFlags & SBSP_PARENT)
-    {
-        /* Browse the parent folder (ignores the pidl) */
-        pidlTmp = GetParentPidl(fodInfos->ShellInfos.pidlAbsCurrent);
-        psfTmp = GetShellFolderFromPidl(pidlTmp);
-
-    }
-    else /* SBSP_ABSOLUTE is 0x0000 */
-    {
-        /* An absolute pidl (relative from the desktop) */
-        pidlTmp =  COMDLG32_PIDL_ILClone((LPITEMIDLIST)pidl);
-        psfTmp = GetShellFolderFromPidl(pidlTmp);
-    }
-    
-    if(!psfTmp) return E_FAIL;
-
-    /* If the pidl to browse to is equal to the actual pidl ... 
-       do nothing and pretend you did it*/
-    if(COMDLG32_PIDL_ILIsEqual(pidlTmp,fodInfos->ShellInfos.pidlAbsCurrent))
-    {
-        IShellFolder_Release(psfTmp);
-        COMDLG32_SHFree(pidlTmp);
-        return NOERROR;
-    }
-
-    /* Release the current DataObject */
-    if (fodInfos->Shell.FOIDataObject)
-    {
-      IDataObject_Release(fodInfos->Shell.FOIDataObject);
-      fodInfos->Shell.FOIDataObject = NULL;
-    }
-
-    /* Create the associated view */
-    if(FAILED(hRes = IShellFolder_CreateViewObject(psfTmp, fodInfos->ShellInfos.hwndOwner,
-           &IID_IShellView, (LPVOID *)&psvTmp))) return hRes;
-
-    /* Check if listview has focus */
-    bViewHasFocus = IsChild(fodInfos->ShellInfos.hwndView,GetFocus());
-
-    /* Get the foldersettings from the old view */
-    if(fodInfos->Shell.FOIShellView)
-      IShellView_GetCurrentInfo(fodInfos->Shell.FOIShellView, &fodInfos->ShellInfos.folderSettings);
-
-    /* Release the old fodInfos->Shell.FOIShellView and update its value.
-    We have to update this early since ShellView_CreateViewWindow of native
-    shell32 calls OnStateChange and needs the correct view here.*/
-    if(fodInfos->Shell.FOIShellView)
-    {
-      IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView);
-      IShellView_Release(fodInfos->Shell.FOIShellView);
-    }
-    fodInfos->Shell.FOIShellView = psvTmp;
-
-    /* Release old FOIShellFolder and update its value */
-    if (fodInfos->Shell.FOIShellFolder)
-      IShellFolder_Release(fodInfos->Shell.FOIShellFolder);
-    fodInfos->Shell.FOIShellFolder = psfTmp;
-
-    /* Release old pidlAbsCurrent and update its value */
-    COMDLG32_SHFree((LPVOID)fodInfos->ShellInfos.pidlAbsCurrent);
-    fodInfos->ShellInfos.pidlAbsCurrent = pidlTmp;
-
-    /* Create the window */
-    TRACE("create view window\n");
-    if(FAILED(hRes = IShellView_CreateViewWindow(psvTmp, NULL,
-         &fodInfos->ShellInfos.folderSettings, fodInfos->Shell.FOIShellBrowser,
-         &fodInfos->ShellInfos.rectView, &hwndView))) return hRes;
-
-    fodInfos->ShellInfos.hwndView = hwndView;
-
-    /* Select the new folder in the Look In combo box of the Open file dialog */
-    FILEDLG95_LOOKIN_SelectItem(fodInfos->DlgInfos.hwndLookInCB,fodInfos->ShellInfos.pidlAbsCurrent);
-
-    /* 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 hRes; 
-}
-
-/**************************************************************************
-*  IShellBrowserImpl_EnableModelessSB
-*/
-HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface,    
-                                              BOOL fEnable)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}
-
-/**************************************************************************
-*  IShellBrowserImpl_GetControlWindow
-*/
-HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface,    
-                                              UINT id,    
-                                              HWND *lphwnd)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}
-/**************************************************************************
-*  IShellBrowserImpl_GetViewStateStream
-*/
-HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
-                                                DWORD grfMode,    
-                                                LPSTREAM *ppStrm)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}       
-/**************************************************************************
-*  IShellBrowserImpl_InsertMenusSB
-*/
-HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface,
-                                           HMENU hmenuShared,
-                                           LPOLEMENUGROUPWIDTHS lpMenuWidths)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}
-/**************************************************************************
-*  IShellBrowserImpl_OnViewWindowActive
-*/
-HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface,
-                                                IShellView *ppshv)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}   
-/**************************************************************************
-*  IShellBrowserImpl_QueryActiveShellView
-*/
-HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface,
-                                                  IShellView **ppshv)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    FileOpenDlgInfos *fodInfos;
-
-    TRACE("(%p)\n", This);
-
-    fodInfos = (FileOpenDlgInfos *) GetPropA(This->hwndOwner,FileOpenDlgInfosStr);
-
-    if(!(*ppshv = fodInfos->Shell.FOIShellView))
-    {
-        return E_FAIL;
-    }
-    IShellView_AddRef(fodInfos->Shell.FOIShellView);
-    return NOERROR;
-}   
-/**************************************************************************
-*  IShellBrowserImpl_RemoveMenusSB
-*/
-HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface,
-                                           HMENU hmenuShared)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}   
-/**************************************************************************
-*  IShellBrowserImpl_SendControlMsg
-*/
-HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,    
-                                            UINT id,    
-                                            UINT uMsg,    
-                                            WPARAM wParam,    
-                                            LPARAM lParam,
-                                            LRESULT *pret)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-    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;
-}
-/**************************************************************************
-*  IShellBrowserImpl_SetMenuSB
-*/
-HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface,
-                                       HMENU hmenuShared,    
-                                       HOLEMENU holemenuReserved,
-                                       HWND hwndActiveObject)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}   
-/**************************************************************************
-*  IShellBrowserImpl_SetStatusTextSB
-*/
-HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface,
-                                             LPCOLESTR lpszStatusText)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}   
-/**************************************************************************
-*  IShellBrowserImpl_SetToolbarItems
-*/
-HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface,
-                                             LPTBBUTTON lpButtons,    
-                                             UINT nButtons,    
-                                             UINT uFlags)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}   
-/**************************************************************************
-*  IShellBrowserImpl_TranslateAcceleratorSB
-*/
-HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface,
-                                                    LPMSG lpmsg,    
-                                                    WORD wID)
-                                              
-{
-    ICOM_THIS(IShellBrowserImpl, iface);
-
-    TRACE("(%p)\n", This);
-
-    /* Feature not implemented */
-    return E_NOTIMPL;
-}
+
 
 /*
@@ -584 +637 @@
 *  IShellBrowserImpl_ICommDlgBrowser_QueryInterface
 */
-HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface(ICommDlgBrowser *iface,
-                                            REFIID riid, 
-                                            LPVOID *ppvObj)
+HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface(
+        ICommDlgBrowser *iface,
+        REFIID riid, 
+        LPVOID *ppvObj)
 {
     _ICOM_THIS_FromICommDlgBrowser(IShellBrowser,iface);
@@ -700 +754 @@
 }
 
-/* copied from shell32 to avoid linking to it */
-static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
-{
-        TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
-
-        switch (src->uType)
-        {
-          case STRRET_WSTR:
-            lstrcpynW((LPWSTR)dest, src->u.pOleStr, len);
-            COMDLG32_SHFree(src->u.pOleStr);
-            break;
-
-          case STRRET_CSTRA:
-            lstrcpynAtoW((LPWSTR)dest, src->u.cStr, len);
-            break;
-
-          case STRRET_OFFSETA:
-            if (pidl)
-            {
-              lstrcpynAtoW((LPWSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
-            }
-            break;
-
-          default:
-            FIXME("unknown type!\n");
-            if (len)
-            { *(LPSTR)dest = '\0';
-            }
-            return(FALSE);
-        }
-        return S_OK;
-}
 /**************************************************************************
 *  IShellBrowserImpl_ICommDlgBrowser_IncludeObject
@@ -804 +826 @@
 }
 
+static ICOM_VTABLE(ICommDlgBrowser) IShellBrowserImpl_ICommDlgBrowser_Vtbl =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown */
+        IShellBrowserImpl_ICommDlgBrowser_QueryInterface,
+        IShellBrowserImpl_ICommDlgBrowser_AddRef,
+        IShellBrowserImpl_ICommDlgBrowser_Release,
+        /* ICommDlgBrowser */
+        IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand,
+        IShellBrowserImpl_ICommDlgBrowser_OnStateChange,
+        IShellBrowserImpl_ICommDlgBrowser_IncludeObject
+};
+
+
+
+
+/*
+ * IServiceProvider
+ */
+
+/***************************************************************************
+*  IShellBrowserImpl_IServiceProvider_QueryInterface
+*/
+HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryInterface(
+        IServiceProvider *iface,
+        REFIID riid, 
+        LPVOID *ppvObj)
+{
+    _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface);
+
+    FIXME("(%p)\n", This);
+
+    return IShellBrowserImpl_QueryInterface(This,riid,ppvObj);
+}
+
+/**************************************************************************
+*  IShellBrowserImpl_IServiceProvider_AddRef
+*/
+ULONG WINAPI IShellBrowserImpl_IServiceProvider_AddRef(IServiceProvider * iface)
+{
+    _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface);
+
+    FIXME("(%p)\n", This);
+
+    return IShellBrowserImpl_AddRef(This);
+}
+
+/**************************************************************************
+*  IShellBrowserImpl_IServiceProvider_Release
+*/
+ULONG WINAPI IShellBrowserImpl_IServiceProvider_Release(IServiceProvider * iface)
+{
+    _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface);
+
+    FIXME("(%p)\n", This);
+
+    return IShellBrowserImpl_Release(This);
+}
+
+/**************************************************************************
+*  IShellBrowserImpl_IServiceProvider_Release
+*
+* NOTES
+*  the w2k shellview asks for 
+*   guidService = SID_STopLevelBrowser
+*   riid = IShellBrowser
+*
+* FIXME
+*  this is a hack!
+*/
+
+HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryService(
+        IServiceProvider * iface,
+        REFGUID guidService,
+        REFIID riid,
+        void** ppv)
+{
+    _ICOM_THIS_FromIServiceProvider(IShellBrowser,iface);
+
+#ifndef __WIN32OS2__
+    FIXME("(%p)\n\t%s\n\t%s\n", This,debugstr_guid(guidService), debugstr_guid(riid) );
+#endif
+
+    *ppv = NULL;
+    if(guidService && IsEqualIID(guidService, &SID_STopLevelBrowser))
+    {
+      return IShellBrowserImpl_QueryInterface(This,riid,ppv);
+    }
+    FIXME("(%p) unknown interface requested\n", This);
+    return E_NOINTERFACE;
+
+}
+
+static ICOM_VTABLE(IServiceProvider) IShellBrowserImpl_IServiceProvider_Vtbl =
+{
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        /* IUnknown */
+        IShellBrowserImpl_IServiceProvider_QueryInterface,
+        IShellBrowserImpl_IServiceProvider_AddRef,
+        IShellBrowserImpl_IServiceProvider_Release,
+        /* IServiceProvider */
+        IShellBrowserImpl_IServiceProvider_QueryService
+};

trunk/src/comdlg32/filedlgbrowser.h

@@ -16 +16 @@
  * Defines and global variables
  */
-#define _ICOM_THIS_FromICommDlgBrowser(Class,name) Class* This = (Class*) (((char*)name)-sizeof(void *))
+#define _ICommDlgBrowser_Offset ((int)(&(((IShellBrowserImpl*)0)->lpVtblCommDlgBrowser)))
+#define _ICOM_THIS_FromICommDlgBrowser(class, name) class* This = (class*)(((char*)name)-_ICommDlgBrowser_Offset);
+
+#define _IServiceProvider_Offset ((int)(&(((IShellBrowserImpl*)0)->lpVtblServiceProvider)))
+#define _ICOM_THIS_FromIServiceProvider(class, name) class* This = (class*)(((char*)name)-_IServiceProvider_Offset);
 
 /* dialog internal property */
@@ -28 +32 @@
  */
 
-
-typedef struct
-{
-
-    ICOM_VTABLE(IShellBrowser)* lpVtbl;         /* IShellBrowser VTable */
-    ICOM_VTABLE(ICommDlgBrowser)* lpVtbl2;      /* ICommDlgBrowser VTable */
-    DWORD ref;                                  /* Reference counter */
-    HWND hwndOwner;                             /* Owner dialog of the interface */
-
-} IShellBrowserImpl;
 
 typedef struct
@@ -67 +61 @@
         DWORD dwDlgProp;
     } DlgInfos;
+
+    struct {
+        UINT fileokstring;
+        UINT lbselchstring;
+        UINT helpmsgstring;
+        UINT sharevistring;
+    } HookMsg;
 
 } FileOpenDlgInfos;
@@ -125 +126 @@
 IShellBrowser * IShellBrowserImpl_Construct(HWND hwndOwner);
 
-/* IUnknown */
-HRESULT WINAPI IShellBrowserImpl_QueryInterface(IShellBrowser *iface,
-                                            REFIID riid, 
-                                            LPVOID *ppvObj);
-
-ULONG WINAPI IShellBrowserImpl_AddRef(IShellBrowser * iface);
-
-ULONG WINAPI IShellBrowserImpl_Release(IShellBrowser * iface);
-
-/* IOleWindow */
-HRESULT WINAPI IShellBrowserImpl_GetWindow(IShellBrowser * iface,  
-                                           HWND * phwnd);
-
-HRESULT WINAPI IShellBrowserImpl_ContextSensitiveHelp(IShellBrowser * iface,
-                                                      BOOL fEnterMode);
-
-/* IShellBrowser */
-
-HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, 
-                                          LPCITEMIDLIST pidl,   
-                                          UINT wFlags);
-
-HRESULT WINAPI IShellBrowserImpl_EnableModelessSB(IShellBrowser *iface,    
-                                              BOOL fEnable);
-                                              
-HRESULT WINAPI IShellBrowserImpl_GetControlWindow(IShellBrowser *iface,    
-                                              UINT id,    
-                                              HWND *lphwnd);
-
-HRESULT WINAPI IShellBrowserImpl_GetViewStateStream(IShellBrowser *iface,
-                                                DWORD grfMode,    
-                                                LPSTREAM *ppStrm);
-
-HRESULT WINAPI IShellBrowserImpl_InsertMenusSB(IShellBrowser *iface,
-                                           HMENU hmenuShared,
-                                           LPOLEMENUGROUPWIDTHS lpMenuWidths);
-
-HRESULT WINAPI IShellBrowserImpl_OnViewWindowActive(IShellBrowser *iface,
-                                                IShellView *ppshv);
-                                              
-
-HRESULT WINAPI IShellBrowserImpl_QueryActiveShellView(IShellBrowser *iface,
-                                                  IShellView **ppshv);
-
-HRESULT WINAPI IShellBrowserImpl_RemoveMenusSB(IShellBrowser *iface,
-                                           HMENU hmenuShared);
-
-HRESULT WINAPI IShellBrowserImpl_SendControlMsg(IShellBrowser *iface,    
-                                            UINT id,    
-                                            UINT uMsg,    
-                                            WPARAM wParam,    
-                                            LPARAM lParam,
-                                            LRESULT *pret);
-
-HRESULT WINAPI IShellBrowserImpl_SetMenuSB(IShellBrowser *iface,
-                                       HMENU hmenuShared,    
-                                       HOLEMENU holemenuReserved,
-                                       HWND hwndActiveObject);
-
-HRESULT WINAPI IShellBrowserImpl_SetStatusTextSB(IShellBrowser *iface,
-                                             LPCOLESTR lpszStatusText);
-                                                
-
-HRESULT WINAPI IShellBrowserImpl_SetToolbarItems(IShellBrowser *iface,
-                                             LPTBBUTTON lpButtons,    
-                                             UINT nButtons,    
-                                             UINT uFlags);
-                                              
-HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface,
-                                                    LPMSG lpmsg,    
-                                                    WORD wID);
-
-
-/* ICommDlgBrowser */
-
-HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_QueryInterface(ICommDlgBrowser *iface,
-                                            REFIID riid, 
-                                            LPVOID *ppvObj);
-
-ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_AddRef(ICommDlgBrowser * iface);
-
-ULONG WINAPI IShellBrowserImpl_ICommDlgBrowser_Release(ICommDlgBrowser * iface);
-
-HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnDefaultCommand(ICommDlgBrowser *iface,
-                                                                  IShellView *ppshv);
-
-HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_OnStateChange(ICommDlgBrowser *iface,
-                                                               IShellView *ppshv,
-                                                               ULONG uChange);
-
-HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBrowser *iface, 
-                                                               IShellView * ppshv,
-                                                               LPCITEMIDLIST pidl);
-
 
 LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex);

trunk/src/shell32/shell32.def

@@ -1 @@
-; $Id: shell32.def,v 1.32 2000-11-02 09:52:18 sandervl Exp $
+; $Id: shell32.def,v 1.33 2000-11-06 10:20:55 sandervl Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -75 +75 @@
     IsNetDrive                        = _IsNetDrive@4                         @66
     Shell_MergeMenus                  = _Shell_MergeMenus@24                  @67
-    SHGetSettings                     = _SHGetSettings@12                     @68
+    SHGetSetSettings                  = _SHGetSetSettings@12                  @68
 ;   SHGetNetResource                  = _SHGetNetResource@?                   @69
     SHCreateDefClassObject            = _SHCreateDefClassObject@20            @70
@@ -377 +377 @@
     SHGetSpecialFolderPathA           = _SHGetSpecialFolderPathA@16           @690
 
+    SHGetSettings                     = _SHGetSettings@12                     @691
+
 ;
 ; version 5.00 (Win2K)

trunk/src/shell32/shelllink.c

@@ -1 @@
-/* $Id: shelllink.c,v 1.1 2000-08-30 13:52:55 sandervl Exp $ */
+/* $Id: shelllink.c,v 1.2 2000-11-06 10:20:56 sandervl Exp $ */
 /*
  *
@@ -12 +12 @@
 
 #include <string.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#ifndef __WIN32OS2__
+#include <unistd.h>
+#endif
+#include <errno.h>
+#ifndef __WIN32OS2__
+#include <sys/wait.h>
+#endif
+
 #include "debugtools.h"
 #include "winerror.h"
-
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
-#include "wine/obj_shelllink.h"
+#include "winbase.h"
+#include "winnls.h"
+
+#include "shlobj.h"
+#include "wine/winestring.h"
 #include "wine/undocshell.h"
+#ifndef __WIN32OS2__
+#include "bitmaps/wine.xpm"
+#endif
 
 #include "heap.h"
-#include "winnls.h"
 #include "pidl.h"
 #include "shell32_main.h"
 #include "shlguid.h"
+#include "file.h"
+#include "options.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
@@ -63 +78 @@
 #define LINK_HEADER_SIZE (sizeof(LINK_HEADER)-sizeof(ITEMIDLIST))
 
+typedef struct
+{
+        BYTE bWidth;
+        BYTE bHeight;
+        BYTE bColorCount;
+        BYTE bReserved;
+        WORD wPlanes;
+        WORD wBitCount;
+        DWORD dwBytesInRes;
+        WORD nID;
+} GRPICONDIRENTRY;
+
+typedef struct
+{
+        WORD idReserved;
+        WORD idType;
+        WORD idCount;
+        GRPICONDIRENTRY idEntries[1];
+} GRPICONDIR;
+
+typedef struct
+{
+        BYTE bWidth;
+        BYTE bHeight;
+        BYTE bColorCount;
+        BYTE bReserved;
+        WORD wPlanes;
+        WORD wBitCount;
+        DWORD dwBytesInRes;
+        DWORD dwImageOffset;
+} ICONDIRENTRY;
+
+typedef struct
+{
+        WORD idReserved;
+        WORD idType;
+        WORD idCount;
+} ICONDIR;
+
+
 #include "poppack.h"
+
 
 static ICOM_VTABLE(IShellLinkA)         slvt;
@@ -92 +148 @@
         SYSTEMTIME      time3;
 
+        LPSTR           sIcoPath;
+        INT             iIcoNdx;
+        LPSTR           sArgs;
+        LPSTR           sWorkDir;
+        LPSTR           sDescription;
 } IShellLinkImpl;
 
@@ -179 +240 @@
 }
 
+
+#ifndef __WIN32OS2__
+/* Icon extraction routines
+ *
+ * FIXME: should use PrivateExtractIcons and friends
+ * FIXME: should not use stdio
+ */
+
+static BOOL SaveIconResAsXPM(const BITMAPINFO *pIcon, const char *szXPMFileName)
+{
+    FILE *fXPMFile;
+    int nHeight;
+    int nXORWidthBytes;
+    int nANDWidthBytes;
+    BOOL b8BitColors;
+    int nColors;
+    BYTE *pXOR;
+    BYTE *pAND;
+    BOOL aColorUsed[256] = {0};
+    int nColorsUsed = 0;
+    int i,j;
+
+    if (!((pIcon->bmiHeader.biBitCount == 4) || (pIcon->bmiHeader.biBitCount == 8)))
+        return 0;
+
+    if (!(fXPMFile = fopen(szXPMFileName, "w")))
+        return 0;
+
+    nHeight = pIcon->bmiHeader.biHeight / 2;
+    nXORWidthBytes = 4 * ((pIcon->bmiHeader.biWidth * pIcon->bmiHeader.biBitCount / 32)
+                          + ((pIcon->bmiHeader.biWidth * pIcon->bmiHeader.biBitCount % 32) > 0));
+    nANDWidthBytes = 4 * ((pIcon->bmiHeader.biWidth / 32)
+                          + ((pIcon->bmiHeader.biWidth % 32) > 0));
+    b8BitColors = pIcon->bmiHeader.biBitCount == 8;
+    nColors = pIcon->bmiHeader.biClrUsed ? pIcon->bmiHeader.biClrUsed
+        : 1 << pIcon->bmiHeader.biBitCount;
+    pXOR = (BYTE*) pIcon + sizeof (BITMAPINFOHEADER) + (nColors * sizeof (RGBQUAD));
+    pAND = pXOR + nHeight * nXORWidthBytes;
+
+#define MASK(x,y) (pAND[(x) / 8 + (nHeight - (y) - 1) * nANDWidthBytes] & (1 << (7 - (x) % 8)))
+#define COLOR(x,y) (b8BitColors ? pXOR[(x) + (nHeight - (y) - 1) * nXORWidthBytes] : (x) % 2 ? pXOR[(x) / 2 + (nHeight - (y) - 1) * nXORWidthBytes] & 0xF : (pXOR[(x) / 2 + (nHeight - (y) - 1) * nXORWidthBytes] & 0xF0) >> 4)
+
+    for (i = 0; i < nHeight; i++)
+        for (j = 0; j < pIcon->bmiHeader.biWidth; j++)
+            if (!aColorUsed[COLOR(j,i)] && !MASK(j,i))
+            {
+                aColorUsed[COLOR(j,i)] = TRUE;
+                nColorsUsed++;
+            }
+
+    if (fprintf(fXPMFile, "/* XPM */\nstatic char *icon[] = {\n") <= 0)
+        goto error;
+    if (fprintf(fXPMFile, "\"%d %d %d %d\",\n",
+                (int) pIcon->bmiHeader.biWidth, nHeight, nColorsUsed + 1, 2) <=0)
+        goto error;
+
+    for (i = 0; i < nColors; i++)
+        if (aColorUsed[i])
+            if (fprintf(fXPMFile, "\"%.2X c #%.2X%.2X%.2X\",\n", i, pIcon->bmiColors[i].rgbRed,
+                        pIcon->bmiColors[i].rgbGreen, pIcon->bmiColors[i].rgbBlue) <= 0)
+                goto error;
+    if (fprintf(fXPMFile, "\"   c None\"") <= 0)
+        goto error;
+
+    for (i = 0; i < nHeight; i++)
+    {
+        if (fprintf(fXPMFile, ",\n\"") <= 0)
+            goto error;
+        for (j = 0; j < pIcon->bmiHeader.biWidth; j++)
+        {
+            if MASK(j,i)
+                {
+                    if (fprintf(fXPMFile, "  ") <= 0)
+                        goto error;
+                }
+            else
+                if (fprintf(fXPMFile, "%.2X", COLOR(j,i)) <= 0)
+                    goto error;
+        }
+        if (fprintf(fXPMFile, "\"") <= 0)
+            goto error;
+    }
+    if (fprintf(fXPMFile, "};\n") <= 0)
+        goto error;
+
+#undef MASK
+#undef COLOR
+
+    fclose(fXPMFile);
+    return 1;
+
+ error:
+    fclose(fXPMFile);
+    unlink( szXPMFileName );
+    return 0;
+}
+
+static BOOL CALLBACK EnumResNameProc(HANDLE hModule, const char *lpszType, char *lpszName, LONG lParam)
+{
+    *(HRSRC *) lParam = FindResourceA(hModule, lpszName, RT_GROUP_ICONA);
+    return FALSE;
+}
+
+static int ExtractFromEXEDLL(const char *szFileName, int nIndex, const char *szXPMFileName)
+{
+    HMODULE hModule;
+    HRSRC hResInfo;
+    char *lpName = NULL;
+    HGLOBAL hResData;
+    GRPICONDIR *pIconDir;
+    BITMAPINFO *pIcon;
+    int nMax = 0;
+    int i;
+
+    if (!(hModule = LoadLibraryExA(szFileName, 0, LOAD_LIBRARY_AS_DATAFILE)))
+        goto error1;
+
+    if (nIndex)
+        hResInfo = FindResourceA(hModule, MAKEINTRESOURCEA(nIndex), RT_GROUP_ICONA);
+    else
+        if (EnumResourceNamesA(hModule, RT_GROUP_ICONA, &EnumResNameProc, (LONG) &hResInfo))
+            goto error2;
+
+    if (!hResInfo)
+        goto error2;
+
+    if (!(hResData = LoadResource(hModule, hResInfo)))
+        goto error2;
+    if (!(pIconDir = LockResource(hResData)))
+        goto error3;
+
+    for (i = 0; i < pIconDir->idCount; i++)
+        if ((pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth) > nMax)
+        {
+            lpName = MAKEINTRESOURCEA(pIconDir->idEntries[i].nID);
+            nMax = pIconDir->idEntries[i].bHeight * pIconDir->idEntries[i].bWidth;
+        }
+
+    FreeResource(hResData);
+
+    if (!(hResInfo = FindResourceA(hModule, lpName, RT_ICONA)))
+        goto error2;
+    if (!(hResData = LoadResource(hModule, hResInfo)))
+        goto error2;
+    if (!(pIcon = LockResource(hResData)))
+        goto error3;
+
+    if(!SaveIconResAsXPM(pIcon, szXPMFileName))
+        goto error3;
+
+    FreeResource(hResData);
+    FreeLibrary(hModule);
+
+    return 1;
+
+ error3:
+    FreeResource(hResData);
+ error2:
+    FreeLibrary(hModule);
+ error1:
+    return 0;
+}
+
+static int ExtractFromICO(const char *szFileName, const char *szXPMFileName)
+{
+    FILE *fICOFile;
+    ICONDIR iconDir;
+    ICONDIRENTRY *pIconDirEntry;
+    int nMax = 0;
+    int nIndex = 0;
+    void *pIcon;
+    int i;
+
+    if (!(fICOFile = fopen(szFileName, "r")))
+        goto error1;
+
+    if (fread(&iconDir, sizeof (ICONDIR), 1, fICOFile) != 1)
+        goto error2;
+    if ((iconDir.idReserved != 0) || (iconDir.idType != 1))
+        goto error2;
+
+    if ((pIconDirEntry = malloc(iconDir.idCount * sizeof (ICONDIRENTRY))) == NULL)
+        goto error2;
+    if (fread(pIconDirEntry, sizeof (ICONDIRENTRY), iconDir.idCount, fICOFile) != iconDir.idCount)
+        goto error3;
+
+    for (i = 0; i < iconDir.idCount; i++)
+        if ((pIconDirEntry[i].bHeight * pIconDirEntry[i].bWidth) > nMax)
+        {
+            nIndex = i;
+            nMax = pIconDirEntry[i].bHeight * pIconDirEntry[i].bWidth;
+        }
+    if ((pIcon = malloc(pIconDirEntry[nIndex].dwBytesInRes)) == NULL)
+        goto error3;
+    if (fseek(fICOFile, pIconDirEntry[nIndex].dwImageOffset, SEEK_SET))
+        goto error4;
+    if (fread(pIcon, pIconDirEntry[nIndex].dwBytesInRes, 1, fICOFile) != 1)
+        goto error4;
+
+    if(!SaveIconResAsXPM(pIcon, szXPMFileName))
+        goto error4;
+
+    free(pIcon);
+    free(pIconDirEntry);
+    fclose(fICOFile);
+
+    return 1;
+
+ error4:
+    free(pIcon);
+ error3:
+    free(pIconDirEntry);
+ error2:
+    fclose(fICOFile);
+ error1:
+    return 0;
+}
+
+/* get the Unix file name for a given path, allocating the string */
+inline static char *get_unix_file_name( const char *dos )
+{
+    DOS_FULL_NAME path;
+
+    if (!DOSFS_GetFullName( dos, FALSE, &path )) return NULL;
+    return HEAP_strdupA( GetProcessHeap(), 0, path.long_name );
+}
+
+static BOOL create_default_icon( const char *filename )
+{
+    FILE *fXPM;
+    int i;
+
+    if (!(fXPM = fopen(filename, "w"))) return FALSE;
+    fprintf(fXPM, "/* XPM */\nstatic char * icon[] = {");
+    for (i = 0; i < sizeof(wine_xpm)/sizeof(wine_xpm[0]); i++)
+        fprintf( fXPM, "\n\"%s\",", wine_xpm[i]);
+    fprintf( fXPM, "};\n" );
+    fclose( fXPM );
+    return TRUE;
+}
+
+/* extract an icon from an exe or icon file; helper for IPersistFile_fnSave */
+static char *extract_icon( const char *path, int index )
+{
+    char *filename = HEAP_strdupA( GetProcessHeap(), 0, tmpnam(NULL) );
+    if (ExtractFromEXEDLL( path, index, filename )) return filename;
+    if (ExtractFromICO( path, filename )) return filename;
+    if (create_default_icon( filename )) return filename;
+    HeapFree( GetProcessHeap(), 0, filename );
+    return NULL;
+}
+#endif //#ifndef __WIN32OS2__
+
+
 static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember)
 {
-        _ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface);
-        FIXME("(%p)->(%s)\n",This,debugstr_w(pszFileName));
-        return NOERROR;
-}
+    HRESULT ret = NOERROR;
+    int pid, status;
+    char buffer[MAX_PATH], buff2[MAX_PATH];
+    char *filename, *link_name, *p;
+    char *shell_link_app = NULL;
+    char *icon_name = NULL;
+    char *path_name = NULL;
+    char *work_dir = NULL;
+    BOOL bDesktop;
+
+    _ICOM_THIS_From_IPersistFile(IShellLinkImpl, iface);
+
+    TRACE("(%p)->(%s)\n",This,debugstr_w(pszFileName));
+
+    if (!pszFileName || !This->sPath)
+        return ERROR_UNKNOWN;
+
+    /* check for .exe extension */
+    if (!(p = strrchr( This->sPath, '.' ))) return NOERROR;
+    if (strchr( p, '\\' ) || strchr( p, '/' )) return NOERROR;
+    if (strcasecmp( p, ".exe" )) return NOERROR;
+
+    /* check if ShellLinker configured */
+#ifdef __WIN32OS2__
+    return NOERROR;
+#else
+    PROFILE_GetWineIniString( "wine", "ShellLinker", "", buffer, sizeof(buffer) );
+    if (!*buffer) return NOERROR;
+    shell_link_app = HEAP_strdupA( GetProcessHeap(), 0, buffer );
+
+    if (!WideCharToMultiByte( CP_ACP, 0, pszFileName, -1, buffer, sizeof(buffer), NULL, NULL))
+        return ERROR_UNKNOWN;
+    GetFullPathNameA( buffer, sizeof(buff2), buff2, NULL );
+    filename = HEAP_strdupA( GetProcessHeap(), 0, buff2 );
+
+    if (SHGetSpecialFolderPathA( 0, buffer, CSIDL_STARTUP, FALSE ))
+    {
+        /* ignore startup for now */
+        if (!strncasecmp( filename, buffer, strlen(buffer) )) goto done;
+    }
+    if (SHGetSpecialFolderPathA( 0, buffer, CSIDL_DESKTOPDIRECTORY, FALSE ))
+    {
+        if (!strncasecmp( filename, buffer, strlen(buffer) ))
+        {
+            link_name = filename + strlen(buffer);
+            bDesktop = TRUE;
+            goto found;
+        }
+    }
+    if (SHGetSpecialFolderPathA( 0, buffer, CSIDL_STARTMENU, FALSE ))
+    {
+        if (!strncasecmp( filename, buffer, strlen(buffer) ))
+        {
+            link_name = filename + strlen(buffer);
+            bDesktop = FALSE;
+            goto found;
+        }
+    }
+    goto done;
+
+ found:
+    /* make link name a Unix name */
+    for (p = link_name; *p; p++) if (*p == '\\') *p = '/';
+    /* strip leading slashes */
+    while (*link_name == '/') link_name++;
+    /* remove extension */
+    if ((p = strrchr( link_name, '.' ))) *p = 0;
+
+    /* convert app path name */
+    path_name = get_unix_file_name( This->sPath );
+
+    /* convert app working dir */
+    if (This->sWorkDir) work_dir = get_unix_file_name( This->sWorkDir );
+
+    /* extract the icon */
+    if (!(icon_name = extract_icon( This->sIcoPath ? This->sIcoPath : This->sPath,
+                                    This->iIcoNdx ))) goto done;
+
+    TRACE("linker app='%s' link='%s' mode=%s path='%s' args='%s' icon='%s' workdir='%s' descr='%s'\n",
+        shell_link_app, link_name, bDesktop ? "desktop" : "menu", path_name,
+        This->sArgs ? This->sArgs : "", icon_name, work_dir ? work_dir : "",
+        This->sDescription ? This->sDescription : "" );
+
+    if ((pid = fork()) == -1) goto done;
+    if (!pid)
+    {
+        int pos = 0;
+        char *argv[20];
+        argv[pos++] = shell_link_app;
+        argv[pos++] = "--link";
+        argv[pos++] = link_name;
+        argv[pos++] = "--path";
+        argv[pos++] = path_name;
+        argv[pos++] = bDesktop ? "--desktop" : "--menu";
+        if (This->sArgs)
+        {
+            argv[pos++] = "--args";
+            argv[pos++] = This->sArgs;
+        }
+        if (icon_name)
+        {
+            argv[pos++] = "--icon";
+            argv[pos++] = icon_name;
+        }
+        if (This->sWorkDir)
+        {
+            argv[pos++] = "--workdir";
+            argv[pos++] = This->sWorkDir;
+        }
+        if (This->sDescription)
+        {
+            argv[pos++] = "--descr";
+            argv[pos++] = This->sDescription;
+        }
+        argv[pos] = NULL;
+        execvp( shell_link_app, argv );
+        _exit(1);
+    }
+
+    while (waitpid( pid, &status, 0 ) == -1)
+    {
+        if (errno != EINTR)
+        {
+            ret = ERROR_UNKNOWN;
+            goto done;
+        }
+    }
+    if (status) ret = E_ACCESSDENIED;
+
+ done:
+    if (icon_name) unlink( icon_name );
+    HeapFree( GetProcessHeap(), 0, shell_link_app );
+    HeapFree( GetProcessHeap(), 0, filename );
+    HeapFree( GetProcessHeap(), 0, icon_name );
+    HeapFree( GetProcessHeap(), 0, path_name );
+    HeapFree( GetProcessHeap(), 0, work_dir );
+    return ret;
+#endif //__WIN32OS2__
+}
+
 static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile* iface, LPCOLESTR pszFileName)
 {
@@ -481 +932 @@
         if (!--(This->ref)) 
         { TRACE("-- destroying IShellLink(%p)\n",This);
+        
+          if (This->sIcoPath)
+            HeapFree(GetProcessHeap(), 0, This->sIcoPath);
+            
+          if (This->sArgs)
+            HeapFree(GetProcessHeap(), 0, This->sArgs);
+
+          if (This->sWorkDir)
+            HeapFree(GetProcessHeap(), 0, This->sWorkDir);
+            
+          if (This->sDescription)
+            HeapFree(GetProcessHeap(), 0, This->sDescription);
 
           if (This->sPath)
@@ -490 +953 @@
           if (This->lpFileStream)
             IStream_Release(This->lpFileStream);
+        
+          This->iIcoNdx = 0;
 
           HeapFree(GetProcessHeap(),0,This);
@@ -542 +1007 @@
         ICOM_THIS(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(desc=%s)\n",This, pszName);
+        TRACE("(%p)->(pName=%s)\n", This, pszName);
+
+        if (This->sDescription)
+            HeapFree(GetProcessHeap(), 0, This->sDescription);
+        if (!(This->sDescription = HEAP_strdupA(GetProcessHeap(), 0, pszName)))
+            return E_OUTOFMEMORY;
+
         return NOERROR;
 }
@@ -557 +1028 @@
         ICOM_THIS(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(dir=%s)\n",This, pszDir);
+        TRACE("(%p)->(dir=%s)\n",This, pszDir);
+
+        if (This->sWorkDir)
+            HeapFree(GetProcessHeap(), 0, This->sWorkDir);
+        if (!(This->sWorkDir = HEAP_strdupA(GetProcessHeap(), 0, pszDir)))
+            return E_OUTOFMEMORY;
+
         return NOERROR;
 }
@@ -572 +1049 @@
         ICOM_THIS(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(args=%s)\n",This, pszArgs);
+        TRACE("(%p)->(args=%s)\n",This, pszArgs);
+
+        if (This->sArgs)
+            HeapFree(GetProcessHeap(), 0, This->sArgs);
+        if (!(This->sArgs = HEAP_strdupA(GetProcessHeap(), 0, pszArgs)))
+            return E_OUTOFMEMORY;
 
         return NOERROR;
@@ -624 +1106 @@
         ICOM_THIS(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(path=%s iicon=%u)\n",This, pszIconPath, iIcon);
+        TRACE("(%p)->(path=%s iicon=%u)\n",This, pszIconPath, iIcon);
+        
+        if (This->sIcoPath)
+            HeapFree(GetProcessHeap(), 0, This->sIcoPath);
+        if (!(This->sIcoPath = HEAP_strdupA(GetProcessHeap(), 0, pszIconPath)))
+            return E_OUTOFMEMORY;       
+        This->iIcoNdx = iIcon;
+        
         return NOERROR;
 }
@@ -645 +1134 @@
         ICOM_THIS(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(path=%s)\n",This, pszFile);
+        TRACE("(%p)->(path=%s)\n",This, pszFile);
+
+        if (This->sPath)
+            HeapFree(GetProcessHeap(), 0, This->sPath);
+        if (!(This->sPath = HEAP_strdupA(GetProcessHeap(), 0, pszFile)))
+            return E_OUTOFMEMORY;
+        
         return NOERROR;
 }
@@ -754 +1249 @@
         _ICOM_THIS_From_IShellLinkW(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(desc=%s)\n",This, debugstr_w(pszName));
+        TRACE("(%p)->(desc=%s)\n",This, debugstr_w(pszName));
+
+        if (This->sDescription)
+            HeapFree(GetProcessHeap(), 0, This->sDescription);
+        if (!(This->sDescription = HEAP_strdupWtoA(GetProcessHeap(), 0, pszName)))
+            return E_OUTOFMEMORY;
+                
         return NOERROR;
 }
@@ -771 +1272 @@
         _ICOM_THIS_From_IShellLinkW(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(dir=%s)\n",This, debugstr_w(pszDir));
+        TRACE("(%p)->(dir=%s)\n",This, debugstr_w(pszDir));
+
+        if (This->sWorkDir)
+            HeapFree(GetProcessHeap(), 0, This->sWorkDir);
+        if (!(This->sWorkDir = HEAP_strdupWtoA(GetProcessHeap(), 0, pszDir)))
+            return E_OUTOFMEMORY;
+
         return NOERROR;
 }
@@ -788 +1295 @@
         _ICOM_THIS_From_IShellLinkW(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(args=%s)\n",This, debugstr_w(pszArgs));
+        TRACE("(%p)->(args=%s)\n",This, debugstr_w(pszArgs));
+        
+        if (This->sArgs)
+            HeapFree(GetProcessHeap(), 0, This->sArgs);
+        if (!(This->sArgs = HEAP_strdupWtoA(GetProcessHeap(), 0, pszArgs)))
+            return E_OUTOFMEMORY;
+        
         return NOERROR;
 }
@@ -840 +1353 @@
         _ICOM_THIS_From_IShellLinkW(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(path=%s iicon=%u)\n",This, debugstr_w(pszIconPath), iIcon);
+        TRACE("(%p)->(path=%s iicon=%u)\n",This, debugstr_w(pszIconPath), iIcon);
+
+        if (This->sIcoPath)
+            HeapFree(GetProcessHeap(), 0, This->sIcoPath);
+        if (!(This->sIcoPath = HEAP_strdupWtoA(GetProcessHeap(), 0, pszIconPath)))
+            return E_OUTOFMEMORY;       
+        This->iIcoNdx = iIcon;
+
         return NOERROR;
 }
@@ -864 +1384 @@
         _ICOM_THIS_From_IShellLinkW(IShellLinkImpl, iface);
         
-        FIXME("(%p)->(path=%s)\n",This, debugstr_w(pszFile));
+        TRACE("(%p)->(path=%s)\n",This, debugstr_w(pszFile));
+        
+        if (This->sPath)
+            HeapFree(GetProcessHeap(), 0, This->sPath);
+        if (!(This->sPath = HEAP_strdupWtoA(GetProcessHeap(), 0, pszFile)))
+            return E_OUTOFMEMORY;       
+        
         return NOERROR;
 }

trunk/src/shell32/shellord.c

@@ -1 @@
-/* $Id: shellord.c,v 1.1 2000-08-30 13:52:56 sandervl Exp $ */
+/* $Id: shellord.c,v 1.2 2000-11-06 10:20:56 sandervl Exp $ */
 /*
  * The parameters of many functions changes between different OS versions
@@ -109 +109 @@
 
 /*************************************************************************
- * SHGetSettings                                [SHELL32.68]
+ * SHGetSetSettings                             [SHELL32.68]
+ */
+VOID WINAPI SHGetSetSettings(DWORD x, DWORD y, DWORD z)
+{
+        FIXME("0x%08lx 0x%08lx 0x%08lx\n", x, y, z);
+}
+
+/*************************************************************************
+ * SHGetSettings                                [SHELL32.@]
  * 
  * NOTES

trunk/src/shell32/shellpath.c

@@ -1 @@
-/* $Id: shellpath.c,v 1.2 2000-08-30 13:51:02 sandervl Exp $ */
+/* $Id: shellpath.c,v 1.3 2000-11-06 10:20:56 sandervl Exp $ */
 /*
  * Path Functions
@@ -10 +10 @@
 #include <odin.h>
 #endif
+
 #include <string.h>
 #include <ctype.h>
@@ -20 +21 @@
 #include "windef.h"
 #include "options.h"
+#include "wine/winestring.h"
 #include "wine/undocshell.h"
 #include "wine/unicode.h"
@@ -481 +483 @@
     return TRUE;
 }
+
 #ifdef __WIN32OS2__
 /*************************************************************************
@@ -758 +761 @@
             hRootKey = HKEY_CURRENT_USER;
             strcpy(szValueName, "Programs");
-            strcpy(szDefaultPath, "StartMenu\\Programs");
+            strcpy(szDefaultPath, "Start Menu\\Programs");
             break;
 
@@ -781 +784 @@
           case CSIDL_STARTMENU:
             hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "StartMenu");
-            strcpy(szDefaultPath, "StartMenu");
+            strcpy(szValueName, "Start Menu");
+            strcpy(szDefaultPath, "Start Menu");
             break;
 
           case CSIDL_COMMON_STARTMENU:
             hRootKey = HKEY_LOCAL_MACHINE;
-            strcpy(szValueName, "Common StartMenu");
-            strcpy(szDefaultPath, "StartMenu");
+            strcpy(szValueName, "Common Start Menu");
+            strcpy(szDefaultPath, "Start Menu");
             break;
 
           case CSIDL_STARTUP:
             hRootKey = HKEY_CURRENT_USER;
-            strcpy(szValueName, "Startup");
-            strcpy(szDefaultPath, "StartMenu\\Programs\\Startup");
+            strcpy(szValueName, "StartUp");
+            strcpy(szDefaultPath, "Start Menu\\Programs\\StartUp");
             break;
 
           case CSIDL_COMMON_STARTUP:
             hRootKey = HKEY_LOCAL_MACHINE;
-            strcpy(szValueName, "Common Startup");
-            strcpy(szDefaultPath, "StartMenu\\Programs\\Startup");
+            strcpy(szValueName, "Common StartUp");
+            strcpy(szDefaultPath, "Start Menu\\Programs\\StartUp");
             break;