Changeset 6708 for trunk/src


Ignore:
Timestamp:
Sep 15, 2001, 11:19:26 AM (24 years ago)
Author:
sandervl
Message:

wine update + removed tags

Location:
trunk/src/comdlg32
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/comdlg32/cdlg_De.orc

    r5876 r6708  
    1818 DEFPUSHBUTTON "Öffnen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    1919 PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
    20  PUSHBUTTON "&Hilfe", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
     20 PUSHBUTTON "&Hilfe", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
    2121 CHECKBOX "&Schreibgeschützt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    2222}
     
    4040 DEFPUSHBUTTON "Speichern als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    4141 PUSHBUTTON "Abbrechen", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
    42  PUSHBUTTON "&Hilfe", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
     42 PUSHBUTTON "&Hilfe", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
    4343 CHECKBOX "&Schreibgeschützt", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    4444}
     
    5353 LTEXT "", 1089, 60, 6, 150, 9
    5454 GROUPBOX "Druckbereicht", 1072, 6, 30, 160, 65, BS_GROUPBOX
    55  RADIOBUTTON "&Alles", 1056, 16, 45, 60, 12
    56  RADIOBUTTON "A&uswahl", 1057, 16, 60, 60, 12
    57  RADIOBUTTON "&Seiten", 1058, 16, 75, 60, 12
     55 RADIOBUTTON "&Alles", rad1, 16, 45, 60, 12
     56 RADIOBUTTON "A&uswahl", rad2, 16, 60, 60, 12
     57 RADIOBUTTON "&Seiten", rad3, 16, 75, 60, 12
    5858 DEFPUSHBUTTON "Drucken", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    5959 PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
    60  PUSHBUTTON "&Einrichten", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
     60 PUSHBUTTON "&Einrichten", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
    6161 LTEXT "&Von:", 1090, 60, 80, 30, 9
    6262 LTEXT "&Bis:", 1091, 120, 80, 30, 9
     
    7474{
    7575 GROUPBOX "Drucker", 1072, 6, 10, 180, 65, BS_GROUPBOX
    76  RADIOBUTTON "&Standarddrucker", 1056, 16, 20, 80, 12
     76 RADIOBUTTON "&Standarddrucker", rad1, 16, 20, 80, 12
    7777 LTEXT "[keiner]", 1088, 35, 35, 120, 9
    78  RADIOBUTTON "Bestimmter &Drucker", 1057, 16, 50, 80, 12
     78 RADIOBUTTON "Bestimmter &Drucker", rad2, 16, 50, 80, 12
    7979 COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
    8080 DEFPUSHBUTTON "Ok", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    8181 PUSHBUTTON "Abbrechen", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
    82  PUSHBUTTON "&Einrichten", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
     82 PUSHBUTTON "&Einrichten", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
    8383 GROUPBOX "Orientierung", 1073, 6, 85, 100, 50, BS_GROUPBOX
    84  RADIOBUTTON "&Hochformat", 1058, 50, 100, 40, 12
    85  RADIOBUTTON "&Querformat", 1059, 50, 115, 40, 12
     84 RADIOBUTTON "&Hochformat", rad3, 50, 100, 40, 12
     85 RADIOBUTTON "&Querformat", rad4, 50, 115, 40, 12
    8686 ICON "LANDSCAP", 1097, 10, 95, 32, 32
    8787 ICON "PORTRAIT", 1098, 10, 95, 32, 32
     
    140140    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14,WS_GROUP
    141141    PUSHBUTTON      "Abbrechen",IDCANCEL,218,23,40,14,WS_GROUP
    142     PUSHBUTTON      "&Zuweisen", 1026,218,40,40,14,WS_GROUP
    143     PUSHBUTTON      "&Hilfe" , 1038,218,57,40,14,WS_GROUP
     142    PUSHBUTTON      "&Zuweisen", psh3,218,40,40,14,WS_GROUP
     143    PUSHBUTTON      "&Hilfe" , pshHelp,218,57,40,14,WS_GROUP
    144144    GROUPBOX        "Darstellung",1072,6,72,84,34,WS_GROUP
    145145    CHECKBOX        "&Durchgestrichen", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
     
    180180 DEFPUSHBUTTON "Ok",  IDOK,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    181181 PUSHBUTTON "Abbrechen", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
    182  PUSHBUTTON "&Hilfe", 1038,100,166, 44, 14
     182 PUSHBUTTON "&Hilfe", pshHelp,100,166, 44, 14
    183183 PUSHBUTTON "Farbe hin&zufügen",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
    184184 PUSHBUTTON "Farben &definieren >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
     
    197197 CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    198198 GROUPBOX "Richtung", 1072, 107, 26, 68, 28
    199  CONTROL "H&och", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
    200  CONTROL "&Runter", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
     199 CONTROL "H&och", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
     200 CONTROL "&Runter", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
    201201 DEFPUSHBUTTON "&Nächsten finden", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
    202202 PUSHBUTTON "Abbrechen", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
    203  PUSHBUTTON "&Hilfe", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
     203 PUSHBUTTON "&Hilfe", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
    204204}
    205205
     
    217217 CHECKBOX "Beachte Groß/Kleinschreibung", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    218218 DEFPUSHBUTTON "&Nächsten finden", IDOK, 174, 4, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    219  PUSHBUTTON "&Ersetzen", 1024, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
    220  PUSHBUTTON "&Alle ersetzen", 1025, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
     219 PUSHBUTTON "&Ersetzen", psh1, 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
     220 PUSHBUTTON "&Alle ersetzen", psh2, 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
    221221 PUSHBUTTON "Abbrechen", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
    222  PUSHBUTTON "&Hilfe", 1038, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
     222 PUSHBUTTON "&Hilfe", pshHelp, 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
    223223}
    224224
  • trunk/src/comdlg32/cdlg_En.orc

    r5876 r6708  
    77{
    88 LTEXT "File &Name:", 1090, 6, 6, 76, 9
    9  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
     9 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
    1010 LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
    1111 LTEXT "&Directories:", -1, 110, 6, 92, 9
     
    1313 LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
    1414 LTEXT "List Files of &Type:", 1089, 6, 104, 90, 9
    15  COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
     15 COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
    1616 LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
    17  COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
     17 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
    1818 DEFPUSHBUTTON "Open", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    1919 PUSHBUTTON "Cancel", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
    20  PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
    21  CHECKBOX "&Read Only", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     20 PUSHBUTTON "&Help", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
     21 CHECKBOX "&Read Only", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    2222}
    2323
     
    2929{
    3030 LTEXT "File &Name:", 1090, 6, 6, 76, 9
    31  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
     31 EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
    3232 LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
    3333 LTEXT "&Directories:", -1, 110, 6, 92, 9
     
    3535 LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
    3636 LTEXT "List Files of &Type:", 1089, 6, 104, 90, 9
    37  COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
     37 COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
    3838 LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
    39  COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
     39 COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
    4040 DEFPUSHBUTTON "Save As", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    4141 PUSHBUTTON "Cancel", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
    42  PUSHBUTTON "&Help", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
    43  CHECKBOX "&Read Only", 1040, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     42 PUSHBUTTON "&Help", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
     43 CHECKBOX "&Read Only", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    4444}
    4545
     
    5252 LTEXT "Printer:", 1088, 6, 6, 40, 9
    5353 LTEXT "", 1089, 60, 6, 150, 9
    54  GROUPBOX "Print Range", 1072, 6, 30, 160, 65, BS_GROUPBOX
    55  RADIOBUTTON "&All", 1056, 16, 45, 60, 12
    56  RADIOBUTTON "S&election", 1057, 16, 60, 60, 12
    57  RADIOBUTTON "&Pages", 1058, 16, 75, 60, 12
     54 GROUPBOX "Print Range", grp1, 6, 30, 160, 65, BS_GROUPBOX
     55 RADIOBUTTON "&All", rad1, 16, 45, 60, 12
     56 RADIOBUTTON "S&election", rad2, 16, 60, 60, 12
     57 RADIOBUTTON "&Pages", rad3, 16, 75, 60, 12
    5858 DEFPUSHBUTTON "Print", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    5959 PUSHBUTTON "Cancel", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
    60  PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
     60 PUSHBUTTON "&Setup", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
    6161 LTEXT "&From:", 1090, 60, 80, 30, 9
    6262 LTEXT "&To:", 1091, 120, 80, 30, 9
    6363 LTEXT "Print &Quality:", 1092, 6, 100, 76, 9
    64  COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
    65  CHECKBOX "Print to Fi&le", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    66  CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     64 COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
     65 CHECKBOX "Print to Fi&le", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     66 CHECKBOX "Condensed", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    6767}
    6868
     
    7373FONT 8, "Helv"
    7474{
    75  GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX
    76  RADIOBUTTON "&Default Printer", 1056, 16, 20, 80, 12
     75 GROUPBOX "Printer", grp1, 6, 10, 180, 65, BS_GROUPBOX
     76 RADIOBUTTON "&Default Printer", rad1, 16, 20, 80, 12
    7777 LTEXT "[none]", 1088, 35, 35, 120, 9
    78  RADIOBUTTON "Specific &Printer", 1057, 16, 50, 80, 12
    79  COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
    80  DEFPUSHBUTTON "OK", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    81  PUSHBUTTON "Cancel", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
    82  PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
    83  GROUPBOX "Orientation", 1073, 6, 85, 100, 50, BS_GROUPBOX
    84  RADIOBUTTON "Po&rtrait", 1058, 50, 100, 40, 12
    85  RADIOBUTTON "&Landscape", 1059, 50, 115, 40, 12
    86  ICON "LANDSCAP", 1097, 10, 95, 32, 32
    87  ICON "PORTRAIT", 1098, 10, 95, 32, 32
    88  GROUPBOX "Paper", 1074, 120, 85, 180, 50, BS_GROUPBOX
     78 RADIOBUTTON "Specific &Printer", rad2, 16, 50, 80, 12
     79 COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
     80 DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
     81 PUSHBUTTON "Cancel", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
     82 PUSHBUTTON "&Setup", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
     83 GROUPBOX "Orientation", grp2, 6, 85, 100, 50, BS_GROUPBOX
     84 RADIOBUTTON "Po&rtrait", rad3, 50, 100, 40, 12
     85 RADIOBUTTON "&Landscape", rad4, 50, 115, 40, 12
     86 ICON "LANDSCAP", stc10, 10, 95, 32, 32
     87 ICON "PORTRAIT", stc11, 10, 95, 32, 32
     88 GROUPBOX "Paper", grp3, 120, 85, 180, 50, BS_GROUPBOX
    8989 LTEXT "Si&ze", 1089, 130, 95, 30, 9
    9090 LTEXT "&Source", 1090, 130, 110, 30, 9
    91  COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
    92  COMBOBOX 1138, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
     91 COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
     92 COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
    9393}
    9494
     
    100100{
    101101    LTEXT           "&Font:",1088 ,6,3,40,9
    102     COMBOBOX        1136 ,6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
     102    COMBOBOX        cmb1, 6,13,94,54,  CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
    103103                    CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
    104104    LTEXT           "Font St&yle:",1089 ,108,3,44,9
    105     COMBOBOX        1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
     105    COMBOBOX        cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
    106106                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
    107107    LTEXT           "&Size:",1090,179,3,30,9
    108     COMBOBOX        1138,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
     108    COMBOBOX        cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
    109109                    WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
    110110    DEFPUSHBUTTON   "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
    111111    PUSHBUTTON      "Cancel",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
    112     PUSHBUTTON      "&Apply", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP
    113     PUSHBUTTON      "&Help" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP
     112    PUSHBUTTON      "&Apply", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
     113    PUSHBUTTON      "&Help" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
    114114    GROUPBOX        "Effects",1072,6,72,84,34,WS_GROUP
    115     CHECKBOX        "Stri&keout", 1040, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
    116     CHECKBOX        "&Underline", 1041, 10,94,50,10, BS_AUTOCHECKBOX
     115    CHECKBOX        "Stri&keout", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
     116    CHECKBOX        "&Underline", chx2, 10,94,50,10, BS_AUTOCHECKBOX
    117117    LTEXT           "&Color:", 1091 ,6,110,30,9
    118     COMBOBOX        1139,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
     118    COMBOBOX        cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
    119119                    CBS_AUTOHSCROLL |  WS_BORDER | WS_VSCROLL | WS_TABSTOP
    120120    GROUPBOX        "Sample",1073,98,72,160,49,WS_GROUP
     
    150150 DEFPUSHBUTTON "OK",  1,  4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
    151151 PUSHBUTTON "Cancel", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
    152  PUSHBUTTON "Help", 1038,100,166, 44, 14
     152 PUSHBUTTON "Help", pshHelp,100,166, 44, 14
    153153 PUSHBUTTON "&Add to Custom Colors",    712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
    154154 PUSHBUTTON "&Define Custom Colors >>", 719/*1025*/,   4, 150, 142, 14, WS_GROUP | WS_TABSTOP
     
    163163{
    164164 LTEXT "Fi&nd What:", -1, 4, 8, 42, 8
    165  EDITTEXT 1152, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
    166  CHECKBOX "Match &Whole Word Only", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    167  CHECKBOX "Match &Case", 1041, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    168  GROUPBOX "Direction", 1072, 107, 26, 68, 28
    169  CONTROL "&Up", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
    170  CONTROL "&Down", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
     165 EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     166 CHECKBOX "Match &Whole Word Only", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     167 CHECKBOX "Match &Case", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     168 GROUPBOX "Direction", grp1, 107, 26, 68, 28
     169 CONTROL "&Up", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
     170 CONTROL "&Down", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
    171171
    172172 DEFPUSHBUTTON "&Find Next", IDOK, 182,  5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
     
    182182{
    183183 LTEXT "Fi&nd What:", -1, 4, 9, 48, 8
    184  EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     184 EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
    185185 LTEXT "Re&place With:", -1, 4, 26, 48, 8
    186  EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
    187  CHECKBOX "Match &Whole Word Only", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
    188  CHECKBOX "Match &Case", 1041, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
     186 EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
     187 CHECKBOX "Match &Whole Word Only", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
     188 CHECKBOX "Match &Case", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
    189189
    190190 DEFPUSHBUTTON "&Find Next", IDOK, 174,  4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
  • trunk/src/comdlg32/colordlg.c

    r6645 r6708  
    1 /* $Id: colordlg.c,v 1.4 2001-09-05 12:11:59 bird Exp $ */
    21/*
    32 * COMMDLG - Color Dialog
  • trunk/src/comdlg32/filedlg.c

    r6645 r6708  
    1 /* $Id: filedlg.c,v 1.6 2001-09-05 12:12:00 bird Exp $ */
    21/*
    32 * COMMDLG - File Dialogs
  • trunk/src/comdlg32/filedlg95.c

    r6645 r6708  
    1 /* $Id: filedlg95.c,v 1.24 2001-09-05 12:12:00 bird Exp $ */
    21/*
    32 * COMMDLG - File Open Dialogs Win95 look and feel
    43 *
    54 * FIXME: The whole concept of handling unicode is badly broken.
    6  *  many hook-messages expecting a pointer to a
    7  *  OPENFILENAMEA or W structure. With the current architecture
    8  *  we would have to convert the beast at every call to a hook.
    9  *  we have to find a better solution but if would likely cause
    10  *  a complete rewrite with after we shouldhandle the
    11  *  OPENFILENAME structure without any converting (jsch).
     5 *      many hook-messages expecting a pointer to a
     6 *      OPENFILENAMEA or W structure. With the current architecture
     7 *      we would have to convert the beast at every call to a hook.
     8 *      we have to find a better solution but if would likely cause
     9 *      a complete rewrite with after we shouldhandle the
     10 *      OPENFILENAME structure without any converting (jsch).
    1211 *
    1312 * FIXME: any hook gets a OPENFILENAMEA structure
     
    7877
    7978#define IsHooked(fodInfos) \
    80     ((fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook)
     79        ((fodInfos->ofnInfos->Flags & OFN_ENABLEHOOK) && fodInfos->ofnInfos->lpfnHook)
    8180/***********************************************************************
    8281 * Data structure and global variables
     
    8786  HIMAGELIST hImgList;
    8887  int m_iIndent;      /* Indentation index */
    89   LPITEMIDLIST pidlItem;  /* absolute pidl of the item */
     88  LPITEMIDLIST pidlItem;  /* absolute pidl of the item */ 
    9089
    9190} SFOLDER,*LPSFOLDER;
     
    217216 *      GetFileName95
    218217 *
    219  * Creates an Open common dialog box that lets the user select
     218 * Creates an Open common dialog box that lets the user select 
    220219 * the drive, directory, and the name of a file or set of files to open.
    221220 *
     
    252251        return FALSE;
    253252    }
    254 
     253   
    255254    /* old style hook messages */
    256255    if (IsHooked(fodInfos))
     
    261260      fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRINGA);
    262261    }
    263 
     262   
    264263    lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,
    265264                                  (LPDLGTEMPLATEA) template,
     
    271270    if( lRes == -1)
    272271        return FALSE;
    273 
     272   
    274273    return lRes;
    275274}
     
    292291  LPSTR lpstrSavDir = NULL;
    293292  DWORD dwFlags = 0;
    294 
    295   /* Initialise FileOpenDlgInfos structure*/
     293 
     294  /* Initialise FileOpenDlgInfos structure*/ 
    296295  fodInfos = (FileOpenDlgInfos*)MemAlloc(sizeof(FileOpenDlgInfos));
    297296  ZeroMemory(fodInfos, sizeof(FileOpenDlgInfos));
    298 
     297 
    299298  /* Pass in the original ofn */
    300299  fodInfos->ofnInfos = ofn;
    301 
     300 
    302301  /* Save original hInstance value */
    303302  hInstance = ofn->hInstance;
     
    317316  fodInfos->DlgInfos.dwDlgProp = 0;
    318317  fodInfos->DlgInfos.hwndCustomDlg = (HWND)NULL;
    319 
     318 
    320319  switch(iDlgType)
    321320  {
     
    401400  FileOpenDlgInfos *fodInfos;
    402401  HINSTANCE hInstance;
    403 
     402 
    404403  /* out arguments */
    405404  LPWSTR lpstrFile = NULL;
     
    438437    /* filter is a list...  title\0ext\0......\0\0 */
    439438    s = ofn->lpstrFilter;
    440 
     439   
    441440    while (*s) s = s+strlenW(s)+1;
    442441    s++;
     
    521520  }
    522521#endif
    523 
     522     
    524523  /* restore saved IN arguments and convert OUT arguments back */
    525524  ofn->Flags = dwFlags;
     
    599598    SetWindowPos(hwndParentDlg, 0, rectParent.left,rectParent.top, (rectParent.right- rectParent.left),
    600599        (rectParent.bottom-rectParent.top),SWP_NOMOVE | SWP_NOZORDER);
    601 
     600       
    602601    hwndChild = GetWindow(hwndChildDlg,GW_CHILD);
    603602    if(hwndStc32)
     
    616615        {
    617616          if (GetWindowLongA( hwndChild, GWL_STYLE ) & WS_MAXIMIZE)
    618                 continue;
     617                                continue;
    619618          GetWindowRect(hwndChild,&rectCtrl);
    620619          MapWindowPoints( 0, hwndParentDlg,(LPPOINT)&rectCtrl,2);
    621 
     620                                 
    622621          /*
    623622            Check the initial position of the controls relative to the initial
     
    630629          }
    631630          else if (rectCtrl.left >= rectTemp.right)
    632       {
     631          {
    633632            rectCtrl.left += ptMoveCtl.x;
    634       }
     633          }
    635634          else if (rectCtrl.top >= rectTemp.bottom)
    636635          {
    637         rectCtrl.top  += ptMoveCtl.y;
    638       }
    639 
    640           SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
    641                 rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
    642                 SWP_NOSIZE | SWP_NOZORDER );
     636            rectCtrl.top  += ptMoveCtl.y;
     637          }
     638                                       
     639          SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
     640                                rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
     641                                SWP_NOSIZE | SWP_NOZORDER );
    643642        }
    644643      } while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
    645644    }
    646645    hwndChild = GetWindow(hwndParentDlg,GW_CHILD);
    647 
     646       
    648647    if(hwndStc32)
    649648    {
     
    666665            rectCtrl.top += ptMoveCtl.y;
    667666
    668             SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top,
     667            SetWindowPos( hwndChild, 0, rectCtrl.left, rectCtrl.top, 
    669668                rectCtrl.right-rectCtrl.left,rectCtrl.bottom-rectCtrl.top,
    670669                SWP_NOSIZE |SWP_NOZORDER );
    671670          }
    672671        } while ((hwndChild=GetWindow( hwndChild, GW_HWNDNEXT )) != (HWND)NULL);
    673       }
     672      }         
    674673    }
    675674}
     
    687686    {
    688687      case WM_INITDIALOG:
    689       {
     688      {         
    690689        fodInfos = (FileOpenDlgInfos *)lParam;
    691690        lParam = (LPARAM) fodInfos->ofnInfos;
     
    694693        if(fodInfos && IsHooked(fodInfos))
    695694          return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
    696         return 0;
    697       }
     695        return 0;       
     696      } 
    698697    }
    699698
    700699    if(fodInfos && IsHooked(fodInfos))
    701       return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
    702 
    703     return DefWindowProcA(hwnd,uMsg,wParam,lParam);
     700      return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam); 
     701
     702    return DefWindowProcA(hwnd,uMsg,wParam,lParam); 
    704703}
    705704
     
    737736          COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
    738737          return (HWND)NULL;
    739         }
     738        }
    740739      }
    741740
     
    743742      if(hChildDlg)
    744743      {
    745         ShowWindow(hChildDlg,SW_SHOW);
     744        ShowWindow(hChildDlg,SW_SHOW); 
    746745        return hChildDlg;
    747746      }
     
    759758      tmplate.cx = rectHwnd.right-rectHwnd.left;
    760759      tmplate.cy = rectHwnd.bottom-rectHwnd.top;
    761 
     760       
    762761      return CreateDialogIndirectParamA(fodInfos->ofnInfos->hInstance,&tmplate,hwnd,(DLGPROC)FileOpenDlgProcUserTemplate,(LPARAM)fodInfos);
    763762    }
    764763    return (HWND)NULL;
    765764}
    766 
     765 
    767766/***********************************************************************
    768767*          SendCustomDlgNotificationMessage
     
    785784    {
    786785        OFNOTIFYA ofnNotify;
    787     HRESULT ret;
     786        HRESULT ret;
    788787        ofnNotify.hdr.hwndFrom=hwndParentDlg;
    789788        ofnNotify.hdr.idFrom=0;
    790789        ofnNotify.hdr.code = uCode;
    791790        ofnNotify.lpOFN = fodInfos->ofnInfos;
    792     TRACE("CALL NOTIFY for %x\n", uCode);
    793     ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
    794     TRACE("RET NOTIFY\n");
    795     return ret;
     791        TRACE("CALL NOTIFY for %x\n", uCode);
     792        ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNotify);
     793        TRACE("RET NOTIFY\n");
     794        return ret;
    796795    }
    797796    return TRUE;
     
    816815            GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
    817816            lpstrFileSpec = (LPSTR)PathFindFileNameA(lpstrPath);
    818             if (lpstrFileSpec==lpstrPath)
    819         {
     817            if (lpstrFileSpec==lpstrPath) 
     818            {
    820819                char lpstrCurrentDir[MAX_PATH];
    821820                /* Prepend the current path */
     
    824823                    snprintf((LPSTR)lParam,(int)wParam,"%s\\%s",lpstrCurrentDir,lpstrPath);
    825824                reqSize=strlen(lpstrCurrentDir)+1+strlen(lpstrPath)+1;
    826             }
    827         else
    828         {
     825            } 
     826            else
     827            {
    829828                lstrcpynA((LPSTR)lParam,(LPSTR)lpstrPath,(int)wParam);
    830829                reqSize=strlen(lpstrPath);
     
    834833
    835834        case CDM_GETFOLDERPATH:
    836         SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
     835            SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath);
    837836            if ((LPSTR)lParam!=NULL)
    838837                lstrcpynA((LPSTR)lParam,lpstrPath,(int)wParam);
     
    840839
    841840        case CDM_GETSPEC:
    842         reqSize=GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
     841            reqSize=GetDlgItemTextA(hwnd,IDC_FILENAME,lpstrPath, sizeof(lpstrPath));
    843842            lpstrFileSpec = (LPSTR)PathFindFileNameA(lpstrPath);
    844843            if ((LPSTR)lParam!=NULL)
     
    847846
    848847        case CDM_SETCONTROLTEXT:
    849         if ( 0 != lParam )
    850             SetDlgItemTextA( hwnd, (UINT) wParam, (LPSTR) lParam );
    851         return TRUE;
     848            if ( 0 != lParam )
     849                SetDlgItemTextA( hwnd, (UINT) wParam, (LPSTR) lParam );
     850            return TRUE;
    852851
    853852        case CDM_HIDECONTROL:
     
    858857    return TRUE;
    859858}
    860 
     859 
    861860/***********************************************************************
    862861 *          FileOpenDlgProc95
     
    869868  TRACE("0x%04x 0x%04x\n", hwnd, uMsg);
    870869#endif
    871 
     870 
    872871  switch(uMsg)
    873872  {
     
    876875         FileOpenDlgInfos * fodInfos = (FileOpenDlgInfos *)lParam;
    877876
    878      /* Adds the FileOpenDlgInfos in the property list of the dialog
     877         /* Adds the FileOpenDlgInfos in the property list of the dialog
    879878            so it will be easily accessible through a GetPropA(...) */
    880         SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos);
    881 
    882          fodInfos->DlgInfos.hwndCustomDlg =
    883            CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd);
     879        SetPropA(hwnd, FileOpenDlgInfosStr, (HANDLE) fodInfos);
     880
     881         fodInfos->DlgInfos.hwndCustomDlg =
     882           CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd);
    884883
    885884         FILEDLG95_InitControls(hwnd);
    886885         SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE);
    887         FILEDLG95_FillControls(hwnd, wParam, lParam);
     886        FILEDLG95_FillControls(hwnd, wParam, lParam);
    888887         SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE);
    889888         SetWindowPos(fodInfos->DlgInfos.hwndCustomDlg, HWND_BOTTOM,
     
    903902      }
    904903      return FALSE;
    905 
     904         
    906905    case WM_GETISHELLBROWSER:
    907906      return FILEDLG95_OnWMGetIShellBrowser(hwnd);
     
    913912    case WM_NOTIFY:
    914913    {
    915     LPNMHDR lpnmh = (LPNMHDR)lParam;
    916     UINT stringId = -1;
    917 
    918     /* set up the button tooltips strings */
    919     if(TTN_GETDISPINFOA == lpnmh->code )
    920     {
    921         LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
    922         switch(lpnmh->idFrom )
    923         {
    924         /* Up folder button */
    925         case FCIDM_TB_UPFOLDER:
    926             stringId = IDS_UPFOLDER;
    927             break;
    928         /* New folder button */
    929         case FCIDM_TB_NEWFOLDER:
    930             stringId = IDS_NEWFOLDER;
    931             break;
    932         /* List option button */
    933         case FCIDM_TB_SMALLICON:
    934             stringId = IDS_LISTVIEW;
    935             break;
    936         /* Details option button */
    937         case FCIDM_TB_REPORTVIEW:
    938             stringId = IDS_REPORTVIEW;
    939             break;
    940         /* Desktop button */
    941         case FCIDM_TB_DESKTOP:
    942             stringId = IDS_TODESKTOP;
    943             break;
    944         default:
    945             stringId = 0;
    946         }
    947         lpdi->hinst = COMMDLG_hInstance32;
    948         lpdi->lpszText =  (LPSTR) stringId;
    949     }
     914        LPNMHDR lpnmh = (LPNMHDR)lParam;
     915        UINT stringId = -1;
     916
     917        /* set up the button tooltips strings */
     918        if(TTN_GETDISPINFOA == lpnmh->code )
     919        {
     920            LPNMTTDISPINFOA lpdi = (LPNMTTDISPINFOA)lParam;
     921            switch(lpnmh->idFrom )
     922            {
     923                /* Up folder button */
     924                case FCIDM_TB_UPFOLDER:
     925                    stringId = IDS_UPFOLDER;
     926                    break;
     927                /* New folder button */
     928                case FCIDM_TB_NEWFOLDER:
     929                    stringId = IDS_NEWFOLDER;
     930                    break;
     931                /* List option button */
     932                case FCIDM_TB_SMALLICON:
     933                    stringId = IDS_LISTVIEW;
     934                    break;
     935                /* Details option button */
     936                case FCIDM_TB_REPORTVIEW:
     937                    stringId = IDS_REPORTVIEW;
     938                    break;
     939                /* Desktop button */
     940                case FCIDM_TB_DESKTOP:
     941                    stringId = IDS_TODESKTOP;
     942                    break;
     943                default:
     944                    stringId = 0;
     945            }
     946            lpdi->hinst = COMMDLG_hInstance32;
     947            lpdi->lpszText =  (LPSTR) stringId;
     948        }
    950949        return FALSE;
    951950    }
     
    979978  {
    980979   { HINST_COMMCTRL, IDB_VIEW_SMALL_COLOR },
    981    { COMDLG32_hInstance, 800 }          // desktop icon
     980   { COMDLG32_hInstance, 800 }                  // desktop icon
    982981  };
    983 
     982 
    984983  RECT rectTB;
    985 
     984 
    986985  FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
    987986
     
    997996  MapWindowPoints( 0, hwnd,(LPPOINT)&rectTB,2);
    998997
    999   fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL,
     998  fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL, 
    1000999        WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE,
    1001         0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL);
    1002 
    1003   SetWindowPos(fodInfos->DlgInfos.hwndTB, 0,
    1004     rectTB.left,rectTB.top, rectTB.right-rectTB.left, rectTB.bottom-rectTB.top,
    1005     SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER );
     1000        0, 0, 150, 26, hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL); 
     1001 
     1002  SetWindowPos(fodInfos->DlgInfos.hwndTB, 0, 
     1003        rectTB.left,rectTB.top, rectTB.right-rectTB.left, rectTB.bottom-rectTB.top,
     1004        SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER );
    10061005
    10071006  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0);
     
    10131012
    10141013  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSA, (WPARAM) 9,(LPARAM) &tbb);
    1015   SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0);
     1014  SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0); 
    10161015
    10171016  /* Set the window text with the text specified in the OPENFILENAME structure */
     
    10531052     are hidden and we are not using a custom template */
    10541053  if ( (fodInfos->ofnInfos->Flags & OFN_HIDEREADONLY) &&
    1055        (!(fodInfos->ofnInfos->Flags &
     1054       (!(fodInfos->ofnInfos->Flags & 
    10561055         (OFN_SHOWHELP|OFN_ENABLETEMPLATE|OFN_ENABLETEMPLATEHANDLE))))
    10571056  {
     
    10621061    /* subtract the height of the help button plus the space between
    10631062       the help button and the cancel button to the height of the dialog */
    1064     SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left,
    1065                  (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom),
     1063    SetWindowPos(hwnd, 0, 0, 0, rectDlg.right-rectDlg.left, 
     1064                 (rectDlg.bottom-rectDlg.top) - (rectHelp.bottom - rectCancel.bottom), 
    10661065                 SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
    10671066  }
     
    10841083{
    10851084  LPITEMIDLIST pidlItemId = NULL;
    1086 
     1085 
    10871086  FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) lParam;
    10881087
    1089   TRACE("dir=%s file=%s\n",
     1088  TRACE("dir=%s file=%s\n", 
    10901089  fodInfos->ofnInfos->lpstrInitialDir, fodInfos->ofnInfos->lpstrFile);
    10911090
     
    11881187  /* Do not use the listview selection anymore */
    11891188  fodInfos->DlgInfos.dwDlgProp &= ~FODPROP_USEVIEW;
    1190   return 0;
     1189  return 0; 
    11911190}
    11921191
     
    12051204  SetWindowLongA(hwnd,DWL_MSGRESULT,(LONG)fodInfos->Shell.FOIShellBrowser);
    12061205
    1207   return TRUE;
     1206  return TRUE; 
    12081207}
    12091208
     
    12111210/***********************************************************************
    12121211 *      FILEDLG95_OnOpenMultipleFiles
    1213  *
     1212 *     
    12141213 * Handles the opening of multiple files.
    12151214 *
     
    12281227  lpstrFile = fodInfos->ofnInfos->lpstrFile;
    12291228  lpstrFile[0] = '\0';
    1230 
     1229 
    12311230  SHGetPathFromIDListA( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec );
    12321231
     
    12341233      ( fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST))
    12351234  {
    1236     LPSTR lpstrTemp = lpstrFileList;
     1235    LPSTR lpstrTemp = lpstrFileList; 
    12371236
    12381237    for ( nCount = 0; nCount < nFileCount; nCount++ )
     
    12591258        return FALSE;
    12601259      }
    1261 
     1260 
    12621261      /* move to the next file in the list of files */
    12631262      lpstrTemp += strlen(lpstrTemp) + 1;
     
    12821281 *
    12831282 * Ok button WM_COMMAND message handler
    1284  *
     1283 * 
    12851284 * If the function succeeds, the return value is nonzero.
    12861285 */
     
    13231322      return FALSE;
    13241323  }
    1325 
     1324 
    13261325  if(nFileCount > 1)
    13271326  {
     
    13821381  to a folder if the path points to a directory or the last
    13831382  valid element is a directory.
    1384 
     1383 
    13851384  valid variables:
    13861385    lpstrPathAndFile: cleaned up path
     
    14321431                               lpwstrTemp, sizeof(lpwstrTemp)/sizeof(WCHAR) );
    14331432
    1434     /* if the last element is a wildcard do a search */
     1433        /* if the last element is a wildcard do a search */
    14351434        if(strpbrk(lpszTemp1, "*?") != NULL)
    14361435        {
    1437       nOpenAction = ONOPEN_SEARCH;
    1438       break;
    1439     }
     1436          nOpenAction = ONOPEN_SEARCH;
     1437          break;
     1438        }
    14401439      }
    14411440      lpszTemp1 = lpszTemp;
     
    14651464          TRACE("value\n");
    14661465
    1467       /* end dialog, return value */
     1466          /* end dialog, return value */
    14681467          nOpenAction = ONOPEN_OPEN;
    1469       break;
     1468          break;
    14701469        }
    1471     COMDLG32_SHFree(pidl);
    1472     pidl = NULL;
     1470        COMDLG32_SHFree(pidl);
     1471        pidl = NULL;
    14731472      }
    14741473      else
    14751474      {
    1476     if(*lpszTemp)   /* points to trailing null for last path element */
     1475        if(*lpszTemp)   /* points to trailing null for last path element */
    14771476        {
    1478       if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST)
    1479       {
     1477          if(fodInfos->ofnInfos->Flags & OFN_PATHMUSTEXIST)
     1478          {
    14801479            FILEDLG95_OnOpenMessage(hwnd, 0, IDS_PATHNOTEXISTING);
    1481         break;
    1482       }
    1483     }
     1480            break;
     1481          }
     1482        }
    14841483        else
    1485     {
     1484        {
    14861485          if(fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST)
    1487       {
     1486          {
    14881487            FILEDLG95_OnOpenMessage(hwnd, 0, IDS_FILENOTEXISTING);
    1489         break;
    1490       }
    1491     }
    1492     /* change to the current folder */
     1488            break;
     1489          }
     1490        }
     1491        /* change to the current folder */
    14931492        nOpenAction = ONOPEN_OPEN;
    1494     break;
     1493        break;
    14951494      }
    14961495    }
     
    15281527        /* replace the current filter */
    15291528        if(fodInfos->ShellInfos.lpstrCurrentFilter)
    1530       MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
     1529          MemFree((LPVOID)fodInfos->ShellInfos.lpstrCurrentFilter);
    15311530        len = MultiByteToWideChar( CP_ACP, 0, lpszTemp, -1, NULL, 0 );
    15321531        fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc(len * sizeof(WCHAR));
     
    15421541      TRACE("ONOPEN_BROWSE\n");
    15431542      {
    1544     IPersistFolder2 * ppf2;
     1543        IPersistFolder2 * ppf2;
    15451544        if(SUCCEEDED(IShellFolder_QueryInterface( lpsf, &IID_IPersistFolder2, (LPVOID*)&ppf2)))
    15461545        {
     
    15481547          IPersistFolder2_GetCurFolder(ppf2, &pidlCurrent);
    15491548          IPersistFolder2_Release(ppf2);
    1550       if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent))
    1551       {
    1552         IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE);
    1553       }
    1554       else if( nOpenAction == ONOPEN_SEARCH )
    1555       {
     1549          if( ! COMDLG32_PIDL_ILIsEqual(pidlCurrent, fodInfos->ShellInfos.pidlAbsCurrent))
     1550          {
     1551            IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE);
     1552          }
     1553          else if( nOpenAction == ONOPEN_SEARCH )
     1554          {
    15561555            IShellView_Refresh(fodInfos->Shell.FOIShellView);
    1557       }
     1556          }
    15581557          COMDLG32_SHFree(pidlCurrent);
    15591558        }
     
    15641563      TRACE("ONOPEN_OPEN %s\n", lpstrPathAndFile);
    15651564      {
    1566     /* add default extension */
    1567     if (fodInfos->ofnInfos->lpstrDefExt)
    1568     {
    1569       if (! *PathFindExtensionA(lpstrPathAndFile))
    1570       {
    1571         strcat(lpstrPathAndFile, ".");
    1572         strcat(lpstrPathAndFile, fodInfos->ofnInfos->lpstrDefExt);
    1573       }
    1574     }
     1565        /* add default extension */
     1566        if (fodInfos->ofnInfos->lpstrDefExt)
     1567        {
     1568          if (! *PathFindExtensionA(lpstrPathAndFile))
     1569          {
     1570            /* only add "." in case a default extension does exist */
     1571            if (*fodInfos->ofnInfos->lpstrDefExt != '\0')
     1572            {
     1573                strcat(lpstrPathAndFile, ".");
     1574                strcat(lpstrPathAndFile, fodInfos->ofnInfos->lpstrDefExt);
     1575            }
     1576          }
     1577        }
    15751578
    15761579        /* Check that the size of the file does not exceed buffer size.
     
    15801583        {
    15811584          LPSTR lpszTemp;
    1582 
     1585         
    15831586          /* fill destination buffer */
    15841587          strcpy(fodInfos->ofnInfos->lpstrFile, lpstrPathAndFile);
     
    15901593          lpszTemp = PathFindFileNameA(lpstrPathAndFile);
    15911594          fodInfos->ofnInfos->nFileOffset = lpszTemp - lpstrPathAndFile;
    1592 
     1595 
    15931596          /* set extension offset */
    15941597          lpszTemp = PathFindExtensionA(lpstrPathAndFile);
    15951598          fodInfos->ofnInfos->nFileExtension = (*lpszTemp) ? lpszTemp - lpstrPathAndFile + 1 : 0;
    1596 
     1599   
    15971600          /* set the lpstrFileTitle */
    15981601          if(fodInfos->ofnInfos->lpstrFileTitle)
    1599       {
     1602          {
    16001603            LPSTR lpstrFileTitle = PathFindFileNameA(lpstrPathAndFile);
    1601         strncpy(fodInfos->ofnInfos->lpstrFileTitle, lpstrFileTitle, fodInfos->ofnInfos->nMaxFileTitle);
    1602       }
     1604            strncpy(fodInfos->ofnInfos->lpstrFileTitle, lpstrFileTitle, fodInfos->ofnInfos->nMaxFileTitle);
     1605          }
    16031606
    16041607          /* ask the hook if we can close */
    16051608          if(IsHooked(fodInfos))
    1606       {
    1607         /* FIXME we are sending ASCII-structures. Does not work with NT */
    1608         /* first old style */
    1609         TRACE("---\n");
     1609          {
     1610            /* FIXME we are sending ASCII-structures. Does not work with NT */
     1611            /* first old style */
     1612            TRACE("---\n");
    16101613            CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,
    16111614                            fodInfos->DlgInfos.hwndCustomDlg,
    16121615                            fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos);
    1613         if (GetWindowLongA(hwnd, DWL_MSGRESULT))
    1614         {
    1615           TRACE("cancled\n");
    1616           ret = FALSE;
    1617           goto ret;
    1618         }
    1619       }
     1616            if (GetWindowLongA(hwnd, DWL_MSGRESULT))
     1617            {
     1618              TRACE("cancled\n");
     1619              ret = FALSE;
     1620              goto ret;
     1621            }
     1622          }
    16201623
    16211624          TRACE("close\n");
    1622       FILEDLG95_Clean(hwnd);
     1625          FILEDLG95_Clean(hwnd);
    16231626          ret = EndDialog(hwnd, TRUE);
    1624     }
    1625     else
     1627        }
     1628        else
    16261629        {
    16271630          /* FIXME set error FNERR_BUFFERTOSMALL */
     
    16511654
    16521655  /*
    1653    * Initialisation of the FileOpenDialogInfos structure
     1656   * Initialisation of the FileOpenDialogInfos structure 
    16541657   */
    16551658
     
    16621665  if (!(fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT))
    16631666  {
    1664      fodInfos->ShellInfos.folderSettings.fFlags |= FWF_SINGLESEL;
     1667     fodInfos->ShellInfos.folderSettings.fFlags |= FWF_SINGLESEL; 
    16651668  }
    16661669  fodInfos->ShellInfos.folderSettings.fFlags |= FWF_AUTOARRANGE | FWF_ALIGNLEFT;
     
    16721675
    16731676  /* Construct the IShellBrowser interface */
    1674   fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd);
    1675 
     1677  fodInfos->Shell.FOIShellBrowser = IShellBrowserImpl_Construct(hwnd); 
     1678   
    16761679  return NOERROR;
    16771680}
     
    16911694
    16921695  if(SUCCEEDED(IShellView_GetItemObject(fodInfos->Shell.FOIShellView,
    1693                     SVGIO_BACKGROUND,
    1694                     &IID_IContextMenu,
    1695                     (LPVOID*)&pcm)))
     1696                                        SVGIO_BACKGROUND,
     1697                                        &IID_IContextMenu,
     1698                                        (LPVOID*)&pcm)))
    16961699  {
    16971700    CMINVOKECOMMANDINFO ci;
     
    17401743  LPITEMIDLIST pidl;
    17411744  HRESULT hres;
    1742 
     1745 
    17431746  TRACE("\n");
    17441747
     
    17731776 *      FILEDLG95_FILETYPE_Init
    17741777 *
    1775  * Initialisation of the file type combo box
     1778 * Initialisation of the file type combo box 
    17761779 */
    17771780static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd)
     
    17831786  if(fodInfos->ofnInfos->lpstrFilter)
    17841787  {
    1785     int nFilters = 0;   /* number of filters */
     1788    int nFilters = 0;   /* number of filters */
    17861789    LPSTR lpstrFilter;
    17871790    LPCSTR lpstrPos = fodInfos->ofnInfos->lpstrFilter;
     
    17891792    for(;;)
    17901793    {
    1791       /* filter is a list...  title\0ext\0......\0\0
     1794      /* filter is a list...  title\0ext\0......\0\0 
    17921795       * Set the combo item text to the title and the item data
    17931796       *  to the ext
     
    17971800
    17981801      /* Get the title */
    1799       if(! *lpstrPos) break;    /* end */
     1802      if(! *lpstrPos) break;    /* end */
    18001803      lpstrDisplay = lpstrPos;
    18011804      lpstrPos += strlen(lpstrPos) + 1;
    18021805
    18031806      /* Copy the extensions */
    1804       if (! *lpstrPos) return E_FAIL;   /* malformed filter */
     1807      if (! *lpstrPos) return E_FAIL;   /* malformed filter */
    18051808      if (!(lpstrExt = (LPSTR) MemAlloc(strlen(lpstrPos)+1))) return E_FAIL;
    18061809      strcpy(lpstrExt,lpstrPos);
    18071810      lpstrPos += strlen(lpstrPos) + 1;
    1808 
     1811           
    18091812      /* Add the item at the end of the combo */
    18101813      CBAddString(fodInfos->DlgInfos.hwndFileTypeCB, lpstrDisplay);
     
    18171820     * FIXME: lpstrCustomFilter not handled at all
    18181821     */
    1819 
     1822 
    18201823    /* set default filter index */
    18211824    if(fodInfos->ofnInfos->nFilterIndex == 0 && fodInfos->ofnInfos->lpstrCustomFilter == NULL)
     
    18251828    if ( fodInfos->ofnInfos->nFilterIndex > nFilters )
    18261829      fodInfos->ofnInfos->nFilterIndex = nFilters;
    1827 
     1830 
    18281831    /* Set the current index selection. */
    18291832    CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, fodInfos->ofnInfos->nFilterIndex-1);
    1830 
     1833 
    18311834    /* Get the corresponding text string from the combo box. */
    18321835    lpstrFilter = (LPSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
     
    18341837
    18351838    if ((INT)lpstrFilter == CB_ERR)  /* control is empty */
    1836       lpstrFilter = NULL;
     1839      lpstrFilter = NULL;       
    18371840
    18381841    if(lpstrFilter)
    18391842    {
    18401843      DWORD len;
    1841       _strlwr(lpstrFilter); /* lowercase */
     1844      _strlwr(lpstrFilter);     /* lowercase */
    18421845      len = MultiByteToWideChar( CP_ACP, 0, lpstrFilter, -1, NULL, 0 );
    18431846      fodInfos->ShellInfos.lpstrCurrentFilter = MemAlloc( len * sizeof(WCHAR) );
     
    19431946
    19441947}
    1945 
     1948   
    19461949/***********************************************************************
    19471950 *      FILEDLG95_LOOKIN_Init
    19481951 *
    1949  * Initialisation of the look in combo box
     1952 * Initialisation of the look in combo box 
    19501953 */
    19511954static HRESULT FILEDLG95_LOOKIN_Init(HWND hwndCombo)
    19521955{
    1953   IShellFolder  *psfRoot, *psfDrives;
    1954   IEnumIDList   *lpeRoot, *lpeDrives;
    1955   LPITEMIDLIST  pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp;
     1956  IShellFolder  *psfRoot, *psfDrives;
     1957  IEnumIDList   *lpeRoot, *lpeDrives;
     1958  LPITEMIDLIST  pidlDrives, pidlTmp, pidlTmp1, pidlAbsTmp;
    19561959
    19571960  LookInInfos *liInfos = MemAlloc(sizeof(LookInInfos));
     
    19831986      while (S_OK == IEnumIDList_Next(lpeRoot, 1, &pidlTmp, NULL))
    19841987      {
    1985     FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
    1986 
    1987     /* special handling for CSIDL_DRIVES */
    1988     if (COMDLG32_PIDL_ILIsEqual(pidlTmp, pidlDrives))
    1989     {
    1990       if(SUCCEEDED(IShellFolder_BindToObject(psfRoot, pidlTmp, NULL, &IID_IShellFolder, (LPVOID*)&psfDrives)))
    1991       {
    1992         /* enumerate the drives */
    1993         if(SUCCEEDED(IShellFolder_EnumObjects(psfDrives, hwndCombo,SHCONTF_FOLDERS, &lpeDrives)))
    1994         {
    1995           while (S_OK == IEnumIDList_Next(lpeDrives, 1, &pidlTmp1, NULL))
    1996           {
    1997             pidlAbsTmp = COMDLG32_PIDL_ILCombine(pidlTmp, pidlTmp1);
    1998             FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlAbsTmp,LISTEND);
    1999             COMDLG32_SHFree(pidlAbsTmp);
    2000             COMDLG32_SHFree(pidlTmp1);
    2001           }
    2002           IEnumIDList_Release(lpeDrives);
    2003         }
    2004         IShellFolder_Release(psfDrives);
    2005       }
    2006     }
     1988        FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
     1989
     1990        /* special handling for CSIDL_DRIVES */
     1991        if (COMDLG32_PIDL_ILIsEqual(pidlTmp, pidlDrives))
     1992        {
     1993          if(SUCCEEDED(IShellFolder_BindToObject(psfRoot, pidlTmp, NULL, &IID_IShellFolder, (LPVOID*)&psfDrives)))
     1994          {
     1995            /* enumerate the drives */
     1996            if(SUCCEEDED(IShellFolder_EnumObjects(psfDrives, hwndCombo,SHCONTF_FOLDERS, &lpeDrives)))
     1997            {
     1998              while (S_OK == IEnumIDList_Next(lpeDrives, 1, &pidlTmp1, NULL))
     1999              {
     2000                pidlAbsTmp = COMDLG32_PIDL_ILCombine(pidlTmp, pidlTmp1);
     2001                FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlAbsTmp,LISTEND);
     2002                COMDLG32_SHFree(pidlAbsTmp);
     2003                COMDLG32_SHFree(pidlTmp1);
     2004              }
     2005              IEnumIDList_Release(lpeDrives);
     2006            }
     2007            IShellFolder_Release(psfDrives);
     2008          }
     2009        }
    20072010        COMDLG32_SHFree(pidlTmp);
    20082011      }
     
    20502053  {
    20512054    ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
    2052                                                0,
    2053                                                &sfi,
    2054                                                sizeof (SHFILEINFOA),
    2055                                                SHGFI_PIDL | SHGFI_SMALLICON |
    2056                                                SHGFI_OPENICON | SHGFI_SYSICONINDEX    |
    2057                                                SHGFI_DISPLAYNAME );
     2055                                               0,   
     2056                                               &sfi,   
     2057                                               sizeof (SHFILEINFOA),   
     2058                                               SHGFI_PIDL | SHGFI_SMALLICON |   
     2059                                               SHGFI_OPENICON | SHGFI_SYSICONINDEX    | 
     2060                                               SHGFI_DISPLAYNAME );   
    20582061  }
    20592062  else
    20602063  {
    20612064    ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
    2062                                                   0,
    2063                                                   &sfi,
     2065                                                  0, 
     2066                                                  &sfi, 
    20642067                                                  sizeof (SHFILEINFOA),
    2065                                                   SHGFI_PIDL | SHGFI_SMALLICON |
    2066                                                   SHGFI_SYSICONINDEX |
     2068                                                  SHGFI_PIDL | SHGFI_SMALLICON | 
     2069                                                  SHGFI_SYSICONINDEX | 
    20672070                                                  SHGFI_DISPLAYNAME);
    20682071  }
     
    20872090    iIndentation = 0;
    20882091    ilItemImage = (HIMAGELIST) SHGetFileInfoA ((LPCSTR) tmpFolder->pidlItem,
    2089                                                 0,
    2090                                                 &sfi,
    2091                                                 sizeof (SHFILEINFOA),
    2092                                                 SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON
     2092                                                0, 
     2093                                                &sfi, 
     2094                                                sizeof (SHFILEINFOA), 
     2095                                                SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_OPENICON 
    20932096                                                | SHGFI_SYSICONINDEX | SHGFI_DISPLAYNAME  );
    20942097
     
    21102113  rectText.left = rectIcon.right;
    21112114  rectText.top =
    2112       (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2;
     2115          (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom - tm.tmHeight) / 2;
    21132116  rectText.right = pDIStruct->rcItem.right + XTEXTOFFSET;
    21142117  rectText.bottom =
    2115       (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2;
    2116 
     2118          (pDIStruct->rcItem.top + pDIStruct->rcItem.bottom + tm.tmHeight) / 2;
     2119 
    21172120  /* Draw the icon from the image list */
    21182121  ImageList_Draw(ilItemImage,
    21192122                 sfi.iIcon,
    2120                  pDIStruct->hDC,
    2121                  rectIcon.left,
    2122                  rectIcon.top,
    2123                  ILD_TRANSPARENT );
     2123                 pDIStruct->hDC, 
     2124                 rectIcon.left, 
     2125                 rectIcon.top, 
     2126                 ILD_TRANSPARENT ); 
    21242127
    21252128  /* Draw the associated text */
     
    21482151    {
    21492152      LPSFOLDER tmpFolder;
    2150       int iItem;
     2153      int iItem; 
    21512154
    21522155      iItem = CBGetCurSel(fodInfos->DlgInfos.hwndLookInCB);
     
    21542157      if(!(tmpFolder = (LPSFOLDER) CBGetItemDataPtr(fodInfos->DlgInfos.hwndLookInCB,
    21552158                                               iItem)))
    2156     return FALSE;
     2159        return FALSE;
    21572160
    21582161
     
    21652168      break;
    21662169    }
    2167 
     2170     
    21682171  }
    21692172  return FALSE;
     
    21902193  if(!(liInfos = (LookInInfos *)GetPropA(hwnd,LookInInfosStr)))
    21912194    return -1;
    2192 
     2195   
    21932196  tmpFolder = MemAlloc(sizeof(SFOLDER));
    21942197  tmpFolder->m_iIndent = 0;
     
    22052208  if(tmpFolder->m_iIndent > liInfos->iMaxIndentation)
    22062209    liInfos->iMaxIndentation = tmpFolder->m_iIndent;
    2207 
     2210 
    22082211  sfi.dwAttributes = SFGAO_FILESYSANCESTOR | SFGAO_FILESYSTEM;
    22092212  SHGetFileInfoA((LPSTR)pidl,
     
    22112214                  &sfi,
    22122215                  sizeof(sfi),
    2213                   SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX
     2216                  SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX 
    22142217                  | SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED);
    22152218
     
    22192222  {
    22202223    int iItemID;
    2221 
     2224 
    22222225    TRACE("-- Add %s at %u\n", sfi.szDisplayName, tmpFolder->m_iIndent);
    22232226
     
    22452248 *      FILEDLG95_LOOKIN_InsertItemAfterParent
    22462249 *
    2247  * Insert an item below its parent
     2250 * Insert an item below its parent 
    22482251 */
    22492252static int FILEDLG95_LOOKIN_InsertItemAfterParent(HWND hwnd,LPITEMIDLIST pidl)
    22502253{
    2251 
     2254 
    22522255  LPITEMIDLIST pidlParent = GetParentPidl(pidl);
    22532256  int iParentPos;
     
    23042307    }
    23052308  }
    2306 
     2309 
    23072310  CBSetCurSel(hwnd,iItemPos);
    23082311  liInfos->uSelectedItem = iItemPos;
     
    24222425    if (nFileSelected >= 1)
    24232426    {
    2424       nLength += 3; /* first and last quotes, trailing \0 */
     2427      nLength += 3;     /* first and last quotes, trailing \0 */
    24252428      for ( nFileToOpen = 0; nFileToOpen < nFileSelected; nFileToOpen++ )
    24262429      {
    24272430        pidl = GetPidlFromDataObject( fodInfos->Shell.FOIDataObject, nFileToOpen+1 );
    2428 
     2431   
    24292432        if (pidl)
    2430     {
     2433        {
    24312434          /* get the total length of the selected file names*/
    24322435          lpstrTemp[0] = '\0';
     
    24342437
    24352438          if ( ! IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl) ) /* Ignore folders */
    2436       {
     2439          {
    24372440            nLength += strlen( lpstrTemp ) + 3;
    24382441            nFiles++;
    2439       }
     2442          }
    24402443          COMDLG32_SHFree( pidl );
    2441     }
     2444        }
    24422445      }
    24432446    }
     
    24572460
    24582461        if (pidl)
    2459     {
    2460       /* get the file name */
     2462        {
     2463          /* get the file name */
    24612464          lpstrTemp[0] = '\0';
    24622465          GetName( fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER, lpstrTemp );
    24632466
    24642467          if (! IsPidlFolder(fodInfos->Shell.FOIShellFolder, pidl)) /* Ignore folders */
    2465       {
     2468          {
    24662469            if ( nFiles > 1)
    2467         {
     2470            {
    24682471              *lpstrCurrFile++ =  '\"';
    24692472              strcpy( lpstrCurrFile, lpstrTemp );
     
    24712474              strcpy( lpstrCurrFile, "\" " );
    24722475              lpstrCurrFile += 2;
    2473         }
    2474         else
    2475         {
     2476            }
     2477            else
     2478            {
    24762479              strcpy( lpstrAllFile, lpstrTemp );
    2477         }
    2478       }
     2480            }
     2481          }
    24792482          COMDLG32_SHFree( (LPVOID) pidl );
    2480     }
     2483        }
    24812484      }
    24822485    }
     
    24962499static HRESULT COMDLG32_StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl)
    24972500{
    2498     switch (src->uType)
    2499     {
    2500       case STRRET_WSTR:
    2501         WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, (LPSTR)dest, len, NULL, NULL);
    2502         COMDLG32_SHFree(src->u.pOleStr);
    2503         break;
    2504 
    2505       case STRRET_CSTRA:
    2506         lstrcpynA((LPSTR)dest, src->u.cStr, len);
    2507         break;
    2508 
    2509       case STRRET_OFFSETA:
    2510         lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
    2511         break;
    2512 
    2513       default:
    2514         FIXME("unknown type!\n");
    2515         if (len)
    2516         {
    2517           *(LPSTR)dest = '\0';
    2518         }
    2519         return(FALSE);
    2520     }
    2521     return S_OK;
     2501        switch (src->uType)
     2502        {
     2503          case STRRET_WSTR:
     2504            WideCharToMultiByte(CP_ACP, 0, src->u.pOleStr, -1, (LPSTR)dest, len, NULL, NULL);
     2505            COMDLG32_SHFree(src->u.pOleStr);
     2506            break;
     2507
     2508          case STRRET_CSTRA:
     2509            lstrcpynA((LPSTR)dest, src->u.cStr, len);
     2510            break;
     2511
     2512          case STRRET_OFFSETA:
     2513            lstrcpynA((LPSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
     2514            break;
     2515
     2516          default:
     2517            FIXME("unknown type!\n");
     2518            if (len)
     2519            {
     2520              *(LPSTR)dest = '\0';
     2521            }
     2522            return(FALSE);
     2523        }
     2524        return S_OK;
    25222525}
    25232526
     
    25292532int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPSTR * lpstrFileList, UINT * sizeUsed)
    25302533{
    2531     FileOpenDlgInfos *fodInfos  = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
    2532     UINT nStrCharCount = 0; /* index in src buffer */
    2533     UINT nFileIndex = 0;    /* index in dest buffer */
    2534     UINT nFileCount = 0;    /* number of files */
    2535     UINT nStrLen = 0;   /* length of string in edit control */
    2536     LPSTR lpstrEdit;    /* buffer for string from edit control */
    2537 
    2538     TRACE("\n");
    2539 
    2540     /* get the filenames from the edit control */
    2541     nStrLen = SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0);
    2542     lpstrEdit = MemAlloc(nStrLen+1);
    2543     GetDlgItemTextA(hwnd, IDC_FILENAME, lpstrEdit, nStrLen+1);
    2544 
    2545     TRACE("nStrLen=%u str=%s\n", nStrLen, lpstrEdit);
    2546 
    2547     /* we might get single filename without any '"',
    2548     * so we need nStrLen + terminating \0 + end-of-list \0 */
    2549     *lpstrFileList = MemAlloc(nStrLen+2);
    2550     *sizeUsed = 0;
    2551 
    2552     /* build 0-delimited file list from filenames */
    2553     while ( nStrCharCount <= nStrLen )
    2554     {
    2555       if ( lpstrEdit[nStrCharCount]=='"' )
    2556       {
    2557         nStrCharCount++;
    2558         while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen))
    2559         {
    2560           (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount];
    2561           (*sizeUsed)++;
    2562           nStrCharCount++;
    2563         }
    2564         (*lpstrFileList)[nFileIndex++] = '\0';
    2565         (*sizeUsed)++;
    2566         nFileCount++;
    2567       }
    2568       nStrCharCount++;
    2569     }
    2570 
    2571     /* single, unquoted string */
    2572     if ((nStrLen > 0) && (*sizeUsed == 0) )
    2573     {
    2574       strcpy(*lpstrFileList, lpstrEdit);
    2575       nFileIndex = strlen(lpstrEdit) + 1;
    2576       (*sizeUsed) = nFileIndex;
    2577       nFileCount = 1;
    2578     }
    2579 
    2580     /* trailing \0 */
    2581     (*lpstrFileList)[nFileIndex] = '\0';
    2582     (*sizeUsed)++;
    2583 
    2584     MemFree(lpstrEdit);
    2585     return nFileCount;
     2534        FileOpenDlgInfos *fodInfos  = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
     2535        UINT nStrCharCount = 0; /* index in src buffer */
     2536        UINT nFileIndex = 0;    /* index in dest buffer */
     2537        UINT nFileCount = 0;    /* number of files */
     2538        UINT nStrLen = 0;       /* length of string in edit control */
     2539        LPSTR lpstrEdit;        /* buffer for string from edit control */
     2540
     2541        TRACE("\n");
     2542
     2543        /* get the filenames from the edit control */
     2544        nStrLen = SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0);
     2545        lpstrEdit = MemAlloc(nStrLen+1);
     2546        GetDlgItemTextA(hwnd, IDC_FILENAME, lpstrEdit, nStrLen+1);
     2547
     2548        TRACE("nStrLen=%u str=%s\n", nStrLen, lpstrEdit);
     2549       
     2550        /* we might get single filename without any '"',
     2551        * so we need nStrLen + terminating \0 + end-of-list \0 */
     2552        *lpstrFileList = MemAlloc(nStrLen+2);
     2553        *sizeUsed = 0;
     2554
     2555        /* build 0-delimited file list from filenames */
     2556        while ( nStrCharCount <= nStrLen )
     2557        {
     2558          if ( lpstrEdit[nStrCharCount]=='"' )
     2559          {
     2560            nStrCharCount++;
     2561            while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen))
     2562            {
     2563              (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount];
     2564              (*sizeUsed)++;
     2565              nStrCharCount++;
     2566            }
     2567            (*lpstrFileList)[nFileIndex++] = '\0';
     2568            (*sizeUsed)++;
     2569            nFileCount++;
     2570          }
     2571          nStrCharCount++;
     2572        }
     2573
     2574        /* single, unquoted string */
     2575        if ((nStrLen > 0) && (*sizeUsed == 0) )
     2576        {
     2577          strcpy(*lpstrFileList, lpstrEdit);
     2578          nFileIndex = strlen(lpstrEdit) + 1;
     2579          (*sizeUsed) = nFileIndex;
     2580          nFileCount = 1;
     2581        }
     2582
     2583        /* trailing \0 */
     2584        (*lpstrFileList)[nFileIndex] = '\0';
     2585        (*sizeUsed)++;
     2586
     2587        MemFree(lpstrEdit);
     2588        return nFileCount;
    25862589}
    25872590
     
    26262629LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex)
    26272630{
    2628 
     2631     
    26292632    STGMEDIUM medium;
    26302633    FORMATETC formatetc;
    26312634    LPITEMIDLIST pidl = NULL;
    2632 
     2635   
    26332636    TRACE("sv=%p index=%u\n", doSelected, nPidlIndex);
    2634 
     2637   
    26352638    /* Set the FORMATETC structure*/
    26362639    SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL);
     
    26862689 *      GetName
    26872690 *
    2688  * Get the pidl's display name (relative to folder) and
     2691 * Get the pidl's display name (relative to folder) and 
    26892692 * put it in lpstrFileName.
    2690  *
     2693 * 
    26912694 * Return NOERROR on success,
    26922695 * E_FAIL otherwise
     
    27202723 *      GetShellFolderFromPidl
    27212724 *
    2722  * pidlRel is the item pidl relative
     2725 * pidlRel is the item pidl relative 
    27232726 * Return the IShellFolder of the absolute pidl
    27242727 */
     
    27362739      if(SUCCEEDED(IShellFolder_BindToObject(psfParent, pidlAbs, NULL, &IID_IShellFolder, (LPVOID*)&psf)))
    27372740      {
    2738     IShellFolder_Release(psfParent);
     2741        IShellFolder_Release(psfParent);
    27392742        return psf;
    27402743      }
     
    27562759
    27572760  TRACE("%p\n", pidl);
    2758 
     2761 
    27592762  pidlParent = COMDLG32_PIDL_ILClone(pidl);
    27602763  COMDLG32_PIDL_ILRemoveLastID(pidlParent);
    2761 
     2764     
    27622765  return pidlParent;
    27632766}
     
    27662769 *      GetPidlFromName
    27672770 *
    2768  * returns the pidl of the file name relative to folder
     2771 * returns the pidl of the file name relative to folder 
    27692772 * NULL if an error occurred
    27702773 */
     
    27802783  if(!*lpcstrFileName) return NULL;
    27812784
    2782   MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,lpcstrFileName,-1,(LPWSTR)lpwstrDirName,MAX_PATH);
     2785  MultiByteToWideChar(CP_ACP,MB_PRECOMPOSED,lpcstrFileName,-1,(LPWSTR)lpwstrDirName,MAX_PATH); 
    27832786
    27842787  if(!lpsf)
     
    27902793  else
    27912794  {
    2792     IShellFolder_ParseDisplayName(lpsf, 0, NULL, (LPWSTR)lpwstrDirName, &ulEaten, &pidl, NULL);
     2795    IShellFolder_ParseDisplayName(lpsf, 0, NULL, (LPWSTR)lpwstrDirName, &ulEaten, &pidl, NULL); 
    27932796  }
    27942797  return pidl;
     
    27992802BOOL IsPidlFolder (LPSHELLFOLDER psf, LPITEMIDLIST pidl)
    28002803{
    2801     ULONG uAttr  = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
    2802     HRESULT ret;
    2803 
    2804     TRACE("%p, %p\n", psf, pidl);
    2805 
    2806     ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
    2807 
    2808     TRACE("-- 0x%08lx 0x%08lx\n", uAttr, ret);
    2809     /* see documentation shell 4.1*/
     2804        ULONG uAttr  = SFGAO_FOLDER | SFGAO_HASSUBFOLDER;
     2805        HRESULT ret;
     2806       
     2807        TRACE("%p, %p\n", psf, pidl);
     2808       
     2809        ret = IShellFolder_GetAttributesOf( psf, 1, &pidl, &uAttr );
     2810       
     2811        TRACE("-- 0x%08lx 0x%08lx\n", uAttr, ret);
     2812        /* see documentation shell 4.1*/
    28102813        return uAttr & (SFGAO_FOLDER | SFGAO_HASSUBFOLDER);
    28112814}
     
    28422845
    28432846  return bBrowseSelFolder;
    2844 }
     2847} 
    28452848
    28462849/*
  • trunk/src/comdlg32/filedlgbrowser.c

    r6645 r6708  
    1 /* $Id: filedlgbrowser.c,v 1.9 2001-09-05 12:12:01 bird Exp $ */
    21/*
    32 *  Implementation of IShellBrowser for the File Open common dialog
  • trunk/src/comdlg32/filetitle.c

    r6645 r6708  
    1 /* $Id: filetitle.c,v 1.5 2001-09-05 12:12:01 bird Exp $ */
    21/*
    32 * COMMDLG - File Dialogs
  • trunk/src/comdlg32/finddlg32.c

    r6645 r6708  
    1 /* $Id: finddlg32.c,v 1.4 2001-09-05 12:12:01 bird Exp $ */
    21/*
    32 *  Common Dialog Boxes interface (32 bit)
  • trunk/src/comdlg32/fontdlg.c

    r6645 r6708  
    1 /* $Id: fontdlg.c,v 1.4 2001-09-05 12:12:02 bird Exp $ */
    21/*
    32 * COMMDLG - Font Dialog
  • trunk/src/comdlg32/printdlg.c

    r6645 r6708  
    1 /* $Id: printdlg.c,v 1.2 2001-09-05 12:12:02 bird Exp $ */
    21/*
    32 * COMMDLG - Print Dialog
Note: See TracChangeset for help on using the changeset viewer.