[ros-diffs] [fireball] 34063: Stefan Ginsberg <stefan__100__ at hotmail.com>: - Make user32 and kernel32 compile warning-free.

fireball at svn.reactos.org fireball at svn.reactos.org
Mon Jun 23 20:57:10 CEST 2008


Author: fireball
Date: Mon Jun 23 13:57:10 2008
New Revision: 34063

URL: http://svn.reactos.org/svn/reactos?rev=34063&view=rev
Log:
Stefan Ginsberg <stefan__100__ at hotmail.com>:
- Make user32 and kernel32 compile warning-free.

Modified:
    trunk/reactos/dll/win32/kernel32/kernel32.rbuild
    trunk/reactos/dll/win32/kernel32/misc/profile.c
    trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S
    trunk/reactos/dll/win32/user32/user32.rbuild
    trunk/reactos/dll/win32/user32/windows/clipboard.c

Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel32.rbuild?rev=34063&r1=34062&r2=34063&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Mon Jun 23 13:57:10 2008
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-	<module name="kernel32_base" type="objectlibrary" allowwarnings="true">
+	<module name="kernel32_base" type="objectlibrary">
 		<include base="kernel32_base">.</include>
 		<include base="kernel32_base">include</include>
 		<include base="ReactOS">include/reactos/subsys</include>
@@ -136,4 +136,4 @@
 		<linkerflag>-nostdlib</linkerflag>
 		<file>kernel32.rc</file>
 	</module>
-</group>
+</group>

Modified: trunk/reactos/dll/win32/kernel32/misc/profile.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/profile.c?rev=34063&r1=34062&r2=34063&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/misc/profile.c [iso-8859-1] Mon Jun 23 13:57:10 2008
@@ -294,7 +294,7 @@
 
 static __inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len)
 {
-    DWORD flags = IS_TEXT_UNICODE_SIGNATURE |
+    INT flags =   IS_TEXT_UNICODE_SIGNATURE |
                   IS_TEXT_UNICODE_REVERSE_SIGNATURE |
                   IS_TEXT_UNICODE_ODD_LENGTH;
     if (*len >= (int)sizeof(bom_utf8) && !memcmp(buffer, bom_utf8, sizeof(bom_utf8)))

Modified: trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S?rev=34063&r1=34062&r2=34063&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S [iso-8859-1] Mon Jun 23 13:57:10 2008
@@ -37,7 +37,7 @@
     fstcw [eax+FIBER_CONTEXT_FLOAT_SAVE_CONTROL_WORD]
     
     /* Check if the CPU supports SIMD MXCSR State Save */
-    cmp byte ptr [PROCESSOR_FEATURE_FXSR], 0
+    cmp byte ptr ds:[PROCESSOR_FEATURE_FXSR], 0
     jnz NoFpuStateSave
     stmxcsr [eax+FIBER_CONTEXT_DR6]
     
@@ -101,7 +101,7 @@
 ControlWordEqual:
 
     /* Load the new one */
-    cmp byte ptr [PROCESSOR_FEATURE_FXSR], 0
+    cmp byte ptr ds:[PROCESSOR_FEATURE_FXSR], 0
     jnz NoFpuStateRestore
     ldmxcsr [ecx+FIBER_CONTEXT_DR6]
     

Modified: trunk/reactos/dll/win32/user32/user32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rbuild?rev=34063&r1=34062&r2=34063&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Mon Jun 23 13:57:10 2008
@@ -1,4 +1,4 @@
-<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" allowwarnings="true" unicode="yes">
+<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes">
 	<importlibrary definition="user32.def" />
 	<include base="user32">.</include>
 	<include base="user32">include</include>

Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/clipboard.c?rev=34063&r1=34062&r2=34063&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] Mon Jun 23 13:57:10 2008
@@ -86,7 +86,7 @@
     /* dealing with bitmap object */
     if (uFormat != CF_BITMAP)
     {
-        size = (DWORD)NtUserGetClipboardData(uFormat, QUERY_SIZE);
+        size = (DWORD)NtUserGetClipboardData(uFormat, NULL);
 
         if (size)
         {
@@ -100,7 +100,7 @@
     }
     else
     {
-        hGlobal = NtUserGetClipboardData(CF_BITMAP, !QUERY_SIZE);
+        hGlobal = NtUserGetClipboardData(CF_BITMAP, NULL);
     }
 
     return hGlobal;



More information about the Ros-diffs mailing list