[ARWINSS]

- Fix win32k compilation. Now Arwinss compiles in trunk again! \o/

svn path=/branches/arwinss/; revision=64717

Author: bragin

arwinss/server/eng/device.c

@@ -457,7 +457,7 @@ PrepareVideoPrt()
 
     KeClearEvent(&PrimarySurface.VideoFileObject->Event);
 
-    ObReferenceObjectByPointer(FileObject, 0, IoFileObjectType, KernelMode);
+    ObReferenceObjectByPointer(FileObject, 0, *IoFileObjectType, KernelMode);
 
     StartOffset.QuadPart = 0;
     Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE,

arwinss/server/eng/driver.c

@@ -521,7 +521,7 @@ PFILE_OBJECT DRIVER_FindMPDriver(ULONG DisplayNumber)
     {
       Status = ObReferenceObjectByHandle(DisplayHandle,
                                          FILE_READ_DATA | FILE_WRITE_DATA,
-                                         IoFileObjectType,
+                                         *IoFileObjectType,
                                          KernelMode,
                                          (PVOID *)&VideoFileObject,
                                          NULL);

arwinss/server/eng/engblt.c

@@ -448,7 +448,7 @@ EngAlphaBlend(IN SURFOBJ* psoDest,
 {
     RECTL              SourceStretchedRect;
     SIZEL              SourceStretchedSize;
-    HBITMAP            SourceStretchedBitmap = 0;
+    HSURF              SourceStretchedBitmap = 0;
     SURFOBJ*           SourceStretchedObj = NULL;
     RECTL              InputRect;
     RECTL              OutputRect;
@@ -544,7 +544,7 @@ EngAlphaBlend(IN SURFOBJ* psoDest,
         Width = DIB_GetDIBWidthBytes(SourceStretchedSize.cx, BitsPerFormat(psoSource->iBitmapFormat));
         /* FIXME: Maybe it is a good idea to use EngCreateDeviceBitmap and IntEngStretchBlt
                   if possible to get a HW accelerated stretch. */
-        SourceStretchedBitmap = EngCreateBitmap(SourceStretchedSize, Width, psoSource->iBitmapFormat,
+        SourceStretchedBitmap = (HSURF)EngCreateBitmap(SourceStretchedSize, Width, psoSource->iBitmapFormat,
                                                 BMF_TOPDOWN | BMF_NOZEROINIT, NULL);
 
         if (SourceStretchedBitmap == 0)

arwinss/server/eng/engbrush.c

@@ -143,7 +143,7 @@ EngRealizeBrush(
     ULONG    iHatch)
 {
     EBRUSHOBJ *pebo;
-    HBITMAP hbmpRealize;
+    HSURF hbmpRealize;
     SURFOBJ *psoRealize;
     POINTL ptlSrc = {0, 0};
     RECTL rclDest;
@@ -154,7 +154,7 @@ EngRealizeBrush(
                                   BitsPerFormat(psoDst->iBitmapFormat));
 
     /* Allocate a bitmap */
-    hbmpRealize = EngCreateBitmap(psoPattern->sizlBitmap,
+    hbmpRealize = (HSURF)EngCreateBitmap(psoPattern->sizlBitmap,
                                   lWidth,
                                   psoDst->iBitmapFormat,
                                   BMF_NOZEROINIT,

arwinss/server/eng/engmisc.c

@@ -65,7 +65,7 @@ VidMemFree(LPVMEMHEAP pvmh,
     return;
 }
 
-DWORD
+HRESULT
 APIENTRY
 EngDxIoctl(ULONG ulIoctl,
            PVOID pBuffer,

arwinss/server/main/init.c

@@ -331,16 +331,6 @@ Win32kWindowStationOpenProcedure(PWIN32_OPENMETHOD_PARAMETERS Parameters)
     return STATUS_SUCCESS;
 }
 
-NTSTATUS
-APIENTRY
-Win32kWin32DataCollectionProcedure(PEPROCESS Process,
-                                   PVOID Callback,
-                                   PVOID Context)
-{
-    UNIMPLEMENTED;
-    return STATUS_SUCCESS;
-}
-
 NTSTATUS
 APIENTRY
 NtGdiFlushUserBatch(VOID)
@@ -428,7 +418,6 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject,
     CalloutData.WindowStationDeleteProcedure = (PKWIN32_SESSION_CALLOUT)Win32kWindowStationDeleteProcedure;
     CalloutData.WindowStationParseProcedure = (PKWIN32_SESSION_CALLOUT)Win32kWindowStationParseProcedure;
     CalloutData.WindowStationOpenProcedure = (PKWIN32_SESSION_CALLOUT)Win32kWindowStationOpenProcedure;
-    CalloutData.Win32DataCollectionProcedure = Win32kWin32DataCollectionProcedure;
 
     /* Register them */
     PsEstablishWin32Callouts(&CalloutData);

arwinss/server/wine/process.c

@@ -41,7 +41,7 @@ DECL_HANDLER(get_process_idle_event)
     /* Reference the process */
     Status = ObReferenceObjectByHandle((HANDLE)req->handle,
                                        PROCESS_QUERY_INFORMATION,
-                                       PsProcessType,
+                                       *PsProcessType,
                                        KernelMode,
                                        (PVOID*)&ProcessObject,
                                        NULL);