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

Filip Navara:

Browse source 
- Only increment VideoPortDeviceNumber, when IntVideoPortCreateAdapterDeviceObject and IntVideoPortFindAdapter succeeded.
  This fixes loading the CL54xx miniport driver. But it still isn't usable, because win32k cannot find the DDI driver for it.

svn path=/trunk/; revision=33357
This commit is contained in:
Colin Finck 2008-05-07 21:51:39 +00:00
parent df3116fa7f
commit b9b700035f
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/video/videoprt/dispatch.c
View file

@ -81,6 +81,8 @@ IntVideoPortAddDevice(
DriverExtension, DriverExtension,
PhysicalDeviceObject, PhysicalDeviceObject,
&DeviceObject); &DeviceObject);
if (NT_SUCCESS(Status))
VideoPortDeviceNumber++;
return Status; return Status;
} }

4
reactos/drivers/video/videoprt/videoprt.c
View file

@ -187,7 +187,7 @@ IntVideoPortCreateAdapterDeviceObject(
* object names and symlinks. * object names and symlinks.
*/ */
DeviceNumber = VideoPortDeviceNumber++; DeviceNumber = VideoPortDeviceNumber;
if (DeviceNumber == 0xFFFFFFFF) if (DeviceNumber == 0xFFFFFFFF)
{ {
WARN_(VIDEOPRT, "Can't find free device number\n"); WARN_(VIDEOPRT, "Can't find free device number\n");
@ -721,6 +721,8 @@ VideoPortInitialize(
return Status; return Status;
Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject); Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject);
INFO_(VIDEOPRT, "IntVideoPortFindAdapter returned 0x%x\n", Status); INFO_(VIDEOPRT, "IntVideoPortFindAdapter returned 0x%x\n", Status);
if (NT_SUCCESS(Status))
VideoPortDeviceNumber++;
return Status; return Status;
} }
else else

1
reactos/drivers/video/videoprt/videoprt.h
View file

@ -196,6 +196,7 @@ IntVideoPortMapPhysicalMemory(
extern ULONG CsrssInitialized; extern ULONG CsrssInitialized;
extern PKPROCESS Csrss; extern PKPROCESS Csrss;
extern ULONG VideoPortDeviceNumber;
VOID FASTCALL VOID FASTCALL
IntAttachToCSRSS(PKPROCESS *CallingProcess, PKAPC_STATE ApcState); IntAttachToCSRSS(PKPROCESS *CallingProcess, PKAPC_STATE ApcState);