From a0f475f608da96d120b152a3f06e1b244a81695a Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Sun, 20 Apr 2008 09:23:29 +0000
Subject: [PATCH] - Frag fully builds. - Unfrag fails to link (both are still
 excluded from the build process).

svn path=/trunk/; revision=33051
---
 rosapps/fraginator/Fraginator.cpp    | 5 ++++-
 rosapps/fraginator/Fraginator.h      | 4 ++--
 rosapps/fraginator/Unfrag.h          | 4 ++--
 rosapps/fraginator/fraginator.rbuild | 5 +----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rosapps/fraginator/Fraginator.cpp b/rosapps/fraginator/Fraginator.cpp
index 5bb2138cf06..43722e1ef51 100644
--- a/rosapps/fraginator/Fraginator.cpp
+++ b/rosapps/fraginator/Fraginator.cpp
@@ -20,7 +20,10 @@ HINSTANCE   GlobalHInstance = NULL;
 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;
 
diff --git a/rosapps/fraginator/Fraginator.h b/rosapps/fraginator/Fraginator.h
index 0839ba18833..fc5c4339fea 100644
--- a/rosapps/fraginator/Fraginator.h
+++ b/rosapps/fraginator/Fraginator.h
@@ -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
diff --git a/rosapps/fraginator/Unfrag.h b/rosapps/fraginator/Unfrag.h
index 38bcf9aafb7..894f622c6d2 100644
--- a/rosapps/fraginator/Unfrag.h
+++ b/rosapps/fraginator/Unfrag.h
@@ -28,10 +28,10 @@
 #endif
 #endif
 
-#include <windows.h>
-#include <string>
 #include <stdio.h>
 #include <stdlib.h>
+#include <windows.h>
+#include <string>
 //#include <initguid.h>
 #include <winioctl.h>
 
diff --git a/rosapps/fraginator/fraginator.rbuild b/rosapps/fraginator/fraginator.rbuild
index 1903e69f369..b3c6ba301d0 100644
--- a/rosapps/fraginator/fraginator.rbuild
+++ b/rosapps/fraginator/fraginator.rbuild
@@ -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>