Author: fireball
Date: Mon Oct 13 11:46:01 2014
New Revision: 64717
URL: http://svn.reactos.org/svn/reactos?rev=64717&view=rev
Log:
[ARWINSS]
- Fix win32k compilation. Now Arwinss compiles in trunk again! \o/
Modified:
branches/arwinss/arwinss/server/eng/device.c
branches/arwinss/arwinss/server/eng/driver.c
branches/arwinss/arwinss/server/eng/engblt.c
branches/arwinss/arwinss/server/eng/engbrush.c
branches/arwinss/arwinss/server/eng/engmisc.c
branches/arwinss/arwinss/server/main/init.c
branches/arwinss/arwinss/server/wine/process.c
Modified: branches/arwinss/arwinss/server/eng/device.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/device.c?rev=64717&r1=64716&r2=64717&view=diff
==============================================================================
--- branches/arwinss/arwinss/server/eng/device.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/eng/device.c [iso-8859-1] Mon Oct 13
11:46:01 2014
@@ -457,7 +457,7 @@
KeClearEvent(&PrimarySurface.VideoFileObject->Event);
- ObReferenceObjectByPointer(FileObject, 0, IoFileObjectType, KernelMode);
+ ObReferenceObjectByPointer(FileObject, 0, *IoFileObjectType, KernelMode);
StartOffset.QuadPart = 0;
Irp = IoBuildSynchronousFsdRequest(IRP_MJ_WRITE,
Modified: branches/arwinss/arwinss/server/eng/driver.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/driver.c?rev=64717&r1=64716&r2=64717&view=diff
==============================================================================
--- branches/arwinss/arwinss/server/eng/driver.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/eng/driver.c [iso-8859-1] Mon Oct 13
11:46:01 2014
@@ -521,7 +521,7 @@
{
Status = ObReferenceObjectByHandle(DisplayHandle,
FILE_READ_DATA | FILE_WRITE_DATA,
- IoFileObjectType,
+ *IoFileObjectType,
KernelMode,
(PVOID *)&VideoFileObject,
NULL);
Modified: branches/arwinss/arwinss/server/eng/engblt.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/engblt.c?rev=64717&r1=64716&r2=64717&view=diff
==============================================================================
--- branches/arwinss/arwinss/server/eng/engblt.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/eng/engblt.c [iso-8859-1] Mon Oct 13
11:46:01 2014
@@ -448,7 +448,7 @@
{
RECTL SourceStretchedRect;
SIZEL SourceStretchedSize;
- HBITMAP SourceStretchedBitmap = 0;
+ HSURF SourceStretchedBitmap = 0;
SURFOBJ* SourceStretchedObj = NULL;
RECTL InputRect;
RECTL OutputRect;
@@ -544,7 +544,7 @@
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)
Modified: branches/arwinss/arwinss/server/eng/engbrush.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/engbrush.c?rev=64717&r1=64716&r2=64717&view=diff
==============================================================================
--- branches/arwinss/arwinss/server/eng/engbrush.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/eng/engbrush.c [iso-8859-1] Mon Oct 13
11:46:01 2014
@@ -143,7 +143,7 @@
ULONG iHatch)
{
EBRUSHOBJ *pebo;
- HBITMAP hbmpRealize;
+ HSURF hbmpRealize;
SURFOBJ *psoRealize;
POINTL ptlSrc = {0, 0};
RECTL rclDest;
@@ -154,7 +154,7 @@
BitsPerFormat(psoDst->iBitmapFormat));
/* Allocate a bitmap */
- hbmpRealize = EngCreateBitmap(psoPattern->sizlBitmap,
+ hbmpRealize = (HSURF)EngCreateBitmap(psoPattern->sizlBitmap,
lWidth,
psoDst->iBitmapFormat,
BMF_NOZEROINIT,
Modified: branches/arwinss/arwinss/server/eng/engmisc.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/eng/engmisc.c?rev=64717&r1=64716&r2=64717&view=diff
==============================================================================
--- branches/arwinss/arwinss/server/eng/engmisc.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/eng/engmisc.c [iso-8859-1] Mon Oct 13
11:46:01 2014
@@ -65,7 +65,7 @@
return;
}
-DWORD
+HRESULT
APIENTRY
EngDxIoctl(ULONG ulIoctl,
PVOID pBuffer,
Modified: branches/arwinss/arwinss/server/main/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/main/init.c?rev=64717&r1=64716&r2=64717&view=diff
==============================================================================
--- branches/arwinss/arwinss/server/main/init.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/main/init.c [iso-8859-1] Mon Oct 13
11:46:01 2014
@@ -326,16 +326,6 @@
NTSTATUS
APIENTRY
Win32kWindowStationOpenProcedure(PWIN32_OPENMETHOD_PARAMETERS Parameters)
-{
- UNIMPLEMENTED;
- return STATUS_SUCCESS;
-}
-
-NTSTATUS
-APIENTRY
-Win32kWin32DataCollectionProcedure(PEPROCESS Process,
- PVOID Callback,
- PVOID Context)
{
UNIMPLEMENTED;
return STATUS_SUCCESS;
@@ -428,7 +418,6 @@
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);
Modified: branches/arwinss/arwinss/server/wine/process.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/wine/process.c?rev=64717&r1=64716&r2=64717&view=diff
==============================================================================
--- branches/arwinss/arwinss/server/wine/process.c [iso-8859-1] (original)
+++ branches/arwinss/arwinss/server/wine/process.c [iso-8859-1] Mon Oct 13
11:46:01 2014
@@ -41,7 +41,7 @@
/* Reference the process */
Status = ObReferenceObjectByHandle((HANDLE)req->handle,
PROCESS_QUERY_INFORMATION,
- PsProcessType,
+ *PsProcessType,
KernelMode,
(PVOID*)&ProcessObject,
NULL);
