[ros-diffs] [cwittich] 25567: fix some more warnings (gcc 4.2)

Author: cwittich
Date: Sun Jan 21 23:10:17 2007
New Revision: 25567

URL: http://svn.reactos.org/svn/reactos?rev=25567&view=rev
Log:
fix some more warnings (gcc 4.2)

Modified:
    trunk/reactos/dll/win32/user32/windows/accel.c
    trunk/reactos/dll/win32/user32/windows/bitmap.c
    trunk/reactos/drivers/network/tcpip/tcpip/proto.c
    trunk/reactos/hal/halx86/generic/halinit.c
    trunk/reactos/hal/halx86/mp/halinit.c
    trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c

Modified: trunk/reactos/dll/win32/user32/windows/accel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/a…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/accel.c (original)
+++ trunk/reactos/dll/win32/user32/windows/accel.c Sun Jan 21 23:10:17 2007
@@ -233,7 +233,7 @@
  return U32LoadAccelerators
  (
   hInstance,
-  FindResourceExW(hInstance, MAKEINTRESOURCEW(RT_ACCELERATOR), lpTableName, 0)
+  FindResourceExW(hInstance, (LPCWSTR) RT_ACCELERATOR, lpTableName, 0)
  );
 }
 
@@ -245,7 +245,7 @@
 {
   HRSRC Accel;
 
-  Accel = FindResourceExA(hInstance, MAKEINTRESOURCEA(RT_ACCELERATOR), lpTableName, 0);
+  Accel = FindResourceExA(hInstance, (LPCSTR) RT_ACCELERATOR, lpTableName, 0);
   if (NULL == Accel)
     {
       return NULL;

Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/bitmap.c (original)
+++ trunk/reactos/dll/win32/user32/windows/bitmap.c Sun Jan 21 23:10:17 2007
@@ -236,8 +236,8 @@
                                        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;
 

Modified: trunk/reactos/drivers/network/tcpip/tcpip/proto.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/proto.c (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/proto.c Sun Jan 21 23:10:17 2007
@@ -24,7 +24,7 @@
   if (*Name++ != (WCHAR)L'\\')
     return STATUS_UNSUCCESSFUL;
 
-  if (*Name == (WCHAR)NULL)
+  if (*Name == L'\0')
     return STATUS_UNSUCCESSFUL;
 
   RtlInitUnicodeString(&us, Name);

Modified: trunk/reactos/hal/halx86/generic/halinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit…
==============================================================================
--- trunk/reactos/hal/halx86/generic/halinit.c (original)
+++ trunk/reactos/hal/halx86/generic/halinit.c Sun Jan 21 23:10:17 2007
@@ -123,7 +123,7 @@
         ((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 */

Modified: trunk/reactos/hal/halx86/mp/halinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halinit.c?re…
==============================================================================
--- trunk/reactos/hal/halx86/mp/halinit.c (original)
+++ trunk/reactos/hal/halx86/mp/halinit.c Sun Jan 21 23:10:17 2007
@@ -123,7 +123,7 @@
         ((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 */

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sun Jan 21 23:10:17 2007
@@ -1874,7 +1874,7 @@
   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;