Changelog: Added path settings to winecfg. Index: programs/winecfg/En.rc =================================================================== RCS file: /home/wine/wine/programs/winecfg/En.rc,v retrieving revision 1.26 diff -u -r1.26 En.rc --- programs/winecfg/En.rc 30 Jul 2004 04:19:11 -0000 1.26 +++ programs/winecfg/En.rc 16 Aug 2004 19:08:11 -0000 @@ -113,13 +113,32 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN - GROUPBOX "Drive Mappings",IDC_STATIC,7,107,246,112 - LISTBOX IDC_LIST_DRIVES,14,118,232,76,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Add...",IDC_BUTTON_ADD,14,199,37,14 - PUSHBUTTON "Remove",IDC_BUTTON_REMOVE,55,199,37,14 - PUSHBUTTON "Edit...",IDC_BUTTON_EDIT,97,199,37,14 - PUSHBUTTON "Autodetect...",IDC_BUTTON_AUTODETECT,197,199,49,14 - LTEXT "WARNING: You don't seem to have a C drive defined. Click 'Add Drive' to add one.", IDS_DRIVE_NO_C, 7,223,250,110 + GROUPBOX "Path settings",IDC_STATIC,7,4,246,120 + LTEXT "Windows",IDC_STATIC,14,17,50,8 + EDITTEXT IDC_EDIT_WINDOWS,64,15,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_WINDOWS,200,14,46,14 + LTEXT "System",IDC_STATIC,14,35,50,8 + EDITTEXT IDC_EDIT_SYSTEM,64,33,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_SYSTEM,200,32,46,14 + LTEXT "Temp",IDC_STATIC,14,53,50,8 + EDITTEXT IDC_EDIT_TEMP,64,51,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_TEMP,200,50,46,14 + LTEXT "Profile",IDC_STATIC,14,71,50,8 + EDITTEXT IDC_EDIT_PROGRAMFILES,64,69,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_PROGRAMFILES,200,68,46,14 + LTEXT "Program Files",IDC_STATIC,14,89,50,8 + EDITTEXT IDC_EDIT_PROFILE,64,87,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_PROFILE,200,86,46,14 + LTEXT "Path",IDC_STATIC,14,107,50,8 + EDITTEXT IDC_EDIT_PATH,64,105,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Add...",IDC_BUTTON_PATH,200,104,46,14 + GROUPBOX "Drive Mappings",IDC_STATIC,7,125,246,100 + LISTBOX IDC_LIST_DRIVES,14,136,232,64,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Add...",IDC_BUTTON_ADD,14,205,37,14 + PUSHBUTTON "Remove",IDC_BUTTON_REMOVE,55,205,37,14 + PUSHBUTTON "Edit...",IDC_BUTTON_EDIT,97,205,37,14 + PUSHBUTTON "Autodetect...",IDC_BUTTON_AUTODETECT,197,205,49,14 + LTEXT "WARNING: You don't seem to have a C drive defined. Click 'Add Drive' to add one.", IDS_DRIVE_NO_C, 7,229,250,110 END IDD_DRIVE_EDIT DIALOG DISCARDABLE 0, 0, 203, 169 @@ -134,7 +153,7 @@ LTEXT "Serial:",IDC_STATIC_SERIAL,33,127,29,12 EDITTEXT IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL LTEXT "Type:",IDC_STATIC_TYPE,5,39,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_DRIVEPATH,31,5,117,13,ES_AUTOHSCROLL LTEXT "Path:",IDC_STATIC,5,8,20,9 COMBOBOX IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -166,4 +185,10 @@ IDS_TAB_GENERAL "General" IDS_TAB_DLLS "Libraries" IDS_TAB_DRIVES "Drives" + IDS_WINDOWS "Choose your main Windows directory..." + IDS_SYSTEM "Choose your Windows system directory..." + IDS_TEMP "Choose your Windows temp directory..." + IDS_PROFILE "Choose your Windows profile directory..." + IDS_PROGRAMFILES "Choose your Windows program files directory..." + IDS_PATH "Choose directory that you want to add to PATH..." END Index: programs/winecfg/Es.rc =================================================================== RCS file: /home/wine/wine/programs/winecfg/Es.rc,v retrieving revision 1.12 diff -u -r1.12 Es.rc --- programs/winecfg/Es.rc 4 Aug 2004 18:17:10 -0000 1.12 +++ programs/winecfg/Es.rc 16 Aug 2004 19:08:11 -0000 @@ -112,12 +112,31 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN - GROUPBOX "Mapeos de unidad",IDC_STATIC,7,107,246,112 - LISTBOX IDC_LIST_DRIVES,14,118,232,76,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Añadir...",IDC_BUTTON_ADD,14,199,37,14 - PUSHBUTTON "Eliminar",IDC_BUTTON_REMOVE,55,199,37,14 - PUSHBUTTON "Editar...",IDC_BUTTON_EDIT,97,199,37,14 - PUSHBUTTON "Autodetectar...",IDC_BUTTON_AUTODETECT,193,199,53,14 + GROUPBOX "Path settings",IDC_STATIC,7,4,246,120 + LTEXT "Windows",IDC_STATIC,14,17,50,8 + EDITTEXT IDC_EDIT_WINDOWS,64,15,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_WINDOWS,200,14,46,14 + LTEXT "System",IDC_STATIC,14,35,50,8 + EDITTEXT IDC_EDIT_SYSTEM,64,33,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_SYSTEM,200,32,46,14 + LTEXT "Temp",IDC_STATIC,14,53,50,8 + EDITTEXT IDC_EDIT_TEMP,64,51,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_TEMP,200,50,46,14 + LTEXT "Profile",IDC_STATIC,14,71,50,8 + EDITTEXT IDC_EDIT_PROGRAMFILES,64,69,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_PROGRAMFILES,200,68,46,14 + LTEXT "Program Files",IDC_STATIC,14,89,50,8 + EDITTEXT IDC_EDIT_PROFILE,64,87,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_PROFILE,200,86,46,14 + LTEXT "Path",IDC_STATIC,14,107,50,8 + EDITTEXT IDC_EDIT_PATH,64,105,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Add...",IDC_BUTTON_PATH,200,104,46,14 + GROUPBOX "Mapeos de unidad",IDC_STATIC,7,125,246,100 + LISTBOX IDC_LIST_DRIVES,14,136,232,64,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Añadir...",IDC_BUTTON_ADD,14,1205,37,14 + PUSHBUTTON "Eliminar",IDC_BUTTON_REMOVE,55,205,37,14 + PUSHBUTTON "Editar...",IDC_BUTTON_EDIT,97,205,37,14 + PUSHBUTTON "Autodetectar...",IDC_BUTTON_AUTODETECT,193,205,53,14 LTEXT "ADVERTENCIA: No parece tener una unidad C definida. Pulse 'Añadir...' para añadir una.", IDS_DRIVE_NO_C, 7,223,250,110 END @@ -133,7 +152,7 @@ LTEXT "Serie:",IDC_STATIC_SERIAL,33,127,29,12 EDITTEXT IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL LTEXT "Tipo:",IDC_STATIC_TYPE,5,39,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_DRIVEPATH,31,5,117,13,ES_AUTOHSCROLL LTEXT "Ruta:",IDC_STATIC,5,8,20,9 COMBOBOX IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -165,4 +184,10 @@ IDS_TAB_GENERAL "General" IDS_TAB_DLLS "Librerías" IDS_TAB_DRIVES "Unidades" + IDS_WINDOWS "Choose your main Windows directory..." + IDS_SYSTEM "Choose your Windows system directory..." + IDS_TEMP "Choose your Windows temp directory..." + IDS_PROFILE "Choose your Windows profile directory..." + IDS_PROGRAMFILES "Choose your Windows program files directory..." + IDS_PATH "Choose directory that you want to add to PATH..." END Index: programs/winecfg/It.rc =================================================================== RCS file: /home/wine/wine/programs/winecfg/It.rc,v retrieving revision 1.5 diff -u -r1.5 It.rc --- programs/winecfg/It.rc 30 Jul 2004 04:19:11 -0000 1.5 +++ programs/winecfg/It.rc 16 Aug 2004 19:08:11 -0000 @@ -112,12 +112,31 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN - GROUPBOX "Altri Drive",IDC_STATIC,7,107,246,112 - LISTBOX IDC_LIST_DRIVES,14,118,232,76,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Aggiungi...",IDC_BUTTON_ADD,14,199,37,14 - PUSHBUTTON "Rimuovi",IDC_BUTTON_REMOVE,55,199,37,14 - PUSHBUTTON "Modifica...",IDC_BUTTON_EDIT,97,199,37,14 - PUSHBUTTON "Rileva automaticamente...",IDC_BUTTON_AUTODETECT,197,199,49,14 + GROUPBOX "Path settings",IDC_STATIC,7,4,246,120 + LTEXT "Windows",IDC_STATIC,14,17,50,8 + EDITTEXT IDC_EDIT_WINDOWS,64,15,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_WINDOWS,200,14,46,14 + LTEXT "System",IDC_STATIC,14,35,50,8 + EDITTEXT IDC_EDIT_SYSTEM,64,33,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_SYSTEM,200,32,46,14 + LTEXT "Temp",IDC_STATIC,14,53,50,8 + EDITTEXT IDC_EDIT_TEMP,64,51,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_TEMP,200,50,46,14 + LTEXT "Profile",IDC_STATIC,14,71,50,8 + EDITTEXT IDC_EDIT_PROGRAMFILES,64,69,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_PROGRAMFILES,200,68,46,14 + LTEXT "Program Files",IDC_STATIC,14,89,50,8 + EDITTEXT IDC_EDIT_PROFILE,64,87,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_PROFILE,200,86,46,14 + LTEXT "Path",IDC_STATIC,14,107,50,8 + EDITTEXT IDC_EDIT_PATH,64,105,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Add...",IDC_BUTTON_PATH,200,104,46,14 + GROUPBOX "Altri Drive",IDC_STATIC,7,125,246,100 + LISTBOX IDC_LIST_DRIVES,14,136,232,64,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Aggiungi...",IDC_BUTTON_ADD,14,205,37,14 + PUSHBUTTON "Rimuovi",IDC_BUTTON_REMOVE,55,205,37,14 + PUSHBUTTON "Modifica...",IDC_BUTTON_EDIT,97,205,37,14 + PUSHBUTTON "Rileva automaticamente...",IDC_BUTTON_AUTODETECT,197,205,49,14 LTEXT "ATTENZIONE: Non è stato definito un driver C. Clicca su 'Aggiungi Driver' per aggiungerne uno.", IDS_DRIVE_NO_C, 7,223,250,110 END @@ -133,7 +152,7 @@ LTEXT "Seriale:",IDC_STATIC_SERIAL,33,127,29,12 EDITTEXT IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL LTEXT "Tipo:",IDC_STATIC_TYPE,5,39,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_DRIVEPATH,31,5,117,13,ES_AUTOHSCROLL LTEXT "Percorso:",IDC_STATIC,5,8,20,9 COMBOBOX IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -165,4 +184,10 @@ IDS_TAB_GENERAL "Generale" IDS_TAB_DLLS "Librerie" IDS_TAB_DRIVES "Drive" + IDS_WINDOWS "Choose your main Windows directory..." + IDS_SYSTEM "Choose your Windows system directory..." + IDS_TEMP "Choose your Windows temp directory..." + IDS_PROFILE "Choose your Windows profile directory..." + IDS_PROGRAMFILES "Choose your Windows program files directory..." + IDS_PATH "Choose directory that you want to add to PATH..." END Index: programs/winecfg/Pt.rc =================================================================== RCS file: /home/wine/wine/programs/winecfg/Pt.rc,v retrieving revision 1.15 diff -u -r1.15 Pt.rc --- programs/winecfg/Pt.rc 30 Jul 2004 04:19:11 -0000 1.15 +++ programs/winecfg/Pt.rc 16 Aug 2004 19:08:11 -0000 @@ -112,12 +112,31 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN - GROUPBOX "Outras unidades",IDC_STATIC,7,107,246,112 - LISTBOX IDC_LIST_DRIVES,14,118,232,76,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Adicionar...",IDC_BUTTON_ADD,14,199,37,14 - PUSHBUTTON "Remover",IDC_BUTTON_REMOVE,55,199,37,14 - PUSHBUTTON "Editar...",IDC_BUTTON_EDIT,97,199,37,14 - PUSHBUTTON "Autodetectar...",IDC_BUTTON_AUTODETECT,197,199,49,14 + GROUPBOX "Path settings",IDC_STATIC,7,4,246,120 + LTEXT "Windows",IDC_STATIC,14,17,50,8 + EDITTEXT IDC_EDIT_WINDOWS,64,15,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_WINDOWS,200,14,46,14 + LTEXT "System",IDC_STATIC,14,35,50,8 + EDITTEXT IDC_EDIT_SYSTEM,64,33,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_SYSTEM,200,32,46,14 + LTEXT "Temp",IDC_STATIC,14,53,50,8 + EDITTEXT IDC_EDIT_TEMP,64,51,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_TEMP,200,50,46,14 + LTEXT "Profile",IDC_STATIC,14,71,50,8 + EDITTEXT IDC_EDIT_PROGRAMFILES,64,69,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_PROGRAMFILES,200,68,46,14 + LTEXT "Program Files",IDC_STATIC,14,89,50,8 + EDITTEXT IDC_EDIT_PROFILE,64,87,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_PROFILE,200,86,46,14 + LTEXT "Path",IDC_STATIC,14,107,50,8 + EDITTEXT IDC_EDIT_PATH,64,105,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Add...",IDC_BUTTON_PATH,200,104,46,14 + GROUPBOX "Outras unidades",IDC_STATIC,7,125,246,100 + LISTBOX IDC_LIST_DRIVES,14,136,232,64,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Adicionar...",IDC_BUTTON_ADD,14,205,37,14 + PUSHBUTTON "Remover",IDC_BUTTON_REMOVE,55,205,37,14 + PUSHBUTTON "Editar...",IDC_BUTTON_EDIT,97,205,37,14 + PUSHBUTTON "Autodetectar...",IDC_BUTTON_AUTODETECT,197,205,49,14 LTEXT "AVISO: Parece que você não tem uma unidade C definida. Clique em 'Adicionar' para adicionar uma.", IDS_DRIVE_NO_C, 7,223,250,110 END @@ -133,7 +152,7 @@ LTEXT "Série:",IDC_STATIC_SERIAL,33,127,29,12 EDITTEXT IDC_EDIT_SERIAL,63,124,78,13,ES_AUTOHSCROLL LTEXT "Tipo:",IDC_STATIC,5,54,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_DRIVEPATH,31,5,117,13,ES_AUTOHSCROLL LTEXT "Caminho:",IDC_STATIC,5,10,20,9 COMBOBOX IDC_COMBO_LETTER,31,20,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -165,4 +184,10 @@ IDS_TAB_GENERAL "Geral" IDS_TAB_DLLS "Bibliotecas" IDS_TAB_DRIVES "Unidades" + IDS_WINDOWS "Choose your main Windows directory..." + IDS_SYSTEM "Choose your Windows system directory..." + IDS_TEMP "Choose your Windows temp directory..." + IDS_PROFILE "Choose your Windows profile directory..." + IDS_PROGRAMFILES "Choose your Windows program files directory..." + IDS_PATH "Choose directory that you want to add to PATH..." END Index: programs/winecfg/Ru.rc =================================================================== RCS file: /home/wine/wine/programs/winecfg/Ru.rc,v retrieving revision 1.9 diff -u -r1.9 Ru.rc --- programs/winecfg/Ru.rc 30 Jul 2004 04:19:11 -0000 1.9 +++ programs/winecfg/Ru.rc 16 Aug 2004 19:08:11 -0000 @@ -128,13 +128,32 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Sans Serif" BEGIN - GROUPBOX "Äðóãèå äèñêè",IDC_STATIC,7,107,246,112 - LISTBOX IDC_LIST_DRIVES,14,118,232,76,LBS_SORT | LBS_NOINTEGRALHEIGHT | + GROUPBOX "Path settings",IDC_STATIC,7,4,246,120 + LTEXT "Windows",IDC_STATIC,14,17,50,8 + EDITTEXT IDC_EDIT_WINDOWS,64,15,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_WINDOWS,200,14,46,14 + LTEXT "System",IDC_STATIC,14,35,50,8 + EDITTEXT IDC_EDIT_SYSTEM,64,33,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_SYSTEM,200,32,46,14 + LTEXT "Temp",IDC_STATIC,14,53,50,8 + EDITTEXT IDC_EDIT_TEMP,64,51,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_TEMP,200,50,46,14 + LTEXT "Profile",IDC_STATIC,14,71,50,8 + EDITTEXT IDC_EDIT_PROGRAMFILES,64,69,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_PROGRAMFILES,200,68,46,14 + LTEXT "Program Files",IDC_STATIC,14,89,50,8 + EDITTEXT IDC_EDIT_PROFILE,64,87,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Browse...",IDC_BUTTON_PROFILE,200,86,46,14 + LTEXT "Path",IDC_STATIC,14,107,50,8 + EDITTEXT IDC_EDIT_PATH,64,105,130,12,ES_AUTOHSCROLL + PUSHBUTTON "Add...",IDC_BUTTON_PATH,200,104,46,14 + GROUPBOX "Äðóãèå äèñêè",IDC_STATIC,7,125,246,100 + LISTBOX IDC_LIST_DRIVES,14,136,232,64,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Äîáàâèòü...",IDC_BUTTON_ADD,14,199,37,14 - PUSHBUTTON "Óäàëèòü",IDC_BUTTON_REMOVE,55,199,37,14 - PUSHBUTTON "Ïðàâêà...",IDC_BUTTON_EDIT,97,199,37,14 - PUSHBUTTON "Àâòîîïðåäåëåíèå...",IDC_BUTTON_AUTODETECT,197,199,49,14 + PUSHBUTTON "Äîáàâèòü...",IDC_BUTTON_ADD,14,205,37,14 + PUSHBUTTON "Óäàëèòü",IDC_BUTTON_REMOVE,55,205,37,14 + PUSHBUTTON "Ïðàâêà...",IDC_BUTTON_EDIT,97,205,37,14 + PUSHBUTTON "Àâòîîïðåäåëåíèå...",IDC_BUTTON_AUTODETECT,197,205,49,14 END IDD_DRIVE_EDIT2 DIALOG DISCARDABLE 0, 0, 272, 153 @@ -148,7 +167,7 @@ EDITTEXT IDC_EDIT_LABEL,63,114,78,13,ES_AUTOHSCROLL LTEXT "Ìåòêà:",IDC_STATIC_LABEL,33,117,29,12 LTEXT "Òèï:",IDC_STATIC,5,54,21,10 - EDITTEXT IDC_EDIT_PATH,31,5,117,13,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_DRIVEPATH,31,5,117,13,ES_AUTOHSCROLL LTEXT "Ïóòü:",IDC_STATIC,5,9,20,9 LTEXT "Èìåíà:",IDC_STATIC,5,39,25,9 EDITTEXT IDC_EDIT_SERIAL,63,129,78,13,ES_AUTOHSCROLL @@ -173,4 +192,10 @@ IDS_TAB_GENERAL "Îáùèå" IDS_TAB_DLLS "Áèáëèîòåêè" IDS_TAB_DRIVES "Äèñêè" + IDS_WINDOWS "Choose your main Windows directory..." + IDS_SYSTEM "Choose your Windows system directory..." + IDS_TEMP "Choose your Windows temp directory..." + IDS_PROFILE "Choose your Windows profile directory..." + IDS_PROGRAMFILES "Choose your Windows program files directory..." + IDS_PATH "Choose directory that you want to add to PATH..." END Index: programs/winecfg/drive.c =================================================================== RCS file: /home/wine/wine/programs/winecfg/drive.c,v retrieving revision 1.15 diff -u -r1.15 drive.c --- programs/winecfg/drive.c 13 May 2004 05:17:41 -0000 1.15 +++ programs/winecfg/drive.c 16 Aug 2004 19:08:12 -0000 @@ -47,6 +47,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); +#define SESSION_MANAGER_KEY "System\\CurrentControlSet\\Control\\Session Manager\\Environment" +#define PATH_WINDOWS_DEFAULT "c:\\windows" +#define PATH_SYSTEM_DEFAULT "c:\\windows\\system" +#define PATH_TEMP_DEFAULT "c:\\windows\\temp" +#define PATH_PROGRAMFILES_DEFAULT "c:\\Program Files" +#define PATH_PROFILE_DEFAULT "c:\\windows\\profiles\\Administrator" +#define PATH_DEFAULT "c:\\windows\\system;c:\\windows" + typedef struct drive_entry_s { char letter; @@ -469,7 +477,7 @@ path = editDriveEntry->unixpath; if (path) { WINE_TRACE("set path control text to '%s'\n", path); - SetWindowText(GetDlgItem(dialog, IDC_EDIT_PATH), path); + SetWindowText(GetDlgItem(dialog, IDC_EDIT_DRIVEPATH), path); } else WINE_WARN("no Path field?\n"); /* drive type */ @@ -545,7 +553,7 @@ if (label) free(label); break; } - case IDC_EDIT_PATH: { + case IDC_EDIT_DRIVEPATH: { char *path = getDialogItemText(hDlg, controlID); if (!path) path = strdup("fake_windows"); /* default to assuming fake_windows in the .wine directory */ WINE_TRACE("got path from control of '%s'\n", path); @@ -696,6 +704,30 @@ DialogBoxParam(NULL, MAKEINTRESOURCE(IDD_DRIVE_EDIT), NULL, (DLGPROC) DriveEditDlgProc, (LPARAM) &(drives[getDrive(newLetter)])); } +LPSTR browseForFolder(HWND hwnd, DWORD title_id) +{ + BROWSEINFO binfo; + LPSTR ret; + LPSTR title[100]; + + ret = (LPSTR)malloc(255); + LoadString((HMODULE)GetWindowLong(hwnd, GWL_HINSTANCE), title_id, (LPBYTE)title, 100); + + binfo.hwndOwner = hwnd; + binfo.pidlRoot = NULL; + binfo.pszDisplayName = ret; + binfo.lpszTitle = (LPCSTR)title; + binfo.ulFlags = 0; + binfo.lpfn = NULL; + binfo.lParam = 0; + binfo.iImage = 1; + + if(SHBrowseForFolder(&binfo)) + return ret; + + return NULL; +} + void onDriveInitDialog(void) { char *pDevices, *pDev; @@ -791,6 +823,82 @@ free(pDev); } +void onPathInitDialog(HWND hwnd) +{ + int ret; + HKEY hkey; + LONG size; + char buf[1024]; + + ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SESSION_MANAGER_KEY, 0, KEY_QUERY_VALUE, &hkey); + if(ret != ERROR_SUCCESS) + { + WINE_TRACE("Could not open registry key. Setting default values.\n"); + SetDlgItemText(hwnd, IDC_EDIT_WINDOWS, PATH_WINDOWS_DEFAULT); + SetDlgItemText(hwnd, IDC_EDIT_SYSTEM, PATH_SYSTEM_DEFAULT); + SetDlgItemText(hwnd, IDC_EDIT_SYSTEM, PATH_TEMP_DEFAULT); + SetDlgItemText(hwnd, IDC_EDIT_PROFILE, PATH_PROFILE_DEFAULT); + SetDlgItemText(hwnd, IDC_EDIT_PROGRAMFILES, PATH_PROGRAMFILES_DEFAULT); + SetDlgItemText(hwnd, IDC_EDIT_WINDOWS, PATH_DEFAULT); + } else { + size = sizeof(buf); + if(RegQueryValueEx(hkey,"WINDIR",NULL,NULL,(LPBYTE)buf,&size) == ERROR_SUCCESS) + { + SetDlgItemText(hwnd, IDC_EDIT_WINDOWS, buf); + } else { + WINE_TRACE("Could not read windir value. Setting default.\n"); + SetDlgItemText(hwnd, IDC_EDIT_WINDOWS, PATH_WINDOWS_DEFAULT); + } + + size = sizeof(buf); + if(RegQueryValueEx(hkey,"WINSYSDIR",NULL,NULL,(LPBYTE)buf,&size) == ERROR_SUCCESS) + { + SetDlgItemText(hwnd, IDC_EDIT_SYSTEM, buf); + } else { + WINE_TRACE("Could not read winsysdir value. Setting default.\n"); + SetDlgItemText(hwnd, IDC_EDIT_SYSTEM, PATH_SYSTEM_DEFAULT); + } + + size = sizeof(buf); + if(RegQueryValueEx(hkey,"TEMP",NULL,NULL,(LPBYTE)buf,&size) == ERROR_SUCCESS) + { + SetDlgItemText(hwnd, IDC_EDIT_TEMP, buf); + } else { + WINE_TRACE("Could not read temp value. Setting default.\n"); + SetDlgItemText(hwnd, IDC_EDIT_TEMP, PATH_TEMP_DEFAULT); + } + + size = sizeof(buf); + if(RegQueryValueEx(hkey,"UserProfile",NULL,NULL,(LPBYTE)buf,&size) == ERROR_SUCCESS) + { + SetDlgItemText(hwnd, IDC_EDIT_PROFILE, buf); + } else { + WINE_TRACE("Could not read profile value. Setting default.\n"); + SetDlgItemText(hwnd, IDC_EDIT_PROFILE, PATH_PROFILE_DEFAULT); + } + + size = sizeof(buf); + if(RegQueryValueEx(hkey,"ProgramFiles", NULL,NULL,(LPBYTE)buf,&size) == ERROR_SUCCESS) + { + SetDlgItemText(hwnd, IDC_EDIT_PROGRAMFILES, buf); + } else { + WINE_TRACE("Could not read ProgramFiles value. Setting default.\n"); + SetDlgItemText(hwnd, IDC_EDIT_PROGRAMFILES, PATH_PROGRAMFILES_DEFAULT); + } + + size = sizeof(buf); + if(RegQueryValueEx(hkey,"PATH",NULL,NULL,(LPBYTE)buf,&size) == ERROR_SUCCESS) + { + SetDlgItemText(hwnd, IDC_EDIT_PATH, buf); + } else { + WINE_TRACE("Could not read PATH value. Setting default.\n"); + SetDlgItemText(hwnd, IDC_EDIT_PATH, PATH_DEFAULT); + } + + RegCloseKey(hkey); + } +} + void applyDriveChanges(void) { @@ -1004,16 +1112,92 @@ } } +void applyPathChanges(HWND hwnd) +{ + int ret; + HKEY hkey; + LONG size; + char *buf; + + ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SESSION_MANAGER_KEY, 0, KEY_SET_VALUE, &hkey); + if(ret != ERROR_SUCCESS) + { + WINE_ERR("Could not open registry key.\n"); + return; + } + + buf = getDialogItemText(hwnd,IDC_EDIT_PROGRAMFILES); + if(buf) + { + size = strlen(buf); + if(RegSetValueEx(hkey, "ProgramFiles", 0, REG_SZ, buf, size) != ERROR_SUCCESS) + WINE_ERR("Could not set ProgramFiles value.\n"); + free(buf); + } + + buf = getDialogItemText(hwnd,IDC_EDIT_WINDOWS); + if(buf) + { + size = strlen(buf); + if(RegSetValueEx(hkey, "SystemRoot", 0, REG_SZ, buf, size) != ERROR_SUCCESS) + WINE_ERR("Could not set SystemRoot value.\n"); + if(RegSetValueEx(hkey, "WinDir", 0, REG_SZ, buf, size) != ERROR_SUCCESS) + WINE_ERR("Could not set WinDir value.\n"); + free(buf); + } + + buf = getDialogItemText(hwnd,IDC_EDIT_TEMP); + if(buf) + { + size = strlen(buf); + if(RegSetValueEx(hkey, "TEMP", 0, REG_SZ, buf, size) != ERROR_SUCCESS) + WINE_ERR("Could not set TEMP value.\n"); + if(RegSetValueEx(hkey, "TMP", 0, REG_SZ, buf, size) != ERROR_SUCCESS) + WINE_ERR("Could not set TMP value.\n"); + free(buf); + } + + buf = getDialogItemText(hwnd,IDC_EDIT_PROFILE); + if(buf) + { + size = strlen(buf); + if(RegSetValueEx(hkey, "UserProfile", 0, REG_SZ, buf, size) != ERROR_SUCCESS) + WINE_ERR("Could not set UserProfile value.\n"); + free(buf); + } + + buf = getDialogItemText(hwnd,IDC_EDIT_SYSTEM); + if(buf) + { + size = strlen(buf); + if(RegSetValueEx(hkey, "WINSYSDIR", 0, REG_SZ, buf, size) != ERROR_SUCCESS) + WINE_ERR("Could not set WINSYSDIR value.\n"); + free(buf); + } + + buf = getDialogItemText(hwnd,IDC_EDIT_PATH); + if(buf) + { + size = strlen(buf); + if(RegSetValueEx(hkey, "PATH", 0, REG_SZ, buf, size) != ERROR_SUCCESS) + WINE_ERR("Could not set PATH value.\n"); + free(buf); + } + + RegCloseKey(hkey); +} INT_PTR CALLBACK DriveDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { int nItem; drive_entry_t *pDrive; + LPSTR buf; switch (uMsg) { case WM_INITDIALOG: onDriveInitDialog(); + onPathInitDialog(hDlg); break; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -1033,7 +1217,7 @@ if (HIWORD(wParam) != BN_CLICKED) break; nItem = SendDlgItemMessage(hDlg, IDC_LIST_DRIVES, LB_GETCURSEL, 0, 0); pDrive = (drive_entry_t*)SendDlgItemMessage(hDlg, IDC_LIST_DRIVES, LB_GETITEMDATA, nItem, 0); - freeDrive(pDrive); + freeDrive(pDrive); refreshDriveDlg(driveDlgHandle); break; @@ -1047,16 +1231,68 @@ case IDC_BUTTON_AUTODETECT: WRITEME(hDlg); break; + + case IDC_BUTTON_WINDOWS: + buf = browseForFolder(hDlg, IDS_WINDOWS); + if(!buf) break; + SetDlgItemText(hDlg, IDC_EDIT_WINDOWS, buf); + free(buf); + break; + case IDC_BUTTON_SYSTEM: + buf = browseForFolder(hDlg, IDS_SYSTEM); + if(!buf) break; + SetDlgItemText(hDlg, IDC_EDIT_SYSTEM, buf); + free(buf); + break; + case IDC_BUTTON_TEMP: + buf = browseForFolder(hDlg, IDS_TEMP); + if(!buf) break; + SetDlgItemText(hDlg, IDC_EDIT_TEMP, buf); + free(buf); + break; + case IDC_BUTTON_PROFILE: + buf = browseForFolder(hDlg, IDS_PROFILE); + if(!buf) break; + SetDlgItemText(hDlg, IDC_EDIT_PROFILE, buf); + free(buf); + break; + case IDC_BUTTON_PROGRAMFILES: + buf = browseForFolder(hDlg, IDS_PROGRAMFILES); + if(!buf) break; + SetDlgItemText(hDlg, IDC_EDIT_PROGRAMFILES, buf); + free(buf); + break; + case IDC_BUTTON_PATH: + { + CHAR* buf2; + int len; + HWND item; + + buf = browseForFolder(hDlg, IDS_PROGRAMFILES); + if(!buf) break; + + item = GetDlgItem(hDlg, IDC_EDIT_PATH); + len = GetWindowTextLength(item)+1; + buf2 = malloc(len+strlen(buf)+2); + GetWindowText(item, buf2, len); + strcat(buf2,";"); + strcat(buf2,buf); + SetDlgItemText(hDlg, IDC_EDIT_PATH, buf2); + free(buf); + free(buf2); + break; + } } break; case WM_NOTIFY: switch(((LPNMHDR)lParam)->code) { case PSN_KILLACTIVE: - WINE_TRACE("PSN_KILLACTIVE\n"); + WINE_TRACE("PSN_KILLACTIVE\n"); SetWindowLong(hDlg, DWL_MSGRESULT, FALSE); break; case PSN_APPLY: - applyDriveChanges(); + applyDriveChanges(); + applyPathChanges(hDlg); SetWindowLong(hDlg, DWL_MSGRESULT, PSNRET_NOERROR); break; case PSN_SETACTIVE: Index: programs/winecfg/resource.h =================================================================== RCS file: /home/wine/wine/programs/winecfg/resource.h,v retrieving revision 1.17 diff -u -r1.17 resource.h --- programs/winecfg/resource.h 30 Jul 2004 01:35:13 -0000 1.17 +++ programs/winecfg/resource.h 16 Aug 2004 19:08:12 -0000 @@ -94,7 +94,7 @@ #define ID_BUTTON_CANCEL 1058 #define ID_BUTTON_OK 1059 #define IDC_EDIT_LABEL 1060 -#define IDC_EDIT_PATH 1061 +#define IDC_EDIT_DRIVEPATH 1061 #define IDC_EDIT_SERIAL 1062 #define IDC_COMBO_LETTER 1063 #define IDC_COMBO_TYPE 1065 @@ -110,6 +110,24 @@ #define IDS_DRIVE_NO_C 1075 #define IDC_BUTTON_SHOW_HIDE_ADVANCED 1076 #define IDC_STATIC_TYPE 1077 +#define IDC_EDIT_WINDOWS 1078 +#define IDC_BUTTON_WINDOWS 1079 +#define IDS_WINDOWS 1080 +#define IDC_EDIT_SYSTEM 1081 +#define IDC_BUTTON_SYSTEM 1082 +#define IDS_SYSTEM 1083 +#define IDC_EDIT_TEMP 1084 +#define IDC_BUTTON_TEMP 1085 +#define IDS_TEMP 1086 +#define IDC_EDIT_PROFILE 1087 +#define IDC_BUTTON_PROFILE 1088 +#define IDS_PROFILE 1089 +#define IDC_EDIT_PROGRAMFILES 1090 +#define IDC_BUTTON_PROGRAMFILES 1091 +#define IDS_PROGRAMFILES 1092 +#define IDC_EDIT_PATH 1093 +#define IDC_BUTTON_PATH 1094 +#define IDS_PATH 1095 /* graphics */ #define IDC_ENABLE_MANAGED 1100 Index: programs/winecfg/Makefile.in =================================================================== RCS file: /home/wine/wine/programs/winecfg/Makefile.in,v retrieving revision 1.11 diff -u -r1.11 Makefile.in --- programs/winecfg/Makefile.in 4 May 2004 02:56:46 -0000 1.11 +++ programs/winecfg/Makefile.in 16 Aug 2004 19:11:05 -0000 @@ -4,7 +4,7 @@ VPATH = @srcdir@ MODULE = winecfg.exe APPMODE = -mwindows -IMPORTS = comdlg32 comctl32 user32 advapi32 kernel32 +IMPORTS = comdlg32 comctl32 user32 advapi32 kernel32 shell32 C_SRCS = \ appdefaults.c \