From 745785f093b5fbe9ee7fb26a7631aa826e752bbd Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Sun, 21 Jan 2007 20:10:17 +0000
Subject: [PATCH] fix some more warnings (gcc 4.2)

svn path=/trunk/; revision=25567
---
 reactos/dll/win32/user32/windows/accel.c             | 4 ++--
 reactos/dll/win32/user32/windows/bitmap.c            | 4 ++--
 reactos/drivers/network/tcpip/tcpip/proto.c          | 2 +-
 reactos/hal/halx86/generic/halinit.c                 | 2 +-
 reactos/hal/halx86/mp/halinit.c                      | 2 +-
 reactos/subsystems/win32/csrss/win32csr/guiconsole.c | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/reactos/dll/win32/user32/windows/accel.c b/reactos/dll/win32/user32/windows/accel.c
index bf873491ef0..38ac260a1e7 100644
--- a/reactos/dll/win32/user32/windows/accel.c
+++ b/reactos/dll/win32/user32/windows/accel.c
@@ -233,7 +233,7 @@ HACCEL WINAPI LoadAcceleratorsW(HINSTANCE hInstance, LPCWSTR lpTableName)
  return U32LoadAccelerators
  (
   hInstance,
-  FindResourceExW(hInstance, MAKEINTRESOURCEW(RT_ACCELERATOR), lpTableName, 0)
+  FindResourceExW(hInstance, (LPCWSTR) RT_ACCELERATOR, lpTableName, 0)
  );
 }
 
@@ -245,7 +245,7 @@ HACCEL WINAPI LoadAcceleratorsA(HINSTANCE hInstance, LPCSTR lpTableName)
 {
   HRSRC Accel;
 
-  Accel = FindResourceExA(hInstance, MAKEINTRESOURCEA(RT_ACCELERATOR), lpTableName, 0);
+  Accel = FindResourceExA(hInstance, (LPCSTR) RT_ACCELERATOR, lpTableName, 0);
   if (NULL == Accel)
     {
       return NULL;
diff --git a/reactos/dll/win32/user32/windows/bitmap.c b/reactos/dll/win32/user32/windows/bitmap.c
index 247670641ac..36dc9afa9c4 100644
--- a/reactos/dll/win32/user32/windows/bitmap.c
+++ b/reactos/dll/win32/user32/windows/bitmap.c
@@ -236,8 +236,8 @@ LoadCursorIconImage(
                                        fuLoad & (LR_DEFAULTCOLOR | LR_MONOCHROME));
 
       h2Resource = FindResourceW(hinst, MAKEINTRESOURCEW(id),
-                                 Icon ? MAKEINTRESOURCEW(RT_ICON) :
-                                 MAKEINTRESOURCEW(RT_CURSOR));
+                                 Icon ? (LPCWSTR) RT_ICON :
+                                 (LPCWSTR) RT_CURSOR);
       if (h2Resource == NULL)
          return NULL;
 
diff --git a/reactos/drivers/network/tcpip/tcpip/proto.c b/reactos/drivers/network/tcpip/tcpip/proto.c
index a3ad1a30456..5c2381d0fcd 100644
--- a/reactos/drivers/network/tcpip/tcpip/proto.c
+++ b/reactos/drivers/network/tcpip/tcpip/proto.c
@@ -24,7 +24,7 @@ NTSTATUS TiGetProtocolNumber(
   if (*Name++ != (WCHAR)L'\\')
     return STATUS_UNSUCCESSFUL;
 
-  if (*Name == (WCHAR)NULL)
+  if (*Name == L'\0')
     return STATUS_UNSUCCESSFUL;
 
   RtlInitUnicodeString(&us, Name);
diff --git a/reactos/hal/halx86/generic/halinit.c b/reactos/hal/halx86/generic/halinit.c
index ca2faf5d1fc..dfc43b66617 100644
--- a/reactos/hal/halx86/generic/halinit.c
+++ b/reactos/hal/halx86/generic/halinit.c
@@ -123,7 +123,7 @@ HalInitSystem(IN ULONG BootPhase,
         ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset =
             (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF);
         ((PKIPCR)KeGetPcr())->IDT[0x30].Offset =
-            (USHORT)HalpClockInterrupt;
+            (ULONG_PTR)HalpClockInterrupt;
         HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched);
 
         /* Initialize DMA. NT does this in Phase 0 */
diff --git a/reactos/hal/halx86/mp/halinit.c b/reactos/hal/halx86/mp/halinit.c
index c6cf27fa753..bbe2156ee47 100644
--- a/reactos/hal/halx86/mp/halinit.c
+++ b/reactos/hal/halx86/mp/halinit.c
@@ -123,7 +123,7 @@ HalInitSystem(IN ULONG BootPhase,
         ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset =
             (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF);
         ((PKIPCR)KeGetPcr())->IDT[0x30].Offset =
-            (USHORT)HalpClockInterrupt;
+            (ULONG_PTR)HalpClockInterrupt;
         HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched);
 
         /* Initialize DMA. NT does this in Phase 0 */
diff --git a/reactos/subsystems/win32/csrss/win32csr/guiconsole.c b/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
index 2ddda23bae3..b6e4dc9939a 100644
--- a/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
+++ b/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
@@ -1874,7 +1874,7 @@ GuiInit(VOID)
   wc.style = 0;
   wc.hInstance = (HINSTANCE) GetModuleHandleW(NULL);
   wc.hIcon = LoadIconW(Win32CsrDllHandle, MAKEINTRESOURCEW(1));
-  wc.hCursor = LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_ARROW));
+  wc.hCursor = LoadCursorW(NULL, IDC_ARROW);
   wc.hbrBackground = NULL;
   wc.lpszMenuName = NULL;
   wc.cbClsExtra = 0;