[ros-diffs] [winesync] 27916: Autosyncing with Wine HEAD

[winesync at svn.reactos.org]

Author: winesync
Date: Fri Jul 27 14:03:59 2007
New Revision: 27916

URL: http://svn.reactos.org/svn/reactos?rev=27916&view=rev
Log:
Autosyncing with Wine HEAD

Modified:
    trunk/reactos/dll/win32/powrprof/powrprof.c
    trunk/reactos/dll/win32/powrprof/powrprof_ros.diff

Modified: trunk/reactos/dll/win32/powrprof/powrprof.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrprof.c?rev=27916&r1=27915&r2=27916&view=diff
==============================================================================
--- trunk/reactos/dll/win32/powrprof/powrprof.c (original)
+++ trunk/reactos/dll/win32/powrprof/powrprof.c Fri Jul 27 14:03:59 2007
@@ -29,7 +29,6 @@
 #include "powrprof.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
-#include "stdlib.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(powrprof);
 
@@ -82,7 +81,7 @@
    r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey);
 
    if (r != ERROR_SUCCESS) {
-      TRACE("RegOpenKeyEx failed: %ld\n", r);
+      TRACE("RegOpenKeyEx failed: %d\n", r);
       bSuccess = FALSE;
    }
 
@@ -165,7 +164,7 @@
 
    r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ, &hKey);
    if (r != ERROR_SUCCESS) {
-      TRACE("RegOpenKeyEx failed: %ld\n", r);
+      TRACE("RegOpenKeyEx failed: %d\n", r);
       TRACE("Using defaults: 3600, 3\n");
       *RangeMax = 3600;
       *RangeMin = 3;
@@ -175,7 +174,7 @@
 
    r = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue);
    if (r != ERROR_SUCCESS) {
-      TRACE("Couldn't open DiskSpinDownMax: %ld\n", r);
+      TRACE("Couldn't open DiskSpinDownMax: %d\n", r);
       TRACE("Using default: 3600\n");
       *RangeMax = 3600;
    } else {
@@ -186,7 +185,7 @@
 
    r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue);
    if (r != ERROR_SUCCESS) {
-      TRACE("Couldn't open DiskSpinDownMin: %ld\n", r);
+      TRACE("Couldn't open DiskSpinDownMin: %d\n", r);
       TRACE("Using default: 3\n");
       *RangeMin = 3;
    } else {
@@ -315,7 +314,7 @@
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-   FIXME("(%p, %ld, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved);
+   FIXME("(%p, %d, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved);
 
    switch(fdwReason) {
       case DLL_PROCESS_ATTACH: {
@@ -341,7 +340,7 @@
 
          PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName);
          if (PPRegSemaphore == NULL) {
-            ERR("Couldn't create Semaphore: %ld\n", GetLastError());
+            ERR("Couldn't create Semaphore: %d\n", GetLastError());
             return FALSE;
          }
          break;

Modified: trunk/reactos/dll/win32/powrprof/powrprof_ros.diff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/powrprof_ros.diff?rev=27916&r1=27915&r2=27916&view=diff
==============================================================================
--- trunk/reactos/dll/win32/powrprof/powrprof_ros.diff (original)
+++ trunk/reactos/dll/win32/powrprof/powrprof_ros.diff Fri Jul 27 14:03:59 2007
@@ -1,7 +1,27 @@
-Index: D:/reactos/dll/win32/powrprof/powrprof.spec
+Index: powrprof.c
 ===================================================================
---- D:/reactos/dll/win32/powrprof/powrprof.spec	(revision 22834)
-+++ D:/reactos/dll/win32/powrprof/powrprof.spec	(revision 22835)
+--- powrprof.c	(revision 26779)
++++ powrprof.c	(working copy)
+@@ -303,6 +303,15 @@
+    return FALSE;
+ }
+ 
++BOOLEAN WINAPI ValidatePowerPolicies(PGLOBAL_POWER_POLICY pGPP, PPOWER_POLICY pPP)
++{
++   /* FIXME: See note #3 */
++   FIXME("(%p, %p) stub!\n", pGPP, pPP);
++   SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
++   return TRUE;
++
++}
++
+ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+ {
+    FIXME("(%p, %d, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved);
+Index: powrprof.spec
+===================================================================
+--- powrprof.spec	(revision 26779)
++++ powrprof.spec	(working copy)
 @@ -18,3 +18,4 @@
  @ stdcall WriteGlobalPwrPolicy (ptr)
  @ stdcall WriteProcessorPwrScheme (long ptr)