[RosApps]

- Add cat, ps and winefile for testing. Building winefile (cmake hacked please check it) is syned up with wine head (winefile.c/h only).

svn path=/trunk/; revision=61241

rosapps/applications/CMakeLists.txt

@@ -6,4 +6,4 @@ add_subdirectory(imagesoft)
 add_subdirectory(notevil)
 add_subdirectory(screensavers)
 add_subdirectory(sysutils)
-#add_subdirectory(winfile)
+add_subdirectory(winfile)

rosapps/applications/sysutils/CMakeLists.txt

@@ -14,4 +14,4 @@ add_subdirectory(kill)
 #add_subdirectory(systeminfo)
 #add_subdirectory(tcat)
 add_subdirectory(tlist)
-#add_subdirectory(utils)
+add_subdirectory(utils)

rosapps/applications/sysutils/utils/CMakeLists.txt

@@ -0,0 +1,16 @@
+#add_subdirectory(binpatch)
+add_subdirectory(cat)
+#add_subdirectory(driver)
+#add_subdirectory(infinst)
+#add_subdirectory(nts2w32err)
+#add_subdirectory(objdir)
+#add_subdirectory(partinfo)
+#add_subdirectory(pice)
+#add_subdirectory(pnpdump)
+add_subdirectory(ps)
+#add_subdirectory(rosperf)
+#add_subdirectory(sdkparse)
+#add_subdirectory(stats)
+#add_subdirectory(theme)
+#add_subdirectory(tickcount)
+

rosapps/applications/sysutils/utils/cat/CMakeLists.txt

@@ -0,0 +1,5 @@
+
+add_executable(cat cat.c)
+set_module_type(cat win32cui)
+add_importlibs(cat ntdll user32 msvcrt kernel32)
+add_cd_file(TARGET cat DESTINATION reactos/bin FOR all)

rosapps/applications/sysutils/utils/ps/CMakeLists.txt

@@ -0,0 +1,5 @@
+
+add_executable(ps ps.c)
+set_module_type(ps win32cui)
+add_importlibs(ps ntdll user32 msvcrt kernel32)
+add_cd_file(TARGET ps DESTINATION reactos/bin FOR all)

rosapps/applications/winfile/CMakeLists.txt

@@ -0,0 +1,14 @@
+
+add_executable(winefile winefile.c rsrc.rc)
+
+set_module_type(winefile win32gui UNICODE)
+add_importlibs(winefile advapi32 gdi32 user32 ws2_32 msimg32 version mpr comctl32 comdlg32 ole32 oleaut32 shell32 shlwapi msvcrt kernel32 ntdll)
+target_link_libraries(winefile uuid)
+
+add_cd_file(TARGET winefile DESTINATION reactos/system32 FOR all)
+
+if(NOT MSVC)
+    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
+    #add_target_compile_flags(winefile "-Wno-format")
+    allow_warnings(winefile)
+endif()

rosapps/applications/winfile/resource.h

@@ -132,6 +132,9 @@
 #define IDS_COL_ATTR                    1217
 #define IDS_COL_SEC                     1218
 #define IDS_FREE_SPACE_FMT              1219
+#define IDS_UNIT_KB                     1220
+#define IDS_UNIT_MB                     1221
+#define IDS_UNIT_GB                     1222
 
 /* range for drive bar command ids: 0x9000..0x90FF */
 

rosapps/applications/winfile/winefile.h

@@ -30,25 +30,17 @@
 
 #define NONAMELESSUNION
 #include <windows.h>
-#include <commctrl.h>
 #include <commdlg.h>
 
-#ifdef UNICODE
-#define _UNICODE
-#endif
+//#ifdef UNICODE
+//#define _UNICODE
+//#endif
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
 #include <locale.h>
 #include <time.h>
 
 #include <shellapi.h>   /* for ShellExecuteW() */
-#include <shlobj.h>     /* for SHFormatDrive() */
-
-#ifndef _NO_EXTENSIONS
-#define _SHELL_FOLDERS
-#endif /* _NO_EXTENSIONS */
+#include <shlobj.h>
 
 #ifndef FILE_ATTRIBUTE_NOT_CONTENT_INDEXED
 #define FILE_ATTRIBUTE_ENCRYPTED            0x00000040
@@ -92,12 +84,7 @@ enum IMAGE {
 
 #define COLOR_COMPRESSED    RGB(0,0,255)
 #define COLOR_SELECTION     RGB(0,0,128)
-
-#ifdef _NO_EXTENSIONS
-#define COLOR_SPLITBAR      WHITE_BRUSH
-#else
 #define COLOR_SPLITBAR      LTGRAY_BRUSH
-#endif
 
 #define FRM_CALC_CLIENT     0xBF83
 #define Frame_CalcFrameClient(hwnd, prt) (SendMessageW(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt))
@@ -135,14 +122,12 @@ typedef struct
   WCHAR     drives[BUFFER_LEN];
   BOOL      prescan_node;   /*TODO*/
   BOOL      saveSettings;
-  
-#ifdef _SHELL_FOLDERS
+
   IShellFolder* iDesktop;
   IMalloc*      iMalloc;
   UINT          cfStrFName;
-#endif
 } WINEFILE_GLOBALS;
 
 extern WINEFILE_GLOBALS Globals;
 
-extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext);
+//extern void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* ext);