From 0f6b71ad04af829161cab621a80b8987129cf0b3 Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Mon, 23 Jun 2008 18:57:10 +0000 Subject: [PATCH] Stefan Ginsberg : - Make user32 and kernel32 compile warning-free. svn path=/trunk/; revision=34063 --- reactos/dll/win32/kernel32/kernel32.rbuild | 4 ++-- reactos/dll/win32/kernel32/misc/profile.c | 2 +- reactos/dll/win32/kernel32/thread/i386/fiber.S | 4 ++-- reactos/dll/win32/user32/user32.rbuild | 2 +- reactos/dll/win32/user32/windows/clipboard.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/kernel32/kernel32.rbuild b/reactos/dll/win32/kernel32/kernel32.rbuild index bb5dbc3737b..24cdeb00529 100644 --- a/reactos/dll/win32/kernel32/kernel32.rbuild +++ b/reactos/dll/win32/kernel32/kernel32.rbuild @@ -1,7 +1,7 @@ - + . include include/reactos/subsys @@ -136,4 +136,4 @@ -nostdlib kernel32.rc - \ No newline at end of file + diff --git a/reactos/dll/win32/kernel32/misc/profile.c b/reactos/dll/win32/kernel32/misc/profile.c index 82caaba3236..b735feb7f0d 100644 --- a/reactos/dll/win32/kernel32/misc/profile.c +++ b/reactos/dll/win32/kernel32/misc/profile.c @@ -294,7 +294,7 @@ static __inline int PROFILE_isspaceW(WCHAR c) 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))) diff --git a/reactos/dll/win32/kernel32/thread/i386/fiber.S b/reactos/dll/win32/kernel32/thread/i386/fiber.S index d5db93e6191..00b3a17fb34 100644 --- a/reactos/dll/win32/kernel32/thread/i386/fiber.S +++ b/reactos/dll/win32/kernel32/thread/i386/fiber.S @@ -37,7 +37,7 @@ _SwitchToFiber@4: 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 @@ StatusWordChanged: 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] diff --git a/reactos/dll/win32/user32/user32.rbuild b/reactos/dll/win32/user32/user32.rbuild index 0ef21aba2a7..66106aa980f 100644 --- a/reactos/dll/win32/user32/user32.rbuild +++ b/reactos/dll/win32/user32/user32.rbuild @@ -1,4 +1,4 @@ - + . include diff --git a/reactos/dll/win32/user32/windows/clipboard.c b/reactos/dll/win32/user32/windows/clipboard.c index 6fb5ba34d88..4176c5dc206 100644 --- a/reactos/dll/win32/user32/windows/clipboard.c +++ b/reactos/dll/win32/user32/windows/clipboard.c @@ -86,7 +86,7 @@ GetClipboardData(UINT uFormat) /* 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 @@ GetClipboardData(UINT uFormat) } else { - hGlobal = NtUserGetClipboardData(CF_BITMAP, !QUERY_SIZE); + hGlobal = NtUserGetClipboardData(CF_BITMAP, NULL); } return hGlobal;