mirror of
https://github.com/reactos/reactos.git
synced 2024-07-01 18:24:24 +00:00
fixes for some compiler errors.
svn path=/trunk/; revision=526
This commit is contained in:
parent
da7f2bf2b2
commit
0deeaa0d83
|
@ -117,7 +117,7 @@ VideoPortGetDeviceBase(IN PVOID HwDeviceExtension,
|
|||
{
|
||||
if (InIoSpace)
|
||||
{
|
||||
return MmMapIoSpace(IoAddress, NumberOfUChars, FALSE);
|
||||
return MmMapIoSpace(IoAddress, NumberOfUchars, FALSE);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -166,16 +166,16 @@ VideoPortInitialize(IN PVOID Context1,
|
|||
{
|
||||
UCHAR Again;
|
||||
WCHAR UnicodeBuffer[18];
|
||||
NTSTATUS RC;
|
||||
NTSTATUS Status;
|
||||
ANSI_STRING AnsiName;
|
||||
UNICODE_STRING UnicodeName;
|
||||
PDRIVER_OBJECT MPDriverObject = (PDRIVER_OBJECT) Context1;
|
||||
PDEVICE_OBJECT MPDeviceObject;
|
||||
VIDEO_PORT_CONFIG_INFO ConfigInfo;
|
||||
VIDEOPORT_DEVICE_EXTENSION_DATA ExtensionData;
|
||||
PVIDEOPORT_EXTENSION_DATA ExtensionData;
|
||||
|
||||
/* Build Dispatch table from passed data */
|
||||
MPDriverObject->DriverStartIo = HwInitializationData->HwStartIO;
|
||||
MPDriverObject->DriverStartIo = (PDRIVER_STARTIO) HwInitializationData->HwStartIO;
|
||||
|
||||
/* Create a unicode device name */
|
||||
do
|
||||
|
@ -187,18 +187,18 @@ VideoPortInitialize(IN PVOID Context1,
|
|||
RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, FALSE);
|
||||
|
||||
/* Create the device */
|
||||
RC = IoCreateDevice(MPDriverObject,
|
||||
HwInitializationData->HwDeviceExtensionSize +
|
||||
sizeof VIDEOPORT_EXTENSION_DATA,
|
||||
&UnicodeName,
|
||||
FILE_DEVICE_VIDEO,
|
||||
0,
|
||||
TRUE,
|
||||
&MPDeviceObject);
|
||||
if (!NT_SUCCESS(RC))
|
||||
Status = IoCreateDevice(MPDriverObject,
|
||||
HwInitializationData->HwDeviceExtensionSize +
|
||||
sizeof(VIDEOPORT_EXTENSION_DATA),
|
||||
&UnicodeName,
|
||||
FILE_DEVICE_VIDEO,
|
||||
0,
|
||||
TRUE,
|
||||
&MPDeviceObject);
|
||||
if (!NT_SUCCESS(Status))
|
||||
{
|
||||
DbgPrint("IoCreateDevice call failed\n",0);
|
||||
return RC;
|
||||
return Status;
|
||||
}
|
||||
ExtensionData =
|
||||
(PVIDEOPORT_EXTENSION_DATA) MPDeviceObject->DeviceExtension;
|
||||
|
|
|
@ -10,5 +10,7 @@ typedef struct _VIDEOPORT_EXTENSTION_DATA
|
|||
} VIDEOPORT_EXTENSION_DATA, *PVIDEOPORT_EXTENSION_DATA;
|
||||
|
||||
#define MPExtensionToVPExtension(MPX) \
|
||||
(PVIDEOPORT_EXTENSION_DATA) ((DWORD) (MPX) - sizeof VIDEOPORT_EXTENSION_DATA)
|
||||
((PVIDEOPORT_EXTENSION_DATA) ((DWORD) (MPX) - sizeof(VIDEOPORT_EXTENSION_DATA)))
|
||||
#define VPExtensionToMPExtension(VPX) \
|
||||
((PVOID) ((DWORD) (VPX) + sizeof(VIDEOPORT_EXTENSION_DATA)))
|
||||
|
||||
|
|
|
@ -27,12 +27,7 @@
|
|||
* interrupts are handled the same as KM drivers.
|
||||
*/
|
||||
|
||||
typedef enum _VP_STATUS
|
||||
{
|
||||
NO_ERROR,
|
||||
ERROR_DEV_NOT_EXIST,
|
||||
ERROR_INVALID_PARAMETER
|
||||
} VP_STATUS, *PVP_STATUS;
|
||||
typedef LONG VP_STATUS, *PVP_STATUS;
|
||||
|
||||
#define VIDEO_MEMORY_SPACE_MEMORY 0x00
|
||||
#define VIDEO_MEMORY_SPACE_IO 0x01
|
||||
|
@ -56,8 +51,6 @@ typedef enum _VIDEO_SYNCHRONIZE_PRIORITY
|
|||
VpHighPriority
|
||||
} VIDEO_SYNCHRONIZE_PRIORITY, *PVIDEO_SYNCHRONIZE_PRIORITY;
|
||||
|
||||
typedef LONG VP_STATUS, *PVP_STATUS;
|
||||
|
||||
typedef struct _STATUS_BLOCK
|
||||
{
|
||||
VP_STATUS Status;
|
||||
|
|
|
@ -5,7 +5,8 @@
|
|||
#include <windows.h>
|
||||
#include <ddk/ntddk.h>
|
||||
|
||||
#include "../include/vectors.h"
|
||||
#if 0
|
||||
#include "win32k/vectors.h"
|
||||
|
||||
PFN Win32kVectors[] =
|
||||
{
|
||||
|
@ -289,6 +290,7 @@ PFN Win32kVectors[] =
|
|||
(PFN) W32kWidenPath,
|
||||
(PFN) W32kgdiPlaySpoolStream
|
||||
};
|
||||
#endif
|
||||
|
||||
WINBOOL STDCALL DllMain(HANDLE hInst,
|
||||
ULONG ul_reason_for_call,
|
||||
|
@ -303,6 +305,10 @@ WINBOOL STDCALL DllMain(HANDLE hInst,
|
|||
|
||||
PVOID W32kGetVectors(VOID)
|
||||
{
|
||||
DbgPrint("Unimplemented\n");
|
||||
return 0;
|
||||
#if 0
|
||||
return Win32kVectors;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue