[ros-diffs] [fireball] 33051: - Frag fully builds. - Unfrag fails to link (both are still excluded from the build process).

Author: fireball
Date: Sun Apr 20 04:23:29 2008
New Revision: 33051

URL: http://svn.reactos.org/svn/reactos?rev=33051&view=rev
Log:
- Frag fully builds.
- Unfrag fails to link (both are still excluded from the build process).

Modified:
    trunk/rosapps/fraginator/Fraginator.cpp
    trunk/rosapps/fraginator/Fraginator.h
    trunk/rosapps/fraginator/Unfrag.h
    trunk/rosapps/fraginator/fraginator.rbuild

Modified: trunk/rosapps/fraginator/Fraginator.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.cpp?r...
==============================================================================
--- trunk/rosapps/fraginator/Fraginator.cpp [iso-8859-1] (original)
+++ trunk/rosapps/fraginator/Fraginator.cpp [iso-8859-1] Sun Apr 20 04:23:29 2008
@@ -20,7 +20,10 @@
 Defragment *Defrag = NULL;

INT WINAPI
-wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd)
+wWinMain(HINSTANCE HInstance,
+         HINSTANCE hPrev,
+         LPWSTR Cmd,
+         int iCmd)
 {
     INITCOMMONCONTROLSEX InitControls;

Modified: trunk/rosapps/fraginator/Fraginator.h
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Fraginator.h?rev...
==============================================================================
--- trunk/rosapps/fraginator/Fraginator.h [iso-8859-1] (original)
+++ trunk/rosapps/fraginator/Fraginator.h [iso-8859-1] Sun Apr 20 04:23:29 2008
@@ -13,13 +13,13 @@
 #include <commctrl.h>

-int WINAPI  WinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPSTR CmdLine, int ShowCmd);
+//int WINAPI  WinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPSTR CmdLine, int ShowCmd);
 Defragment *StartDefragBox (wstring Drive, DefragType Method);

extern HINSTANCE   GlobalHInstance;
 extern Defragment *Defrag;

-extern INT PASCAL wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd);
+//extern INT PASCAL wWinMain (HINSTANCE HInstance, HINSTANCE HPrevInstance, LPCWSTR CmdLine, INT ShowCmd);

#endif // FRAGINATOR_H

Modified: trunk/rosapps/fraginator/Unfrag.h
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/Unfrag.h?rev=330...
==============================================================================
--- trunk/rosapps/fraginator/Unfrag.h [iso-8859-1] (original)
+++ trunk/rosapps/fraginator/Unfrag.h [iso-8859-1] Sun Apr 20 04:23:29 2008
@@ -28,10 +28,10 @@
 #endif
 #endif

+#include <stdio.h>
+#include <stdlib.h>
 #include <windows.h>
 #include <string>
-#include <stdio.h>
-#include <stdlib.h>
 //#include <initguid.h>
 #include <winioctl.h>

Modified: trunk/rosapps/fraginator/fraginator.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/fraginator.rbuil...
==============================================================================
--- trunk/rosapps/fraginator/fraginator.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/fraginator/fraginator.rbuild [iso-8859-1] Sun Apr 20 04:23:29 2008
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
-<group xmlns:xi="http://www.w3.org/2001/XInclude">
+<!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
    <module name="frag" type="win32gui" installbase="system32" installname="frag.exe" unicode="yes">
    	<include base="frag">.</include>
-		<define name="__USE_W32API" />
    	<define name="WINVER">0x0501</define>
    	<define name="_WIN32_IE">0x0600</define>
    	<library>kernel32</library>
@@ -20,7 +19,6 @@

<module name="unfrag" type="win32cui" installbase="system32" installname="unfrag.exe" unicode="yes">
    	<include base="unfrag">.</include>
-		<define name="__USE_W32API" />
    	<define name="WINVER">0x0501</define>
    	<define name="_WIN32_IE">0x0600</define>
    	<library>kernel32</library>
@@ -30,4 +28,3 @@
    	<file>Defragment.cpp</file>
    	<file>DriveVolume.cpp</file>
    </module>
-</group>