[ros-diffs] [janderwald] 22996: * fix a few msvc compilation errors (MS powercfg.h does not use include guards)

Author: janderwald
Date: Mon Jul 10 17:47:11 2006
New Revision: 22996

URL: http://svn.reactos.org/svn/reactos?rev=22996&view=rev
Log:
* fix a few msvc compilation errors (MS powercfg.h does not use include guards)

Modified:
    trunk/reactos/dll/cpl/powercfg/advanced.c
    trunk/reactos/dll/cpl/powercfg/alarms.c
    trunk/reactos/dll/cpl/powercfg/hibernate.c
    trunk/reactos/dll/cpl/powercfg/powercfg.c

Modified: trunk/reactos/dll/cpl/powercfg/advanced.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/advanced.…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/advanced.c (original)
+++ trunk/reactos/dll/cpl/powercfg/advanced.c Mon Jul 10 17:47:11 2006
@@ -9,6 +9,10 @@
  *                  Martin Rottensteiner
  */
 
+//#ifndef NSTATUS
+//typedef long NTSTATUS;
+//#endif
+
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include <windows.h>
@@ -16,7 +20,6 @@
 #include <cpl.h>
 #include "resource.h"
 #include "powercfg.h"
-#include "powrprof.h"
 
 HWND hAdv=0;
 
@@ -109,7 +112,7 @@
 {
 	SYSTEM_BATTERY_STATE sbs;
 
-	if (CallNtPowerInformation(SystemBatteryState,NULL, (ULONG)NULL, &sbs,
sizeof(SYSTEM_BATTERY_STATE)) == STATUS_SUCCESS)
+	if (CallNtPowerInformation(SystemBatteryState,NULL, (ULONG)0, &sbs,
sizeof(SYSTEM_BATTERY_STATE)) == STATUS_SUCCESS)
 	{
 		if (sbs.BatteryPresent)
 		{
@@ -119,7 +122,6 @@
 			}
 			return TRUE;
 		}
-		return FALSE;
 	}
 
 	return FALSE;

Modified: trunk/reactos/dll/cpl/powercfg/alarms.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/alarms.c?…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/alarms.c (original)
+++ trunk/reactos/dll/cpl/powercfg/alarms.c Mon Jul 10 17:47:11 2006
@@ -18,7 +18,6 @@
 
 #include "resource.h"
 #include "powercfg.h"
-#include "powrprof.h"
 
 BOOLEAN Ala_InitData(HWND);
 

Modified: trunk/reactos/dll/cpl/powercfg/hibernate.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/hibernate…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/hibernate.c (original)
+++ trunk/reactos/dll/cpl/powercfg/hibernate.c Mon Jul 10 17:47:11 2006
@@ -9,6 +9,10 @@
  *                  Martin Rottensteiner
  */
 
+//#ifndef NSTATUS
+//typedef long NTSTATUS;
+//#endif
+
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include <windows.h>
@@ -19,7 +23,7 @@
 
 #include "resource.h"
 #include "powercfg.h"
-#include "powrprof.h"
+
 
 void Hib_InitDialog(HWND);
 INT_PTR Hib_SaveData(HWND);

Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.…
==============================================================================
--- trunk/reactos/dll/cpl/powercfg/powercfg.c (original)
+++ trunk/reactos/dll/cpl/powercfg/powercfg.c Mon Jul 10 17:47:11 2006
@@ -15,7 +15,6 @@
 
 #include "resource.h"
 #include "powercfg.h"
-#include "powrprof.h"
 
 #define NUM_APPLETS	(1)