Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ilardig] 51692: [input] - Fix an Italian typo spotted by r3ddr4g0n
by ilardig＠svn.reactos.org 13 May '11

13 May '11

Author: ilardig Date: Fri May 13 13:25:44 2011 New Revision: 51692 URL: http://svn.reactos.org/svn/reactos?rev=51692&view=rev Log: [input] - Fix an Italian typo spotted by r3ddr4g0n Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] Fri May 13 13:25:44 2011 @@ -9,7 +9,7 @@ CONTROL "TEXT", IDC_KEYLAYOUT_LIST, "SYSLISTVIEW32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | LVS_SORTASCENDING | LVS_REPORT | 0x0000808D, 8, 28, 237, 109 PUSHBUTTON "&Predefinito", IDC_SET_DEFAULT, 101, 159, 144, 14 PUSHBUTTON "&Aggiungi...", IDC_ADD_BUTTON, 27, 142, 70, 14 - PUSHBUTTON "&Remuovi...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 + PUSHBUTTON "&Rimuovi...", IDC_REMOVE_BUTTON, 101, 142, 70, 14 PUSHBUTTON "&Proprietà...", IDC_PROP_BUTTON, 175, 142, 70, 14 GROUPBOX "Preferenze", -1, 7, 185, 240, 36 PUSHBUTTON "&Impostazioni tasti...", IDC_KEY_SET_BTN, 14, 198, 110, 14

1 0

[mjmartin] 51691: [USBSTOR] - Add a check at USBSTOR_FdoHandleStartDevice to make sure the device uses Bulk Transfers. - Use macros for initializing the Urbs. The macros ensure that the proper fiel...
by mjmartin＠svn.reactos.org 13 May '11

13 May '11

Author: mjmartin Date: Fri May 13 09:14:28 2011 New Revision: 51691 URL: http://svn.reactos.org/svn/reactos?rev=51691&view=rev Log: [USBSTOR] - Add a check at USBSTOR_FdoHandleStartDevice to make sure the device uses Bulk Transfers. - Use macros for initializing the Urbs. The macros ensure that the proper fields of the URB are set correctly. Fixes failing of getting device descriptor and getting devices BlockLength. Modified: branches/usb-bringup/drivers/usb/usbstor/descriptor.c branches/usb-bringup/drivers/usb/usbstor/fdo.c branches/usb-bringup/drivers/usb/usbstor/scsi.c Modified: branches/usb-bringup/drivers/usb/usbstor/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/descriptor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/descriptor.c [iso-8859-1] Fri May 13 09:14:28 2011 @@ -60,13 +60,15 @@ // // initialize urb // - Urb->UrbHeader.Function = URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE; - Urb->UrbHeader.Length = sizeof(URB); - Urb->UrbControlDescriptorRequest.DescriptorType = DescriptorType; - Urb->UrbControlDescriptorRequest.TransferBuffer = Descriptor; - Urb->UrbControlDescriptorRequest.TransferBufferLength = DescriptorLength; - Urb->UrbControlDescriptorRequest.Index = DescriptorIndex; - Urb->UrbControlDescriptorRequest.LanguageId = LanguageId; + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), + DescriptorType, + DescriptorIndex, + LanguageId, + Descriptor, + NULL, + DescriptorLength, + NULL); // // submit urb Modified: branches/usb-bringup/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] Fri May 13 09:14:28 2011 @@ -124,6 +124,7 @@ IN PFDO_DEVICE_EXTENSION DeviceExtension, IN OUT PIRP Irp) { + PUSB_INTERFACE_DESCRIPTOR InterfaceDesc; NTSTATUS Status; UCHAR Index = 0; @@ -157,6 +158,18 @@ // dump device descriptor // USBSTOR_DumpDeviceDescriptor(DeviceExtension->DeviceDescriptor); + + // + // Check that this device uses bulk transfers and is SCSI + // + InterfaceDesc = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)DeviceExtension->ConfigurationDescriptor + sizeof(USB_CONFIGURATION_DESCRIPTOR)); + DPRINT1("bInterfaceSubClass %x\n", InterfaceDesc->bInterfaceSubClass); + if (InterfaceDesc->bInterfaceProtocol != 0x50) + { + DPRINT1("USB Device is not a bulk only device and is not currently supported\n"); + return STATUS_NOT_SUPPORTED; + } + // // now select an interface @@ -290,6 +303,7 @@ // // just forward irp to lower device // + //IoSkipCurrentIrpStackLocation(Irp); Status = USBSTOR_SyncForwardIrp(DeviceExtension->LowerDeviceObject, Irp); break; } Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 13 09:14:28 2011 @@ -258,19 +258,20 @@ // // get next stack location // + IoStack = IoGetNextIrpStackLocation(Irp); // // now initialize the urb for sending the csw // - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; - Context->Urb.UrbBulkOrInterruptTransfer.PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBuffer = Context->csw; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength = 512; //FIXME - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferMDL = NULL; - Context->Urb.UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK; - + UsbBuildInterruptOrBulkTransferRequest(&Context->Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, + Context->csw, + NULL, + 512, //FIXME + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + NULL); // // initialize stack location @@ -291,6 +292,7 @@ // call driver // IoCallDriver(Context->FDODeviceExtension->LowerDeviceObject, Irp); + return STATUS_MORE_PROCESSING_REQUIRED; } @@ -330,12 +332,15 @@ // // now initialize the urb for sending data // - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; - Context->Urb.UrbBulkOrInterruptTransfer.PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferMDL = Context->TransferBufferMDL; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength = Context->TransferDataLength; - Context->Urb.UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK; + + UsbBuildInterruptOrBulkTransferRequest(&Context->Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, + NULL, + Context->TransferBufferMDL, + Context->TransferDataLength, + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + NULL); // // setup completion routine @@ -347,12 +352,15 @@ // // now initialize the urb for sending the csw // - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; - Context->Urb.UrbBulkOrInterruptTransfer.PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBuffer = Context->csw; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength = 512; //FIXME - Context->Urb.UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK; + + UsbBuildInterruptOrBulkTransferRequest(&Context->Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle, + Context->csw, + NULL, + 512, //FIXME + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + NULL); // // setup completion routine @@ -373,6 +381,7 @@ // call driver // IoCallDriver(Context->FDODeviceExtension->LowerDeviceObject, Irp); + return STATUS_MORE_PROCESSING_REQUIRED; } @@ -427,12 +436,14 @@ // // now initialize the urb // - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Length = sizeof(URB); - Context->Urb.UrbBulkOrInterruptTransfer.Hdr.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; - Context->Urb.UrbBulkOrInterruptTransfer.PipeHandle = FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkOutPipeIndex].PipeHandle; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBuffer = (PVOID)Context->cbw; - Context->Urb.UrbBulkOrInterruptTransfer.TransferBufferLength = sizeof(CBW); - Context->Urb.UrbBulkOrInterruptTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_OUT | USBD_SHORT_TRANSFER_OK; + UsbBuildInterruptOrBulkTransferRequest(&Context->Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + FDODeviceExtension->InterfaceInformation->Pipes[FDODeviceExtension->BulkOutPipeIndex].PipeHandle, + Context->cbw, + NULL, + sizeof(CBW), + USBD_TRANSFER_DIRECTION_OUT | USBD_SHORT_TRANSFER_OK, + NULL); // // initialize rest of context @@ -477,7 +488,6 @@ FreeItem(Context); return STATUS_INSUFFICIENT_RESOURCES; } - // // get next stack location @@ -822,6 +832,7 @@ // // FIXME: support more logical blocks // + DPRINT1("Request->DataTransferLength %x, PDODeviceExtension->BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); ASSERT(Request->DataTransferLength == PDODeviceExtension->BlockLength); //

1 0

[gadamopoulos] 51690: [win32k] - Dereference the SMWP object before deleting it. Fixes handle leak
by gadamopoulos＠svn.reactos.org 13 May '11

13 May '11

Author: gadamopoulos Date: Fri May 13 08:34:24 2011 New Revision: 51690 URL: http://svn.reactos.org/svn/reactos?rev=51690&view=rev Log: [win32k] - Dereference the SMWP object before deleting it. Fixes handle leak Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Fri May 13 08:34:24 2011 @@ -1793,6 +1793,7 @@ winpos->pos.flags); } ExFreePoolWithTag(pDWP->acvr, USERTAG_SWP); + UserDereferenceObject(pDWP); UserDeleteObject(hdwp, otSMWP); return res; }

1 0

[gadamopoulos] 51689: [win32k] - When we run out of user handles show count of event and SMWP objects
by gadamopoulos＠svn.reactos.org 13 May '11

13 May '11

Author: gadamopoulos Date: Fri May 13 08:01:11 2011 New Revision: 51689 URL: http://svn.reactos.org/svn/reactos?rev=51689&view=rev Log: [win32k] - When we run out of user handles show count of event and SMWP objects Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] Fri May 13 08:01:11 2011 @@ -71,7 +71,7 @@ { /**/ int i, iFree = 0, iWindow = 0, iMenu = 0, iCursorIcon = 0, - iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0, iTimer = 0; + iHook = 0, iCallProc = 0, iAccel = 0, iMonitor = 0, iTimer = 0, iEvent = 0, iSMWP = 0; /**/ DPRINT1("Out of user handles! Used -> %i, NM_Handle -> %d\n", gpsi->cHandleEntries, ht->nb_handles); //#if 0 @@ -106,12 +106,17 @@ case otTimer: iTimer++; break; + case otEvent: + iEvent++; + break; + case otSMWP: + iSMWP++; default: break; } } - DPRINT1("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d Timer = %d\n", - iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor, iTimer ); + DPRINT1("Handle Count by Type:\n Free = %d Window = %d Menu = %d CursorIcon = %d Hook = %d\n CallProc = %d Accel = %d Monitor = %d Timer = %d Event = %d SMWP = %d\n", + iFree, iWindow, iMenu, iCursorIcon, iHook, iCallProc, iAccel, iMonitor, iTimer, iEvent, iSMWP ); //#endif return NULL; #if 0

1 0

[mjmartin] 51688: [USBHUB_NEW] - Only get the string descriptors if they are available. Fixes crash when using usb mouse and keyboards in windows.
by mjmartin＠svn.reactos.org 12 May '11

12 May '11

Author: mjmartin Date: Thu May 12 23:31:32 2011 New Revision: 51688 URL: http://svn.reactos.org/svn/reactos?rev=51688&view=rev Log: [USBHUB_NEW] - Only get the string descriptors if they are available. Fixes crash when using usb mouse and keyboards in windows. Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Thu May 12 23:31:32 2011 @@ -914,38 +914,44 @@ // // - // Get the product string - // - Status = GetUsbStringDescriptor(UsbChildDeviceObject, - UsbChildExtension->DeviceDesc.iProduct, - 0, - (PVOID*)&UsbChildExtension->usTextDescription.Buffer, - &UsbChildExtension->usTextDescription.Length); - if (!NT_SUCCESS(Status)) - { - DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); - goto Cleanup; - } - - UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; - DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); - - // - // Get the Serial Number string - // - Status = GetUsbStringDescriptor(UsbChildDeviceObject, - UsbChildExtension->DeviceDesc.iSerialNumber, - 0, - (PVOID*)&UsbChildExtension->usInstanceId.Buffer, - &UsbChildExtension->usInstanceId.Length); - if (!NT_SUCCESS(Status)) - { - DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); - goto Cleanup; - } - - UsbChildExtension->usInstanceId.MaximumLength = UsbChildExtension->usInstanceId.Length; - DPRINT1("Usb InstanceId %wZ\n", &UsbChildExtension->usInstanceId); + // Get the product string if obe provided + // + if (UsbChildExtension->DeviceDesc.iProduct) + { + Status = GetUsbStringDescriptor(UsbChildDeviceObject, + UsbChildExtension->DeviceDesc.iProduct, + 0, + (PVOID*)&UsbChildExtension->usTextDescription.Buffer, + &UsbChildExtension->usTextDescription.Length); + if (!NT_SUCCESS(Status)) + { + DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); + goto Cleanup; + } + + UsbChildExtension->usTextDescription.MaximumLength = UsbChildExtension->usTextDescription.Length; + DPRINT1("Usb TextDescription %wZ\n", &UsbChildExtension->usTextDescription); + } + + // + // Get the Serial Number string if obe provided + // + if (UsbChildExtension->DeviceDesc.iSerialNumber) + { + Status = GetUsbStringDescriptor(UsbChildDeviceObject, + UsbChildExtension->DeviceDesc.iSerialNumber, + 0, + (PVOID*)&UsbChildExtension->usInstanceId.Buffer, + &UsbChildExtension->usInstanceId.Length); + if (!NT_SUCCESS(Status)) + { + DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); + goto Cleanup; + } + + UsbChildExtension->usInstanceId.MaximumLength = UsbChildExtension->usInstanceId.Length; + DPRINT1("Usb InstanceId %wZ\n", &UsbChildExtension->usInstanceId); + } return Status;

1 0

[sserapion] 51687: [ntlmssp] - WIP code. - Implement most of AcquireCredentialsHandle and some supporting code. - Implement Memory protector and RNG routines(not completely working in ros! see dllm...
by sserapion＠svn.reactos.org 12 May '11

12 May '11

Author: sserapion Date: Thu May 12 19:47:08 2011 New Revision: 51687 URL: http://svn.reactos.org/svn/reactos?rev=51687&view=rev Log: [ntlmssp] - WIP code. - Implement most of AcquireCredentialsHandle and some supporting code. - Implement Memory protector and RNG routines(not completely working in ros! see dllmain.c for comments). - Started implementing context support routines. - Made provisions for future LSA AP mode. Added: branches/sspi-bringup/reactos/dll/win32/ntlmssp/crypt.c (with props) branches/sspi-bringup/reactos/dll/win32/ntlmssp/rc4.c (with props) branches/sspi-bringup/reactos/dll/win32/ntlmssp/rc4.h (with props) branches/sspi-bringup/reactos/dll/win32/ntlmssp/stubs.c (with props) branches/sspi-bringup/reactos/dll/win32/ntlmssp/util.c (with props) Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c branches/sspi-bringup/reactos/dll/win32/ntlmssp/dllmain.c branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlm.c branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlm.h branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.rbuild branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.spec Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/context.c [iso-8859-1] Thu May 12 19:47:08 2011 @@ -21,34 +21,138 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntlm); -/*********************************************************************** - * InitializeSecurityContextW - */ -SECURITY_STATUS SEC_ENTRY InitializeSecurityContextW( - PCredHandle phCredential, PCtxtHandle phContext, SEC_WCHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, - PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, - PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) +CRITICAL_SECTION ContextCritSect; +LIST_ENTRY ValidContextList; + +NTSTATUS +NtlmContextInitialize(VOID) +{ + InitializeCriticalSection(&ContextCritSect); + InitializeListHead(&ValidContextList); + + return STATUS_SUCCESS; +} + +VOID +NtlmReferenceContext(IN ULONG_PTR Handle) +{ + PNTLMSSP_CONTEXT Context = (PNTLMSSP_CONTEXT)Handle; + + EnterCriticalSection(&ContextCritSect); + + ASSERT(Context->RefCount > 0); + + /* A context that is not authenticated is only valid for a + pre-determined interval */ + if (NtlmIntervalElapsed(Context->StartTime, Context->Timeout)) + { + if ((Context->State != Authenticated) && + (Context->State != AuthenticateSent) && + (Context->State != PassedToService)) + { + ERR("Context %p has timed out\n", Context); + LeaveCriticalSection(&ContextCritSect); + return; + } + } + Context->RefCount += 1; + LeaveCriticalSection(&ContextCritSect); +} + +VOID +NtlmDereferenceContext(IN ULONG_PTR Handle) +{ + PNTLMSSP_CONTEXT Context = (PNTLMSSP_CONTEXT)Handle; + + EnterCriticalSection(&ContextCritSect); + + ASSERT(Context->RefCount >= 1); + + Context->RefCount -= 1; + + /* If there are no references free the object */ + if (Context->RefCount == 0) + { + ERR("Deleting context %p\n",Context); + /* free memory */ + NtlmFree(Context); + } + + LeaveCriticalSection(&ContextCritSect); +} + +VOID +NtlmContextTerminate(VOID) +{ + EnterCriticalSection(&ContextCritSect); + + /* dereference all items */ + while (!IsListEmpty(&ValidContextList)) + { + PNTLMSSP_CONTEXT Context; + Context = CONTAINING_RECORD(ValidContextList.Flink, + NTLMSSP_CONTEXT, + Entry); + + NtlmDereferenceContext((ULONG_PTR)Context); + } + + LeaveCriticalSection(&ContextCritSect); + + /* free critical section */ + DeleteCriticalSection(&ContextCritSect); + + return; +} + +/* public functions */ + +SECURITY_STATUS +SEC_ENTRY +InitializeSecurityContextW(IN OPTIONAL PCredHandle phCredential, + IN OPTIONAL PCtxtHandle phContext, + IN OPTIONAL SEC_WCHAR *pszTargetName, + IN ULONG fContextReq, + IN ULONG Reserved1, + IN ULONG TargetDataRep, + IN OPTIONAL PSecBufferDesc pInput, + IN ULONG Reserved2, + IN OUT OPTIONAL PCtxtHandle phNewContext, + IN OUT OPTIONAL PSecBufferDesc pOutput, + OUT ULONG *pfContextAttr, + OUT OPTIONAL PTimeStamp ptsExpiry) { SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; + SecBuffer inputTokens[2]; + SecBuffer outputTokens[2]; + UCHAR sessionKey[MSV1_0_USER_SESSION_KEY_LENGTH]; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - FIXME("AcceptSecurityContext Unimplemented\n"); - - return ret; -} - -/*********************************************************************** - * InitializeSecurityContextA - */ -SECURITY_STATUS SEC_ENTRY InitializeSecurityContextA( - PCredHandle phCredential, PCtxtHandle phContext, SEC_CHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, - PSecBufferDesc pInput,ULONG Reserved2, PCtxtHandle phNewContext, - PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) + if(TargetDataRep == SECURITY_NETWORK_DREP) + WARN("SECURITY_NETWORK_DREP\n"); + + RtlZeroMemory(sessionKey, MSV1_0_USER_SESSION_KEY_LENGTH); + + return ret; +} + +SECURITY_STATUS +SEC_ENTRY +InitializeSecurityContextA(IN OPTIONAL PCredHandle phCredential, + IN OPTIONAL PCtxtHandle phContext, + IN OPTIONAL SEC_CHAR *pszTargetName, + IN ULONG fContextReq, + IN ULONG Reserved1, + IN ULONG TargetDataRep, + IN OPTIONAL PSecBufferDesc pInput, + IN ULONG Reserved2, + IN OUT OPTIONAL PCtxtHandle phNewContext, + IN OUT OPTIONAL PSecBufferDesc pOutput, + OUT ULONG *pfContextAttr, + OUT OPTIONAL PTimeStamp ptsExpiry) { SECURITY_STATUS ret; SEC_WCHAR *target = NULL; @@ -75,33 +179,41 @@ return ret; } -/*********************************************************************** - * QueryContextAttributesW - */ -SECURITY_STATUS SEC_ENTRY QueryContextAttributesW(PCtxtHandle phContext, - ULONG ulAttribute, void *pBuffer) +SECURITY_STATUS +SEC_ENTRY +QueryContextAttributesW(PCtxtHandle phContext, + ULONG ulAttribute, + void *pBuffer) { TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer); if (!phContext) return SEC_E_INVALID_HANDLE; + UNIMPLEMENTED; + return SEC_E_UNSUPPORTED_FUNCTION; } - -/*********************************************************************** - * QueryContextAttributesA - */ -SECURITY_STATUS SEC_ENTRY QueryContextAttributesA(PCtxtHandle phContext, - ULONG ulAttribute, void *pBuffer) +SECURITY_STATUS +SEC_ENTRY +QueryContextAttributesA(PCtxtHandle phContext, + ULONG ulAttribute, + void *pBuffer) { return QueryContextAttributesW(phContext, ulAttribute, pBuffer); } -SECURITY_STATUS SEC_ENTRY AcceptSecurityContext( - PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, - ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, - PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) +SECURITY_STATUS +SEC_ENTRY +AcceptSecurityContext(IN PCredHandle phCredential, + IN OUT PCtxtHandle phContext, + IN PSecBufferDesc pInput, + IN ULONG fContextReq, + IN ULONG TargetDataRep, + IN OUT PCtxtHandle phNewContext, + IN OUT PSecBufferDesc pOutput, + OUT ULONG *pfContextAttr, + OUT PTimeStamp ptsExpiry) { SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; @@ -109,30 +221,28 @@ fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); - FIXME("AcceptSecurityContext Unimplemented\n"); - - return ret; -} - -/*********************************************************************** - * DeleteSecurityContext - */ -SECURITY_STATUS SEC_ENTRY DeleteSecurityContext(PCtxtHandle phContext) + UNIMPLEMENTED; + + return ret; +} + +SECURITY_STATUS +SEC_ENTRY +DeleteSecurityContext(PCtxtHandle phContext) { if (!phContext) { - ERR("Delete NULL context!\n"); return SEC_E_INVALID_HANDLE; } - FIXME("Delete context %p unimplemented\n", phContext); + NtlmDereferenceContext((ULONG_PTR)phContext); + phContext = NULL; return SEC_E_OK; } -/*********************************************************************** - * ImpersonateSecurityContext - */ -SECURITY_STATUS SEC_ENTRY ImpersonateSecurityContext(PCtxtHandle phContext) +SECURITY_STATUS +SEC_ENTRY +ImpersonateSecurityContext(PCtxtHandle phContext) { SECURITY_STATUS ret; @@ -151,7 +261,9 @@ /*********************************************************************** * RevertSecurityContext */ -SECURITY_STATUS SEC_ENTRY RevertSecurityContext(PCtxtHandle phContext) +SECURITY_STATUS +SEC_ENTRY +RevertSecurityContext(PCtxtHandle phContext) { SECURITY_STATUS ret; @@ -167,9 +279,20 @@ return ret; } -SECURITY_STATUS SEC_ENTRY FreeContextBuffer(PVOID pv) +SECURITY_STATUS +SEC_ENTRY +FreeContextBuffer(PVOID pv) { HeapFree(GetProcessHeap(), 0, pv); - return SEC_E_OK; } + +SECURITY_STATUS +SEC_ENTRY +ApplyControlToken(IN PCtxtHandle phContext, + IN PSecBufferDesc pInput) +{ + + UNIMPLEMENTED; + return SEC_E_UNSUPPORTED_FUNCTION; +} Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/credentials.c [iso-8859-1] Thu May 12 19:47:08 2011 @@ -21,11 +21,109 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntlm); -/*********************************************************************** - * QueryCredentialsAttributesW - */ -SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesW( - PCredHandle phCredential, ULONG ulAttribute, PVOID pBuffer) +CRITICAL_SECTION CredentialCritSect; +LIST_ENTRY ValidCredentialList; + + +/* private functions */ +NTSTATUS +NtlmCredentialInitialize(VOID) +{ + InitializeCriticalSection(&CredentialCritSect); + InitializeListHead(&ValidCredentialList); + return STATUS_SUCCESS; +} + +BOOL +NtlmCompareCredentials(IN NTLMSSP_CREDENTIAL Credential1, + IN NTLMSSP_CREDENTIAL Credential2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/* FIXME: validate handles! */ +VOID +NtlmReferenceCredential(IN ULONG_PTR Handle) +{ + PNTLMSSP_CREDENTIAL cred = (PNTLMSSP_CREDENTIAL)Handle; + + EnterCriticalSection(&CredentialCritSect); + + ASSERT(cred->RefCount > 0); + cred->RefCount += 1; + + LeaveCriticalSection(&CredentialCritSect); +} + +VOID +NtlmDereferenceCredential(IN ULONG_PTR Handle) +{ + PNTLMSSP_CREDENTIAL cred = (PNTLMSSP_CREDENTIAL)Handle; + + EnterCriticalSection(&CredentialCritSect); + + TRACE("NtlmDereferenceCredential %p refcount %d\n", Handle, cred->RefCount); + + ASSERT(cred->RefCount >= 1); + + cred->RefCount -= 1; + + /* If there are no references free the object */ + if (cred->RefCount == 0 ) + { + TRACE("Deleting credential %p\n",cred); + + /* free memory */ + if(cred->DomainName.Buffer) + NtlmFree(cred->DomainName.Buffer); + if (cred->UserName.Buffer) + NtlmFree(cred->UserName.Buffer); + if (cred->Password.Buffer) + NtlmFree(cred->Password.Buffer); + if (cred->SecToken) + NtClose(cred->SecToken); + + /* remove from list */ + RemoveEntryList(&cred->Entry); + + /* delete object */ + NtlmFree(cred); + } + LeaveCriticalSection(&CredentialCritSect); +} + +VOID +NtlmCredentialTerminate(VOID) +{ + EnterCriticalSection(&CredentialCritSect); + + /* dereference all items */ + while (!IsListEmpty(&ValidCredentialList)) + { + PNTLMSSP_CREDENTIAL Credential; + Credential = CONTAINING_RECORD(ValidCredentialList.Flink, + NTLMSSP_CREDENTIAL, + Entry); + + NtlmDereferenceCredential((ULONG_PTR)Credential); + } + + LeaveCriticalSection(&CredentialCritSect); + + /* free critical section */ + DeleteCriticalSection(&CredentialCritSect); + + return; +} + +/* public functions */ + +SECURITY_STATUS +SEC_ENTRY +QueryCredentialsAttributesW(PCredHandle phCredential, + ULONG ulAttribute, + PVOID pBuffer) { SECURITY_STATUS ret; @@ -42,12 +140,11 @@ return ret; } - -/*********************************************************************** - * QueryCredentialsAttributesA - */ -SECURITY_STATUS SEC_ENTRY QueryCredentialsAttributesA( - PCredHandle phCredential, ULONG ulAttribute, PVOID pBuffer) +SECURITY_STATUS +SEC_ENTRY +QueryCredentialsAttributesA(IN PCredHandle phCredential, + IN ULONG ulAttribute, + OUT PVOID pBuffer) { SECURITY_STATUS ret; @@ -64,99 +161,166 @@ return ret; } -/*********************************************************************** - * AcquireCredentialsHandleW - */ -SECURITY_STATUS SEC_ENTRY AcquireCredentialsHandleW( - SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, - PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, - PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) -{ - SECURITY_STATUS ret = SEC_E_UNSUPPORTED_FUNCTION; - PNtlmCredentials cred = NULL; - SEC_WCHAR *username = NULL, *domain = NULL; - - ERR("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", +SECURITY_STATUS +SEC_ENTRY +AcquireCredentialsHandleW(IN OPTIONAL SEC_WCHAR *pszPrincipal, + IN OPTIONAL SEC_WCHAR *pszPackage, + IN ULONG fCredentialUse, + IN PLUID pLogonID, + IN PVOID pAuthData, + IN SEC_GET_KEY_FN pGetKeyFn, + IN PVOID pGetKeyArgument, + OUT PCredHandle phCredential, + OUT PTimeStamp ptsExpiry) +{ + + PNTLMSSP_CREDENTIAL cred = NULL; + SECURITY_STATUS ret = SEC_E_OK; + ULONG credFlags = fCredentialUse; + UNICODE_STRING username, domain, password; + BOOL foundCred = FALSE; + LUID luidToUse = SYSTEM_LUID; + + TRACE("AcquireCredentialsHandleW(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - FIXME("AcquireCredentialsHandleW Unimplemented\n"); - switch(fCredentialUse) - { - case SECPKG_CRED_INBOUND: - cred = HeapAlloc(GetProcessHeap(), 0, sizeof(*cred)); - if (!cred) - ret = SEC_E_INSUFFICIENT_MEMORY; - else - { - cred->mode = NTLM_SERVER; - cred->username_arg = NULL; - cred->domain_arg = NULL; - cred->password = NULL; - cred->pwlen = 0; - phCredential->dwUpper = fCredentialUse; - phCredential->dwLower = (ULONG_PTR)cred; - ret = SEC_E_OK; - } - break; - case SECPKG_CRED_OUTBOUND: - { - cred = HeapAlloc(GetProcessHeap(), 0, sizeof(*cred)); - if (!cred) - { - ret = SEC_E_INSUFFICIENT_MEMORY; - break; - } - cred->mode = NTLM_CLIENT; - cred->username_arg = NULL; - cred->domain_arg = NULL; - cred->password = NULL; - cred->pwlen = 0; - - if(pAuthData != NULL) - { - PSEC_WINNT_AUTH_IDENTITY_W auth_data = pAuthData; - - TRACE("Username is %s\n", debugstr_wn(auth_data->User, auth_data->UserLength)); - TRACE("Domain name is %s\n", debugstr_wn(auth_data->Domain, auth_data->DomainLength)); - - //cred->username_arg = GetUsernameArg(auth_data->User, auth_data->UserLength); - //cred->domain_arg = GetDomainArg(auth_data->Domain, auth_data->DomainLength); - } - - phCredential->dwUpper = fCredentialUse; - phCredential->dwLower = (ULONG_PTR)cred; - TRACE("ACH phCredential->dwUpper: 0x%08lx, dwLower: 0x%08lx\n", - phCredential->dwUpper, phCredential->dwLower); - ret = SEC_E_OK; - break; - } - case SECPKG_CRED_BOTH: - FIXME("AcquireCredentialsHandle: SECPKG_CRED_BOTH stub\n"); - ret = SEC_E_UNSUPPORTED_FUNCTION; - phCredential = NULL; - break; - default: - phCredential = NULL; - ret = SEC_E_UNKNOWN_CREDENTIALS; - } - - HeapFree(GetProcessHeap(), 0, username); - HeapFree(GetProcessHeap(), 0, domain); + if (pGetKeyFn || pGetKeyArgument) + { + WARN("msdn says these should always be null!\n"); + return ret; + } + + //initialize to null + RtlInitUnicodeString(&username, NULL); + RtlInitUnicodeString(&domain, NULL); + RtlInitUnicodeString(&password, NULL); + + //if(fCredentialUse == SECPKG_CRED_OUTBOUND) + if(pAuthData) + { + PSEC_WINNT_AUTH_IDENTITY_W auth_data = pAuthData; + + /* detect null session */ + if ((auth_data->User) && (auth_data->Password) && + (auth_data->Domain) && (!auth_data->UserLength) && + (!auth_data->PasswordLength) &&(!auth_data->DomainLength)) + { + WARN("Using null session.\n"); + credFlags |= NTLM_CRED_NULLSESSION; + } + + /* create unicode strings and null terminate buffers */ + + if(auth_data->User) + { + int len = auth_data->UserLength; + username.Buffer = NtlmAllocate((len+1) * sizeof(WCHAR)); + if(username.Buffer) + { + username.MaximumLength = username.Length = len+1; + memcpy(username.Buffer, auth_data->User, len* sizeof(WCHAR)); + username.Buffer[len+1] = L'\0'; + } + else + return SEC_E_INSUFFICIENT_MEMORY; + } + + if(auth_data->Password) + { + int len = auth_data->PasswordLength; + password.Buffer = NtlmAllocate((len+1) * sizeof(WCHAR)); + if(password.Buffer) + { + password.MaximumLength = password.Length = len+1; + memcpy(password.Buffer, auth_data->Password, len* sizeof(WCHAR)); + password.Buffer[len+1] = L'\0'; + } + else + return SEC_E_INSUFFICIENT_MEMORY; + } + + if(auth_data->Domain) + { + int len = auth_data->DomainLength; + domain.Buffer = NtlmAllocate((len+1) * sizeof(WCHAR)); + if(domain.Buffer) + { + domain.MaximumLength = domain.Length = len+1; + memcpy(domain.Buffer, auth_data->Domain, len* sizeof(WCHAR)); + domain.Buffer[len+1] = L'\0'; + } + else + return SEC_E_INSUFFICIENT_MEMORY; + } + } + + /* FIXME: LOOKUP STORED CREDENTIALS!!! */ + + /* we need to build a credential */ + /* refactor: move into seperate function */ + if(!foundCred) + { + cred = (PNTLMSSP_CREDENTIAL)NtlmAllocate(sizeof(NTLMSSP_CREDENTIAL)); + cred->RefCount = 1; + cred->ProcId = GetCurrentProcessId();//FIXME + cred->SecPackageFlags = credFlags; + cred->SecToken = NULL; //FIXME + + /* FIX ME: check against LSA token */ + if((cred->SecToken == NULL) && !(credFlags & NTLM_CRED_NULLSESSION)) + { + /* check privilages? */ + cred->LogonId = luidToUse; + } + + if(domain.Buffer != NULL) + cred->DomainName = domain; + + if(username.Buffer != NULL) + cred->UserName = username; + + if(password.Buffer != NULL) + { + NtlmProtectMemory(password.Buffer, password.Length); + cred->Password = password; + } + + EnterCriticalSection(&CredentialCritSect); + InsertHeadList(&ValidCredentialList, &cred->Entry); + LeaveCriticalSection(&CredentialCritSect); + + TRACE("added credential %x\n",cred); + TRACE("%s %s %s",debugstr_w(username.Buffer), debugstr_w(password.Buffer), debugstr_w(domain.Buffer)); + } + + /* return cred */ + phCredential->dwUpper = credFlags; + phCredential->dwLower = (ULONG_PTR)cred; + + //*ptsExpiry->HighPart = 0x7FFFFF36; + //*ptsExpiry->LowPart = 0xD5969FFF; + + + /* free strings as we used recycled credentials */ + //if(foundCred) return ret; } - -/*********************************************************************** - * AcquireCredentialsHandleA - */ -SECURITY_STATUS SEC_ENTRY AcquireCredentialsHandleA( - SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, - PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, - PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) -{ - SECURITY_STATUS ret; +SECURITY_STATUS +SEC_ENTRY +AcquireCredentialsHandleA(SEC_CHAR *pszPrincipal, + SEC_CHAR *pszPackage, + ULONG fCredentialUse, + PLUID pLogonID, + PVOID pAuthData, + SEC_GET_KEY_FN pGetKeyFn, + PVOID pGetKeyArgument, + PCredHandle phCredential, + PTimeStamp ptsExpiry) +{ + SECURITY_STATUS ret = SEC_E_OK; int user_sizeW, domain_sizeW, passwd_sizeW; SEC_WCHAR *user = NULL, *domain = NULL, *passwd = NULL, *package = NULL; @@ -164,7 +328,7 @@ PSEC_WINNT_AUTH_IDENTITY_W pAuthDataW = NULL; PSEC_WINNT_AUTH_IDENTITY_A identity = NULL; - ERR("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", + TRACE("AcquireCredentialsHandleA(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); @@ -178,7 +342,6 @@ MultiByteToWideChar(CP_ACP, 0, pszPackage, -1, package, package_sizeW); } - if(pAuthData != NULL) { identity = pAuthData; @@ -259,28 +422,17 @@ return ret; } -/*********************************************************************** - * FreeCredentialsHandle - */ -SECURITY_STATUS SEC_ENTRY FreeCredentialsHandle( - PCredHandle phCredential) -{ - SECURITY_STATUS ret; - - if(phCredential){ - PNtlmCredentials cred = (PNtlmCredentials) phCredential->dwLower; - phCredential->dwUpper = 0; - phCredential->dwLower = 0; - if (cred->password) - memset(cred->password, 0, cred->pwlen); - HeapFree(GetProcessHeap(), 0, cred->password); - HeapFree(GetProcessHeap(), 0, cred->username_arg); - HeapFree(GetProcessHeap(), 0, cred->domain_arg); - HeapFree(GetProcessHeap(), 0, cred); - ret = SEC_E_OK; - } - else - ret = SEC_E_OK; - - return ret; -} +SECURITY_STATUS +SEC_ENTRY +FreeCredentialsHandle(PCredHandle phCredential) +{ + TRACE("FreeCredentialsHandle %x %x %x\n", phCredential, phCredential->dwLower); + + if(!phCredential) /* fixme: more handle validation */ + return SEC_E_INVALID_HANDLE; + + NtlmDereferenceCredential((ULONG_PTR)phCredential->dwLower); + phCredential = NULL; + + return SEC_E_OK; +} Added: branches/sspi-bringup/reactos/dll/win32/ntlmssp/crypt.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/crypt.c (added) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/crypt.c [iso-8859-1] Thu May 12 19:47:08 2011 @@ -1,0 +1,128 @@ +/* + * Copyright 2011 Samuel Serapión + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "ntlm.h" +#include <wincrypt.h> +#include "rc4.h" + +HCRYPTPROV Prov; +PVOID LockedMemoryPtr = NULL; +ULONG LockedMemorySize = 0; + +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); + +BOOL +NtlmInitializeRNG(VOID) +{ + BOOL ret; + + /* prevent double initialization */ + if(Prov) + return TRUE; + + ret = CryptAcquireContext(&Prov, + NULL, + NULL, + PROV_RSA_FULL, + CRYPT_VERIFYCONTEXT); + + if(!ret) + ERR("CryptAcquireContext failed with %x.\n",GetLastError()); + return ret; +} + +VOID +NtlmTerminateRNG(VOID) +{ + if(Prov) + { + CryptReleaseContext(Prov,0); + Prov = 0; + } +} + +NTSTATUS +NtlmGenerateRandomBits(VOID *Bits, ULONG Size) +{ + if(CryptGenRandom(Prov, Size, (BYTE*)Bits)) + return STATUS_SUCCESS; + + /* fix me: translate win32 error? */ + return STATUS_UNSUCCESSFUL; +} + +BOOL +NtlmProtectMemory(VOID *Data, ULONG Size) +{ + rc4_key rc4key; + + if(Data == NULL || Size == 0) + return TRUE; + + if(LockedMemoryPtr == NULL) + return FALSE; + + rc4_init(&rc4key, (unsigned char*)LockedMemoryPtr, LockedMemorySize); + rc4_crypt(&rc4key, (unsigned char *)Data,(unsigned char *)Data, Size); + + ZeroMemory(&rc4key, sizeof(rc4key)); + + return TRUE; +} + +BOOL +NtlmUnProtectMemory(VOID *Data, ULONG Size) +{ + return NtlmProtectMemory(Data, Size); +} + +VOID +NtlmTerminateProtectedMemory(VOID) +{ + if(LockedMemoryPtr) + { + ZeroMemory(LockedMemoryPtr, LockedMemorySize); + VirtualFree(LockedMemoryPtr, 0, MEM_RELEASE); + LockedMemoryPtr = NULL; + } +} + +BOOL +NtlmInitializeProtectedMemory(VOID) +{ + /* key size of the algorithm */ + LockedMemorySize = 256; + + LockedMemoryPtr = VirtualAlloc(NULL, + LockedMemorySize, + MEM_COMMIT, + PAGE_READWRITE); + + if(!LockedMemoryPtr) + return FALSE; + + /* do actual locking */ + VirtualLock(LockedMemoryPtr, LockedMemorySize); + + if(!NT_SUCCESS(NtlmGenerateRandomBits(LockedMemoryPtr, LockedMemorySize))) + { + NtlmTerminateProtectedMemory(); + return FALSE; + } + + return TRUE; +} Propchange: branches/sspi-bringup/reactos/dll/win32/ntlmssp/crypt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/dllmain.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/dllmain.c [iso-8859-1] Thu May 12 19:47:08 2011 @@ -20,12 +20,37 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntlm); + +BOOL SetupIsActive(VOID); + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); - return TRUE; + /* hack: rsaehn has still not registered its crypto providers */ + /* its not like we are going to logon to anything yet */ + if(!SetupIsActive()) + { + //REACTOS BUG: even after 2nd stage crypto providers are not available! + //NtlmInitializeRNG(); + //NtlmInitializeProtectedMemory(); + } + NtlmCredentialInitialize(); + NtlmContextInitialize(); + break; + case DLL_PROCESS_DETACH: + NtlmContextTerminate(); + NtlmCredentialTerminate(); + NtlmTerminateRNG(); + NtlmTerminateProtectedMemory(); + break; + default: + break; + } + return TRUE; } Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlm.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlm.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlm.c [iso-8859-1] Thu May 12 19:47:08 2011 @@ -19,6 +19,9 @@ #include "ntlm.h" WINE_DEFAULT_DEBUG_CHANNEL(ntlm); + +/* FIXME: hardcoded NtlmUserMode */ +NTLM_MODE NtlmMode = NtlmUserMode; static SecurityFunctionTableA ntlmTableA = { SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, @@ -92,7 +95,6 @@ ret = QuerySecurityPackageInfoA(NULL, ppPackageInfo); *pcPackages = 1; - ERR("EnumerateSecurityPackagesW returning! \n"); return ret; } @@ -106,7 +108,6 @@ ret = QuerySecurityPackageInfoW(NULL, ppPackageInfo); *pcPackages = 1; - ERR("EnumerateSecurityPackagesW returning! \n"); return ret; } Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlm.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlm.h [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlm.h [iso-8859-1] Thu May 12 19:47:08 2011 @@ -23,18 +23,25 @@ #include <stdarg.h> #include <stdio.h> -#include "ntstatus.h" +#include <ntstatus.h> #define WIN32_NO_STATUS -#include "windows.h" +#include <windows.h> +#include <ndk/ntndk.h> #define SECURITY_WIN32 #define _NO_KSECDD_IMPORT_ -#include "rpc.h" -#include "sspi.h" -#include "ntsecapi.h" -#include "ntsecpkg.h" +#include <rpc.h> +#include <sspi.h> +#include <ntsecapi.h> +#include <ntsecpkg.h> #include "wine/unicode.h" #include "wine/debug.h" + +/* globals */ +extern SECPKG_FUNCTION_TABLE NtLmPkgFuncTable; //functions we provide to LSA in SpLsaModeInitialize +extern PSECPKG_DLL_FUNCTIONS NtlmPkgDllFuncTable; //fuctions provided by LSA in SpInstanceInit +extern SECPKG_USER_FUNCTION_TABLE NtlmUmodeFuncTable; //fuctions we provide via SpUserModeInitialize +extern PLSA_SECPKG_FUNCTION_TABLE NtlmLsaFuncTable; // functions provided by LSA in SpInitialize #define NTLM_NAME_A "NTLM\0" #define NTLM_NAME_W L"NTLM\0" @@ -42,18 +49,20 @@ #define NTLM_COMMENT_A "NTLM Security Package\0" #define NTLM_COMMENT_W L"NTLM Security Package\0" -/* According to Windows, NTLM has the following capabilities. */ +/* NTLM has the following capabilities. */ #define NTLM_CAPS ( \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_IMPERSONATION | \ SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_LOGON | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_NEGOTIABLE | \ SECPKG_FLAG_PRIVACY | \ - SECPKG_FLAG_TOKEN_ONLY | \ - SECPKG_FLAG_CONNECTION | \ - SECPKG_FLAG_MULTI_REQUIRED | \ - SECPKG_FLAG_IMPERSONATION | \ - SECPKG_FLAG_ACCEPT_WIN32_NAME | \ - SECPKG_FLAG_READONLY_WITH_CHECKSUM) + SECPKG_FLAG_TOKEN_ONLY) -#define NTLM_MAX_BUF 1904 /* wtf? */ +#define NTLM_MAX_BUF 1904 +#define NTLM_CRED_NULLSESSION SECPKG_CRED_RESERVED /* NTLMSSP flags indicating the negotiated features */ #define NTLMSSP_NEGOTIATE_UNICODE 0x00000001 @@ -76,176 +85,108 @@ #define NTLMSSP_NEGOTIATE_KEY_EXCHANGE 0x40000000 #define NTLMSSP_NEGOTIATE_56 0x80000000 -typedef struct tag_arc4_info { - unsigned char x, y; - unsigned char state[256]; -} arc4_info; -typedef enum _helper_mode /* remove? */ +typedef enum _NTLM_MODE { + NtlmLsaMode = 1, + NtlmUserMode +} NTLM_MODE, *PNTLM_MODE; + +extern NTLM_MODE NtlmMode; + +typedef struct _NTLMSSP_CREDENTIAL { - NTLM_SERVER, - NTLM_CLIENT, - NUM_HELPER_MODES -} HelperMode; + LIST_ENTRY Entry; + ULONG RefCount; + ULONG SecPackageFlags; + UNICODE_STRING DomainName; + UNICODE_STRING UserName; + UNICODE_STRING Password; + ULONG ProcId; + HANDLE SecToken; + LUID LogonId; -typedef struct _NtlmCredentials /* remove? */ +} NTLMSSP_CREDENTIAL, *PNTLMSSP_CREDENTIAL; + +typedef enum { + Idle, + NegotiateSent, + ChallengeSent, + AuthenticateSent, + Authenticated, + PassedToService +} NTLM_CONTEXT_STATE, *PNTLM_CONTEXT_STATE; + +typedef struct _NTLMSSP_CONTEXT { - HelperMode mode; - char *username_arg; - char *domain_arg; - char *password; - int pwlen; -} NtlmCredentials, *PNtlmCredentials; + LIST_ENTRY Entry; + LARGE_INTEGER StartTime;//context creation time + ULONG Timeout;//how long context is valid pre-authentication + ULONG RefCount; + ULONG ProtocolFlags; + ULONG ContextFlags; + NTLM_CONTEXT_STATE State; + HANDLE SecToken; + PNTLMSSP_CREDENTIAL Credential; //creator + UCHAR Challenge[MSV1_0_CHALLENGE_LENGTH]; //ChallengeSent + UCHAR SessionKey[MSV1_0_USER_SESSION_KEY_LENGTH]; //LSA + BOOL isServer; + ULONG ProcId; +} NTLMSSP_CONTEXT, *PNTLMSSP_CONTEXT; -typedef struct _NegoHelper { /* remove? */ - HelperMode mode; - int pipe_in; - int pipe_out; - int major; - int minor; - int micro; - char *com_buf; - int com_buf_size; - int com_buf_offset; - BYTE *session_key; - ULONG neg_flags; - struct { - struct { - ULONG seq_num; - arc4_info *a4i; - } ntlm; - struct { - BYTE *send_sign_key; - BYTE *send_seal_key; - BYTE *recv_sign_key; - BYTE *recv_seal_key; - ULONG send_seq_no; - ULONG recv_seq_no; - arc4_info *send_a4i; - arc4_info *recv_a4i; - } ntlm2; - } crypt; -} NegoHelper, *PNegoHelper; +/* private functions */ -typedef enum _sign_direction { /* remove? */ - NTLM_SEND, - NTLM_RECV -} SignDirection; +/* credentials.c */ +NTSTATUS +NtlmCredentialInitialize(VOID); -/* functions */ +VOID +NtlmCredentialTerminate(VOID); -SECURITY_STATUS -SEC_ENTRY -ntlm_QueryCredentialsAttributesA( - PCredHandle phCredential, ULONG ulAttribute, PVOID pBuffer); +/* context.c */ -SECURITY_STATUS -SEC_ENTRY -ntlm_AcquireCredentialsHandleA( - SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, - PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, - PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry); +NTSTATUS +NtlmContextInitialize(VOID); -SECURITY_STATUS -SEC_ENTRY -ntlm_FreeCredentialsHandle( - PCredHandle phCredential); +VOID +NtlmContextTerminate(VOID); -SECURITY_STATUS -SEC_ENTRY -ntlm_InitializeSecurityContextA( - PCredHandle phCredential, PCtxtHandle phContext, SEC_CHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, - PSecBufferDesc pInput,ULONG Reserved2, PCtxtHandle phNewContext, - PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry); +/* crypt.c */ +BOOL +NtlmInitializeRNG(VOID); -SECURITY_STATUS -SEC_ENTRY -ntlm_AcceptSecurityContext( - PCredHandle phCredential, PCtxtHandle phContext, PSecBufferDesc pInput, - ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, - PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry); +VOID +NtlmTerminateRNG(VOID); -SECURITY_STATUS -SEC_ENTRY -ntlm_CompleteAuthToken(PCtxtHandle phContext, - PSecBufferDesc pToken); +NTSTATUS +NtlmGenerateRandomBits(VOID *Bits, + ULONG Size); -SECURITY_STATUS -SEC_ENTRY -ntlm_DeleteSecurityContext( - PCtxtHandle phContext); +BOOL +NtlmInitializeProtectedMemory(VOID); -SECURITY_STATUS -SEC_ENTRY -ntlm_QueryContextAttributesA( - PCtxtHandle phContext, - ULONG ulAttribute, void *pBuffer); +VOID +NtlmTerminateProtectedMemory(VOID); -SECURITY_STATUS -SEC_ENTRY -ntlm_ImpersonateSecurityContext( - PCtxtHandle phContext); +BOOL +NtlmProtectMemory(VOID *Data, + ULONG Size); -SECURITY_STATUS -SEC_ENTRY -ntlm_RevertSecurityContext( - PCtxtHandle phContext); +BOOL +NtlmUnProtectMemory(VOID *Data, + ULONG Size); -SECURITY_STATUS -SEC_ENTRY -ntlm_MakeSignature( - PCtxtHandle phContext, ULONG fQOP, - PSecBufferDesc pMessage, ULONG MessageSeqNo); +/* util.c */ -SECURITY_STATUS -SEC_ENTRY -ntlm_VerifySignature( - PCtxtHandle phContext, - PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP); +PVOID +NtlmAllocate(IN ULONG Size); -SECURITY_STATUS -SEC_ENTRY -ntlm_EncryptMessage( - PCtxtHandle phContext, - ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo); +VOID +NtlmFree(IN PVOID Buffer); -SECURITY_STATUS -SEC_ENTRY -ntlm_DecryptMessage( - PCtxtHandle phContext, - PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP); +BOOLEAN +NtlmIntervalElapsed(IN LARGE_INTEGER Start, + IN LONG Timeout); -SECURITY_STATUS -SEC_ENTRY -ntlm_QueryCredentialsAttributesW( - PCredHandle phCredential, ULONG ulAttribute, PVOID pBuffer); - -SECURITY_STATUS -SEC_ENTRY -ntlm_QueryCredentialsAttributesA( - PCredHandle phCredential, ULONG ulAttribute, PVOID pBuffer); - -SECURITY_STATUS -SEC_ENTRY -ntlm_AcquireCredentialsHandleW( - SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, - PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, - PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry); - -SECURITY_STATUS -SEC_ENTRY -ntlm_InitializeSecurityContextW( - PCredHandle phCredential, PCtxtHandle phContext, SEC_WCHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, - PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, - PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry); - -SECURITY_STATUS -SEC_ENTRY -ntlm_QueryContextAttributesW( - PCtxtHandle phContext, - ULONG ulAttribute, void *pBuffer); #endif Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.rbuild [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.rbuild [iso-8859-1] Thu May 12 19:47:08 2011 @@ -5,11 +5,13 @@ <include base="ntlmssp">.</include> <library>wine</library> <library>advapi32</library> + <library>crypt32</library> <library>ntdll</library> - <file>base64_codec.c</file> <file>context.c</file> <file>credentials.c</file> - <file>hmac_md5.c</file> + <file>crypt.c</file> + <file>rc4.c</file> + <file>stubs.c</file> <file>messages.c</file> <file>ntlm.c</file> <file>sign.c</file> Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.spec URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.spec [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/ntlmssp.spec [iso-8859-1] Thu May 12 19:47:08 2011 @@ -1,7 +1,7 @@ @ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) @ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) -@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr)secur32.AcquireCredentialsHandleW -#@ stdcall ApplyControlToken(ptr ptr) +@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) +@ stdcall ApplyControlToken(ptr ptr) @ stdcall CompleteAuthToken(ptr ptr) @ stdcall DeleteSecurityContext(ptr) @ stdcall EnumerateSecurityPackagesA(ptr ptr) Added: branches/sspi-bringup/reactos/dll/win32/ntlmssp/rc4.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/rc4.c (added) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/rc4.c [iso-8859-1] Thu May 12 19:47:08 2011 @@ -1,0 +1,98 @@ +/* + * rc4.c + * + * Copyright (c) 1996-2000 Whistle Communications, Inc. + * All rights reserved. + * + * Subject to the following obligations and disclaimer of warranty, use and + * redistribution of this software, in source or object code forms, with or + * without modifications are expressly permitted by Whistle Communications; + * provided, however, that: + * 1. Any and all reproductions of the source or object code must include the + * copyright notice above and the following disclaimer of warranties; and + * 2. No rights are granted, in any manner or form, to use Whistle + * Communications, Inc. trademarks, including the mark "WHISTLE + * COMMUNICATIONS" on advertising, endorsements, or otherwise except as + * such appears in the above copyright notice or in the software. + * + * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND + * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO + * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, + * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. + * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY + * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS + * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE. + * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES + * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING + * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * $FreeBSD: src/sys/crypto/rc4/rc4.c,v 1.2.2.1 2000/04/18 04:48:31 archie Exp $ + */ +#include "rc4.h" + +static inline void swap_bytes(unsigned char *a, unsigned char *b) +{ + unsigned char swapByte; + + swapByte = *a; + *a = *b; + *b = swapByte; +} + +/* + * Initialize an RC4 state buffer using the supplied key, + * which can have arbitrary length. + */ +void +rc4_init(rc4_key *const state, const unsigned char *key, int keylen) +{ + unsigned char j; + int i; + + /* Initialize state with identity permutation */ + for (i = 0; i < 256; i++) + state->perm[i] = (unsigned char)i; + state->index1 = 0; + state->index2 = 0; + + /* Randomize the permutation using key data */ + for (j = i = 0; i < 256; i++) { + j += state->perm[i] + key[i % keylen]; + swap_bytes(&state->perm[i], &state->perm[j]); + } +} + +/* + * Encrypt some data using the supplied RC4 state buffer. + * The input and output buffers may be the same buffer. + * Since RC4 is a stream cypher, this function is used + * for both encryption and decryption. + */ +void +rc4_crypt(rc4_key *const state, const unsigned char *inbuf, unsigned char *outbuf, int buflen) +{ + int i; + unsigned char j; + + for (i = 0; i < buflen; i++) + { + /* Update modification indicies */ + state->index1++; + state->index2 += state->perm[state->index1]; + + /* Modify permutation */ + swap_bytes(&state->perm[state->index1], + &state->perm[state->index2]); + + /* Encrypt/decrypt next byte */ + j = state->perm[state->index1] + state->perm[state->index2]; + outbuf[i] = inbuf[i] ^ state->perm[j]; + } +} Propchange: branches/sspi-bringup/reactos/dll/win32/ntlmssp/rc4.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/sspi-bringup/reactos/dll/win32/ntlmssp/rc4.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/rc4.h (added) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/rc4.h [iso-8859-1] Thu May 12 19:47:08 2011 @@ -1,0 +1,10 @@ + +typedef struct _rc4_key +{ + unsigned char perm[256]; + unsigned char index1; + unsigned char index2; +}rc4_key; + +void rc4_init(rc4_key *const state, const unsigned char *key, int keylen); +void rc4_crypt(rc4_key *const state, const unsigned char *inbuf, unsigned char *outbuf, int buflen); Propchange: branches/sspi-bringup/reactos/dll/win32/ntlmssp/rc4.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/sspi-bringup/reactos/dll/win32/ntlmssp/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/stubs.c (added) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/stubs.c [iso-8859-1] Thu May 12 19:47:08 2011 @@ -1,0 +1,28 @@ +/* + * Copyright 2011 Samuel Serapion + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "ntlm.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); + +/* initialize all to null since we still dont use them */ +SECPKG_FUNCTION_TABLE NtLmPkgFuncTable; //functions we provide to LSA in SpLsaModeInitialize +PSECPKG_DLL_FUNCTIONS NtlmPkgDllFuncTable = NULL; //fuctions provided by LSA in SpInstanceInit +SECPKG_USER_FUNCTION_TABLE NtlmUmodeFuncTable; //fuctions we provide via SpUserModeInitialize +PLSA_SECPKG_FUNCTION_TABLE NtlmLsaFuncTable = NULL; // functions provided by LSA in SpInitialize Propchange: branches/sspi-bringup/reactos/dll/win32/ntlmssp/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/sspi-bringup/reactos/dll/win32/ntlmssp/util.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/util.c (added) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/util.c [iso-8859-1] Thu May 12 19:47:08 2011 @@ -1,0 +1,132 @@ +/* + * Copyright 2011 Samuel Serapion + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "ntlm.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ntlm); + + +PVOID +NtlmAllocate(IN ULONG Size) +{ + PVOID buffer = NULL; + + if(Size == 0) + { + ERR("Allocating 0 bytes!\n"); + return NULL; + } + + switch(NtlmMode) + { + case NtlmLsaMode: + buffer = NtlmLsaFuncTable->AllocateLsaHeap(Size); + if (buffer != NULL) + RtlZeroMemory(buffer, Size); + break; + case NtlmUserMode: + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Size); + break; + default: + ERR("NtlmState unknown!\n"); + break; + } + return buffer; +} + +VOID +NtlmFree(IN PVOID Buffer) +{ + if (Buffer) + { + switch (NtlmMode) + { + case NtlmLsaMode: + NtlmLsaFuncTable->FreeLsaHeap(Buffer); + break; + case NtlmUserMode: + HeapFree(GetProcessHeap(),0,Buffer); + break; + default: + ERR("NtlmState unknown!\n"); + break; + } + } + else + { + ERR("Trying to free NULL!\n"); + } +} + +BOOLEAN +NtlmIntervalElapsed(IN LARGE_INTEGER Start,IN LONG Timeout) +{ + LARGE_INTEGER now; + LARGE_INTEGER elapsed; + LARGE_INTEGER interval; + + /* timeout is never */ + if (Timeout > 0xffffffff) + return FALSE; + + /* get current time */ + NtQuerySystemTime(&now); + elapsed.QuadPart = now.QuadPart - Start.QuadPart; + + /* convert from milliseconds into 100ns */ + interval.QuadPart = Int32x32To64(Timeout, 10000); + + /* time overflowed or elapsed is greater than interval */ + if (elapsed.QuadPart < 0 || elapsed.QuadPart > interval.QuadPart ) + return TRUE; + + return FALSE; +} + +/* hack: see dllmain.c */ +/* from base/services/umpnpmgr/umpnpmgr.c */ +BOOL +SetupIsActive(VOID) +{ + HKEY hKey = NULL; + DWORD regType, active, size; + LONG rc; + BOOL ret = FALSE; + + rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\Setup", 0, KEY_QUERY_VALUE, &hKey); + if (rc != ERROR_SUCCESS) + goto cleanup; + + size = sizeof(DWORD); + rc = RegQueryValueExW(hKey, L"SystemSetupInProgress", NULL, &regType, (LPBYTE)&active, &size); + if (rc != ERROR_SUCCESS) + goto cleanup; + if (regType != REG_DWORD || size != sizeof(DWORD)) + goto cleanup; + + ret = (active != 0); + +cleanup: + if (hKey != NULL) + RegCloseKey(hKey); + + TRACE("System setup in progress? %S\n", ret ? L"YES" : L"NO"); + + return ret; +} Propchange: branches/sspi-bringup/reactos/dll/win32/ntlmssp/util.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sserapion] 51686: [secur32] - Fix copy/paste mistakes. - Uncomment some code. - add SealMessage stub.
by sserapion＠svn.reactos.org 12 May '11

12 May '11

Author: sserapion Date: Thu May 12 16:53:49 2011 New Revision: 51686 URL: http://svn.reactos.org/svn/reactos?rev=51686&view=rev Log: [secur32] - Fix copy/paste mistakes. - Uncomment some code. - add SealMessage stub. Modified: branches/sspi-bringup/reactos/dll/win32/secur32/precomp.h branches/sspi-bringup/reactos/dll/win32/secur32/secur32.c branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec branches/sspi-bringup/reactos/dll/win32/secur32/sspi.c branches/sspi-bringup/reactos/dll/win32/secur32/stubs.c branches/sspi-bringup/reactos/dll/win32/secur32/wrapper.c Modified: branches/sspi-bringup/reactos/dll/win32/secur32/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/secur32/precomp.h [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/secur32/precomp.h [iso-8859-1] Thu May 12 16:53:49 2011 @@ -31,3 +31,7 @@ #include "secur32_priv.h" #include "thunks.h" + +extern SecurityFunctionTableA securityFunctionTableA; +extern SecurityFunctionTableW securityFunctionTableW; + Modified: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/secur32/secur32.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/secur32/secur32.c [iso-8859-1] Thu May 12 16:53:49 2011 @@ -37,68 +37,6 @@ CRITICAL_SECTION cs; SecurePackageTable *packageTable = NULL; SecureProviderTable *providerTable = NULL; - -static SecurityFunctionTableA securityFunctionTableA = { - SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, - EnumerateSecurityPackagesA, - QueryCredentialsAttributesA, - AcquireCredentialsHandleA, - FreeCredentialsHandle, - NULL, /* Reserved2 */ - InitializeSecurityContextA, - AcceptSecurityContext, - CompleteAuthToken, - DeleteSecurityContext, - ApplyControlToken, - QueryContextAttributesA, - ImpersonateSecurityContext, - RevertSecurityContext, - MakeSignature, - VerifySignature, - FreeContextBuffer, - QuerySecurityPackageInfoA, - EncryptMessage, /* Reserved3 */ - DecryptMessage, /* Reserved4 */ - ExportSecurityContext, - ImportSecurityContextA, - AddCredentialsA, - NULL, /* Reserved8 */ - QuerySecurityContextToken, - EncryptMessage, - DecryptMessage, - SetContextAttributesA -}; - -static SecurityFunctionTableW securityFunctionTableW = { - SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, - EnumerateSecurityPackagesW, - QueryCredentialsAttributesW, - AcquireCredentialsHandleW, - FreeCredentialsHandle, - NULL, /* Reserved2 */ - InitializeSecurityContextW, - AcceptSecurityContext, - CompleteAuthToken, - DeleteSecurityContext, - ApplyControlToken, - QueryContextAttributesW, - ImpersonateSecurityContext, - RevertSecurityContext, - MakeSignature, - VerifySignature, - FreeContextBuffer, - QuerySecurityPackageInfoW, - EncryptMessage, /* Reserved3 */ - DecryptMessage, /* Reserved4 */ - ExportSecurityContext, - ImportSecurityContextW, - AddCredentialsW, - NULL, /* Reserved8 */ - QuerySecurityContextToken, - EncryptMessage, - DecryptMessage, - SetContextAttributesW -}; static PWSTR SECUR32_strdupW(PCWSTR str) { @@ -332,7 +270,7 @@ EnterCriticalSection(&cs); - ERR("Adding %s provider\n", debugstr_w(moduleName)); + TRACE("Adding %s provider\n", debugstr_w(moduleName)); if (!providerTable) { @@ -383,7 +321,7 @@ EnterCriticalSection(&cs); - ERR("Will add %d packages\n",toAdd); + TRACE("Will add %d packages\n",toAdd); if (!packageTable) { @@ -411,7 +349,7 @@ infoA ? &infoA[i] : NULL, infoW ? &infoW[i] : NULL); - ERR("added: %s\n",debugstr_w(package->infoW.Name)); + TRACE("added: %s\n",debugstr_w(package->infoW.Name)); } packageTable->numPackages += toAdd; @@ -431,7 +369,7 @@ (INIT_SECURITY_INTERFACE_A)GetProcAddress(lib, SECURITY_ENTRYPOINT_ANSIA); - ERR("loaded %s, InitSecurityInterfaceA is %p, InitSecurityInterfaceW is %p\n", + TRACE("loaded %s, InitSecurityInterfaceA is %p, InitSecurityInterfaceW is %p\n", debugstr_w(moduleName), pInitSecurityInterfaceA, pInitSecurityInterfaceW); if (pInitSecurityInterfaceW || pInitSecurityInterfaceA) @@ -449,17 +387,17 @@ fnTableW = pInitSecurityInterfaceW(); if (fnTableW && fnTableW->EnumerateSecurityPackagesW) { - //if (fnTableW != &securityFunctionTableW) + if (fnTableW != &securityFunctionTableW) ret = fnTableW->EnumerateSecurityPackagesW(&toAdd, &infoW); - //else - //ERR("%s has built-in providers, skip adding\n", debugstr_w(moduleName)); + else + WARN("%s has built-in providers, skip adding\n", debugstr_w(moduleName)); } else if (fnTableA && fnTableA->EnumerateSecurityPackagesA) { - //if (fnTableA != &securityFunctionTableA) + if (fnTableA != &securityFunctionTableA) ret = fnTableA->EnumerateSecurityPackagesA(&toAdd, &infoA); - //else - //ERR("%s has built-in providers, skip adding\n", debugstr_w(moduleName)); + else + WARN("%s has built-in providers, skip adding\n", debugstr_w(moduleName)); } if (ret == SEC_E_OK && toAdd > 0 && (infoW || infoA)) { @@ -477,7 +415,7 @@ return TRUE; } - WARN("failed to load %s\n", debugstr_w(moduleName)); + ERR("failed to load %s\n", debugstr_w(moduleName)); return FALSE; } Modified: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec [iso-8859-1] Thu May 12 16:53:49 2011 @@ -64,7 +64,7 @@ @ stub SaslInitializeSecurityContextA @ stub SaslInitializeSecurityContextW @ stub SaslContextOption -@ stub SealMessage #(ptr long ptr long) +@ stdcall SealMessage (ptr long ptr long) @ stub SecCacheSspiPackages @ stub SecpFreeMemory @ stub SecpTranslateName Modified: branches/sspi-bringup/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/secur32/sspi.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/secur32/sspi.c [iso-8859-1] Thu May 12 16:53:49 2011 @@ -9,7 +9,7 @@ SECURITY_STATUS WINAPI ApplyControlTokenW(PCtxtHandle Handle, PSecBufferDesc Buffer); SECURITY_STATUS WINAPI ApplyControlTokenA(PCtxtHandle Handle, PSecBufferDesc Buffer); -static SecurityFunctionTableA securityFunctionTableA = +SecurityFunctionTableA securityFunctionTableA = { SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, EnumerateSecurityPackagesA, @@ -41,7 +41,7 @@ NULL }; -static SecurityFunctionTableW securityFunctionTableW = +SecurityFunctionTableW securityFunctionTableW = { SECURITY_SUPPORT_PROVIDER_INTERFACE_VERSION, EnumerateSecurityPackagesW, @@ -72,6 +72,7 @@ DecryptMessage, NULL }; + /*********************************************************************** * EnumerateSecurityPackagesW (SECUR32.@) @@ -269,7 +270,6 @@ WINAPI InitSecurityInterfaceW(VOID) { - ERR("InitSecurityInterfaceW() called\n"); return &securityFunctionTableW; } @@ -278,7 +278,6 @@ WINAPI InitSecurityInterfaceA(VOID) { - ERR("InitSecurityInterfaceA() called\n"); return &securityFunctionTableA; } Modified: branches/sspi-bringup/reactos/dll/win32/secur32/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/secur32/stubs.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/secur32/stubs.c [iso-8859-1] Thu May 12 16:53:49 2011 @@ -59,3 +59,15 @@ UNIMPLEMENTED; return STATUS_UNSUCCESSFUL; } + +SECURITY_STATUS +SEC_ENTRY +SealMessage( + LSA_SEC_HANDLE ContextHandle, + ULONG QualityOfProtection, + PSecBufferDesc MessageBuffers, + ULONG MessageSequenceNumber) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} Modified: branches/sspi-bringup/reactos/dll/win32/secur32/wrapper.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/secur32/wrapper.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/secur32/wrapper.c [iso-8859-1] Thu May 12 16:53:49 2011 @@ -33,7 +33,7 @@ { SECURITY_STATUS ret; - TRACE("%p %p %p\n", phSec, package, realHandle); + TRACE("makeSecHandle %p %p %p\n", phSec, package, realHandle); if (phSec && package && realHandle) { @@ -152,9 +152,9 @@ SECURITY_STATUS WINAPI FreeCredentialsHandle( PCredHandle phCredential) { - SECURITY_STATUS ret; - - TRACE("%p\n", phCredential); + SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; + + TRACE("FreeCredentialsHandle %p\n", phCredential); if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; @@ -163,12 +163,9 @@ if (package && package->provider && package->provider->fnTableW.FreeCredentialsHandle) ret = package->provider->fnTableW.FreeCredentialsHandle(cred); - else - ret = SEC_E_INVALID_HANDLE; HeapFree(GetProcessHeap(), 0, cred); } - else - ret = SEC_E_INVALID_HANDLE; + return ret; }

1 0

[gadamopoulos] 51685: [desk cpl] - Properly apply system metrics
by gadamopoulos＠svn.reactos.org 12 May '11

12 May '11

Author: gadamopoulos Date: Thu May 12 16:49:50 2011 New Revision: 51685 URL: http://svn.reactos.org/svn/reactos?rev=51685&view=rev Log: [desk cpl] - Properly apply system metrics Modified: trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=5… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Thu May 12 16:49:50 2011 @@ -222,6 +222,7 @@ DWORD dwDisposition; TCHAR clText[16]; NONCLIENTMETRICS NonClientMetrics; + ICONMETRICS IconMetrics; /* Apply Colors from global variable */ SetSysColors(NUM_COLORS, g_ColorList, theme->crColor); @@ -247,7 +248,7 @@ RegCloseKey(hKey); } - /* Apply the fonts */ + /* Apply non client metrics */ NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); NonClientMetrics.lfCaptionFont = theme->lfFont[FONT_CAPTION]; @@ -255,50 +256,30 @@ NonClientMetrics.lfMenuFont = theme->lfFont[FONT_MENU]; NonClientMetrics.lfStatusFont = theme->lfFont[FONT_INFO]; NonClientMetrics.lfMessageFont = theme->lfFont[FONT_DIALOG]; - SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); - SystemParametersInfo(SPI_SETICONTITLELOGFONT, sizeof(LOGFONT), &theme->lfFont[FONT_ICON], 0); - - /* FIXME: Apply size metrics */ - - /* Save fonts and size metrics to registry */ - Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hKey, &dwDisposition); - if (Result == ERROR_SUCCESS) - { - RegSetValueEx(hKey, TEXT("CaptionFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_CAPTION], sizeof(LOGFONT)); - RegSetValueEx(hKey, TEXT("SmCaptionFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_SMCAPTION], sizeof(LOGFONT)); - RegSetValueEx(hKey, TEXT("IconFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_ICON], sizeof(LOGFONT)); - RegSetValueEx(hKey, TEXT("MenuFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_MENU], sizeof(LOGFONT)); - RegSetValueEx(hKey, TEXT("StatusFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_INFO], sizeof(LOGFONT)); - RegSetValueEx(hKey, TEXT("MessageFont"), 0, REG_BINARY, (BYTE *)&theme->lfFont[FONT_DIALOG], sizeof(LOGFONT)); - - /* Save size metrics to registry */ - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_BORDER_X]); - RegSetValueEx(hKey, TEXT("BorderWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_CAPTION_Y]); - RegSetValueEx(hKey, TEXT("CaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_CAPTION_Y]); - RegSetValueEx(hKey, TEXT("CaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_SMCAPTION_Y]); - RegSetValueEx(hKey, TEXT("SmCaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_SMCAPTION_Y]); - RegSetValueEx(hKey, TEXT("SmCaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_ICON_SPC_X]); - RegSetValueEx(hKey, TEXT("IconSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_ICON_SPC_Y]); - RegSetValueEx(hKey, TEXT("IconVerticalSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_MENU_SIZE_X]); - RegSetValueEx(hKey, TEXT("MenuWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_MENU_Y]); - RegSetValueEx(hKey, TEXT("MenuHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_SCROLL_X]); - RegSetValueEx(hKey, TEXT("ScrollWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * theme->Size[SIZE_SCROLL_Y]); - RegSetValueEx(hKey, TEXT("ScrollHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), theme->Size[SIZE_ICON_X]); - RegSetValueEx(hKey, TEXT("Shell Icon Size"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - - RegCloseKey(hKey); - } + NonClientMetrics.iBorderWidth = theme->Size[SIZE_BORDER_X]; + NonClientMetrics.iScrollWidth = theme->Size[SIZE_SCROLL_X]; + NonClientMetrics.iScrollHeight = theme->Size[SIZE_SCROLL_Y]; + NonClientMetrics.iCaptionWidth = theme->Size[SIZE_CAPTION_Y]; + NonClientMetrics.iCaptionHeight = theme->Size[SIZE_CAPTION_Y]; + NonClientMetrics.iSmCaptionWidth = theme->Size[SIZE_SMCAPTION_Y]; + NonClientMetrics.iSmCaptionHeight = theme->Size[SIZE_SMCAPTION_Y]; + NonClientMetrics.iMenuWidth = theme->Size[SIZE_MENU_SIZE_X]; + NonClientMetrics.iMenuHeight = theme->Size[SIZE_MENU_Y]; + SystemParametersInfo(SPI_SETNONCLIENTMETRICS, + sizeof(NONCLIENTMETRICS), + &NonClientMetrics, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); + + /* Apply icon metrics */ + IconMetrics.cbSize = sizeof(ICONMETRICS); + SystemParametersInfo(SPI_GETICONMETRICS, sizeof(ICONMETRICS), &IconMetrics, 0); + IconMetrics.iHorzSpacing = theme->Size[SIZE_ICON_SPC_X]; + IconMetrics.iVertSpacing = theme->Size[SIZE_ICON_SPC_Y]; + IconMetrics.lfFont = theme->lfFont[FONT_ICON]; + SystemParametersInfo(SPI_SETICONMETRICS, + sizeof(ICONMETRICS), + &IconMetrics, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); /* Effects, save only when needed: */ /* FIXME: XP seems to use grayed checkboxes to reflect differences between menu and tooltips settings

1 0

[mjmartin] 51684: [USBEHCI_NEW] - Modify BuildBulkTransferQueueHead to support TransferBufferLengths larger than PAGE_SIZE * 5. - Acquire a SpinLock before adding QueueHeads to AsyncList and Pendin...
by mjmartin＠svn.reactos.org 12 May '11

12 May '11

Author: mjmartin Date: Thu May 12 13:35:06 2011 New Revision: 51684 URL: http://svn.reactos.org/svn/reactos?rev=51684&view=rev Log: [USBEHCI_NEW] - Modify BuildBulkTransferQueueHead to support TransferBufferLengths larger than PAGE_SIZE * 5. - Acquire a SpinLock before adding QueueHeads to AsyncList and PendingList. - Dont request a new QueueHead for incomplete transfers in QueueHeadCompletion, as the memory for the just completed QueueHead has not been released yet. Doing so overwrites the m_TransferDescriptor[x] members with new address resulting in memory leaks. Instead request a new QueueHead after the QueueHead has been freed in QueueHeadCleanup. - Fix a bug where a QueueHead was removed from the m_CompletedRequestAsyncList instead of the m_PendingRequestAsyncList. - Temporary hackfix InternalCalculateTransferLength to return the TransferBufferLength. This hack will be removed as soon as possible. - With these changes the hub and ehci driver allow viewing content of and transfers to/from usb disks. Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Thu May 12 13:35:06 2011 @@ -137,8 +137,7 @@ // Loop through the pending list and iterrate one for each QueueHead that // has a IRP to complete. // - - + return 0; } @@ -149,6 +148,7 @@ PQUEUE_HEAD QueueHead; NTSTATUS Status; ULONG Type; + KIRQL OldLevel; // // sanity check @@ -214,7 +214,9 @@ // // Add it to the pending list // + KeAcquireSpinLock(&m_Lock, &OldLevel); LinkQueueHead(AsyncListQueueHead, QueueHead); + KeReleaseSpinLock(&m_Lock, OldLevel); } @@ -251,12 +253,12 @@ *OutRequest = NULL; Status = InternalCreateUSBRequest(&UsbRequest); - + if (NT_SUCCESS(Status)) { *OutRequest = UsbRequest; } - + return Status; } @@ -432,41 +434,20 @@ PQUEUE_HEAD CurrentQH, NTSTATUS Status) { - IUSBRequest *Request; - PQUEUE_HEAD NewQueueHead; + KIRQL OldLevel; // // now unlink the queue head // FIXME: implement chained queue heads // + + KeAcquireSpinLock(&m_Lock, &OldLevel); + UnlinkQueueHead(CurrentQH); - // - // get contained usb request - // - Request = (IUSBRequest*)CurrentQH->Request; - - // - // check if the request is complete - // - if (Request->IsRequestComplete() == FALSE) - { - // - // request is still in complete - // get new queue head - // - Status = Request->GetQueueHead(&NewQueueHead); - - // - // add to pending list - // - InsertTailList(&m_PendingRequestAsyncList, &NewQueueHead->LinkedQueueHeads); - } - - // - // put queue head into completed queue head list - // InsertTailList(&m_CompletedRequestAsyncList, &CurrentQH->LinkedQueueHeads); + + KeReleaseSpinLock(&m_Lock, OldLevel); } @@ -508,7 +489,6 @@ // Request = (IUSBRequest*)QueueHead->Request; - // // move to next entry // @@ -568,6 +548,7 @@ CUSBQueue::QueueHeadCleanup( PQUEUE_HEAD CurrentQH) { + PQUEUE_HEAD NewQueueHead; IUSBRequest * Request; BOOLEAN ShouldReleaseWhenDone; USBD_STATUS UrbStatus; @@ -625,9 +606,47 @@ } // - // notify request that a queue head has been completed - // - Request->CompletionCallback(STATUS_SUCCESS /*FIXME*/, UrbStatus, CurrentQH); + // Check if the transfer was completed and if UrbStatus is ok + // + if ((Request->IsRequestComplete() == FALSE) && (UrbStatus == USBD_STATUS_SUCCESS)) + { + // + // let IUSBRequest free the queue head + // + Request->FreeQueueHead(CurrentQH); + + // + // request is incomplete, get new queue head + // + if (Request->GetQueueHead(&NewQueueHead) == STATUS_SUCCESS) + { + // + // add to pending list + // + InsertTailList(&m_PendingRequestAsyncList, &NewQueueHead->LinkedQueueHeads); + + // + // Done for now + // + return; + } + DPRINT1("Unable to create a new QueueHead\n"); + PC_ASSERT(FALSE); + + // + // Else there was a problem + // FIXME: Find better return + UrbStatus = USBD_STATUS_INSUFFICIENT_RESOURCES; + } + + if (UrbStatus != USBD_STATUS_SUCCESS) PC_ASSERT(FALSE); + + // + // notify request that a transfer has completed + // + Request->CompletionCallback(UrbStatus != USBD_STATUS_SUCCESS ? STATUS_UNSUCCESSFUL : STATUS_SUCCESS, + UrbStatus, + CurrentQH); // // let IUSBRequest free the queue head @@ -666,6 +685,7 @@ KIRQL OldLevel; PLIST_ENTRY Entry; PQUEUE_HEAD CurrentQH; + IUSBRequest *Request; DPRINT("CUSBQueue::CompleteAsyncRequests\n"); @@ -692,6 +712,11 @@ CurrentQH = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); // + // Get the Request for this QueueHead + // + Request = (IUSBRequest*) CurrentQH->Request; + + // // complete request now // QueueHeadCleanup(CurrentQH); @@ -705,7 +730,7 @@ // // remove first entry // - Entry = RemoveHeadList(&m_CompletedRequestAsyncList); + Entry = RemoveHeadList(&m_PendingRequestAsyncList); // // get queue head structure @@ -713,7 +738,7 @@ CurrentQH = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); // - // Add it to the pending list + // Add it to the AsyncList list // LinkQueueHead(AsyncListQueueHead, CurrentQH); } Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Thu May 12 13:35:06 2011 @@ -86,6 +86,16 @@ ULONG m_TransferBufferLength; // + // current transfer length + // + ULONG m_TransferBufferLengthCompleted; + + // + // Total Transfer Length + // + ULONG m_TotalBytesTransferred; + + // // transfer buffer MDL // PMDL m_TransferBufferMDL; @@ -169,6 +179,12 @@ m_TransferBufferMDL = TransferBuffer; m_DeviceAddress = DeviceAddress; m_EndpointDescriptor = EndpointDescriptor; + m_TotalBytesTransferred = 0; + + // + // Set Length Completed to 0 + // + m_TransferBufferLengthCompleted = 0; // // allocate completion event @@ -208,6 +224,7 @@ PC_ASSERT(Irp); m_DmaManager = DmaManager; + m_TotalBytesTransferred = 0; // // get current irp stack location @@ -244,7 +261,7 @@ case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: { // - // bulk / interrupt transfer + // bulk interrupt transfer // if (Urb->UrbBulkOrInterruptTransfer.TransferBufferLength) { @@ -281,6 +298,10 @@ // FIXME: Does hub driver already do this when passing MDL? // MmBuildMdlForNonPagedPool(m_TransferBufferMDL); + + // + // Keep that ehci created the MDL and needs to free it. + // } else { @@ -291,6 +312,11 @@ // save buffer length // m_TransferBufferLength = Urb->UrbBulkOrInterruptTransfer.TransferBufferLength; + + // + // Set Length Completed to 0 + // + m_TransferBufferLengthCompleted = 0; // // get endpoint descriptor @@ -357,7 +383,6 @@ // // Check if the MDL was created // - if (!Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL) { // @@ -439,6 +464,7 @@ // // store urb status // + DPRINT1("Request Cancelled\n"); Urb->UrbHeader.Status = USBD_STATUS_CANCELED; Urb->UrbHeader.Length = 0; @@ -521,6 +547,18 @@ // // FIXME: check if request was split // + + // + // Check if the transfer was completed, only valid for Bulk Transfers + // + if ((m_TransferBufferLengthCompleted < m_TransferBufferLength) + && (GetTransferType() == USB_ENDPOINT_TYPE_BULK)) + { + // + // Transfer not completed + // + return FALSE; + } return TRUE; } //---------------------------------------------------------------------------------------- @@ -642,7 +680,7 @@ // now initialize the queue head // QueueHead->EndPointCharacteristics.DeviceAddress = GetDeviceAddress(); - + if (m_EndpointDescriptor) { // @@ -751,7 +789,7 @@ ULONG TransferDescriptorCount, Index; ULONG BytesAvailable, BufferIndex; PVOID Base; - ULONG PageOffset; + ULONG PageOffset, CurrentTransferBufferLength; // // Allocate the queue head @@ -770,24 +808,59 @@ // sanity checks // PC_ASSERT(QueueHead); - - // - // FIXME: support more than one descriptor - // - PC_ASSERT(m_TransferBufferLength < PAGE_SIZE * 5); PC_ASSERT(m_TransferBufferLength); - TransferDescriptorCount = 1; + // + // Max default of 3 descriptors + // + TransferDescriptorCount = 3; // // get virtual base of mdl // Base = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); - BytesAvailable = m_TransferBufferLength; + + // + // Increase the size of last transfer, 0 in case this is the first + // + Base = (PVOID)((ULONG_PTR)Base + m_TransferBufferLengthCompleted); PC_ASSERT(m_EndpointDescriptor); PC_ASSERT(Base); + // + // Get the offset from page size + // + PageOffset = BYTE_OFFSET(Base); + + // + // PageOffset should only be > 0 if this is the first transfer for this requests + // + if ((PageOffset != 0) && (m_TransferBufferLengthCompleted != 0)) + { + ASSERT(FALSE); + } + + // + // Calculate the size of this transfer + // + if ((PageOffset != 0) && ((m_TransferBufferLength - m_TransferBufferLengthCompleted) >= (PAGE_SIZE * 4) + PageOffset)) + { + CurrentTransferBufferLength = (PAGE_SIZE * 4) + PageOffset; + } + else if ((m_TransferBufferLength - m_TransferBufferLengthCompleted) >= PAGE_SIZE * 5) + { + CurrentTransferBufferLength = PAGE_SIZE * 5; + } + else + CurrentTransferBufferLength = (m_TransferBufferLength - m_TransferBufferLengthCompleted); + + // + // Add current transfer length to transfer length completed + // + m_TransferBufferLengthCompleted += CurrentTransferBufferLength; + BytesAvailable = CurrentTransferBufferLength; + DPRINT("CurrentTransferBufferLength %x, m_TransferBufferLengthCompleted %x\n", CurrentTransferBufferLength, m_TransferBufferLengthCompleted); DPRINT("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress); DPRINT("EndPointDirection %x\n", USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); @@ -833,9 +906,9 @@ for(BufferIndex = 0; BufferIndex < 5; BufferIndex++) { // - // setup buffer - // - if (BufferIndex == 0) + // If this is the first buffer of the first descriptor and there is a PageOffset + // + if ((BufferIndex == 0) && (PageOffset != 0) && (Index == 0)) { // // use physical address @@ -843,45 +916,25 @@ m_TransferDescriptors[Index]->BufferPointer[0] = MmGetPhysicalAddress(Base).LowPart; // - // get offset within page - // - PageOffset = BYTE_OFFSET(m_TransferDescriptors[Index]->BufferPointer[0]); - - // - // check if request fills another page - // - if (PageOffset + BytesAvailable > PAGE_SIZE) - { - // - // move to next page - // - Base = (PVOID)ROUND_TO_PAGES(Base); - - // - // increment transfer bytes - // + // move to next page + // + Base = (PVOID)ROUND_TO_PAGES(Base); + + // + // increment transfer bytes + // + if (CurrentTransferBufferLength > PAGE_SIZE - PageOffset) m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = PAGE_SIZE - PageOffset; - - // - // decrement available byte count - // - BytesAvailable -= m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; - - DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], - BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); - } - else - { - // - // request ends on the first buffer page - // - m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = BytesAvailable; - BytesAvailable = 0; - - DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], - BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); - break; - } + else + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = CurrentTransferBufferLength; + + // + // decrement available byte count + // + BytesAvailable -= m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; + + DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); } else { @@ -935,7 +988,7 @@ BytesAvailable -= BytesAvailable; // - // done + // done as this is the last partial or full page // DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); @@ -943,6 +996,12 @@ break; } } + + // + // Check if all bytes have been consumed + // + if (BytesAvailable == 0) + break; } // @@ -971,6 +1030,12 @@ // // FIXME need dead queue transfer descriptor? // + + // + // Check if all bytes have been consumed + // + if (BytesAvailable == 0) + break; } // @@ -982,7 +1047,7 @@ // Initialize the QueueHead // QueueHead->EndPointCharacteristics.DeviceAddress = GetDeviceAddress(); - + if (m_EndpointDescriptor) { // @@ -1440,10 +1505,12 @@ CUSBRequest::FreeQueueHead( IN struct _QUEUE_HEAD * QueueHead) { + LONG DescriptorCount; + // // FIXME: support chained queue heads // - PC_ASSERT(QueueHead == m_QueueHead); + //PC_ASSERT(QueueHead == m_QueueHead); // // release queue head @@ -1458,32 +1525,40 @@ // // release transfer descriptors // - - if (m_TransferDescriptors[0]) - { - // - // release transfer descriptors - // - m_DmaManager->Release(m_TransferDescriptors[0], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); - m_TransferDescriptors[0] = 0; - } - - if (m_TransferDescriptors[1]) - { - // - // release transfer descriptors - // - m_DmaManager->Release(m_TransferDescriptors[1], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); - m_TransferDescriptors[1] = 0; - } - - if (m_TransferDescriptors[2]) - { - // - // release transfer descriptors - // - m_DmaManager->Release(m_TransferDescriptors[2], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); - m_TransferDescriptors[2] = 0; + for (DescriptorCount = 0; DescriptorCount < 3; DescriptorCount++) + { + if (m_TransferDescriptors[DescriptorCount]) + { + // + // Calculate Total Bytes Transferred + // FIXME: Is this the correct method of determine bytes transferred? + // + if (USB_ENDPOINT_TYPE_BULK == GetTransferType()) + { + // + // sanity check + // + ASSERT(m_EndpointDescriptor); + + if (USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)) + { + DPRINT1("m_TotalBytesTransferred %x, %x - %x\n", + m_TotalBytesTransferred, + m_TransferDescriptors[DescriptorCount]->TotalBytesToTransfer, + m_TransferDescriptors[DescriptorCount]->Token.Bits.TotalBytesToTransfer); + + m_TotalBytesTransferred += + m_TransferDescriptors[DescriptorCount]->TotalBytesToTransfer - + m_TransferDescriptors[DescriptorCount]->Token.Bits.TotalBytesToTransfer; + } + } + + // + // release transfer descriptors + // + m_DmaManager->Release(m_TransferDescriptors[DescriptorCount], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + m_TransferDescriptors[DescriptorCount] = 0; + } } if (m_DescriptorPacket) @@ -1573,8 +1648,9 @@ { // // bulk in request - // - return m_TransferDescriptors[0]->TotalBytesToTransfer - m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer; + // HACK: Properly determine transfer length + // + return m_TransferBufferLength;//m_TotalBytesTransferred; } //

1 0

[mjmartin] 51683: [USBHUB_NEW] - Implement IOCTL_INTERNAL_USB_GET_PORT_STATUS. - Fixes to comments
by mjmartin＠svn.reactos.org 12 May '11

12 May '11

Author: mjmartin Date: Thu May 12 12:58:07 2011 New Revision: 51683 URL: http://svn.reactos.org/svn/reactos?rev=51683&view=rev Log: [USBHUB_NEW] - Implement IOCTL_INTERNAL_USB_GET_PORT_STATUS. - Fixes to comments Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c branches/usb-bringup/drivers/usb/usbhub_new/pdo.c branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Thu May 12 12:58:07 2011 @@ -112,7 +112,7 @@ RtlZeroMemory(Urb, sizeof(URB)); // - // Create URB for getting Port Status + // Initialize URB for getting Port Status // UsbBuildVendorRequest(Urb, URB_FUNCTION_CLASS_OTHER, @@ -165,7 +165,7 @@ RtlZeroMemory(Urb, sizeof(URB)); // - // Create URB for Clearing Port Reset + // Initialize URB for Clearing Port Reset // UsbBuildVendorRequest(Urb, URB_FUNCTION_CLASS_OTHER, @@ -217,7 +217,7 @@ RtlZeroMemory(Urb, sizeof(URB)); // - // Create URB for Clearing Port Reset + // Initialize URB for Clearing Port Reset // UsbBuildVendorRequest(Urb, URB_FUNCTION_CLASS_OTHER, @@ -655,7 +655,7 @@ RtlZeroMemory(Urb, sizeof(URB)); // - // Create URB for getting device descriptor + // Initialize URB for getting device descriptor // UsbBuildGetDescriptorRequest(Urb, sizeof(Urb->UrbControlDescriptorRequest), Modified: branches/usb-bringup/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Thu May 12 12:58:07 2011 @@ -26,7 +26,7 @@ // Get the original Irp // OriginalIrp = (PIRP)Context; - + // // Update it to match what was returned for the IRP that was passed to RootHub // @@ -137,7 +137,15 @@ //DPRINT1("UsbhubInternalDeviceControlPdo(%x) called\n", DeviceObject); + // + // get current stack location + // Stack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(Stack); + + // + // Set default status + // Status = Irp->IoStatus.Status; ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -173,18 +181,13 @@ case IOCTL_INTERNAL_USB_SUBMIT_URB: { //DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB\n"); - // - // get current stack location - // - Stack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(Stack); // // Get the Urb // Urb = (PURB)Stack->Parameters.Others.Argument1; ASSERT(Urb); - + // // Set the real device handle // @@ -229,8 +232,12 @@ DPRINT1("Length %x\n", Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); DPRINT1("UrbLink %x\n", Urb->UrbBulkOrInterruptTransfer.UrbLink); DPRINT1("hca %x\n", Urb->UrbBulkOrInterruptTransfer.hca); + if (Urb->UrbBulkOrInterruptTransfer.TransferFlags == USBD_SHORT_TRANSFER_OK) + { + } */ break; + } case URB_FUNCTION_CLASS_INTERFACE: DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); @@ -255,8 +262,39 @@ DPRINT1("IOCTL_INTERNAL_USB_RESET_PORT\n"); break; case IOCTL_INTERNAL_USB_GET_PORT_STATUS: + { + PORT_STATUS_CHANGE PortStatus; + LONG PortId; + PUCHAR PortStatusBits; + + PortStatusBits = (PUCHAR)Stack->Parameters.Others.Argument1; + // + // USBD_PORT_ENABLED (bit 0) or USBD_PORT_CONNECTED (bit 1) + // DPRINT1("IOCTL_INTERNAL_USB_GET_PORT_STATUS\n"); - break; + DPRINT1("Arg1 %x\n", *PortStatusBits); + *PortStatusBits = 0; + if (Stack->Parameters.Others.Argument1) + { + for (PortId = 1; PortId <= HubDeviceExtension->UsbExtHubInfo.NumberOfPorts; PortId++) + { + Status = GetPortStatusAndChange(RootHubDeviceObject, PortId, &PortStatus); + if (NT_SUCCESS(Status)) + { + DPRINT1("Connect %x\n", ((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2)); + DPRINT1("Enable %x\n", ((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2)); + *PortStatusBits += + ((PortStatus.Status & USB_PORT_STATUS_CONNECT) << 1) << ((PortId - 1) * 2) + + ((PortStatus.Status & USB_PORT_STATUS_ENABLE) >> 1) << ((PortId - 1) * 2); + + } + } + } + + DPRINT1("Arg1 %x\n", *PortStatusBits); + Status = STATUS_SUCCESS; + break; + } case IOCTL_INTERNAL_USB_ENABLE_PORT: DPRINT1("IOCTL_INTERNAL_USB_ENABLE_PORT\n"); break; Modified: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Thu May 12 12:58:07 2011 @@ -9,8 +9,6 @@ * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ - -//#define NDEBUG #include "usbhub.h" NTSTATUS NTAPI @@ -61,7 +59,7 @@ PDEVICE_OBJECT DeviceObject; PHUB_DEVICE_EXTENSION HubDeviceExtension; NTSTATUS Status; - + DPRINT1("USBHUB: AddDevice\n"); // // Create the Device Object // Modified: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] Thu May 12 12:58:07 2011 @@ -158,7 +158,13 @@ VOID DumpConfigurationDescriptor( PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); - + VOID DumpFullConfigurationDescriptor( PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); + +NTSTATUS +GetPortStatusAndChange( + IN PDEVICE_OBJECT RootHubDeviceObject, + IN ULONG PortId, + OUT PPORT_STATUS_CHANGE StatusChange);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs