Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-03 08:20:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert part of my last commit, this was testcode not meant to be committed.

Browse source 
svn path=/trunk/; revision=42602
This commit is contained in:
Timo Kreuzer 2009-08-10 20:22:11 +00:00
parent 344e472e73
commit fc40a70945
2 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/subsystems/win32/win32k/objects/device.c
View file

@ -8,7 +8,7 @@
#include <w32k.h> #include <w32k.h>
#define YDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
// TODO: proper implementation of LDEVOBJ and PDEVOBJ interface // TODO: proper implementation of LDEVOBJ and PDEVOBJ interface
@ -214,9 +214,6 @@ IntPrepareDriver()
LARGE_INTEGER Zero; LARGE_INTEGER Zero;
BOOLEAN ret = FALSE; BOOLEAN ret = FALSE;
DPRINT("IntPrepareDriver()\n");
ASSERT(FALSE);
Zero.QuadPart = 0; Zero.QuadPart = 0;
if (STATUS_SUCCESS != KeWaitForSingleObject(&VideoDriverNeedsPreparation, Executive, KernelMode, TRUE, &Zero)) if (STATUS_SUCCESS != KeWaitForSingleObject(&VideoDriverNeedsPreparation, Executive, KernelMode, TRUE, &Zero))
{ {
@ -453,7 +450,7 @@ PrepareVideoPrt()
IO_STATUS_BLOCK Iosb; IO_STATUS_BLOCK Iosb;
BOOL Prepare = TRUE; BOOL Prepare = TRUE;
ULONG Length = sizeof(BOOL); ULONG Length = sizeof(BOOL);
// PIO_STACK_LOCATION StackPtr; PIO_STACK_LOCATION StackPtr;
LARGE_INTEGER StartOffset; LARGE_INTEGER StartOffset;
PFILE_OBJECT FileObject = PrimarySurface.VideoFileObject; PFILE_OBJECT FileObject = PrimarySurface.VideoFileObject;
PDEVICE_OBJECT DeviceObject = FileObject->DeviceObject; PDEVICE_OBJECT DeviceObject = FileObject->DeviceObject;
@ -478,16 +475,16 @@ PrepareVideoPrt()
} }
/* Set up IRP Data */ /* Set up IRP Data */
// Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.OriginalFileObject = FileObject;
// Irp->RequestorMode = KernelMode; Irp->RequestorMode = KernelMode;
// Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL;
// Irp->Overlay.AsynchronousParameters.UserApcContext = NULL; Irp->Overlay.AsynchronousParameters.UserApcContext = NULL;
// Irp->Flags |= IRP_WRITE_OPERATION; Irp->Flags |= IRP_WRITE_OPERATION;
/* Setup Stack Data */ /* Setup Stack Data */
// StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr = IoGetNextIrpStackLocation(Irp);
// StackPtr->FileObject = PrimarySurface.VideoFileObject; StackPtr->FileObject = PrimarySurface.VideoFileObject;
// StackPtr->Parameters.Write.Key = 0; StackPtr->Parameters.Write.Key = 0;
Status = IoCallDriver(DeviceObject, Irp); Status = IoCallDriver(DeviceObject, Irp);
@ -509,8 +506,6 @@ IntCreatePrimarySurface()
SURFOBJ *SurfObj; SURFOBJ *SurfObj;
BOOL calledFromUser; BOOL calledFromUser;
DPRINT("IntCreatePrimarySurface()\n");
if (! IntPrepareDriverIfNeeded()) if (! IntPrepareDriverIfNeeded())
{ {
return FALSE; return FALSE;

5
reactos/subsystems/win32/win32k/objects/dibobj.c
View file

@ -19,9 +19,6 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#if 0
#include "dibbmp.c"
#else
#include <w32k.h> #include <w32k.h>
#define NDEBUG #define NDEBUG
@ -1738,6 +1735,4 @@ BuildDIBPalette(CONST BITMAPINFO *bmi, PINT paletteType)
return hPal; return hPal;
} }
#endif
/* EOF */ /* EOF */