winecfg: remove the FileSystem option
Dimitrie O. Paun
dpaun at rogers.com
Fri Mar 12 08:45:21 CST 2004
This no longer exists, Alexander removed it a few days ago.
ChangeLog
Remove the FileSystem option from the drive configuration.
Index: programs/winecfg/En.rc
===================================================================
RCS file: /var/cvs/wine/programs/winecfg/En.rc,v
retrieving revision 1.18
diff -u -r1.18 En.rc
--- programs/winecfg/En.rc 17 Feb 2004 20:26:15 -0000 1.18
+++ programs/winecfg/En.rc 11 Mar 2004 15:01:56 -0000
@@ -153,8 +153,6 @@
COMBOBOX IDC_COMBO_LETTER,31,20,78,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Browse...",IDC_BUTTON_BROWSE_PATH,154,5,40,13
- COMBOBOX IDC_COMBO_NAMES,31,36,78,60,CBS_DROPDOWNLIST |
- WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO_TYPE,31,52,78,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "Autodetect from Device:",IDC_RADIO_AUTODETECT,"Button",
Index: programs/winecfg/Es.rc
===================================================================
RCS file: /var/cvs/wine/programs/winecfg/Es.rc,v
retrieving revision 1.6
diff -u -r1.6 Es.rc
--- programs/winecfg/Es.rc 7 Feb 2004 01:01:34 -0000 1.6
+++ programs/winecfg/Es.rc 12 Mar 2004 14:42:46 -0000
@@ -155,8 +155,6 @@
COMBOBOX IDC_COMBO_LETTER,31,20,78,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Examinar...",IDC_BUTTON_BROWSE_PATH,154,5,40,13
- COMBOBOX IDC_COMBO_NAMES,31,36,78,60,CBS_DROPDOWNLIST |
- WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO_TYPE,31,52,78,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "Autodetectar desde dispositivo:",IDC_RADIO_AUTODETECT,"Button",
Index: programs/winecfg/Pt.rc
===================================================================
RCS file: /var/cvs/wine/programs/winecfg/Pt.rc,v
retrieving revision 1.7
diff -u -r1.7 Pt.rc
--- programs/winecfg/Pt.rc 7 Feb 2004 01:01:34 -0000 1.7
+++ programs/winecfg/Pt.rc 12 Mar 2004 14:42:55 -0000
@@ -146,8 +146,6 @@
COMBOBOX IDC_COMBO_LETTER,31,20,78,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Procurar...",IDC_BUTTON_BROWSE_PATH,154,5,40,13
- COMBOBOX IDC_COMBO_NAMES,31,36,78,60,CBS_DROPDOWNLIST |
- WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO_TYPE,31,52,78,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "Autodetectar do dispositivo:",IDC_RADIO_AUTODETECT,"Button",
Index: programs/winecfg/Ru.rc
===================================================================
RCS file: /var/cvs/wine/programs/winecfg/Ru.rc,v
retrieving revision 1.4
diff -u -r1.4 Ru.rc
--- programs/winecfg/Ru.rc 7 Feb 2004 01:01:34 -0000 1.4
+++ programs/winecfg/Ru.rc 12 Mar 2004 14:43:06 -0000
@@ -168,8 +168,6 @@
COMBOBOX IDC_COMBO_LETTER,31,20,78,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Îáçîð...",IDC_BUTTON_BROWSE_PATH,154,5,40,13
- COMBOBOX IDC_COMBO_NAMES,31,36,78,60,CBS_DROPDOWNLIST |
- WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO_TYPE,31,52,78,60,CBS_DROPDOWNLIST |
WS_VSCROLL | WS_TABSTOP
CONTROL "Àâòîîïðåäåëèòü ñ óñòðîéñâà:",IDC_RADIO_AUTODETECT,"Button",
Index: programs/winecfg/drive.c
===================================================================
RCS file: /var/cvs/wine/programs/winecfg/drive.c,v
retrieving revision 1.11
diff -u -r1.11 drive.c
--- programs/winecfg/drive.c 20 Jan 2004 02:07:36 -0000 1.11
+++ programs/winecfg/drive.c 11 Mar 2004 15:03:05 -0000
@@ -88,8 +88,8 @@
/* copies a drive configuration branch */
void copyDrive(char srcLetter, char destLetter) {
- char driveSection[sizeof("Drive X")];
- char *path, *label, *type, *serial, *fs;
+ char driveSection[sizeof("Drive X") + 1];
+ char *path, *label, *type, *serial;
WINE_TRACE("srcLetter=%c, destLetter=%c\n", srcLetter, destLetter);
@@ -98,24 +98,21 @@
label = getDriveValue(srcLetter, "Label");
type = getDriveValue(srcLetter, "Type");
serial = getDriveValue(srcLetter, "Serial");
- fs = getDriveValue(srcLetter, "FileSystem");
sprintf(driveSection, "Drive %c", destLetter);
if (path) addTransaction(driveSection, "Path", ACTION_SET, path);
if (label) addTransaction(driveSection, "Label", ACTION_SET, label);
if (type) addTransaction(driveSection, "Type", ACTION_SET, type);
if (serial) addTransaction(driveSection, "Serial", ACTION_SET, serial);
- if (fs) addTransaction(driveSection, "FileSystem", ACTION_SET, fs);
if (path) free(path);
if (label) free(label);
if (type) free(type);
if (serial) free(serial);
- if (fs) free(fs);
}
void removeDrive(char letter) {
- char driveSection[sizeof("Drive X")];
+ char driveSection[sizeof("Drive X") + 1];
sprintf(driveSection, "Drive %c", letter);
addTransaction(driveSection, NULL, ACTION_REMOVE, NULL);
}
@@ -258,14 +255,6 @@
};
#define DRIVE_TYPE_DEFAULT 1
-static code_desc_pair fs_pairs[] = {
- {"win95", "Long file names"},
- {"msdos", "MS-DOS 8 character file names"},
- {"unix", "UNIX file names"}
-};
-
-#define DRIVE_FS_DEFAULT 0
-
void fill_drive_droplist(long mask, char currentLetter, HWND hDlg)
{
@@ -391,7 +380,6 @@
void refreshDriveEditDialog(HWND dialog) {
char *path;
char *type;
- char *fs;
char *serial;
char *label;
char *device;
@@ -424,22 +412,6 @@
} else WINE_WARN("no Type field?\n");
- /* FileSystem name handling */
- fs = getDriveValue(editWindowLetter, "FileSystem");
- if (fs) {
- for( i=0, selection=-1; i < sizeof(fs_pairs)/sizeof(code_desc_pair); i++) {
- SendDlgItemMessage(dialog, IDC_COMBO_NAMES, CB_ADDSTRING, 0,
- (LPARAM) fs_pairs[i].sDesc);
- if(strcasecmp(fs_pairs[i].sCode, fs) == 0){
- selection = i;
- }
- }
-
- if( selection == -1 ) selection = DRIVE_FS_DEFAULT;
- SendDlgItemMessage(dialog, IDC_COMBO_NAMES, CB_SETCURSEL, selection, 0);
- } else WINE_WARN("no FileSystem field?\n");
-
-
/* removeable media properties */
serial = getDriveValue(editWindowLetter, "Serial");
if (serial) {
@@ -475,7 +447,6 @@
if (path) free(path);
if (type) free(type);
- if (fs) free(fs);
if (serial) free(serial);
if (label) free(label);
if (device) free(device);
Index: programs/winecfg/resource.h
===================================================================
RCS file: /var/cvs/wine/programs/winecfg/resource.h,v
retrieving revision 1.13
diff -u -r1.13 resource.h
--- programs/winecfg/resource.h 17 Feb 2004 20:26:15 -0000 1.13
+++ programs/winecfg/resource.h 11 Mar 2004 15:02:05 -0000
@@ -98,7 +98,6 @@
#define IDC_EDIT_PATH 1061
#define IDC_EDIT_SERIAL 1062
#define IDC_COMBO_LETTER 1063
-#define IDC_COMBO_NAMES 1064
#define IDC_COMBO_TYPE 1065
#define IDC_EDIT_DEVICE 1066
#define IDC_BUTTON_BROWSE_PATH 1067
--
Dimi.
More information about the wine-patches
mailing list