Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Move some functions from stubs.c to new file eng/mapping.c

Browse source 
- Move EngSetPointerTag to mouse.c
- Move EngQuerySystemAttribute and EngGetTickCount to engmisc.c
- Unimplement EngLoadModule as it was wrong
- FLOATOBJ_XxxFloatObj are duplicated from FLOATOBJ_Xxx, remove the stubs and redirect in the pspec.
- Redirect EngGetCurrentProcessId and EngGetcurrentThreadId to ntoskrnl

svn path=/trunk/; revision=42601
This commit is contained in:
Timo Kreuzer 2009-08-10 20:19:33 +00:00
parent de2b47bdf6
commit 344e472e73
9 changed files with 240 additions and 301 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
reactos/subsystems/win32/win32k/eng/engmisc.c
View file

@ -221,20 +221,6 @@ IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave)
return Result; return Result;
} }
HANDLE APIENTRY
EngGetCurrentProcessId(VOID)
{
/* http://www.osr.com/ddk/graphics/gdifncs_5ovb.htm */
return PsGetCurrentProcessId();
}
HANDLE APIENTRY
EngGetCurrentThreadId(VOID)
{
/* http://www.osr.com/ddk/graphics/gdifncs_25rb.htm */
return PsGetCurrentThreadId();
}
HANDLE APIENTRY HANDLE APIENTRY
EngGetProcessHandle(VOID) EngGetProcessHandle(VOID)
{ {
@ -253,4 +239,57 @@ EngGetCurrentCodePage(OUT PUSHORT OemCodePage,
RtlGetDefaultCodePage(AnsiCodePage, OemCodePage); RtlGetDefaultCodePage(AnsiCodePage, OemCodePage);
} }
BOOL
APIENTRY
EngQuerySystemAttribute(
IN ENG_SYSTEM_ATTRIBUTE CapNum,
OUT PDWORD pCapability)
{
SYSTEM_BASIC_INFORMATION sbi;
SYSTEM_PROCESSOR_INFORMATION spi;
switch (CapNum)
{
case EngNumberOfProcessors:
NtQuerySystemInformation(SystemBasicInformation,
&sbi,
sizeof(SYSTEM_BASIC_INFORMATION),
NULL);
*pCapability = sbi.NumberOfProcessors;
return TRUE;
case EngProcessorFeature:
NtQuerySystemInformation(SystemProcessorInformation,
&spi,
sizeof(SYSTEM_PROCESSOR_INFORMATION),
NULL);
*pCapability = spi.ProcessorFeatureBits;
return TRUE;
default:
break;
}
return FALSE;
}
ULONGLONG
APIENTRY
EngGetTickCount(VOID)
{
ULONG Multiplier;
LARGE_INTEGER TickCount;
/* Get the multiplier and current tick count */
KeQueryTickCount(&TickCount);
Multiplier = SharedUserData->TickCountMultiplier;
/* Convert to milliseconds and return */
return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) +
(Multiplier * (TickCount.HighPart << 8)));
}
/* EOF */ /* EOF */

145
reactos/subsystems/win32/win32k/eng/mapping.c Normal file
View file

@ -0,0 +1,145 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: Functions for mapping files and sections
* FILE: subsys/win32k/eng/device.c
* PROGRAMER:
*/
#include <w32k.h>
#define NDEBUG
#include <debug.h>
HANDLE
APIENTRY
EngLoadModule(LPWSTR pwsz)
{
UNIMPLEMENTED;
return NULL;
}
HANDLE
APIENTRY
EngLoadModuleForWrite(
IN LPWSTR pwsz,
IN ULONG cjSizeOfModule)
{
// www.osr.com/ddk/graphics/gdifncs_98rr.htm
UNIMPLEMENTED;
return NULL;
}
PVOID
APIENTRY
EngMapModule(
IN HANDLE h,
OUT PULONG pulSize)
{
// www.osr.com/ddk/graphics/gdifncs_9b1j.htm
UNIMPLEMENTED;
return NULL;
}
VOID
APIENTRY
EngFreeModule (IN HANDLE h)
{
// www.osr.com/ddk/graphics/gdifncs_9fzb.htm
UNIMPLEMENTED;
}
PVOID
APIENTRY
EngMapFile(
IN LPWSTR pwsz,
IN ULONG cjSize,
OUT ULONG_PTR *piFile)
{
UNIMPLEMENTED;
return NULL;
}
BOOL
APIENTRY
EngUnmapFile(
IN ULONG_PTR iFile)
{
UNIMPLEMENTED;
return FALSE;
}
BOOL
APIENTRY
EngMapFontFileFD(
IN ULONG_PTR iFile,
OUT PULONG *ppjBuf,
OUT ULONG *pcjBuf)
{
// www.osr.com/ddk/graphics/gdifncs_0co7.htm
UNIMPLEMENTED;
return FALSE;
}
VOID
APIENTRY
EngUnmapFontFileFD(
IN ULONG_PTR iFile)
{
// http://www.osr.com/ddk/graphics/gdifncs_6wbr.htm
UNIMPLEMENTED;
}
BOOL
APIENTRY
EngMapFontFile(
ULONG_PTR iFile,
PULONG *ppjBuf,
ULONG *pcjBuf)
{
// www.osr.com/ddk/graphics/gdifncs_3up3.htm
return EngMapFontFileFD(iFile, ppjBuf, pcjBuf);
}
VOID
APIENTRY
EngUnmapFontFile(
IN ULONG_PTR iFile)
{
// www.osr.com/ddk/graphics/gdifncs_09wn.htm
EngUnmapFontFileFD(iFile);
}
BOOLEAN
APIENTRY
EngMapSection(IN PVOID Section,
IN BOOLEAN Map,
IN HANDLE Process,
IN PVOID* BaseAddress)
{
UNIMPLEMENTED;
return FALSE;
}
PVOID
APIENTRY
EngAllocSectionMem(IN PVOID SectionObject,
IN ULONG Flags,
IN SIZE_T MemSize,
IN ULONG Tag)
{
UNIMPLEMENTED;
return NULL;
}
BOOLEAN
APIENTRY
EngFreeSectionMem(IN PVOID SectionObject OPTIONAL,
IN PVOID MappedBase)
{
UNIMPLEMENTED;
return FALSE;
}

15
reactos/subsystems/win32/win32k/eng/mouse.c
View file

@ -16,6 +16,21 @@
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
BOOL
APIENTRY
EngSetPointerTag(
IN HDEV hdev,
IN SURFOBJ *psoMask,
IN SURFOBJ *psoColor,
IN XLATEOBJ *pxlo,
IN FLONG fl)
{
// This function is obsolete for Windows 2000 and later.
// This function is still supported, but always returns FALSE.
// www.osr.com/ddk/graphics/gdifncs_4yav.htm
return FALSE;
}
/* /*
* FUNCTION: Notify the mouse driver that drawing is about to begin in * FUNCTION: Notify the mouse driver that drawing is about to begin in
* a rectangle on a particular surface. * a rectangle on a particular surface.

21
reactos/subsystems/win32/win32k/ldr/loader.c
View file

@ -243,27 +243,6 @@ EngLoadImage (LPWSTR DriverName)
return hImageHandle; return hImageHandle;
} }
/*
* @unimplemented
*/
HANDLE
APIENTRY
EngLoadModule(LPWSTR ModuleName)
{
SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo;
NTSTATUS Status;
// FIXME: should load as readonly
RtlInitUnicodeString (&GdiDriverInfo.DriverName, ModuleName);
Status = ZwSetSystemInformation (SystemLoadGdiDriverInformation,
&GdiDriverInfo, sizeof(SYSTEM_GDI_DRIVER_INFORMATION));
if (!NT_SUCCESS(Status)) return NULL;
return (HANDLE)GdiDriverInfo.ImageAddress;
}
VOID VOID
APIENTRY APIENTRY
EngUnloadImage ( IN HANDLE hModule ) EngUnloadImage ( IN HANDLE hModule )

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

@ -8,7 +8,7 @@
#include <w32k.h> #include <w32k.h>
#define NDEBUG #define YDEBUG
#include <debug.h> #include <debug.h>
// TODO: proper implementation of LDEVOBJ and PDEVOBJ interface // TODO: proper implementation of LDEVOBJ and PDEVOBJ interface
@ -214,6 +214,9 @@ 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))
{ {
@ -450,7 +453,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;
@ -475,16 +478,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);
@ -506,6 +509,8 @@ 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,6 +19,9 @@
* 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
@ -1735,4 +1738,6 @@ BuildDIBPalette(CONST BITMAPINFO *bmi, PINT paletteType)
return hPal; return hPal;
} }
#endif
/* EOF */ /* EOF */

250
reactos/subsystems/win32/win32k/stubs/stubs.c
View file

@ -6,58 +6,7 @@
#define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ ) #define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ )
/*
* @unimplemented
*/
BOOL
APIENTRY
EngMapFontFileFD (
IN ULONG_PTR iFile,
OUT PULONG *ppjBuf,
OUT ULONG *pcjBuf
)
{
// www.osr.com/ddk/graphics/gdifncs_0co7.htm
UNIMPLEMENTED;
return FALSE;
}
/*
* @unimplemented
*/
VOID
APIENTRY
EngUnmapFontFileFD ( IN ULONG_PTR iFile )
{
// http://www.osr.com/ddk/graphics/gdifncs_6wbr.htm
UNIMPLEMENTED;
}
/*
* @implemented
*/
BOOL
APIENTRY
EngMapFontFile (
ULONG_PTR iFile,
PULONG *ppjBuf,
ULONG *pcjBuf
)
{
// www.osr.com/ddk/graphics/gdifncs_3up3.htm
return EngMapFontFileFD ( iFile, ppjBuf, pcjBuf );
}
/*
* @implemented
*/
VOID
APIENTRY
EngUnmapFontFile ( ULONG_PTR iFile )
{
// www.osr.com/ddk/graphics/gdifncs_09wn.htm
EngUnmapFontFileFD ( iFile );
}
/* /*
* @unimplemented * @unimplemented
@ -201,18 +150,6 @@ EngFindResource(
return NULL; return NULL;
} }
/*
* @unimplemented
*/
VOID
APIENTRY
EngFreeModule ( IN HANDLE h )
{
// www.osr.com/ddk/graphics/gdifncs_9fzb.htm
UNIMPLEMENTED;
}
/* /*
* @unimplemented * @unimplemented
*/ */
@ -342,36 +279,6 @@ EngGetType1FontList(
return FALSE; return FALSE;
} }
/*
* @unimplemented
*/
HANDLE
APIENTRY
EngLoadModuleForWrite(
IN LPWSTR pwsz,
IN ULONG cjSizeOfModule
)
{
// www.osr.com/ddk/graphics/gdifncs_98rr.htm
UNIMPLEMENTED;
return NULL;
}
/*
* @unimplemented
*/
PVOID
APIENTRY
EngMapModule(
IN HANDLE h,
OUT PULONG pSize
)
{
// www.osr.com/ddk/graphics/gdifncs_9b1j.htm
UNIMPLEMENTED;
return NULL;
}
/* /*
* @unimplemented * @unimplemented
*/ */
@ -421,21 +328,6 @@ EngQueryPalette(
return 0; return 0;
} }
BOOL
APIENTRY
EngSetPointerTag(
IN HDEV hdev,
IN SURFOBJ *psoMask,
IN SURFOBJ *psoColor,
IN XLATEOBJ *pxlo,
IN FLONG fl
)
{
// This function is obsolete for Windows 2000 and later.
// This function is still supported, but always returns FALSE.
// www.osr.com/ddk/graphics/gdifncs_4yav.htm
return FALSE;
}
DWORD DWORD
APIENTRY APIENTRY
@ -746,45 +638,6 @@ EngDitherColor(
return DCR_SOLID; return DCR_SOLID;
} }
/*
* @implemented
*/
BOOL APIENTRY
EngQuerySystemAttribute(
IN ENG_SYSTEM_ATTRIBUTE CapNum,
OUT PDWORD pCapability)
{
SYSTEM_BASIC_INFORMATION sbi;
SYSTEM_PROCESSOR_INFORMATION spi;
switch (CapNum)
{
case EngNumberOfProcessors:
NtQuerySystemInformation(
SystemBasicInformation,
&sbi,
sizeof(SYSTEM_BASIC_INFORMATION),
NULL);
*pCapability = sbi.NumberOfProcessors;
return TRUE;
case EngProcessorFeature:
NtQuerySystemInformation(
SystemProcessorInformation,
&spi,
sizeof(SYSTEM_PROCESSOR_INFORMATION),
NULL);
*pCapability = spi.ProcessorFeatureBits;
return TRUE;
default:
break;
}
return FALSE;
}
/* /*
* @unimplemented * @unimplemented
*/ */
@ -850,19 +703,6 @@ EngLpkInstalled()
return FALSE; return FALSE;
} }
/*
* @unimplemented
*/
PVOID APIENTRY
EngMapFile(
IN LPWSTR Filename,
IN ULONG Size,
OUT ULONG_PTR *File)
{
UNIMPLEMENTED;
return NULL;
}
/* /*
* @unimplemented * @unimplemented
*/ */
@ -913,16 +753,6 @@ EngQueryFileTimeStamp(IN LPWSTR FileName)
return FileTime; return FileTime;
} }
/*
* @unimplemented
*/
BOOL APIENTRY
EngUnmapFile(
IN ULONG_PTR File)
{
UNIMPLEMENTED;
return FALSE;
}
/* /*
* @unimplemented * @unimplemented
@ -2753,86 +2583,6 @@ EngFntCacheLookUp(IN ULONG FastCheckSum,
return NULL; return NULL;
} }
VOID
APIENTRY
FLOATOBJ_AddFloatObj(PFLOATOBJ pFloatObj1,
PFLOATOBJ pFloatObj2)
{
UNIMPLEMENTED;
}
VOID
APIENTRY
FLOATOBJ_DivFloatObj(PFLOATOBJ pFloatObj1,
PFLOATOBJ pFloatObj2)
{
UNIMPLEMENTED;
}
VOID
APIENTRY
FLOATOBJ_MulFloatObj(PFLOATOBJ pFloatObj1,
PFLOATOBJ pFloatObj2)
{
UNIMPLEMENTED;
}
VOID
APIENTRY
FLOATOBJ_SubFloatObj(PFLOATOBJ pFloatObj1,
PFLOATOBJ pFloatObj2)
{
UNIMPLEMENTED;
}
PVOID
APIENTRY
EngAllocSectionMem(IN PVOID SectionObject,
IN ULONG Flags,
IN SIZE_T MemSize,
IN ULONG Tag)
{
UNIMPLEMENTED;
return NULL;
}
BOOLEAN
APIENTRY
EngFreeSectionMem(IN PVOID SectionObject OPTIONAL,
IN PVOID MappedBase)
{
UNIMPLEMENTED;
return FALSE;
}
ULONGLONG
APIENTRY
EngGetTickCount(VOID)
{
ULONG Multiplier;
LARGE_INTEGER TickCount;
/* Get the multiplier and current tick count */
KeQueryTickCount(&TickCount);
Multiplier = SharedUserData->TickCountMultiplier;
/* Convert to milliseconds and return */
return (Int64ShrlMod32(UInt32x32To64(Multiplier, TickCount.LowPart), 24) +
(Multiplier * (TickCount.HighPart << 8)));
}
BOOLEAN
APIENTRY
EngMapSection(IN PVOID Section,
IN BOOLEAN Map,
IN HANDLE Process,
IN PVOID* BaseAddress)
{
UNIMPLEMENTED;
return FALSE;
}
BOOLEAN BOOLEAN
APIENTRY APIENTRY
EngNineGrid(IN SURFOBJ* pDestSurfaceObj, EngNineGrid(IN SURFOBJ* pDestSurfaceObj,

12
reactos/subsystems/win32/win32k/win32k.pspec
View file

@ -1,9 +1,9 @@
#include "include/reactos/msvctarget.h" #include "include/reactos/msvctarget.h"
@ stdcall FLOATOBJ_AddFloatObj(ptr ptr) @ stdcall FLOATOBJ_AddFloatObj(ptr ptr) FLOATOBJ_Add
@ stdcall FLOATOBJ_DivFloatObj(ptr ptr) @ stdcall FLOATOBJ_DivFloatObj(ptr ptr) FLOATOBJ_Div
@ stdcall FLOATOBJ_MulFloatObj(ptr ptr) @ stdcall FLOATOBJ_MulFloatObj(ptr ptr) FLOATOBJ_Mul
@ stdcall FLOATOBJ_SubFloatObj(ptr ptr) @ stdcall FLOATOBJ_SubFloatObj(ptr ptr) FLOATOBJ_Sub
@ stdcall BRUSHOBJ_hGetColorTransform(ptr) @ stdcall BRUSHOBJ_hGetColorTransform(ptr)
@ stdcall BRUSHOBJ_pvAllocRbrush(ptr long) @ stdcall BRUSHOBJ_pvAllocRbrush(ptr long)
@ stdcall BRUSHOBJ_pvGetRbrush(ptr) @ stdcall BRUSHOBJ_pvGetRbrush(ptr)
@ -66,8 +66,8 @@
@ stdcall EngFreeSectionMem(ptr ptr) @ stdcall EngFreeSectionMem(ptr ptr)
@ stdcall EngFreeUserMem(ptr) @ stdcall EngFreeUserMem(ptr)
@ stdcall EngGetCurrentCodePage(ptr ptr) @ stdcall EngGetCurrentCodePage(ptr ptr)
@ stdcall EngGetCurrentProcessId() @ stdcall EngGetCurrentProcessId() NTOSKRNL.PsGetCurrentProcessId
@ stdcall EngGetCurrentThreadId() @ stdcall EngGetCurrentThreadId() NTOSKRNL.PsGetCurrentThreadId
@ stdcall EngGetDriverName(ptr) @ stdcall EngGetDriverName(ptr)
@ stdcall EngGetFileChangeTime(ptr ptr) @ stdcall EngGetFileChangeTime(ptr ptr)
@ stdcall EngGetFilePath(ptr ptr) @ stdcall EngGetFilePath(ptr ptr)

1
reactos/subsystems/win32/win32k/win32k.rbuild
View file

@ -65,6 +65,7 @@
</if> </if>
<file>gradient.c</file> <file>gradient.c</file>
<file>lineto.c</file> <file>lineto.c</file>
<file>mapping.c</file>
<file>mem.c</file> <file>mem.c</file>
<file>engmisc.c</file> <file>engmisc.c</file>
<file>mouse.c</file> <file>mouse.c</file>