[ros-diffs] [sserapion] 43847: Fix gdi32 build for real.

Author: sserapion
Date: Fri Oct 30 15:24:42 2009
New Revision: 43847

URL: http://svn.reactos.org/svn/reactos?rev=43847&view=rev
Log:
Fix gdi32 build for real.

Modified:
    branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/gdientry.c
    branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/wingl.c
    branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c
    branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c

Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/gdientry.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/gdientry.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/gdientry.c [iso-8859-1] Fri
Oct 30 15:24:42 2009
@@ -1411,7 +1411,7 @@
     RtlMoveMemory(&SurfaceMore.ddsCapsEx,
                   &pSurface->ddckCKDestBlt,
                   sizeof(DDSCAPSEX));
-    SurfaceMore.dwSurfaceHandle =
(DWORD)pSurface->dbnOverlayNode.object_int->lpVtbl;
+    SurfaceMore.dwSurfaceHandle =
PtrToUlong(pSurface->dbnOverlayNode.object_int->lpVtbl);
 
     /* Set up SurfaceGlobal struct */
     SurfaceGlobal.fpVidMem = pSurface->lpGbl->fpVidMem;
@@ -1433,12 +1433,12 @@
     }
 
     /* Create the object */
-    pSurface->hDDSurface =
(DWORD)NtGdiDdCreateSurfaceObject(GetDdHandle(pSurface->lpGbl->lpDD->hDD),
-                                                            
(HANDLE)pSurface->hDDSurface,
-                                                             &SurfaceLocal,
-                                                             &SurfaceMore,
-                                                             &SurfaceGlobal,
-                                                             bComplete);
+    pSurface->hDDSurface =
(ULONG_PTR)NtGdiDdCreateSurfaceObject(GetDdHandle(pSurface->lpGbl->lpDD->hDD),
+                                                               
(HANDLE)pSurface->hDDSurface,
+                                                                &SurfaceLocal,
+                                                                &SurfaceMore,
+                                                                &SurfaceGlobal,
+                                                                bComplete);
 
     /* Return status */
     if (pSurface->hDDSurface) return TRUE;

Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/wingl.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/wingl.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/wingl.c [iso-8859-1] Fri Oct
30 15:24:42 2009
@@ -28,11 +28,11 @@
 
 
 
-typedef int  (WINAPI *CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *);
-typedef BOOL (WINAPI *SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *);
-typedef BOOL (WINAPI *SWAPBUFFERS) (HDC hdc);
-typedef int  (WINAPI *DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
-typedef int  (WINAPI *GETPIXELFMT) (HDC);
+typedef INT_PTR (WINAPI *CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *);
+typedef INT_PTR (WINAPI *SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *);
+typedef INT_PTR (WINAPI *SWAPBUFFERS) (HDC hdc);
+typedef INT_PTR (WINAPI *DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
+typedef INT_PTR (WINAPI *GETPIXELFMT) (HDC);
 
 
 static CHOOSEPIXELFMT    glChoosePixelFormat   = NULL;

Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri
Oct 30 15:24:42 2009
@@ -418,7 +418,7 @@
         }
      }
 
-     if ((PtrToUlong(lpvBits)) & (sizeof(DWORD) - 1))
+     if (((ULONG_PTR)lpvBits) & (sizeof(DWORD) - 1))
      {
          pvSafeBits = RtlAllocateHeap(RtlGetProcessHeap(), 0, cjBmpScanSize);
          if (!pvSafeBits)

Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Fri
Oct 30 15:24:42 2009
@@ -142,7 +142,7 @@
 WINAPI
 CreatePolygonRgn( const POINT * lppt, int cPoints, int fnPolyFillMode)
 {
-    return (HRGN) NtGdiPolyPolyDraw( ULongToPtr(fnPolyFillMode), (PPOINT) lppt, (PULONG)
&cPoints, 1, GdiPolyPolyRgn);
+    return (HRGN) NtGdiPolyPolyDraw( ULongToHandle(fnPolyFillMode), (PPOINT) lppt,
(PULONG) &cPoints, 1, GdiPolyPolyRgn);
 }