diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index e8843523441..a4982930bfc 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3143,7 +3143,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case TB_ISBUTTONPRESSED: return TOOLBAR_IsButtonPressed (hwnd, wParam, lParam); -/* case TB_LOADIMAGES: */ /* 4.70 */ + case TB_LOADIMAGES: /* 4.70 */ + FIXME("missing standard imagelists\n"); + return 0; + /* case TB_MAPACCELERATORA: */ /* 4.71 */ /* case TB_MAPACCELERATORW: */ /* 4.71 */ /* case TB_MARKBUTTON: */ /* 4.71 */ diff --git a/dlls/commdlg/cdlg_En.rc b/dlls/commdlg/cdlg_En.rc index e9d91e02144..ecb8a46f02c 100644 --- a/dlls/commdlg/cdlg_En.rc +++ b/dlls/commdlg/cdlg_En.rc @@ -236,51 +236,30 @@ FONT 8, "Helv" } -IDD_OPENDIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 159 +NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Open" FONT 8, "helv" { - DEFPUSHBUTTON "&Open", IDOK,219,111,50,14 - PUSHBUTTON "Cancel", IDCANCEL,219,128,50,14 + LTEXT "Look &in",IDC_LOOKINSTATIC,7,6,27,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,36,3,138,300,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - CONTROL "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,109,9 - COMBOBOX IDC_FILETYPE,54,128,157,102,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_FILENAME,54,110,158,15,ES_AUTOHSCROLL - LTEXT "File &name:",IDC_FILENAMESTATIC,3,111,36,10 - LTEXT "Files of &type",IDC_FILETYPESTATIC,3,128,41,10 - LTEXT "", IDC_SHELLSTATIC,3,21,273,84,SS_SUNKEN | NOT WS_VISIBLE | NOT WS_GROUP |WS_EX_TRANSPARENT | WS_TABSTOP - LTEXT "Look &in",IDC_LOOKINSTATIC,3,5,29,10 - COMBOBOX IDC_LOOKIN,50,1,137,55,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Up",IDC_UPFOLDER,194,1,15,15,BS_ICON | BS_CENTER | BS_VCENTER - PUSHBUTTON "New",IDC_NEWFOLDER,213,1,15,15,BS_ICON | BS_CENTER | BS_VCENTER - CONTROL "I",IDC_LIST,"Button",BS_AUTORADIOBUTTON | BS_ICON | BS_CENTER | BS_VCENTER | BS_PUSHLIKE,233,1,15,15 - CONTROL "L",IDC_DETAILS,"Button",BS_AUTORADIOBUTTON | BS_ICON | BS_CENTER | BS_VCENTER | BS_PUSHLIKE,249,1,15,15 + LTEXT "" , IDC_TOOLBARSTATIC, 172, 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 "File &name:",IDC_FILENAMESTATIC,5,112,48,8, SS_NOTIFY + EDITTEXT IDC_FILENAME,54,111,155,12,ES_AUTOHSCROLL + + LTEXT "Files of &type",IDC_FILETYPESTATIC,5,131,48,8, SS_NOTIFY + COMBOBOX IDC_FILETYPE,54,129,155,100,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10 + + DEFPUSHBUTTON "&Open", IDOK,222,110,50,14 + PUSHBUTTON "Cancel", IDCANCEL,222,128,50,14 + PUSHBUTTON "&Help", pshHelp,222,145,50,14 } -IDD_SAVEDIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 159 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Save As" -FONT 8, "helv" -{ - DEFPUSHBUTTON "&Save", IDOK,219,111,50,14 - PUSHBUTTON "Cancel", IDCANCEL,219,128,50,14 - - CONTROL "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,109,9 - COMBOBOX IDC_FILETYPE,54,128,157,102,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_FILENAME,54,110,158,15,ES_AUTOHSCROLL - LTEXT "File &name:",IDC_FILENAMESTATIC,3,111,36,10 - LTEXT "Save as &type",IDC_FILETYPESTATIC,3,128,41,10 - LTEXT "", IDC_SHELLSTATIC,3,21,273,84,SS_SUNKEN | NOT WS_VISIBLE | NOT WS_GROUP |WS_EX_TRANSPARENT - LTEXT "Save &in",IDC_LOOKINSTATIC,3,5,29,10 - COMBOBOX IDC_LOOKIN,50,1,137,55,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Up",IDC_UPFOLDER,194,1,15,15,BS_ICON | BS_CENTER | BS_VCENTER - PUSHBUTTON "New",IDC_NEWFOLDER,213,1,15,15,BS_ICON | BS_CENTER | BS_VCENTER - CONTROL "I",IDC_LIST,"Button",BS_AUTORADIOBUTTON | BS_ICON | BS_CENTER | BS_VCENTER | BS_PUSHLIKE,233,1,15,15 - CONTROL "L",IDC_DETAILS,"Button",BS_AUTORADIOBUTTON | BS_ICON | BS_CENTER | BS_VCENTER | BS_PUSHLIKE,249,1,15,15 - -} STRINGTABLE DISCARDABLE { IDS_ABOUTBOX "&About FolderPicker Test" diff --git a/dlls/commdlg/cdlg_xx.rc b/dlls/commdlg/cdlg_xx.rc index a101046ab7d..af6fa60f874 100644 --- a/dlls/commdlg/cdlg_xx.rc +++ b/dlls/commdlg/cdlg_xx.rc @@ -312,54 +312,3 @@ PD32_NOCOLLATE ICON 'FF FF F0 FF FF FC 3F FF FF FF FF E7 FF FF F9 FF' 'FF FE 7F F0 00 00' } - -/****************** - * Bitmap - */ - -IDB_TOOLBAR BITMAP DISCARDABLE -{' -42 4d b6 02 00 00 00 00 00 00 76 00 00 00 28 00 -00 00 41 00 00 00 10 00 00 00 01 00 04 00 00 00 -00 00 40 02 00 00 00 00 00 00 00 00 00 00 00 00 -00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80 -00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80 -00 00 c0 c0 c0 00 80 80 80 00 00 00 ff 00 00 ff -00 00 00 ff ff 00 ff 00 00 00 ff 00 ff 00 ff ff -00 00 ff ff ff 00 aa aa aa aa aa aa aa aa aa aa -aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa -aa aa aa aa aa aa a3 00 b6 01 aa aa aa 88 88 8a -aa aa 00 00 00 00 00 0a aa aa 44 4a aa aa aa aa -aa aa 88 80 00 0f 00 0f 00 0f ab 00 db 02 aa aa -a0 00 00 8a aa aa 0b bb bb bb bb 0a aa aa 4f 4a -00 0a aa aa aa aa f7 8f ff ff ff ff ff ff a9 02 -2a 02 aa aa a0 77 70 8a aa aa 0b bb bb bb bb 9a -aa aa 44 aa aa aa aa aa aa aa f7 80 00 0f 00 0f -00 0f a2 00 02 00 aa aa a0 77 70 8a aa aa 0b bb -bb bb bb 9a aa aa aa aa aa aa aa aa aa aa f7 8f -ff ff ff ff ff ff a4 f8 15 00 aa aa a0 77 70 8a -aa aa 0b bb bb b9 bb 9a a9 aa aa aa aa aa aa aa -aa aa f7 80 00 0f 00 0f 00 0f a2 00 02 00 aa aa -a0 77 70 8a aa aa 0b bb bb bb 9b 9a 9a aa 44 4a -aa aa 44 4a aa aa f7 8f ff ff ff ff ff ff a0 00 -ad 00 aa aa a0 77 70 8a aa aa 0b bb bb bb b9 99 -aa aa 4f 4a 00 0a 4f 4a 00 0a f7 80 00 0f 00 0f -00 0f a1 00 b5 00 aa aa a0 77 70 88 8a aa 00 00 -00 99 99 99 99 9a 44 aa aa aa 44 aa aa aa f7 8f -ff ff ff ff ff ff ad 01 0b 02 aa 00 00 77 70 00 -0a aa a0 bb bb 0a a9 99 aa aa aa aa aa aa aa aa -aa aa f7 80 00 0f 00 0f 00 0f a9 01 5d 01 aa a0 -f7 77 77 70 aa aa aa 00 00 aa 9a 9a 9a aa aa aa -aa aa aa aa aa aa f7 8f ff ff ff ff ff ff a0 01 -63 01 aa aa 0f 77 77 0a aa aa aa aa aa a9 aa 9a -a9 aa 44 4a aa aa 44 4a aa aa 88 88 88 88 88 88 -88 88 ab 01 0f 01 aa aa a0 f7 70 aa aa aa aa aa -aa aa aa 9a aa aa 4f 4a 00 0a 4f 4a 00 0a f7 8f -77 78 f7 78 f7 78 a8 01 7d 01 aa aa aa 0f 0a aa -aa aa aa aa aa aa aa 9a aa aa 44 aa aa aa 44 aa -aa aa f7 8f 77 78 f7 78 f7 78 ae 01 62 02 aa aa -aa a0 aa aa aa aa aa aa aa aa aa 9a aa aa aa aa -aa aa aa aa aa aa ff ff ff ff ff ff ff f7 a2 01 -b9 01 aa aa aa aa aa aa aa aa aa aa aa aa aa aa -aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa -aa aa a2 00 43 02'} diff --git a/dlls/commdlg/filedlg95.c b/dlls/commdlg/filedlg95.c index 2fd22a9a582..f10079078d9 100644 --- a/dlls/commdlg/filedlg95.c +++ b/dlls/commdlg/filedlg95.c @@ -22,7 +22,6 @@ DEFAULT_DEBUG_CHANNEL(commdlg) - /*********************************************************************** * Data structure and global variables */ @@ -152,14 +151,13 @@ LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPCSTR lpcstrFileName); void *MemAlloc(UINT size); void MemFree(void *mem); -BOOL WINAPI GetOpenFileName95(FileOpenDlgInfos *fodInfos); -BOOL WINAPI GetSaveFileName95(FileOpenDlgInfos *fodInfos); +BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos); HRESULT WINAPI FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); /*********************************************************************** - * GetOpenFileName95 + * GetFileName95 * * Creates an Open common dialog box that lets the user select * the drive, directory, and the name of a file or set of files to open. @@ -168,7 +166,7 @@ HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam * OUT : TRUE on success * FALSE on cancel, error, close or filename-does-not-fit-in-buffer. */ -BOOL WINAPI GetOpenFileName95(FileOpenDlgInfos *fodInfos) +BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos) { LRESULT lRes; @@ -178,7 +176,7 @@ BOOL WINAPI GetOpenFileName95(FileOpenDlgInfos *fodInfos) /* Create the dialog from a template */ - if(!(hRes = FindResourceA(COMMDLG_hInstance32,MAKEINTRESOURCEA(IDD_OPENDIALOG),RT_DIALOGA))) + if(!(hRes = FindResourceA(COMMDLG_hInstance32,MAKEINTRESOURCEA(NEWFILEOPENORD),RT_DIALOGA))) { COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); return FALSE; @@ -202,54 +200,11 @@ BOOL WINAPI GetOpenFileName95(FileOpenDlgInfos *fodInfos) return lRes; } -/*********************************************************************** - * GetSaveFileName95 - * - * Creates an Save as common dialog box that lets the user select - * the drive, directory, and the name of a file or set of files to open. - * - * IN : The FileOpenDlgInfos structure associated with the dialog - * OUT : TRUE on success - * FALSE on cancel, error, close or filename-does-not-fit-in-buffer. - */ -BOOL WINAPI GetSaveFileName95(FileOpenDlgInfos *fodInfos) -{ - - LRESULT lRes; - LPCVOID template; - HRSRC hRes; - HANDLE hDlgTmpl = 0; - - /* Create the dialog from a template */ - - if(!(hRes = FindResourceA(COMMDLG_hInstance32,MAKEINTRESOURCEA(IDD_SAVEDIALOG),RT_DIALOGA))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); - return FALSE; - } - if (!(hDlgTmpl = LoadResource(COMMDLG_hInstance32, hRes )) || - !(template = LockResource( hDlgTmpl ))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); - return FALSE; - } - lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32, - (LPDLGTEMPLATEA) template, - fodInfos->ofnInfos.hwndOwner, - (DLGPROC) FileOpenDlgProc95, - (LPARAM) fodInfos); - /* Unable to create the dialog*/ - if( lRes == -1) - return FALSE; - - return lRes; -} - /*********************************************************************** * GetFileDialog95A * * Copy the OPENFILENAMEA structure in a FileOpenDlgInfos structure. - * Call GetOpenFileName95 with this structure and clean the memory. + * Call GetFileName95 with this structure and clean the memory. * * IN : The OPENFILENAMEA initialisation structure passed to * GetOpenFileNameA win api function (see filedlg.c) @@ -345,11 +300,11 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) switch(iDlgType) { case OPEN_DIALOG : - ret = GetOpenFileName95(fodInfos); + ret = GetFileName95(fodInfos); break; case SAVE_DIALOG : fodInfos->DlgInfos.dwDlgProp |= FODPROP_SAVEDLG; - ret = GetSaveFileName95(fodInfos); + ret = GetFileName95(fodInfos); break; default : ret = 0; @@ -391,7 +346,7 @@ BOOL WINAPI GetFileDialog95A(LPOPENFILENAMEA ofn,UINT iDlgType) * GetFileDialog95W * * Copy the OPENFILENAMEW structure in a FileOpenDlgInfos structure. - * Call GetOpenFileName95 with this structure and clean the memory. + * Call GetFileName95 with this structure and clean the memory. * * IN : The OPENFILENAMEW initialisation structure passed to * GetOpenFileNameW win api function (see filedlg.c) @@ -490,11 +445,11 @@ BOOL WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType) switch(iDlgType) { case OPEN_DIALOG : - ret = GetOpenFileName95(fodInfos); + ret = GetFileName95(fodInfos); break; case SAVE_DIALOG : fodInfos->DlgInfos.dwDlgProp |= FODPROP_SAVEDLG; - ret = GetSaveFileName95(fodInfos); + ret = GetFileName95(fodInfos); break; default : ret = 0; @@ -1016,8 +971,16 @@ static LRESULT FILEDLG95_OnWMGetIShellBrowser(HWND hwnd) */ static LRESULT FILEDLG95_InitUI(HWND hwnd) { - HIMAGELIST himlToolbar; - HICON hicon; + TBBUTTON tbb[] = + {{VIEW_PARENTFOLDER, IDC_UPFOLDER, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 }, + {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0 }, + {VIEW_NEWFOLDER, IDC_NEWFOLDER, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 }, + {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0 }, + {VIEW_LIST, IDC_LIST, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 }, + {VIEW_DETAILS, IDC_DETAILS, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 }, + }; + RECT rectTB; + FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("%p\n", fodInfos); @@ -1027,38 +990,33 @@ static LRESULT FILEDLG95_InitUI(HWND hwnd) fodInfos->DlgInfos.hwndFileTypeCB = GetDlgItem(hwnd,IDC_FILETYPE); fodInfos->DlgInfos.hwndLookInCB = GetDlgItem(hwnd,IDC_LOOKIN); - ShowWindow(GetDlgItem(hwnd,IDC_SHELLSTATIC),SW_HIDE); - /* Load the icons bitmaps */ - - if((himlToolbar = COMDLG32_ImageList_LoadImageA(COMMDLG_hInstance32, - MAKEINTRESOURCEA(IDB_TOOLBAR), - 0, - 1, - CLR_DEFAULT, - IMAGE_BITMAP, - 0))) - { - /* Up folder icon */ - if((hicon = COMDLG32_ImageList_GetIcon(himlToolbar,0,ILD_NORMAL))) - SendDlgItemMessageA(hwnd,IDC_UPFOLDER,BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hicon); - /* New folder icon */ - if((hicon = COMDLG32_ImageList_GetIcon(himlToolbar,1,ILD_NORMAL))) - SendDlgItemMessageA(hwnd,IDC_NEWFOLDER,BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hicon); - /* List view icon */ - if((hicon = COMDLG32_ImageList_GetIcon(himlToolbar,2,ILD_NORMAL))) - SendDlgItemMessageA(hwnd,IDC_LIST,BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hicon); - /* Detail view icon */ - if((hicon = COMDLG32_ImageList_GetIcon(himlToolbar,3,ILD_NORMAL))) - SendDlgItemMessageA(hwnd,IDC_DETAILS,BM_SETIMAGE,(WPARAM)IMAGE_ICON,(LPARAM)hicon); - /* Cleanup */ - COMDLG32_ImageList_Destroy(himlToolbar); - } + /* construct the toolbar */ + GetWindowRect(GetDlgItem(hwnd,IDC_TOOLBARSTATIC),&rectTB); + MapWindowPoints( 0, hwnd,(LPPOINT)&rectTB,2); + fodInfos->DlgInfos.hwndTB = CreateWindowExA(0, TOOLBARCLASSNAMEA, (LPSTR) NULL, + WS_CHILD | WS_GROUP | TBSTYLE_TOOLTIPS | CCS_NODIVIDER | CCS_NORESIZE, + 0, 0, 150, 26, + hwnd, (HMENU) IDC_TOOLBAR, COMMDLG_hInstance32, NULL); + + SetWindowPos(fodInfos->DlgInfos.hwndTB, 0, + rectTB.left,rectTB.top, rectTB.right-rectTB.left, rectTB.bottom-rectTB.top, + SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER ); + SendMessageA(fodInfos->DlgInfos.hwndTB, TB_BUTTONSTRUCTSIZE, (WPARAM) sizeof(TBBUTTON), 0); + SendMessageA(fodInfos->DlgInfos.hwndTB, TB_LOADIMAGES, (WPARAM) IDB_VIEW_SMALL_COLOR, HINST_COMMCTRL); + SendMessageA(fodInfos->DlgInfos.hwndTB, TB_ADDBUTTONSA, (WPARAM) 6,(LPARAM) &tbb); + SendMessageA(fodInfos->DlgInfos.hwndTB, TB_AUTOSIZE, 0, 0); /* Set the window text with the text specified in the OPENFILENAME structure */ if(fodInfos->ofnInfos.lpstrTitle) - SetWindowTextA(hwnd,fodInfos->ofnInfos.lpstrTitle); + { + SetWindowTextA(hwnd,fodInfos->ofnInfos.lpstrTitle); + } + else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) + { + SetWindowTextA(hwnd,"Save"); + } /* Initialise the file name edit control */ if(strlen(fodInfos->ofnInfos.lpstrFile)) @@ -1075,10 +1033,11 @@ static LRESULT FILEDLG95_InitUI(HWND hwnd) { ShowWindow(GetDlgItem(hwnd,IDC_OPENREADONLY),SW_HIDE); } - - /* List View is selected by default */ - SendDlgItemMessageA(hwnd, IDC_LIST, BM_SETCHECK,(WPARAM) BST_CHECKED,0); - + /* change Open to Save */ + if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) + { + SetDlgItemTextA(hwnd,IDOK,"Save"); + } return 0; } diff --git a/dlls/commdlg/filedlgbrowser.h b/dlls/commdlg/filedlgbrowser.h index 1f5591ac342..ca0572fb5d3 100644 --- a/dlls/commdlg/filedlgbrowser.h +++ b/dlls/commdlg/filedlgbrowser.h @@ -61,6 +61,7 @@ typedef struct HWND hwndFileTypeCB; HWND hwndLookInCB; HWND hwndFileName; + HWND hwndTB; HWND hwndCustomDlg; DWORD dwDlgProp; } DlgInfos; diff --git a/include/dlgs.h b/include/dlgs.h index 193c9b6983a..261978c1de8 100644 --- a/include/dlgs.h +++ b/include/dlgs.h @@ -5,6 +5,8 @@ #ifndef __WINE_DLGS_H #define __WINE_DLGS_H +#include "wine/obj_shellview.h" + #define ctlFirst 0x0400 #define ctlLast 0x04ff /* Push buttons */ @@ -170,29 +172,38 @@ #define scr7 0x0496 #define scr8 0x0497 +/* + * Controls + */ +#define ctl1 0x04A0 + /* These dialog resource ordinals really start at 0x0600, but the * RC Compiler can't handle hex for resource IDs, hence the decimal. */ -#define FILEOPENORD 1536 -#define MULTIFILEOPENORD 1537 -#define PRINTDLGORD 1538 -#define PRNSETUPDLGORD 1539 -#define FINDDLGORD 1540 -#define REPLACEDLGORD 1541 -#define FONTDLGORD 1542 -#define FORMATDLGORD31 1543 -#define FORMATDLGORD30 1544 +#define FILEOPENORD 1536 +#define MULTIFILEOPENORD 1537 +#define PRINTDLGORD 1538 +#define PRNSETUPDLGORD 1539 +#define FINDDLGORD 1540 +#define REPLACEDLGORD 1541 +#define FONTDLGORD 1542 +#define FORMATDLGORD31 1543 +#define FORMATDLGORD30 1544 +#define PAGESETUPDLGORD 1546 +#define NEWFILEOPENORD 1547 +#define PRINTDLGEXORD 1549 +#define PAGESETUPDLGORDMOTIF 1550 +#define COLORMGMTDLGORD 1551 +#define NEWFILEOPENV2ORD 1552 - -#define IDD_OPENDIALOG 101 -#define IDD_SAVEDIALOG 201 +/* fixme: move away */ #define IDS_ABOUTBOX 101 #define IDS_DOCUMENTFOLDERS 102 #define IDS_PERSONAL 103 #define IDS_FAVORITES 104 #define IDS_PATH 105 #define IDS_DESKTOP 106 -#define IDB_TOOLBAR 107 + #define IDS_FONTS 108 #define IDS_MYCOMPUTER 110 #define IDS_SYSTEMFOLDERS 112 @@ -200,17 +211,27 @@ #define IDS_FILENOTFOUND 114 #define IDS_VERIFYFILE 115 #define IDS_CREATEFILE 116 -#define IDC_OPENREADONLY 0x410 -#define IDC_FILETYPESTATIC 0x441 -#define IDC_FILENAMESTATIC 0x442 -#define IDC_LOOKINSTATIC 0x443 -#define IDC_SHELLSTATIC 0x461 -#define IDC_FILETYPE 0x470 -#define IDC_LOOKIN 0x471 -#define IDC_FILENAME 0x480 + +#define IDC_OPENREADONLY chx1 + +#define IDC_TOOLBARSTATIC stc1 +#define IDC_FILETYPESTATIC stc2 +#define IDC_FILENAMESTATIC stc3 +#define IDC_LOOKINSTATIC stc4 + +#define IDC_SHELLSTATIC lst1 + +#define IDC_FILETYPE cmb1 +#define IDC_LOOKIN cmb2 + +#define IDC_FILENAME edt1 + +/* fixme: replace with FCIDM_* constants */ #define IDC_UPFOLDER 1009 #define IDC_NEWFOLDER 1010 #define IDC_LIST 1011 -#define IDC_DETAILS 1014 +#define IDC_DETAILS 1012 + +#define IDC_TOOLBAR ctl1 #endif /* #ifdef __WINE_DLGS_H */