Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[greatlrd] 18919: fill in the DDSD we got from the call of createsurface it is not complete

by greatlrd＠svn.reactos.com

fill in the DDSD we got from the call of createsurface it is not complete Modified: trunk/reactos/lib/ddraw/main/surface_main.c _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 20:35:03 UTC (rev 18918) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 20:43:06 UTC (rev 18919) @@ -18,8 +18,6 @@ if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) return DDERR_UNSUPPORTED; - if(!(pDDSD2->dwFlags & DDSD_CAPS)) - return DDERR_INVALIDPARAMS; This->owner = (IDirectDrawImpl*)pDD; @@ -29,6 +27,29 @@ ddsd.dwSize = sizeof(DDSURFACEDESC); /* FIXME Fill the rest from ddsd2 to ddsd */ + + RtlCopyMemory(&ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(ddsd.ddc kCKDestBlt)); + RtlCopyMemory(&ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,sizeof( ddsd.ddckCKDestOverlay)); + RtlCopyMemory(&ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(ddsd.ddckC KSrcBlt)); + RtlCopyMemory(&ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,sizeof(dd sd.ddckCKSrcOverlay)); + RtlCopyMemory(&ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeof(ddsd .ddpfPixelFormat)); + RtlCopyMemory(&ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(ddsd.ddsCaps)); + + ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; + ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; + ddsd.dwFlags = pDDSD2->dwFlags; + ddsd.dwHeight = pDDSD2->dwHeight; + /* FIXME ddsd.dwLinearSize = pDDSD2->dwLinearSize; Problem with our header for dx */ + ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; + ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; + ddsd.dwReserved = pDDSD2->dwReserved; + ddsd.dwWidth = pDDSD2->dwWidth; + /* FIXME ddsd.dwZBufferBitDepth where in pDDSD2 */ + /* FIXME ddsd.lPitch = pDDSD2->lPitch; Problem with our header for dx */ + ddsd.lpSurface = pDDSD2->lpSurface; + + + /************ Test see if we can Create Surface ***********************/ if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE)

18 years, 11 months

[weiden] 18918: fix return type of ObDereferenceSecurityDescriptor

by weiden＠svn.reactos.com

fix return type of ObDereferenceSecurityDescriptor Modified: trunk/reactos/ntoskrnl/ob/security.c _____ Modified: trunk/reactos/ntoskrnl/ob/security.c --- trunk/reactos/ntoskrnl/ob/security.c 2005-10-31 20:08:24 UTC (rev 18917) +++ trunk/reactos/ntoskrnl/ob/security.c 2005-10-31 20:35:03 UTC (rev 18918) @@ -270,7 +270,7 @@ /* * @unimplemented */ -NTSTATUS STDCALL +VOID STDCALL ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN ULONG Count) {

18 years, 11 months

[greatlrd] 18917: Fix someprat of Createsurface now it is working for ati readon, the code is not complete.

by greatlrd＠svn.reactos.com

Fix someprat of Createsurface now it is working for ati readon, the code is not complete. Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c Modified: trunk/reactos/lib/ddraw/main/surface_main.c Modified: trunk/reactos/lib/ddraw/rosdraw.h _____ Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c --- trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-10-31 19:41:27 UTC (rev 18916) +++ trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-10-31 20:08:24 UTC (rev 18917) @@ -13,7 +13,8 @@ HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest, LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { - + DX_STUB; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; IDirectDrawSurfaceImpl* That = (IDirectDrawSurfaceImpl*)src; _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 19:41:27 UTC (rev 18916) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 20:08:24 UTC (rev 18917) @@ -14,7 +14,7 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) { IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - + if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) return DDERR_UNSUPPORTED; @@ -23,69 +23,83 @@ This->owner = (IDirectDrawImpl*)pDD; - DDSURFACEDESC DDSD = *(LPDDSURFACEDESC)pDDSD2; - DDSD.dwSize = sizeof(pDDSD2); - + /************ fill the discription of our primary surface ***********************/ + DDSURFACEDESC ddsd; + memset (&ddsd, 0, sizeof(DDSURFACEDESC)); + ddsd.dwSize = sizeof(DDSURFACEDESC); + + /* FIXME Fill the rest from ddsd2 to ddsd */ + + /************ Test see if we can Create Surface ***********************/ if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) { /* can the driver create the surface */ DDHAL_CANCREATESURFACEDATA CanCreateData; memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); CanCreateData.lpDD = &This->owner->DirectDrawGlobal; - CanCreateData.lpDDSurfaceDesc = &DDSD; + CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&ddsd; if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCre ateData) == DDHAL_DRIVER_NOTHANDLED) return DDERR_INVALIDPARAMS; - if(CanCreateData.ddRVal != DD_OK) + if(CanCreateData.ddRVal != DD_OK) return CanCreateData.ddRVal; } - /* surface global struct */ - memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + + /************ Create Surface ***********************/ + + /* FIXME we are skipping filling in some data, I do not care for now */ + + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal = &This->owner->DirectDrawGlobal; + ddsd.dwFlags = DDSD_CAPS; + ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + + /* surface global struct */ + memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); This->Global.lpDD = &This->owner->DirectDrawGlobal; This->Global.wHeight = This->owner->DirectDrawGlobal.vmiData.dwDisplayHeight; This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth; This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch; + - /* surface more struct */ + /* surface more struct */ memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - + /* surface local struct */ + memset(&This->Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); This->Local.lpGbl = &This->Global; This->Local.lpSurfMore = &This->More; - This->Local.ddsCaps = DDSD.ddsCaps; - /* we need to set some flags if we create the primary surface */ - if(pDDSD2->ddsCaps.dwCaps == DDSCAPS_PRIMARYSURFACE) - { - This->Local.dwFlags |= DDRAWISURF_FRONTBUFFER; - This->Global.dwGlobalFlags |= DDRAWISURFGBL_ISGDISURFACE; - } - + /* FIXME do a memcopy */ + This->Local.ddsCaps = *(DDSCAPS*)&ddsd.ddsCaps; + /* for the double pointer below */ DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; pLocal[0] = &This->Local; - pLocal[1] = NULL; // we need this one for bad written drivers - + pLocal[1] = NULL; + /* the parameter struct */ DDHAL_CREATESURFACEDATA CreateData; memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); - CreateData.lpDD = &This->owner->DirectDrawGlobal; - CreateData.lpDDSurfaceDesc = &DDSD; + CreateData.lpDD = pDirectDrawGlobal; + CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &ddsd; CreateData.dwSCnt = 1; CreateData.lplpSList = pLocal; - + CreateData.ddRVal = DD_FALSE; + + /* this is the call we were waiting for */ if(This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CreateSurface(&CreateD ata) == DDHAL_DRIVER_NOTHANDLED) return DDERR_INVALIDPARAMS; - + + /* FIXME remove the if and debug string*/ if(CreateData.ddRVal != DD_OK) return CreateData.ddRVal; - - OutputDebugString(L"This does not get hit :( "); + + OutputDebugString(L"This does hit By Ati Readon but not for nvida :( "); OutputDebugString(L"Yet ;)"); return DD_OK; @@ -122,6 +136,8 @@ LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + + DX_STUB; if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_FLIPTOGDISURFACE) { _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-31 19:41:27 UTC (rev 18916) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-31 20:08:24 UTC (rev 18917) @@ -44,6 +44,7 @@ DDRAWI_DDRAWSURFACE_GBL Global; DDRAWI_DDRAWSURFACE_MORE More; DDRAWI_DDRAWSURFACE_LCL Local; + DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; } IDirectDrawSurfaceImpl;

18 years, 11 months

[weiden] 18916: added stubs for ObLogSecurityDescriptor and ObDereferenceSecurityDescriptor

by weiden＠svn.reactos.com

added stubs for ObLogSecurityDescriptor and ObDereferenceSecurityDescriptor Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ob/security.c _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.def --- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-10-31 19:39:22 UTC (rev 18915) +++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-10-31 19:41:27 UTC (rev 18916) @@ -828,10 +828,12 @@ ;ObCheckCreateObjectAccess@28 ;ObCheckObjectAccess@20 ObCreateObject@36 +ObDereferenceSecurityDescriptor@8 ObFindHandleForObject@20 ObGetObjectPointerCount@4 ObGetObjectSecurity@12 ObInsertObject@24 +ObLogSecurityDescriptor@12 ObMakeTemporaryObject@4 ObOpenObjectByName@28 ObOpenObjectByPointer@28 _____ Modified: trunk/reactos/ntoskrnl/ob/security.c --- trunk/reactos/ntoskrnl/ob/security.c 2005-10-31 19:39:22 UTC (rev 18915) +++ trunk/reactos/ntoskrnl/ob/security.c 2005-10-31 19:41:27 UTC (rev 18916) @@ -253,4 +253,28 @@ return Status; } + +/* + * @unimplemented + */ +NTSTATUS STDCALL +ObLogSecurityDescriptor(IN PSECURITY_DESCRIPTOR InputSecurityDescriptor, + OUT PSECURITY_DESCRIPTOR *OutputSecurityDescriptor, + IN ULONG RefBias) +{ + DPRINT1("ObLogSecurityDescriptor is not implemented!\n"); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +NTSTATUS STDCALL +ObDereferenceSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN ULONG Count) +{ + DPRINT1("ObDereferenceSecurityDescriptor is not implemented!\n"); +} + /* EOF */

18 years, 11 months

[weiden] 18915: don't ask for generic read access rights in WaitNamedPipe

by weiden＠svn.reactos.com

don't ask for generic read access rights in WaitNamedPipe Modified: trunk/reactos/lib/kernel32/file/npipe.c _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-10-31 19:12:07 UTC (rev 18914) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-10-31 19:39:22 UTC (rev 18915) @@ -128,23 +128,16 @@ if (!(dwOpenMode & FILE_FLAG_OVERLAPPED)) CreateOptions |= FILE_SYNCHRONOUS_IO_NONALERT; - switch (dwOpenMode & PIPE_ACCESS_DUPLEX) + if (dwOpenMode & PIPE_ACCESS_INBOUND) { - case PIPE_ACCESS_INBOUND: - ShareAccess |= FILE_SHARE_WRITE; - DesiredAccess |= GENERIC_READ; - break; - - case PIPE_ACCESS_OUTBOUND: - ShareAccess |= FILE_SHARE_READ; - DesiredAccess |= GENERIC_WRITE; - break; - - case PIPE_ACCESS_DUPLEX: - ShareAccess |= FILE_SHARE_READ | FILE_SHARE_WRITE; - DesiredAccess |= GENERIC_READ | GENERIC_WRITE; - break; + ShareAccess |= FILE_SHARE_WRITE; + DesiredAccess |= GENERIC_READ; } + if (dwOpenMode & PIPE_ACCESS_OUTBOUND) + { + ShareAccess |= FILE_SHARE_READ; + DesiredAccess |= GENERIC_WRITE; + } if (dwPipeMode & PIPE_TYPE_MESSAGE) WriteModeMessage = FILE_PIPE_MESSAGE_TYPE; @@ -243,7 +236,7 @@ NULL, NULL); Status = NtOpenFile(&FileHandle, - FILE_GENERIC_READ, + FILE_READ_ATTRIBUTES | SYNCHRONIZE, &ObjectAttributes, &Iosb, FILE_SHARE_READ | FILE_SHARE_WRITE,

18 years, 11 months

[mbosma] 18914: Fix wrong DDESC2 to DDESC conversion. Spotted by GreatLord.

by mbosma＠svn.reactos.com

Fix wrong DDESC2 to DDESC conversion. Spotted by GreatLord. Modified: trunk/reactos/lib/ddraw/main/surface_main.c _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 19:02:09 UTC (rev 18913) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 19:12:07 UTC (rev 18914) @@ -11,25 +11,28 @@ #include "rosdraw.h" -HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD) +HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) { IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - if(sizeof(DDSURFACEDESC2) != pDDSD->dwSize) + if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) return DDERR_UNSUPPORTED; - if(!(pDDSD->dwFlags & DDSD_CAPS)) + if(!(pDDSD2->dwFlags & DDSD_CAPS)) return DDERR_INVALIDPARAMS; This->owner = (IDirectDrawImpl*)pDD; - + + DDSURFACEDESC DDSD = *(LPDDSURFACEDESC)pDDSD2; + DDSD.dwSize = sizeof(pDDSD2); + if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) { /* can the driver create the surface */ DDHAL_CANCREATESURFACEDATA CanCreateData; memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); CanCreateData.lpDD = &This->owner->DirectDrawGlobal; - CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; + CanCreateData.lpDDSurfaceDesc = &DDSD; if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCre ateData) == DDHAL_DRIVER_NOTHANDLED) return DDERR_INVALIDPARAMS; @@ -45,9 +48,6 @@ This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth; This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch; - - - /* surface more struct */ memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); @@ -56,10 +56,10 @@ memset(&This->Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); This->Local.lpGbl = &This->Global; This->Local.lpSurfMore = &This->More; - This->Local.ddsCaps = *(DDSCAPS*)&pDDSD->ddsCaps; + This->Local.ddsCaps = DDSD.ddsCaps; /* we need to set some flags if we create the primary surface */ - if(pDDSD->ddsCaps.dwCaps == DDSCAPS_PRIMARYSURFACE) + if(pDDSD2->ddsCaps.dwCaps == DDSCAPS_PRIMARYSURFACE) { This->Local.dwFlags |= DDRAWISURF_FRONTBUFFER; This->Global.dwGlobalFlags |= DDRAWISURFGBL_ISGDISURFACE; @@ -74,7 +74,7 @@ DDHAL_CREATESURFACEDATA CreateData; memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); CreateData.lpDD = &This->owner->DirectDrawGlobal; - CreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; + CreateData.lpDDSurfaceDesc = &DDSD; CreateData.dwSCnt = 1; CreateData.lplpSList = pLocal;

18 years, 11 months

[greatlrd] 18913: Use the info we got from callback for the res in createsurface

by greatlrd＠svn.reactos.com

Use the info we got from callback for the res in createsurface Modified: trunk/reactos/lib/ddraw/main/surface_main.c _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 18:56:44 UTC (rev 18912) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-10-31 19:02:09 UTC (rev 18913) @@ -22,7 +22,7 @@ return DDERR_INVALIDPARAMS; This->owner = (IDirectDrawImpl*)pDD; - + if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) { /* can the driver create the surface */ @@ -41,10 +41,13 @@ /* surface global struct */ memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); This->Global.lpDD = &This->owner->DirectDrawGlobal; - This->Global.wHeight = This->owner->Height; - This->Global.wWidth = This->owner->Width; - This->Global.dwLinearSize = This->Global.wWidth * This->owner->Bpp/8; + This->Global.wHeight = This->owner->DirectDrawGlobal.vmiData.dwDisplayHeight; + This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth; + This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch; + + + /* surface more struct */ memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);

18 years, 11 months

[hbirr] 18912: Removed the 'special' mode, because it didn't connect a pipe.

by hbirr＠svn.reactos.com

Removed the 'special' mode, because it didn't connect a pipe. Modified: trunk/reactos/drivers/fs/np/create.c _____ Modified: trunk/reactos/drivers/fs/np/create.c --- trunk/reactos/drivers/fs/np/create.c 2005-10-31 16:46:46 UTC (rev 18911) +++ trunk/reactos/drivers/fs/np/create.c 2005-10-31 18:56:44 UTC (rev 18912) @@ -113,7 +113,6 @@ PNPFS_FCB ClientFcb; PNPFS_FCB ServerFcb = NULL; PNPFS_DEVICE_EXTENSION DeviceExt; - BOOLEAN SpecialAccess; DPRINT("NpfsCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp); @@ -125,12 +124,6 @@ Irp->IoStatus.Information = 0; - SpecialAccess = ((IoStack->Parameters.CreatePipe.ShareAccess & 3) == 3); - if (SpecialAccess) - { - DPRINT("NpfsCreate() open client end for special use!\n"); - } - /* * Step 1. Find the pipe we're trying to open. */ @@ -172,7 +165,7 @@ ClientFcb->Pipe = Pipe; ClientFcb->PipeEnd = FILE_PIPE_CLIENT_END; ClientFcb->OtherSide = NULL; - ClientFcb->PipeState = SpecialAccess ? 0 : FILE_PIPE_DISCONNECTED_STATE; + ClientFcb->PipeState = FILE_PIPE_DISCONNECTED_STATE; InitializeListHead(&ClientFcb->ReadRequestListHead); DPRINT("Fcb: %x\n", ClientFcb); @@ -211,67 +204,56 @@ * Step 3. Search for listening server FCB. */ - if (!SpecialAccess) + /* + * WARNING: Point of no return! Once we get the server FCB it's + * possible that we completed a wait request and so we have to + * complete even this request. + */ + + ServerFcb = NpfsFindListeningServerInstance(Pipe); + if (ServerFcb == NULL) { + PLIST_ENTRY CurrentEntry; + PNPFS_FCB Fcb; + /* - * WARNING: Point of no return! Once we get the server FCB it's - * possible that we completed a wait request and so we have to - * complete even this request. + * If no waiting server FCB was found then try to pick + * one of the listing server FCB on the pipe. */ - ServerFcb = NpfsFindListeningServerInstance(Pipe); - if (ServerFcb == NULL) + CurrentEntry = Pipe->ServerFcbListHead.Flink; + while (CurrentEntry != &Pipe->ServerFcbListHead) { - PLIST_ENTRY CurrentEntry; - PNPFS_FCB Fcb; - - /* - * If no waiting server FCB was found then try to pick - * one of the listing server FCB on the pipe. - */ - - CurrentEntry = Pipe->ServerFcbListHead.Flink; - while (CurrentEntry != &Pipe->ServerFcbListHead) + Fcb = CONTAINING_RECORD(CurrentEntry, NPFS_FCB, FcbListEntry); + if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE) { - Fcb = CONTAINING_RECORD(CurrentEntry, NPFS_FCB, FcbListEntry); - if (Fcb->PipeState == FILE_PIPE_LISTENING_STATE) - { - ServerFcb = Fcb; - break; - } - CurrentEntry = CurrentEntry->Flink; + ServerFcb = Fcb; + break; } + CurrentEntry = CurrentEntry->Flink; + } - /* - * No one is listening to me?! I'm so lonely... :( - */ + /* + * No one is listening to me?! I'm so lonely... :( + */ - if (ServerFcb == NULL) - { - /* Not found, bail out with error for FILE_OPEN requests. */ - DPRINT("No listening server fcb found!\n"); - if (ClientFcb->Data) - ExFreePool(ClientFcb->Data); - KeUnlockMutex(&Pipe->FcbListLock); - Irp->IoStatus.Status = STATUS_PIPE_BUSY; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_PIPE_BUSY; - } - } - else + if (ServerFcb == NULL) { - /* Signal the server thread and remove it from the waiter list */ - /* FIXME: Merge this with the NpfsFindListeningServerInstance routine. */ - NpfsSignalAndRemoveListeningServerInstance(Pipe, ServerFcb); + /* Not found, bail out with error for FILE_OPEN requests. */ + DPRINT("No listening server fcb found!\n"); + if (ClientFcb->Data) + ExFreePool(ClientFcb->Data); + KeUnlockMutex(&Pipe->FcbListLock); + Irp->IoStatus.Status = STATUS_PIPE_NOT_AVAILABLE; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_PIPE_NOT_AVAILABLE; } } - else if (IsListEmpty(&Pipe->ServerFcbListHead)) + else { - DPRINT("No server fcb found!\n"); - KeUnlockMutex(&Pipe->FcbListLock); - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; + /* Signal the server thread and remove it from the waiter list */ + /* FIXME: Merge this with the NpfsFindListeningServerInstance routine. */ + NpfsSignalAndRemoveListeningServerInstance(Pipe, ServerFcb); } /*

18 years, 11 months

[hpoussin] 18911: Big move of driver input stack to a Plug-and-Play model:

by hpoussin＠svn.reactos.com

Big move of driver input stack to a Plug-and-Play model: - mouclass: Do non buffered IO. The pointer move should be smoother. Search non Plug-and-Play drivers in registry, instead of using their device name. - kbdclass: Full rewrite to support more than one keyboard. Use registry settings as specified in MSDN. (Info: kbdclass is now very similar to mouclass) - i8042prt: Keep it as a non Plug-and-Play driver, but register it in DEVICEMAP registry key. - USB controller: Enable USB keyboard/mouse I may have broken support for serial mice, i'll add it back in a few days... Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.xml Added: trunk/reactos/drivers/input/kbdclass/misc.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.h Modified: trunk/reactos/drivers/usb/miniport/common/main.c Modified: trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/subsys/win32k/ntuser/input.c _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-10-31 11:59:29 UTC (rev 18910) +++ trunk/reactos/bootdata/hivesys.inf 2005-10-31 16:46:46 UTC (rev 18911) @@ -532,7 +532,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\mouclass","Type",0x00010001,0x00 000001 HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","ConnectMul tiplePorts",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","MouseDataQ ueueSize",0x00010001,0x00000064 -HKLM,"SYSTEM\CurrentControlSet\Services\mouclass\Parameters","PointerDe viceBaseName",0x00000000,"PointerClassPnp" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08 002BE10318}","UpperFilters",0x00010000,"mouclass" ; Mailslot filesystem driver _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-10-31 11:59:29 UTC (rev 18910) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-10-31 16:46:46 UTC (rev 18911) @@ -417,6 +417,7 @@ goto hookworkitemdone; } +#if 0 Status = IoCallDriver( WorkItemData->Target, NewIrp); @@ -427,6 +428,7 @@ KernelMode, FALSE, NULL); +#endif if (IsKbd) { /* Call the hooked initialization if it exists */ @@ -633,11 +635,58 @@ return STATUS_SUCCESS; } +static NTSTATUS +AddRegistryEntry( + IN PCWSTR PortTypeName, + IN PUNICODE_STRING DeviceName, + IN PCWSTR RegistryPath) +{ + UNICODE_STRING PathU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DEVICEMAP"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hDeviceMapKey = (HANDLE)-1; + HANDLE hPortKey = (HANDLE)-1; + UNICODE_STRING PortTypeNameU; + NTSTATUS Status; + + InitializeObjectAttributes(&ObjectAttributes, &PathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&hDeviceMapKey, 0, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + RtlInitUnicodeString(&PortTypeNameU, PortTypeName); + InitializeObjectAttributes(&ObjectAttributes, &PortTypeNameU, OBJ_KERNEL_HANDLE, hDeviceMapKey, NULL); + Status = ZwCreateKey(&hPortKey, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + Status = ZwSetValueKey(hPortKey, DeviceName, 0, REG_SZ, (PVOID)RegistryPath, wcslen(RegistryPath) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + Status = STATUS_SUCCESS; + +cleanup: + if (hDeviceMapKey != (HANDLE)-1) + ZwClose(hDeviceMapKey); + if (hPortKey != (HANDLE)-1) + ZwClose(hPortKey); + return Status; +} + static NTSTATUS STDCALL I8042AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT Pdo) { - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0"); - UNICODE_STRING MouseName = RTL_CONSTANT_STRING(L"\\Device\\PointerClass0"); + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardPort8042"); + UNICODE_STRING MouseName = RTL_CONSTANT_STRING(L"\\Device\\PointerPort8042"); ULONG MappedIrqKeyboard = 0, MappedIrqMouse = 0; KIRQL DirqlKeyboard = 0; KIRQL DirqlMouse = 0; @@ -716,6 +765,7 @@ if (NT_SUCCESS(Status)) { + AddRegistryEntry(L"KeyboardPort", &DeviceName, L"REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\i8042prt"); FdoDevExt = Fdo->DeviceExtension; RtlZeroMemory(FdoDevExt, sizeof(FDO_DEVICE_EXTENSION)); @@ -764,6 +814,7 @@ if (NT_SUCCESS(Status)) { + AddRegistryEntry(L"PointerPort", &MouseName, L"REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\i8042prt"); FdoDevExt = Fdo->DeviceExtension; RtlZeroMemory(FdoDevExt, sizeof(FDO_DEVICE_EXTENSION)); _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c --- trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-10-31 11:59:29 UTC (rev 18910) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-10-31 16:46:46 UTC (rev 18911) @@ -1,302 +1,718 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: drivers/input/kbdclass/kbdclass.c - * PURPOSE: Keyboard class driver - * PROGRAMMER: Victor Kirhenshtein (sauros(a)iname.com) - * Jason Filby (jasonfilby(a)yahoo.com) - * Tinus_ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Keyboard class driver + * FILE: drivers/kbdclass/kbdclass.c + * PURPOSE: Keyboard class driver + * + * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.org) */ -/* INCLUDES ****************************************************************/ - -#include <ddk/ntddk.h> - #define NDEBUG #include <debug.h> +#define INITGUID #include "kbdclass.h" -/* GLOBALS *******************************************************************/ +static VOID NTAPI +DriverUnload(IN PDRIVER_OBJECT DriverObject) +{ + // nothing to do here yet +} -NTSTATUS STDCALL DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath); +static NTSTATUS NTAPI +KbdclassCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("IRP_MJ_CREATE\n"); -/* - * Driver data - */ + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + return ForwardIrpAndForget(DeviceObject, Irp); -static BOOLEAN AlreadyOpened = FALSE; + /* FIXME: open all associated Port devices */ + return STATUS_SUCCESS; +} -static VOID STDCALL KbdCopyKeys(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +static NTSTATUS NTAPI +KbdclassClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - PDEVICE_EXTENSION DevExt = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation(Irp); - ULONG NrToRead = stk->Parameters.Read.Length / - sizeof(KEYBOARD_INPUT_DATA); - ULONG NrRead = Irp->IoStatus.Information/sizeof(KEYBOARD_INPUT_DATA); - KEYBOARD_INPUT_DATA *Rec = - (KEYBOARD_INPUT_DATA *)Irp->AssociatedIrp.SystemBuffer; + DPRINT("IRP_MJ_CLOSE\n"); - while (DevExt->KeysInBuffer && - NrRead < NrToRead) { - memcpy(&Rec[NrRead], - &DevExt->KbdBuffer[DevExt->BufHead], - sizeof(KEYBOARD_INPUT_DATA)); + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + return ForwardIrpAndForget(DeviceObject, Irp); - if (++DevExt->BufHead >= KBD_BUFFER_SIZE) - DevExt->BufHead = 0; + /* FIXME: close all associated Port devices */ + return STATUS_SUCCESS; +} - DevExt->KeysInBuffer--; - NrRead++; - } - Irp->IoStatus.Information = NrRead * sizeof(KEYBOARD_INPUT_DATA); +static NTSTATUS NTAPI +KbdclassRead( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("IRP_MJ_READ\n"); - if (NrRead < NrToRead) { - Irp->IoStatus.Status = STATUS_PENDING; - DPRINT("Pending... (NrRead %d, NrToRead %d\n", NrRead, NrToRead); - } else { - DPRINT("Send scancode: %x\n", ((KEYBOARD_INPUT_DATA*)Irp->AssociatedIrp.SystemBuffer)->MakeCode); - Irp->IoStatus.Status = STATUS_SUCCESS; + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + return ForwardIrpAndForget(DeviceObject, Irp); + + if (IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length < sizeof(KEYBOARD_INPUT_DATA)) + { + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - IoStartNextPacket (DeviceObject, FALSE); - DPRINT("Success!\n"); + + return STATUS_BUFFER_TOO_SMALL; } + + IoMarkIrpPending(Irp); + IoStartPacket(DeviceObject, Irp, NULL, NULL); + return STATUS_PENDING; } -static VOID STDCALL KbdClassServiceCallback ( - PDEVICE_OBJECT DeviceObject, - PKEYBOARD_INPUT_DATA InputDataStart, - PKEYBOARD_INPUT_DATA InputDataEnd, - PULONG InputDataConsumed) +static NTSTATUS NTAPI +KbdclassDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { - PDEVICE_EXTENSION DevExt = DeviceObject->DeviceExtension; - PKEYBOARD_INPUT_DATA CurrentInput = InputDataStart; + NTSTATUS Status; - DPRINT("ServiceCallback called\n"); + DPRINT("IRP_MJ_DEVICE_CONTROL\n"); + + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + return ForwardIrpAndForget(DeviceObject, Irp); - while (DevExt->KeysInBuffer < KBD_BUFFER_SIZE && - CurrentInput < InputDataEnd) { - memcpy(&DevExt->KbdBuffer[DevExt->BufTail], - CurrentInput, - sizeof(KEYBOARD_INPUT_DATA)); + switch (IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControl Code) + { + case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: + case IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION: + case IOCTL_KEYBOARD_QUERY_INDICATORS: + case IOCTL_KEYBOARD_QUERY_TYPEMATIC: + case IOCTL_KEYBOARD_SET_INDICATORS: + case IOCTL_KEYBOARD_SET_TYPEMATIC: /* not in MSDN, would seem logical */ + /* FIXME: send it to all associated Port devices */ + Status = STATUS_NOT_SUPPORTED; + break; + default: + DPRINT1("IRP_MJ_DEVICE_CONTROL / unknown I/O control code 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlC ode); + Status = STATUS_NOT_SUPPORTED; + } - if (++DevExt->BufTail >= KBD_BUFFER_SIZE) - DevExt->BufTail = 0; - DevExt->KeysInBuffer++; + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); - CurrentInput++; - InputDataConsumed[0]++; - } + return Status; +} - if (CurrentInput < InputDataStart) - /* Copy the rest to the beginning, perhaps the keyboard - * can buffer it for us */ - memmove(InputDataStart, - CurrentInput, - ((char *)InputDataEnd - (char *)CurrentInput)); +static NTSTATUS NTAPI +IrpStub( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status = STATUS_NOT_SUPPORTED; - if (DeviceObject->CurrentIrp) { - PIRP Irp = DeviceObject->CurrentIrp; - PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation(Irp); - if (stk->MajorFunction == IRP_MJ_READ) - KbdCopyKeys(DeviceObject, Irp); + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + { + /* Forward some IRPs to lower device */ + switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction) + { + case IRP_MJ_INTERNAL_DEVICE_CONTROL: + return ForwardIrpAndForget(DeviceObject, Irp); + default: + { + DPRINT1("Port DO stub for major function 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); + ASSERT(FALSE); + Status = Irp->IoStatus.Status; + } + } } + else + { + DPRINT1("Class DO stub for major function 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); + ASSERT(FALSE); + Status = Irp->IoStatus.Status; + } + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } -static VOID STDCALL KbdStartIo(PDEVICE_OBJECT DeviceObject, PIRP Irp) +static NTSTATUS +ReadRegistryEntries( + IN PUNICODE_STRING RegistryPath, + IN PKBDCLASS_DRIVER_EXTENSION DriverExtension) { - /* We only do this for read irps */ - DPRINT("KeyboardStartIo(DeviceObject %x Irp %x)\n",DeviceObject,Irp); - KbdCopyKeys(DeviceObject, Irp); -} + RTL_QUERY_REGISTRY_TABLE Parameters[4]; + NTSTATUS Status; + ULONG DefaultConnectMultiplePorts = 1; + ULONG DefaultKeyboardDataQueueSize = 0x64; + UNICODE_STRING DefaultKeyboardDeviceBaseName = RTL_CONSTANT_STRING(L"KeyboardClass"); -/* - * These are just passed down the stack but we must change the IOCTL to be - * INTERNAL. MSDN says there might be more... - */ -static NTSTATUS STDCALL KbdDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) -{ - PDEVICE_EXTENSION DevExt = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION Stk = IoGetCurrentIrpStackLocation(Irp); - PIO_STACK_LOCATION NextStk = IoGetNextIrpStackLocation(Irp); + RtlZeroMemory(Parameters, sizeof(Parameters)); - DPRINT ("KbdDeviceControl %x\n", Stk->Parameters.DeviceIoControl.IoControlCode); + Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[0].Name = L"ConnectMultiplePorts"; + Parameters[0].EntryContext = &DriverExtension->ConnectMultiplePorts; + Parameters[0].DefaultType = REG_DWORD; + Parameters[0].DefaultData = &DefaultConnectMultiplePorts; + Parameters[0].DefaultLength = sizeof(ULONG); + + Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[1].Name = L"KeyboardDataQueueSize"; + Parameters[1].EntryContext = &DriverExtension->KeyboardDataQueueSize; + Parameters[1].DefaultType = REG_DWORD; + Parameters[1].DefaultData = &DefaultKeyboardDataQueueSize; + Parameters[1].DefaultLength = sizeof(ULONG); + + Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; + Parameters[2].Name = L"KeyboardDeviceBaseName"; + Parameters[2].EntryContext = &DriverExtension->KeyboardDeviceBaseName; + Parameters[2].DefaultType = REG_SZ; + Parameters[2].DefaultData = &DefaultKeyboardDeviceBaseName; + Parameters[2].DefaultLength = sizeof(ULONG); - switch (Stk->Parameters.DeviceIoControl.IoControlCode) { - case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: - case IOCTL_KEYBOARD_QUERY_INDICATOR_TRANSLATION: - case IOCTL_KEYBOARD_QUERY_INDICATORS: - case IOCTL_KEYBOARD_QUERY_TYPEMATIC: - case IOCTL_KEYBOARD_SET_INDICATORS: - case IOCTL_KEYBOARD_SET_TYPEMATIC: /* not in MSDN, would seem logical */ - IoCopyCurrentIrpStackLocationToNext(Irp); - NextStk->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + Status = RtlQueryRegistryValues( + RTL_REGISTRY_ABSOLUTE, + RegistryPath->Buffer, + Parameters, + NULL, + NULL); - return IoCallDriver(DevExt->I8042Device, Irp); - default: - return STATUS_INVALID_DEVICE_REQUEST; + if (NT_SUCCESS(Status)) + { + /* Check values */ + if (DriverExtension->ConnectMultiplePorts != 0 + && DriverExtension->ConnectMultiplePorts != 1) + { + DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts; + } + if (DriverExtension->KeyboardDataQueueSize == 0) + { + DriverExtension->KeyboardDataQueueSize = DefaultKeyboardDataQueueSize; + } } + + return Status; } -static NTSTATUS STDCALL KbdInternalDeviceControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +static NTSTATUS +CreateKeyboardClassDeviceObject( + IN PDRIVER_OBJECT DriverObject, + OUT PDEVICE_OBJECT *ClassDO OPTIONAL) { - PDEVICE_EXTENSION DevExt = DeviceObject->DeviceExtension; + PKBDCLASS_DRIVER_EXTENSION DriverExtension; + ULONG DeviceId = 0; + ULONG PrefixLength; + UNICODE_STRING DeviceNameU; + PWSTR DeviceIdW = NULL; /* Pointer into DeviceNameU.Buffer */ + PDEVICE_OBJECT Fdo; + PKBDCLASS_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; - DPRINT ("KbdInternalDeviceControl\n"); + DPRINT("CreateKeyboardClassDeviceObject(0x%p)\n", DriverObject); - IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(DevExt->I8042Device, Irp); + /* Create new device object */ + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + DeviceNameU.Length = 0; + DeviceNameU.MaximumLength = + wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ + + DriverExtension->KeyboardDeviceBaseName.Length/* "KeyboardClass" */ + + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ + + sizeof(UNICODE_NULL); /* Final NULL char */ + DeviceNameU.Buffer = ExAllocatePool(PagedPool, DeviceNameU.MaximumLength); + if (!DeviceNameU.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + Status = RtlAppendUnicodeToString(&DeviceNameU, L"\\Device\\"); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + Status = RtlAppendUnicodeStringToString(&DeviceNameU, &DriverExtension->KeyboardDeviceBaseName); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + PrefixLength = DeviceNameU.MaximumLength - 4 * sizeof(WCHAR) - sizeof(UNICODE_NULL); + DeviceIdW = &DeviceNameU.Buffer[PrefixLength / sizeof(WCHAR)]; + while (DeviceId < 9999) + { + DeviceNameU.Length = PrefixLength + swprintf(DeviceIdW, L"%lu", DeviceId) * sizeof(WCHAR); + Status = IoCreateDevice( + DriverObject, + sizeof(KBDCLASS_DEVICE_EXTENSION), + &DeviceNameU, + FILE_DEVICE_KEYBOARD, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (NT_SUCCESS(Status)) + goto cleanup; + else if (Status != STATUS_OBJECT_NAME_COLLISION) + { + DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + goto cleanup; + } + DeviceId++; + } + DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->KeyboardDeviceBaseName); + Status = STATUS_UNSUCCESSFUL; +cleanup: + ExFreePool(DeviceNameU.Buffer); + if (!NT_SUCCESS(Status)) + return Status; + + DeviceExtension = (PKBDCLASS_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(KBDCLASS_DEVICE_EXTENSION)); + DeviceExtension->Common.IsClassDO = TRUE; + DeviceExtension->DriverExtension = DriverExtension; + DeviceExtension->PnpState = dsStopped; + KeInitializeSpinLock(&(DeviceExtension->SpinLock)); + DeviceExtension->ReadIsPending = FALSE; + DeviceExtension->InputCount = 0; + DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->KeyboardDataQueueSize * sizeof(KEYBOARD_INPUT_DATA)); + Fdo->Flags |= DO_POWER_PAGABLE; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + /* FIXME: create registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ + + if (ClassDO) + *ClassDO = Fdo; + + return STATUS_SUCCESS; } -static NTSTATUS STDCALL KbdDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp) +static BOOLEAN +KbdclassCallback( + IN PDEVICE_OBJECT ClassDeviceObject, + IN OUT PKEYBOARD_INPUT_DATA KeyboardDataStart, + IN PKEYBOARD_INPUT_DATA KeyboardDataEnd, + IN OUT PULONG ConsumedCount) { - PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation(Irp); - NTSTATUS Status; + PKBDCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; + PIRP Irp = NULL; + KIRQL OldIrql; + PIO_STACK_LOCATION Stack; + ULONG InputCount = KeyboardDataEnd - KeyboardDataStart; + ULONG ReadSize; - DPRINT("DeviceObject %x\n",DeviceObject); - DPRINT("Irp %x\n",Irp); + ASSERT(ClassDeviceExtension->Common.IsClassDO); - DPRINT("Dispatch: stk->MajorFunction %d\n", stk->MajorFunction); - DPRINT("AlreadyOpened %d\n",AlreadyOpened); + DPRINT("KbdclassCallback()\n"); + /* A filter driver might have consumed all the data already; I'm + * not sure if they are supposed to move the packets when they + * consume them though. + */ + if (ClassDeviceExtension->ReadIsPending == TRUE && InputCount) + { + Irp = ClassDeviceObject->CurrentIrp; + ClassDeviceObject->CurrentIrp = NULL; + Stack = IoGetCurrentIrpStackLocation(Irp); - switch (stk->MajorFunction) { - case IRP_MJ_CREATE: - if (AlreadyOpened == TRUE) { - CHECKPOINT; - Status = STATUS_UNSUCCESSFUL; - DPRINT1("Keyboard is already open\n"); - } else { - CHECKPOINT; - Status = STATUS_SUCCESS; - AlreadyOpened = TRUE; - } - break; + /* A read request is waiting for input, so go straight to it */ + /* FIXME: use SEH */ + RtlCopyMemory( + Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->UserBuffer, + KeyboardDataStart, + sizeof(KEYBOARD_INPUT_DATA)); - case IRP_MJ_CLOSE: - Status = STATUS_SUCCESS; - AlreadyOpened = FALSE; - break; + /* Go to next packet and complete this request with STATUS_SUCCESS */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(KEYBOARD_INPUT_DATA); + Stack->Parameters.Read.Length = sizeof(KEYBOARD_INPUT_DATA); - case IRP_MJ_READ: - DPRINT("Queueing packet\n"); - IoMarkIrpPending(Irp); - IoStartPacket(DeviceObject,Irp,NULL,NULL); - return(STATUS_PENDING); + ClassDeviceExtension->ReadIsPending = FALSE; - default: - Status = STATUS_NOT_IMPLEMENTED; - break; + /* Skip the packet we just sent away */ + KeyboardDataStart++; + (*ConsumedCount)++; + InputCount--; } - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp,IO_NO_INCREMENT); - DPRINT("Status %d\n",Status); - return(Status); + /* If we have data from the port driver and a higher service to send the data to */ + if (InputCount != 0) + { + KeAcquireSpinLock(&ClassDeviceExtension->SpinLock, &OldIrql); + + if (ClassDeviceExtension->InputCount + InputCount > ClassDeviceExtension->DriverExtension->KeyboardDataQueueSize) + ReadSize = ClassDeviceExtension->DriverExtension->KeyboardDataQueueSize - ClassDeviceExtension->InputCount; + else + ReadSize = InputCount; + + /* + * FIXME: If we exceed the buffer, keyboard data gets thrown away.. better + * solution? + */ + + /* + * Move the keyboard input data from the port data queue to our class data + * queue. + */ + RtlMoveMemory( + ClassDeviceExtension->PortData, + (PCHAR)KeyboardDataStart, + sizeof(KEYBOARD_INPUT_DATA) * ReadSize); + + /* Move the pointer and counter up */ + ClassDeviceExtension->PortData += ReadSize; + ClassDeviceExtension->InputCount += ReadSize; + + KeReleaseSpinLock(&ClassDeviceExtension->SpinLock, OldIrql); + (*ConsumedCount) += ReadSize; + } + else + { + DPRINT("KbdclassCallBack() entered, InputCount = %lu - DOING NOTHING\n", InputCount); + } + + if (Irp != NULL) + { + IoStartNextPacket(ClassDeviceObject, FALSE); + IoCompleteRequest(Irp, IO_KEYBOARD_INCREMENT); + } + + DPRINT("Leaving KbdclassCallback()\n"); + return TRUE; } -static VOID STDCALL KbdClassSendConnect(PDEVICE_EXTENSION DevExt) +/* Send IOCTL_INTERNAL_KEYBOARD_CONNECT to keyboard port */ +static NTSTATUS +ConnectKeyboardPortDriver( + IN PDEVICE_OBJECT KeyboardPortDO, + IN PDEVICE_OBJECT KeyboardClassDO) { - CONNECT_DATA ConnectData; KEVENT Event; + PIRP Irp; IO_STATUS_BLOCK IoStatus; + CONNECT_DATA ConnectData; NTSTATUS Status; - PIRP Irp; KeInitializeEvent(&Event, NotificationEvent, FALSE); - ConnectData.ClassDeviceObject = DevExt->DeviceObject; - ConnectData.ClassService = KbdClassServiceCallback; + ConnectData.ClassDeviceObject = KeyboardClassDO; + ConnectData.ClassService = KbdclassCallback; - Irp = IoBuildDeviceIoControlRequest( - IOCTL_INTERNAL_KEYBOARD_CONNECT, - DevExt->I8042Device, - &ConnectData, - sizeof(CONNECT_DATA), - NULL, - 0, - TRUE, - &Event, - &IoStatus); + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_KEYBOARD_CONNECT, + KeyboardPortDO, + &ConnectData, sizeof(CONNECT_DATA), + NULL, 0, + TRUE, &Event, &IoStatus); - if (!Irp) - return; + Status = IoCallDriver(KeyboardPortDO, Irp); - Status = IoCallDriver( - DevExt->I8042Device, - Irp); - DPRINT("SendConnect status: %x\n", Status); + if (Status == STATUS_PENDING) + KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + else + IoStatus.Status = Status; - if (STATUS_PENDING ==Status) - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - DPRINT("SendConnect done\n"); + return IoStatus.Status; } -NTSTATUS STDCALL DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath) -/* - * FUNCTION: Module entry point - */ +static NTSTATUS NTAPI +KbdclassAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo) { - PDEVICE_OBJECT DeviceObject; - PDEVICE_EXTENSION DevExt; - PFILE_OBJECT I8042File; + PKBDCLASS_DRIVER_EXTENSION DriverExtension; + PDEVICE_OBJECT Fdo; + PKBDCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\Keyboard"); - UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\Keyboard"); - UNICODE_STRING I8042Name = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0"); - DPRINT("Keyboard Class Driver 0.0.1\n"); + DPRINT("KbdclassAddDevice called. Pdo = 0x%p\n", Pdo); - DriverObject->MajorFunction[IRP_MJ_CREATE] = KbdDispatch; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = KbdDispatch; - DriverObject->MajorFunction[IRP_MJ_READ] = KbdDispatch; - DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = - KbdInternalDeviceControl; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = KbdDeviceControl; + DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); - DriverObject->DriverStartIo = KbdStartIo; + /* Create new device object */ + Status = IoCreateDevice( + DriverObject, + sizeof(KBDCLASS_DEVICE_EXTENSION), + NULL, + Pdo->DeviceType, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoCreateDevice() failed with status 0x%08lx\n", Status); + return Status; + } - IoCreateDevice(DriverObject, - sizeof(DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_KEYBOARD, - 0, - TRUE, - &DeviceObject); + DeviceExtension = (PKBDCLASS_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(KBDCLASS_DEVICE_EXTENSION)); + DeviceExtension->Common.IsClassDO = FALSE; + DeviceExtension->PnpState = dsStopped; + Fdo->Flags |= DO_POWER_PAGABLE; + Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + IoDeleteDevice(Fdo); + return Status; + } + Fdo->Flags |= DO_BUFFERED_IO; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - RtlZeroMemory(DeviceObject->DeviceExtension, sizeof(DEVICE_EXTENSION)); - DevExt = DeviceObject->DeviceExtension; - DevExt->DeviceObject = DeviceObject; + if (DriverExtension->ConnectMultiplePorts) + Status = ConnectKeyboardPortDriver(Fdo, DriverExtension->MainKbdclassDeviceObject); + else + Status = ConnectKeyboardPortDriver(Fdo, Fdo); + if (!NT_SUCCESS(Status)) + { + DPRINT("ConnectKeyboardPortDriver() failed with status 0x%08lx\n", Status); + /* FIXME: why can't I cleanup without error? */ + //IoDetachDevice(Fdo); + //IoDeleteDevice(Fdo); + return Status; + } - Status = IoGetDeviceObjectPointer(&I8042Name, - FILE_READ_DATA, - &I8042File, - &DevExt->I8042Device); + /* Register GUID_DEVINTERFACE_KEYBOARD interface */ + Status = IoRegisterDeviceInterface( + Pdo, + &GUID_DEVINTERFACE_KEYBOARD, + NULL, + &DeviceExtension->KeyboardInterfaceName); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); + return Status; + } - if (STATUS_SUCCESS != Status) { - DPRINT("Failed to open device: %x\n", Status); + return STATUS_SUCCESS; +} + +static VOID NTAPI +KbdclassStartIo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PKBDCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); + + ASSERT(DeviceExtension->Common.IsClassDO); + + if (DeviceExtension->InputCount > 0) + { + KIRQL oldIrql; + + KeAcquireSpinLock(&DeviceExtension->SpinLock, &oldIrql); + + /* FIXME: use SEH */ + RtlCopyMemory( + Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->UserBuffer, + DeviceExtension->PortData - DeviceExtension->InputCount, + sizeof(KEYBOARD_INPUT_DATA)); + + if (DeviceExtension->InputCount > 1) + { + RtlMoveMemory( + DeviceExtension->PortData - DeviceExtension->InputCount, + DeviceExtension->PortData - DeviceExtension->InputCount + 1, + (DeviceExtension->InputCount - 1) * sizeof(KEYBOARD_INPUT_DATA)); + } + DeviceExtension->PortData--; + DeviceExtension->InputCount--; + DeviceExtension->ReadIsPending = FALSE; + + /* Go to next packet and complete this request with STATUS_SUCCESS */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(KEYBOARD_INPUT_DATA); + Stack->Parameters.Read.Length = sizeof(KEYBOARD_INPUT_DATA); + IoCompleteRequest(Irp, IO_KEYBOARD_INCREMENT); + + IoStartNextPacket(DeviceObject, FALSE); + KeReleaseSpinLock(&DeviceExtension->SpinLock, oldIrql); + } + else + { + DeviceExtension->ReadIsPending = TRUE; + } +} + +static NTSTATUS +SearchForLegacyDrivers( + IN PDRIVER_OBJECT DriverObject, + IN PKBDCLASS_DRIVER_EXTENSION DriverExtension) +{ + UNICODE_STRING DeviceMapKeyU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DEVICEMAP"); + UNICODE_STRING PortBaseName = {0, }; + PKEY_VALUE_BASIC_INFORMATION KeyValueInformation = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hDeviceMapKey = (HANDLE)-1; + HANDLE hPortKey = (HANDLE)-1; + ULONG Index = 0; + ULONG Size, ResultLength; + NTSTATUS Status; + + /* Create port base name, by replacing Class by Port at the end of the class base name */ + Status = RtlDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DriverExtension->KeyboardDeviceBaseName, + &PortBaseName); + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlDuplicateUnicodeString() failed with status 0x%08lx\n", Status); + goto cleanup; + } + PortBaseName.Length -= (sizeof(L"Class") - sizeof(UNICODE_NULL)); + RtlAppendUnicodeToString(&PortBaseName, L"Port"); + + /* Allocate memory */ + Size = sizeof(KEY_VALUE_BASIC_INFORMATION) + MAX_PATH; + KeyValueInformation = ExAllocatePool(PagedPool, Size); + if (!KeyValueInformation) + { + DPRINT("ExAllocatePool() failed\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + /* Open HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ + InitializeObjectAttributes(&ObjectAttributes, &DeviceMapKeyU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&hDeviceMapKey, 0, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + /* Open sub key */ + InitializeObjectAttributes(&ObjectAttributes, &PortBaseName, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hDeviceMapKey, NULL); + Status = ZwOpenKey(&hPortKey, KEY_QUERY_VALUE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); + DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status); + goto cleanup; + } + + /* Read each value name */ + while (ZwEnumerateValueKey(hPortKey, Index++, KeyValueBasicInformation, KeyValueInformation, Size, &ResultLength) == STATUS_SUCCESS) + { + UNICODE_STRING PortName; + PDEVICE_OBJECT PortDeviceObject = NULL; + PFILE_OBJECT FileObject = NULL; + + PortName.Length = PortName.MaximumLength = KeyValueInformation->NameLength; + PortName.Buffer = KeyValueInformation->Name; + + /* Open the device object pointer */ + Status = IoGetDeviceObjectPointer(&PortName, FILE_READ_ATTRIBUTES, &FileObject, &PortDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", Status); + } + + /* Connect the port device object */ + if (DriverExtension->ConnectMultiplePorts) + { + Status = ConnectKeyboardPortDriver(PortDeviceObject, DriverExtension->MainKbdclassDeviceObject); + if (!NT_SUCCESS(Status)) + { + /* FIXME: Log the error */ + DPRINT("ConnectKeyboardPortDriver() failed with status 0x%08lx\n", Status); + /* FIXME: cleanup */ + } + } + else + { + PDEVICE_OBJECT ClassDO; + Status = CreateKeyboardClassDeviceObject(DriverObject, &ClassDO); + if (!NT_SUCCESS(Status)) + { + /* FIXME: Log the error */ + DPRINT("CreatePointerClassDeviceObject() failed with status 0x%08lx\n", Status); + /* FIXME: cleanup */ + continue; + } + Status = ConnectKeyboardPortDriver(PortDeviceObject, ClassDO); + if (!NT_SUCCESS(Status)) + { + /* FIXME: Log the error */ + DPRINT("ConnectKeyboardPortDriver() failed with status 0x%08lx\n", Status); + /* FIXME: cleanup */ + } + } + } + if (Status == STATUS_NO_MORE_ENTRIES) + Status = STATUS_SUCCESS; + +cleanup: + if (KeyValueInformation != NULL) + ExFreePool(KeyValueInformation); + if (hDeviceMapKey != (HANDLE)-1) + ZwClose(hDeviceMapKey); + if (hPortKey != (HANDLE)-1) + ZwClose(hPortKey); + return Status; +} + +/* + * Standard DriverEntry method. + */ +NTSTATUS NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + PKBDCLASS_DRIVER_EXTENSION DriverExtension; + ULONG i; + NTSTATUS Status; + + Status = IoAllocateDriverObjectExtension( + DriverObject, + DriverObject, + sizeof(KBDCLASS_DRIVER_EXTENSION), + (PVOID*)&DriverExtension); + if (!NT_SUCCESS(Status)) [truncated at 1000 lines; 662 more skipped]

18 years, 11 months

[fireball] 18910: I don't think tracert really depends on winmm lib.

by fireball＠svn.reactos.com

I don't think tracert really depends on winmm lib. Modified: trunk/reactos/apps/utils/net/tracert/tracert.xml _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.xml --- trunk/reactos/apps/utils/net/tracert/tracert.xml 2005-10-31 08:02:49 UTC (rev 18909) +++ trunk/reactos/apps/utils/net/tracert/tracert.xml 2005-10-31 11:59:29 UTC (rev 18910) @@ -6,7 +6,6 @@ <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> <library>ws2_32</library> - <library>winmm</library> <file>tracert.c</file> <file>tracert.rc</file> </module>

18 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005