Коммит 0deeaa0d создал по автору Rex Jolliff's avatar Rex Jolliff
Просмотр файлов

fixes for some compiler errors. 

svn path=/trunk/; revision=526
владелец da7f2bf2
Скрыть пробелы
Построчно Рядом
reactos/drivers/dd/vidport/vidport.c
Просмотр файла @ 0deeaa0d
...@@ -117,7 +117,7 @@ VideoPortGetDeviceBase(IN PVOID HwDeviceExtension, ...@@ -117,7 +117,7 @@ VideoPortGetDeviceBase(IN PVOID HwDeviceExtension,
{ {
if (InIoSpace) if (InIoSpace)
{ {
return MmMapIoSpace(IoAddress, NumberOfUChars, FALSE); return MmMapIoSpace(IoAddress, NumberOfUchars, FALSE);
} }
else else
{ {
...@@ -166,16 +166,16 @@ VideoPortInitialize(IN PVOID Context1, ...@@ -166,16 +166,16 @@ VideoPortInitialize(IN PVOID Context1,
{ {
UCHAR Again; UCHAR Again;
WCHAR UnicodeBuffer[18]; WCHAR UnicodeBuffer[18];
NTSTATUS RC; NTSTATUS Status;
ANSI_STRING AnsiName; ANSI_STRING AnsiName;
UNICODE_STRING UnicodeName; UNICODE_STRING UnicodeName;
PDRIVER_OBJECT MPDriverObject = (PDRIVER_OBJECT) Context1; PDRIVER_OBJECT MPDriverObject = (PDRIVER_OBJECT) Context1;
PDEVICE_OBJECT MPDeviceObject; PDEVICE_OBJECT MPDeviceObject;
VIDEO_PORT_CONFIG_INFO ConfigInfo; VIDEO_PORT_CONFIG_INFO ConfigInfo;
VIDEOPORT_DEVICE_EXTENSION_DATA ExtensionData; PVIDEOPORT_EXTENSION_DATA ExtensionData;
/* Build Dispatch table from passed data */ /* Build Dispatch table from passed data */
MPDriverObject->DriverStartIo = HwInitializationData->HwStartIO; MPDriverObject->DriverStartIo = (PDRIVER_STARTIO) HwInitializationData->HwStartIO;
/* Create a unicode device name */ /* Create a unicode device name */
do do
...@@ -187,18 +187,18 @@ VideoPortInitialize(IN PVOID Context1, ...@@ -187,18 +187,18 @@ VideoPortInitialize(IN PVOID Context1,
RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, FALSE); RtlAnsiStringToUnicodeString(&UnicodeName, &AnsiName, FALSE);
/* Create the device */ /* Create the device */
RC = IoCreateDevice(MPDriverObject, Status = IoCreateDevice(MPDriverObject,
HwInitializationData->HwDeviceExtensionSize + HwInitializationData->HwDeviceExtensionSize +
sizeof VIDEOPORT_EXTENSION_DATA, sizeof(VIDEOPORT_EXTENSION_DATA),
&UnicodeName, &UnicodeName,
FILE_DEVICE_VIDEO, FILE_DEVICE_VIDEO,
0, 0,
TRUE, TRUE,
&MPDeviceObject); &MPDeviceObject);
if (!NT_SUCCESS(RC)) if (!NT_SUCCESS(Status))
{ {
DbgPrint("IoCreateDevice call failed\n",0); DbgPrint("IoCreateDevice call failed\n",0);
return RC; return Status;
} }
ExtensionData = ExtensionData =
(PVIDEOPORT_EXTENSION_DATA) MPDeviceObject->DeviceExtension; (PVIDEOPORT_EXTENSION_DATA) MPDeviceObject->DeviceExtension;
......
reactos/drivers/dd/vidport/vidport.h
Просмотр файла @ 0deeaa0d
...@@ -10,5 +10,7 @@ typedef struct _VIDEOPORT_EXTENSTION_DATA ...@@ -10,5 +10,7 @@ typedef struct _VIDEOPORT_EXTENSTION_DATA
} VIDEOPORT_EXTENSION_DATA, *PVIDEOPORT_EXTENSION_DATA; } VIDEOPORT_EXTENSION_DATA, *PVIDEOPORT_EXTENSION_DATA;
#define MPExtensionToVPExtension(MPX) \ #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)))
reactos/include/ddk/ntddvid.h
Просмотр файла @ 0deeaa0d
...@@ -27,12 +27,7 @@ ...@@ -27,12 +27,7 @@
* interrupts are handled the same as KM drivers. * interrupts are handled the same as KM drivers.
*/ */
typedef enum _VP_STATUS typedef LONG VP_STATUS, *PVP_STATUS;
{
NO_ERROR,
ERROR_DEV_NOT_EXIST,
ERROR_INVALID_PARAMETER
} VP_STATUS, *PVP_STATUS;
#define VIDEO_MEMORY_SPACE_MEMORY 0x00 #define VIDEO_MEMORY_SPACE_MEMORY 0x00
#define VIDEO_MEMORY_SPACE_IO 0x01 #define VIDEO_MEMORY_SPACE_IO 0x01
...@@ -56,8 +51,6 @@ typedef enum _VIDEO_SYNCHRONIZE_PRIORITY ...@@ -56,8 +51,6 @@ typedef enum _VIDEO_SYNCHRONIZE_PRIORITY
VpHighPriority VpHighPriority
} VIDEO_SYNCHRONIZE_PRIORITY, *PVIDEO_SYNCHRONIZE_PRIORITY; } VIDEO_SYNCHRONIZE_PRIORITY, *PVIDEO_SYNCHRONIZE_PRIORITY;
typedef LONG VP_STATUS, *PVP_STATUS;
typedef struct _STATUS_BLOCK typedef struct _STATUS_BLOCK
{ {
VP_STATUS Status; VP_STATUS Status;
......
reactos/subsys/win32k/main/dllmain.c
Просмотр файла @ 0deeaa0d
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
#include <windows.h> #include <windows.h>
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include "../include/vectors.h" #if 0
#include "win32k/vectors.h"
PFN Win32kVectors[] = PFN Win32kVectors[] =
{ {
...@@ -289,6 +290,7 @@ PFN Win32kVectors[] = ...@@ -289,6 +290,7 @@ PFN Win32kVectors[] =
(PFN) W32kWidenPath, (PFN) W32kWidenPath,
(PFN) W32kgdiPlaySpoolStream (PFN) W32kgdiPlaySpoolStream
}; };
#endif
WINBOOL STDCALL DllMain(HANDLE hInst, WINBOOL STDCALL DllMain(HANDLE hInst,
ULONG ul_reason_for_call, ULONG ul_reason_for_call,
...@@ -303,6 +305,10 @@ WINBOOL STDCALL DllMain(HANDLE hInst, ...@@ -303,6 +305,10 @@ WINBOOL STDCALL DllMain(HANDLE hInst,
PVOID W32kGetVectors(VOID) PVOID W32kGetVectors(VOID)
{ {
DbgPrint("Unimplemented\n");
return 0;
#if 0
return Win32kVectors; return Win32kVectors;
#endif
} }
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать