17 Jun
2005
17 Jun
'05
8:32 p.m.
remove tabs for proper indenting
Modified: trunk/reactos/subsys/system/winefile/resource.h
Modified: trunk/reactos/subsys/system/winefile/winefile.h
_____
Modified: trunk/reactos/subsys/system/winefile/resource.h
--- trunk/reactos/subsys/system/winefile/resource.h 2005-06-17
20:30:57 UTC (rev 16016)
+++ trunk/reactos/subsys/system/winefile/resource.h 2005-06-17
20:32:22 UTC (rev 16017)
@@ -19,69 +19,69 @@
/* images */
-#define IDB_TOOLBAR 100
-#define IDB_DRIVEBAR 101
-#define IDB_IMAGES 102
-#define IDI_WINEFILE 100
+#define IDB_TOOLBAR 100
+#define IDB_DRIVEBAR 101
+#define IDB_IMAGES 102
+#define IDI_WINEFILE 100
/* accellerators and menus */
-#define IDA_WINEFILE 101
-#define IDM_WINEFILE 102
+#define IDA_WINEFILE 101
+#define IDM_WINEFILE 102
/* dialogs */
-#define IDD_EXECUTE 103
-#define IDD_SELECT_DESTINATION 104
-#define IDD_DIALOG_VIEW_TYPE 105
-#define IDD_DIALOG_PROPERTIES 106
+#define IDD_EXECUTE 103
+#define IDD_SELECT_DESTINATION 104
+#define IDD_DIALOG_VIEW_TYPE 105
+#define IDD_DIALOG_PROPERTIES 106
/* control ids */
-#define ID_ACTIVATE 101
-#define ID_EXECUTE 105
-#define ID_FILE_MOVE 106
-#define ID_FILE_COPY 107
-#define ID_FILE_DELETE 108
-#define ID_FILE_EXIT 115
-#define ID_FORMAT_DISK 203
-#define ID_CONNECT_NETWORK_DRIVE 252
-#define ID_DISCONNECT_NETWORK_DRIVE 253
-#define ID_VIEW_NAME 401
-#define ID_VIEW_ALL_ATTRIBUTES 402
-#define ID_VIEW_SELECTED_ATTRIBUTES 403
-#define ID_VIEW_SORT_NAME 404
-#define ID_VIEW_SORT_TYPE 405
-#define ID_VIEW_SORT_SIZE 406
-#define ID_VIEW_SORT_DATE 407
-#define ID_VIEW_FILTER 409
-#define ID_VIEW_SPLIT 414
-#define ID_SELECT_FONT 510
-#define ID_VIEW_TOOL_BAR 508
-#define ID_VIEW_DRIVE_BAR 507
-#define ID_VIEW_STATUSBAR 503
+#define ID_ACTIVATE 101
+#define ID_EXECUTE 105
+#define ID_FILE_MOVE 106
+#define ID_FILE_COPY 107
+#define ID_FILE_DELETE 108
+#define ID_FILE_EXIT 115
+#define ID_FORMAT_DISK 203
+#define ID_CONNECT_NETWORK_DRIVE 252
+#define ID_DISCONNECT_NETWORK_DRIVE 253
+#define ID_VIEW_NAME 401
+#define ID_VIEW_ALL_ATTRIBUTES 402
+#define ID_VIEW_SELECTED_ATTRIBUTES 403
+#define ID_VIEW_SORT_NAME 404
+#define ID_VIEW_SORT_TYPE 405
+#define ID_VIEW_SORT_SIZE 406
+#define ID_VIEW_SORT_DATE 407
+#define ID_VIEW_FILTER 409
+#define ID_VIEW_SPLIT 414
+#define ID_SELECT_FONT 510
+#define ID_VIEW_TOOL_BAR 508
+#define ID_VIEW_DRIVE_BAR 507
+#define ID_VIEW_STATUSBAR 503
-#define ID_ABOUT 1803
-#define ID_REFRESH 1704
-#define ID_EDIT_PROPERTIES 57656
-#define ID_WINDOW_NEW 0xE130
-#define ID_WINDOW_ARRANGE 0xE131
-#define ID_WINDOW_CASCADE 0xE132
-#define ID_WINDOW_TILE_HORZ 0xE133
-#define ID_WINDOW_TILE_VERT 0xE134
-#define ID_WINDOW_SPLIT 0xE135
-#define ID_HELP_USING 0xE144
-#define ID_HELP 0xE146
+#define ID_ABOUT 1803
+#define ID_REFRESH 1704
+#define ID_EDIT_PROPERTIES 57656
+#define ID_WINDOW_NEW 0xE130
+#define ID_WINDOW_ARRANGE 0xE131
+#define ID_WINDOW_CASCADE 0xE132
+#define ID_WINDOW_TILE_HORZ 0xE133
+#define ID_WINDOW_TILE_VERT 0xE134
+#define ID_WINDOW_SPLIT 0xE135
+#define ID_HELP_USING 0xE144
+#define ID_HELP 0xE146
-#define IDC_VIEW_PATTERN 1000
-#define IDC_VIEW_TYPE_DIRECTORIES 1001
-#define IDC_VIEW_TYPE_PROGRAMS 1002
-#define IDC_VIEW_TYPE_DOCUMENTS 1003
-#define IDC_VIEW_TYPE_OTHERS 1004
-#define IDC_VIEW_TYPE_HIDDEN 1005
+#define IDC_VIEW_PATTERN 1000
+#define IDC_VIEW_TYPE_DIRECTORIES 1001
+#define IDC_VIEW_TYPE_PROGRAMS 1002
+#define IDC_VIEW_TYPE_DOCUMENTS 1003
+#define IDC_VIEW_TYPE_OTHERS 1004
+#define IDC_VIEW_TYPE_HIDDEN 1005
#define IDC_STATIC_PROP_FILENAME 1006
#define IDC_STATIC_PROP_PATH 1007
@@ -90,57 +90,57 @@
#define IDC_STATIC_PROP_COPYRIGHT 1010
#define IDC_STATIC_PROP_SIZE 1011
#define IDC_CHECK_READONLY 1012
-#define IDC_CHECK_ARCHIVE 1013
-#define IDC_CHECK_COMPRESSED 1014
-#define IDC_CHECK_HIDDEN 1015
-#define IDC_CHECK_SYSTEM 1016
-#define IDC_LIST_PROP_VERSION_TYPES 1017
-#define IDC_LIST_PROP_VERSION_VALUES 1018
+#define IDC_CHECK_ARCHIVE 1013
+#define IDC_CHECK_COMPRESSED 1014
+#define IDC_CHECK_HIDDEN 1015
+#define IDC_CHECK_SYSTEM 1016
+#define IDC_LIST_PROP_VERSION_TYPES 1017
+#define IDC_LIST_PROP_VERSION_VALUES 1018
/* winefile extensions */
-#define ID_ABOUT_WINE 0x8000
-#define ID_LICENSE 0x8001
-#define ID_NO_WARRANTY 0x8002
-#define ID_WINDOW_AUTOSORT 0x8003
-#define ID_VIEW_FULLSCREEN 0x8004
-#define ID_PREFERRED_SIZES 0x8005
+#define ID_ABOUT_WINE 0x8000
+#define ID_LICENSE 0x8001
+#define ID_NO_WARRANTY 0x8002
+#define ID_WINDOW_AUTOSORT 0x8003
+#define ID_VIEW_FULLSCREEN 0x8004
+#define ID_PREFERRED_SIZES 0x8005
/* string table */
-#define IDS_FONT_SEL_DLG_NAME 1101
-#define IDS_FONT_SEL_ERROR 1103
+#define IDS_FONT_SEL_DLG_NAME 1101
+#define IDS_FONT_SEL_ERROR 1103
-#define IDS_WINEFILE 1200
-#define IDS_ERROR 1201
-#define IDS_ROOT_FS 1202
-#define IDS_UNIXFS 1203
-#define IDS_DESKTOP 1204
-#define IDS_SHELL 1205
-#define IDS_TITLEFMT 1206
-#define IDS_NO_IMPL 1207
-#define IDS_WINE 1208
-#define IDS_WINE_FILE 1209
+#define IDS_WINEFILE 1200
+#define IDS_ERROR 1201
+#define IDS_ROOT_FS 1202
+#define IDS_UNIXFS 1203
+#define IDS_DESKTOP 1204
+#define IDS_SHELL 1205
+#define IDS_TITLEFMT 1206
+#define IDS_NO_IMPL 1207
+#define IDS_WINE 1208
+#define IDS_WINE_FILE 1209
-#define IDS_COL_NAME 1210
-#define IDS_COL_SIZE 1211
-#define IDS_COL_CDATE 1212
-#define IDS_COL_ADATE 1213
-#define IDS_COL_MDATE 1214
-#define IDS_COL_IDX 1215
-#define IDS_COL_LINKS 1216
-#define IDS_COL_ATTR 1217
-#define IDS_COL_SEC 1218
-#define IDS_FREE_SPACE_FMT 1219
+#define IDS_COL_NAME 1210
+#define IDS_COL_SIZE 1211
+#define IDS_COL_CDATE 1212
+#define IDS_COL_ADATE 1213
+#define IDS_COL_MDATE 1214
+#define IDS_COL_IDX 1215
+#define IDS_COL_LINKS 1216
+#define IDS_COL_ATTR 1217
+#define IDS_COL_SEC 1218
+#define IDS_FREE_SPACE_FMT 1219
/* range for drive bar command ids: 0x9000..0x90FF */
#ifdef __WINE__
-#define ID_DRIVE_UNIX_FS 0x9000
+#define ID_DRIVE_UNIX_FS 0x9000
#endif
-#define ID_DRIVE_SHELL_NS 0x9001
+#define ID_DRIVE_SHELL_NS 0x9001
-#define ID_DRIVE_FIRST 0x9002
+#define ID_DRIVE_FIRST 0x9002
_____
Modified: trunk/reactos/subsys/system/winefile/winefile.h
--- trunk/reactos/subsys/system/winefile/winefile.h 2005-06-17
20:30:57 UTC (rev 16016)
+++ trunk/reactos/subsys/system/winefile/winefile.h 2005-06-17
20:32:22 UTC (rev 16017)
@@ -35,7 +35,7 @@
#include <commdlg.h>
#ifdef UNICODE
-#define _UNICODE
+#define _UNICODE
#include <wchar.h>
#endif
#include <tchar.h>
@@ -46,14 +46,14 @@
#include <locale.h>
#ifndef __WINE__
-#include <malloc.h> /* for alloca() */
+#include <malloc.h> /* for alloca() */
#endif
-#include <shellapi.h> /* for ShellExecute() */
-#include <shlobj.h> /* for SHFormatDrive() */
+#include <shellapi.h> /* for ShellExecute() */
+#include <shlobj.h> /* for SHFormatDrive() */
#ifndef _NO_EXTENSIONS
-#define _SHELL_FOLDERS
+#define _SHELL_FOLDERS
#endif /* _NO_EXTENSIONS */
#ifndef FILE_ATTRIBUTE_NOT_CONTENT_INDEXED
@@ -64,81 +64,81 @@
#endif
-#ifdef _DEBUG
-#define ASSERT(x) {if (!(x)) DebugBreak();}
+#ifdef _DEBUG
+#define ASSERT(x) {if (!(x)) DebugBreak();}
#else
-#define ASSERT(x) /* nothing */
+#define ASSERT(x) /* nothing */
#endif
-#define BUFFER_LEN 1024
+#define BUFFER_LEN 1024
enum IMAGE {
- IMG_NONE=-1, IMG_FILE=0, IMG_DOCUMENT,
IMG_EXECUTABLE,
- IMG_FOLDER, IMG_OPEN_FOLDER,
IMG_FOLDER_PLUS,IMG_OPEN_PLUS, IMG_OPEN_MINUS,
- IMG_FOLDER_UP, IMG_FOLDER_CUR
+ IMG_NONE=-1, IMG_FILE=0, IMG_DOCUMENT, IMG_EXECUTABLE,
+ IMG_FOLDER, IMG_OPEN_FOLDER, IMG_FOLDER_PLUS,IMG_OPEN_PLUS,
IMG_OPEN_MINUS,
+ IMG_FOLDER_UP, IMG_FOLDER_CUR
};
-#define IMAGE_WIDTH 16
-#define IMAGE_HEIGHT 13
-#define SPLIT_WIDTH 5
-#define TREE_LINE_DX 3
+#define IMAGE_WIDTH 16
+#define IMAGE_HEIGHT 13
+#define SPLIT_WIDTH 5
+#define TREE_LINE_DX 3
-#define IDW_STATUSBAR 0x100
-#define IDW_TOOLBAR 0x101
-#define IDW_DRIVEBAR 0x102
-#define IDW_FIRST_CHILD 0xC000 /*0x200*/
+#define IDW_STATUSBAR 0x100
+#define IDW_TOOLBAR 0x101
+#define IDW_DRIVEBAR 0x102
+#define IDW_FIRST_CHILD 0xC000 /*0x200*/
-#define IDW_TREE_LEFT 3
-#define IDW_TREE_RIGHT 6
-#define IDW_HEADER_LEFT 2
-#define IDW_HEADER_RIGHT 5
+#define IDW_TREE_LEFT 3
+#define IDW_TREE_RIGHT 6
+#define IDW_HEADER_LEFT 2
+#define IDW_HEADER_RIGHT 5
-#define WM_DISPATCH_COMMAND 0xBF80
+#define WM_DISPATCH_COMMAND 0xBF80
-#define COLOR_COMPRESSED RGB(0,0,255)
-#define COLOR_SELECTION RGB(0,0,128)
+#define COLOR_COMPRESSED RGB(0,0,255)
+#define COLOR_SELECTION RGB(0,0,128)
#ifdef _NO_EXTENSIONS
-#define COLOR_SPLITBAR WHITE_BRUSH
+#define COLOR_SPLITBAR WHITE_BRUSH
#else
-#define COLOR_SPLITBAR LTGRAY_BRUSH
+#define COLOR_SPLITBAR LTGRAY_BRUSH
#endif
-#define FRM_CALC_CLIENT 0xBF83
-#define Frame_CalcFrameClient(hwnd, prt) ((BOOL)SNDMSG(hwnd,
FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt))
+#define FRM_CALC_CLIENT 0xBF83
+#define Frame_CalcFrameClient(hwnd, prt) ((BOOL)SNDMSG(hwnd,
FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt))
typedef struct
{
- HANDLE hInstance;
- HACCEL haccel;
- ATOM hframeClass;
- HWND hwndParent;
+ HANDLE hInstance;
+ HACCEL haccel;
+ ATOM hframeClass;
+ HWND hwndParent;
- HWND hMainWnd;
- HMENU hMenuFrame;
- HMENU hWindowsMenu;
- HMENU hLanguageMenu;
- HMENU hMenuView;
- HMENU hMenuOptions;
- HWND hmdiclient;
- HWND hstatusbar;
- HWND htoolbar;
- HWND hdrivebar;
- HFONT hfont;
+ HWND hMainWnd;
+ HMENU hMenuFrame;
+ HMENU hWindowsMenu;
+ HMENU hLanguageMenu;
+ HMENU hMenuView;
+ HMENU hMenuOptions;
+ HWND hmdiclient;
+ HWND hstatusbar;
+ HWND htoolbar;
+ HWND hdrivebar;
+ HFONT hfont;
- TCHAR num_sep;
- SIZE spaceSize;
+ TCHAR num_sep;
+ SIZE spaceSize;
HIMAGELIST himl;
- TCHAR drives[BUFFER_LEN];
- BOOL prescan_node; /*TODO*/
+ TCHAR drives[BUFFER_LEN];
+ BOOL prescan_node; /*TODO*/
#ifdef _SHELL_FOLDERS
- IShellFolder* iDesktop;
- IMalloc* iMalloc;
- UINT cfStrFName;
+ IShellFolder* iDesktop;
+ IMalloc* iMalloc;
+ UINT cfStrFName;
#endif
} WINEFILE_GLOBALS;
7445
days inactive
7445
days old
0 comments
1 participants
participants (1)
-
mf＠svn.reactos.com