Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[rharabien] 51931: [BOOTDATA] - Add Start Menu shell32 class to registry so LiveCD has it. It's needed for explorer-new. [FREELDR] - Fix rbuild file

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu May 26 20:39:52 2011 New Revision: 51931 URL: http://svn.reactos.org/svn/reactos?rev=51931&view=rev Log: [BOOTDATA] - Add Start Menu shell32 class to registry so LiveCD has it. It's needed for explorer-new. [FREELDR] - Fix rbuild file Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild Modified: trunk/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls_i386.inf [iso-8859-1] Thu May 26 20:39:52 2011 @@ -317,6 +317,10 @@ HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}","",0x00000000,"Shell Drag and Drop helper" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","ThreadingModel",0x00000000,"Apartment" + +HKCR,"CLSID\{4622AD11-FF23-11D0-8D34-00A0C90F2719}","",0x00000000,"Shell Start Menu" +HKCR,"CLSID\{4622AD11-FF23-11D0-8D34-00A0C90F2719}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" +HKCR,"CLSID\{4622AD11-FF23-11D0-8D34-00A0C90F2719}\InProcServer32","ThreadingModel",0x00000000,"Apartment" ; Folder Options CPL HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}","",0x00000000,"Folder Options" Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Thu May 26 20:39:52 2011 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="setupldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)> +<module name="setupldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)"> <linkerscript>freeldr_$(ARCH).lnk</linkerscript> <bootstrap installbase="loader" /> <library>freeldr_startup</library>

13 years, 7 months

[cgutman] 51930: [NTOSKRNL] - Implement the kernel side of surprise device removal including sending the appropriate IRPs and notifying the user-mode PnP manager - Fix the completely broken GUID_DE...

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu May 26 20:39:15 2011 New Revision: 51930 URL: http://svn.reactos.org/svn/reactos?rev=51930&view=rev Log: [NTOSKRNL] - Implement the kernel side of surprise device removal including sending the appropriate IRPs and notifying the user-mode PnP manager - Fix the completely broken GUID_DEVICE_ARRIVAL notification (we were sending it for the parent not the children and we were sending regardless of whether any device had actually arrived) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu May 26 20:39:15 2011 @@ -123,6 +123,21 @@ IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); return STATUS_SUCCESS; +} + +VOID +NTAPI +IopSendSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_SURPRISE_REMOVAL; + + /* Drivers should never fail a IRP_MN_SURPRISE_REMOVAL request */ + IopSynchronousCall(DeviceObject, &Stack, &Dummy); } VOID @@ -1566,6 +1581,44 @@ return STATUS_SUCCESS; } +static +VOID +IopHandleDeviceRemoval( + IN PDEVICE_NODE DeviceNode, + IN PDEVICE_RELATIONS DeviceRelations) +{ + PDEVICE_NODE Child = DeviceNode->Child, NextChild; + ULONG i; + BOOLEAN Found; + + while (Child != NULL) + { + NextChild = Child->Sibling; + Found = FALSE; + + for (i = 0; i < DeviceRelations->Count; i++) + { + if (IopGetDeviceNode(DeviceRelations->Objects[i]) == Child) + { + Found = TRUE; + break; + } + } + + if (!Found) + { + IopSendSurpriseRemoval(Child->PhysicalDeviceObject); + + /* Tell the user-mode PnP manager that a device was removed */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_SURPRISE_REMOVAL, + &Child->InstancePath); + + IopSendRemoveDevice(Child->PhysicalDeviceObject); + } + + Child = NextChild; + } +} NTSTATUS IopEnumerateDevice( @@ -1583,12 +1636,6 @@ DPRINT("DeviceObject 0x%p\n", DeviceObject); - DPRINT("Sending GUID_DEVICE_ARRIVAL\n"); - - /* Report the device to the user-mode pnp manager */ - IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, - &DeviceNode->InstancePath); - DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n"); Stack.Parameters.QueryDeviceRelations.Type = BusRelations; @@ -1613,6 +1660,11 @@ } DPRINT("Got %u PDOs\n", DeviceRelations->Count); + + /* + * Send removal IRPs for devices that have disappeared + */ + IopHandleDeviceRemoval(DeviceNode, DeviceRelations); /* * Create device nodes for all discovered devices @@ -1633,6 +1685,12 @@ &ChildDeviceNode); if (NT_SUCCESS(Status)) { + DPRINT("Sending GUID_DEVICE_ARRIVAL\n"); + + /* Report the device to the user-mode pnp manager */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL, + &ChildDeviceNode->InstancePath); + /* Mark the node as enumerated */ ChildDeviceNode->Flags |= DNF_ENUMERATED;

13 years, 7 months

[rharabien] 51929: [USETUP] - Fix polish translation

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu May 26 20:33:58 2011 New Revision: 51929 URL: http://svn.reactos.org/svn/reactos?rev=51929&view=rev Log: [USETUP] - Fix polish translation Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Thu May 26 20:33:58 2011 @@ -266,7 +266,7 @@ { 8, 11, - "oprogramowanie, b©d¥ce cz©sci¥ system ReactOS podlega wi©c", + "oprogramowanie, b©d¥ce cz©ci¥ systemu ReactOS podlega wi©c", TEXT_STYLE_NORMAL }, { @@ -332,7 +332,7 @@ { 8, 25, - "dotycz¥ce kopiowania w «r¢dach. Nie ma ¯ADNEJ gwarancji", + "dotycz¥ce kopiowania w «r¢dach. Nie ma ½ADNEJ gwarancji", TEXT_STYLE_NORMAL }, { @@ -717,7 +717,7 @@ { 10, 8, - "Upewnij si© ze w Nap©dzie A: nie ma dyskietki i", + "Upewnij si© ¾e w Nap©dzie A: nie ma dyskietki i", TEXT_STYLE_NORMAL }, { @@ -902,7 +902,7 @@ { 6, 9, - "katalog do kt¢rego chcesz zainstalowa system ReactOS:", + "katalog, do kt¢rego chcesz zainstalowa system ReactOS:", TEXT_STYLE_NORMAL }, { @@ -1334,7 +1334,7 @@ }, { //ERROR_LOAD_COMPUTER, - "Instalator nie m¢g zaadowa listy typ¢w komputea\ra.\n", + "Instalator nie m¢g zaadowa listy typ¢w komputera.\n", "ENTER = Restart komputera" }, { @@ -1415,7 +1415,7 @@ }, { //ERROR_INITIALIZE_REGISTRY, - "Instalator nie by w stanie ustawic inicjalizacji rejestru.", + "Instalator nie by w stanie ustawi inicjalizacji rejestru.", "ENTER = Restart komputera" }, { @@ -1617,7 +1617,7 @@ {STRING_CHOOSENEWPARTITION, "Wybrane: utworzenie nowej partycji na"}, {STRING_HDDSIZE, - "Prosz© wprowadzi rozmiar nowej partycji, w megabajtach."}, + "Prosz© wprowadzi rozmiar nowej partycji w megabajtach."}, {STRING_CREATEPARTITION, " ENTER = Utworzenie Partycji ESC = Anulowanie F3 = Wyjcie"}, {STRING_PARTFORMAT, @@ -1633,7 +1633,7 @@ {STRING_REBOOTCOMPUTER, "ENTER = Restart komputera"}, {STRING_TXTSETUPFAILED, - "Instalator nie by w stanie odnale« sekji '%S'\nw pliku TXTSETUP.SIF.\n"}, + "Instalator nie by w stanie odnale« sekcji '%S'\nw pliku TXTSETUP.SIF.\n"}, {STRING_COPYING, " Kopiowanie plik¢w: %S"}, {STRING_SETUPCOPYINGFILES, @@ -1651,15 +1651,15 @@ {STRING_CODEPAGEINFOUPDATE, " Dodawanie informacji o stronie kodowej do rejestru..."}, {STRING_DONE, - " Ukoñczone..."}, + " Ukoäczone..."}, {STRING_REBOOTCOMPUTER2, " ENTER = Restart komputera"}, {STRING_CONSOLEFAIL1, "Otwarcie konsoli nieudane\n\n"}, {STRING_CONSOLEFAIL2, - "Najcz©stsz¥ tego przyczyn¥ jest u¾ycie klawiatury USB,\n"}, + "Najcz©stsz¥ tego przyczyn¥ jest u¾ycie klawiatury USB.\n"}, {STRING_CONSOLEFAIL3, - "kt¢re nie s¥ w peni obsugiwane.\n"}, + "Nie s¥ obecnie w peni obsugiwane.\n"}, {STRING_FORMATTINGDISK, "Instalator formatuje tw¢j dysk"}, {STRING_CHECKINGDISK,

13 years, 7 months

[cgutman] 51928: [PCI] - Inform the PnP manager that we don't support stopping devices by failing the IRP_MN_QUERY_STOP_DEVICE IRP instead of the IRP_MN_STOP_DEVICE IRP (which is not allowed)

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu May 26 19:51:12 2011 New Revision: 51928 URL: http://svn.reactos.org/svn/reactos?rev=51928&view=rev Log: [PCI] - Inform the PnP manager that we don't support stopping devices by failing the IRP_MN_QUERY_STOP_DEVICE IRP instead of the IRP_MN_STOP_DEVICE IRP (which is not allowed) Modified: trunk/reactos/drivers/bus/pci/fdo.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/fdo.c [iso-8859-1] Thu May 26 19:51:12 2011 @@ -547,10 +547,6 @@ case IRP_MN_QUERY_REMOVE_DEVICE: Status = STATUS_NOT_IMPLEMENTED; break; - - case IRP_MN_QUERY_STOP_DEVICE: - Status = STATUS_NOT_IMPLEMENTED; - break; #endif case IRP_MN_START_DEVICE: DPRINT("IRP_MN_START_DEVICE received\n"); @@ -561,12 +557,17 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; - case IRP_MN_STOP_DEVICE: - /* Currently not supported */ + + case IRP_MN_QUERY_STOP_DEVICE: + /* We don't support stopping yet */ Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; + + case IRP_MN_STOP_DEVICE: + /* We can't fail this one so we fail the QUERY_STOP request that precedes it */ + break; #if 0 case IRP_MN_SURPRISE_REMOVAL: Status = STATUS_NOT_IMPLEMENTED;

13 years, 7 months

[cgutman] 51927: [NDIS] - Fix handling of some PnP IRPs - Handle IRP_MN_STOP_DEVICE as it travels down the stack not up - Only complete the IRP_MN_QUERY_XXX_DEVICE IRPs if we fail them otherwise pa...

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu May 26 19:34:39 2011 New Revision: 51927 URL: http://svn.reactos.org/svn/reactos?rev=51927&view=rev Log: [NDIS] - Fix handling of some PnP IRPs - Handle IRP_MN_STOP_DEVICE as it travels down the stack not up - Only complete the IRP_MN_QUERY_XXX_DEVICE IRPs if we fail them otherwise pass them down the device stack - Handle IRP_MN_CANCEL_XXX_DEVICE as it travels back up the stack not on its way down - Append our flags when handling IRP_MN_QUERY_PNP_DEVICE_STATE and pass it down the device stack Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu May 26 19:34:39 2011 @@ -2218,48 +2218,54 @@ NDIS_DbgPrint(MIN_TRACE, ("Lower driver failed device start\n")); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; + return Status; case IRP_MN_STOP_DEVICE: - Status = NdisIForwardIrpAndWait(Adapter, Irp); - if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) - { - Status = NdisIPnPStopDevice(DeviceObject, Irp); - } - else - NDIS_DbgPrint(MIN_TRACE, ("Lower driver failed device stop\n")); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = NdisIPnPStopDevice(DeviceObject, Irp); + if (!NT_SUCCESS(Status)) + NDIS_DbgPrint(MIN_TRACE, ("WARNING: Ignoring halt device failure! Passing the IRP down anyway\n")); + Irp->IoStatus.Status = STATUS_SUCCESS; break; case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: Status = NdisIPnPQueryStopDevice(DeviceObject, Irp); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + if (Status != STATUS_SUCCESS) + { + IoCompleteRequest(Irp, IO_NO_INCREMENT); + NDIS_DbgPrint(MIN_TRACE, ("Failing miniport halt request\n")); + return Status; + } break; case IRP_MN_CANCEL_REMOVE_DEVICE: case IRP_MN_CANCEL_STOP_DEVICE: - Status = NdisIPnPCancelStopDevice(DeviceObject, Irp); + Status = NdisIForwardIrpAndWait(Adapter, Irp); + if (NT_SUCCESS(Status) && NT_SUCCESS(Irp->IoStatus.Status)) + { + Status = NdisIPnPCancelStopDevice(DeviceObject, Irp); + } + else + { + NDIS_DbgPrint(MIN_TRACE, ("Lower driver failed cancel stop/remove request\n")); + } Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - break; + return Status; case IRP_MN_QUERY_PNP_DEVICE_STATE: Status = NDIS_STATUS_SUCCESS; Irp->IoStatus.Status = Status; Irp->IoStatus.Information |= Adapter->NdisMiniportBlock.PnPFlags; - IoCompleteRequest(Irp, IO_NO_INCREMENT); break; default: - IoSkipCurrentIrpStackLocation(Irp); - Status = IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp); break; } - return Status; + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(Adapter->NdisMiniportBlock.NextDeviceObject, Irp); }

13 years, 7 months

[sserapion] 51926: fix fixes.

by sserapion＠svn.reactos.org

Author: sserapion Date: Thu May 26 18:51:04 2011 New Revision: 51926 URL: http://svn.reactos.org/svn/reactos?rev=51926&view=rev Log: fix fixes. Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c Modified: branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ntlmssp/calculations.c [iso-8859-1] Thu May 26 18:51:04 2011 @@ -30,9 +30,9 @@ NTOWFv1(const PWCHAR password, PUCHAR result) { - ULONG i, len = wcslen(password) * sizeof(WCHAR); + ULONG i, len = wcslen(password); WCHAR pass[14]; - memcpy(pass, password, len); + memcpy(pass, password, len * sizeof(WCHAR)); for(i = len; i<14; i++) { pass[i] = L'0'; @@ -44,11 +44,11 @@ NTOWFv2(const PWCHAR password, const PWCHAR user, const PWCHAR domain, PUCHAR result) { UCHAR response_key_nt_v1 [16]; - ULONG len_user = (user ? wcslen(user) : 0) * sizeof(WCHAR); - ULONG len_domain = (domain ? wcslen(domain) : 0) * sizeof(WCHAR); + ULONG len_user = user ? wcslen(user) : 0; + ULONG len_domain = domain ? wcslen(domain) : 0; WCHAR user_upper[len_user + 1]; - ULONG len_user_u = len_user; - ULONG len_domain_u = len_domain; + ULONG len_user_u = len_user * sizeof(WCHAR); + ULONG len_domain_u = len_domain * sizeof(WCHAR); WCHAR buff[len_user + len_domain]; ULONG i; @@ -324,9 +324,9 @@ pNtResponse->Flags = 0; pNtResponse->MsgWord = 0; + NtQuerySystemTime((PLARGE_INTEGER)&pNtResponse->TimeStamp); NtlmGenerateRandomBits(pNtResponse->ChallengeFromClient, MSV1_0_CHALLENGE_LENGTH); - memcpy(pNtResponse->Buffer, pServerName->Buffer, pServerName->Length); NtlmNtResponse(pUserName, @@ -361,6 +361,7 @@ { HMAC_MD5_CTX ctx; + HMACMD5Init(&ctx, (PUCHAR)NtpUserSessionKey, sizeof(*NtpUserSessionKey)); HMACMD5Update(&ctx, ChallengeToClient, MSV1_0_CHALLENGE_LENGTH); HMACMD5Update(&ctx, ChallengeFromClient, MSV1_0_CHALLENGE_LENGTH);

13 years, 7 months

[rharabien] 51925: [TASKMGR] - Simplify opening settings registry key

by rharabien＠svn.reactos.org

Author: rharabien Date: Thu May 26 18:19:17 2011 New Revision: 51925 URL: http://svn.reactos.org/svn/reactos?rev=51925&view=rev Log: [TASKMGR] - Simplify opening settings registry key Modified: trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Thu May 26 18:19:17 2011 @@ -179,7 +179,7 @@ ULONG cwcUserName; /* Get new system time */ - status = NtQuerySystemInformation(SystemTimeOfDayInformation, &SysTimeInfo, sizeof(SysTimeInfo), 0); + status = NtQuerySystemInformation(SystemTimeOfDayInformation, &SysTimeInfo, sizeof(SysTimeInfo), NULL); if (!NT_SUCCESS(status)) return; Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Thu May 26 18:19:17 2011 @@ -759,19 +759,10 @@ void SaveSettings(void) { HKEY hKey; - WCHAR szSubKey1[] = L"Software"; - WCHAR szSubKey2[] = L"Software\\ReactOS"; - WCHAR szSubKey3[] = L"Software\\ReactOS\\TaskManager"; + WCHAR szSubKey[] = L"Software\\ReactOS\\TaskManager"; /* Open (or create) the key */ - hKey = NULL; - RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey1, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - RegCloseKey(hKey); - hKey = NULL; - RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey2, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - RegCloseKey(hKey); - hKey = NULL; - if (RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey3, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) + if (RegCreateKeyExW(HKEY_CURRENT_USER, szSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) return; /* Save the settings */ RegSetValueExW(hKey, L"Preferences", 0, REG_BINARY, (LPBYTE)&TaskManagerSettings, sizeof(TASKMANAGER_SETTINGS));

13 years, 7 months

[cmihail] 51924: [TCPIP] - Removed hack from lwIP code. Now the listening pcb is obtained in a way as to not affect pllute lwIP code. - Also there's still a little foreign code left in lwIP, but th...

by cmihail＠svn.reactos.org

Author: cmihail Date: Thu May 26 17:42:00 2011 New Revision: 51924 URL: http://svn.reactos.org/svn/reactos?rev=51924&view=rev Log: [TCPIP] - Removed hack from lwIP code. Now the listening pcb is obtained in a way as to not affect pllute lwIP code. - Also there's still a little foreign code left in lwIP, but this can be easily removed as it contains no functional purpose, except debugging. Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Thu May 26 17:42:00 2011 @@ -163,14 +163,17 @@ if (Status == STATUS_SUCCESS) { - DbgPrint("[IP, TCPAcceptEventHandler] newpcb->state = %s, newpcb->id = %d\n", - tcp_state_str[newpcb->state], newpcb->identifier); + DbgPrint("[IP, TCPAcceptEventHandler] newpcb->state = %s, listen_pcb->state = %s, newpcb->id = %d\n", + tcp_state_str[newpcb->state], + tcp_state_str[((struct tcp_pcb*)Connection->SocketContext)->state], + newpcb->identifier); LockObject(Bucket->AssociatedEndpoint, &OldIrql); Bucket->AssociatedEndpoint->SocketContext = newpcb; - DbgPrint("[IP, TCPAcceptEventHandler] LibTCPAccept coming up\n"); - - LibTCPAccept(newpcb, Bucket->AssociatedEndpoint); + + LibTCPAccept(newpcb, + (struct tcp_pcb*)Connection->SocketContext, + Bucket->AssociatedEndpoint); DbgPrint("[IP, TCPAcceptEventHandler] Trying to unlock Bucket->AssociatedEndpoint\n"); UnlockObject(Bucket->AssociatedEndpoint, OldIrql); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] Thu May 26 17:42:00 2011 @@ -529,8 +529,6 @@ #endif /* LWIP_CALLBACK_API */ /* inherit socket options */ npcb->so_options = pcb->so_options & SOF_INHERITED; - - npcb->listener = pcb; /* Register the new PCB so that we can begin receiving segments for it. */ Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h [iso-8859-1] Thu May 26 17:42:00 2011 @@ -278,7 +278,6 @@ /* KEEPALIVE counter */ u8_t keep_cnt_sent; u16_t identifier; - struct tcp_pcb_listen* listener; }; struct tcp_pcb_listen { Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Thu May 26 17:42:00 2011 @@ -21,7 +21,7 @@ err_t LibTCPClose(struct tcp_pcb *pcb); err_t LibTCPGetPeerName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port); err_t LibTCPGetHostName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port); -void LibTCPAccept(struct tcp_pcb *pcb, void *arg); +void LibTCPAccept(struct tcp_pcb *pcb, struct tcp_pcb *listen_pcb, void *arg); /* IP functions */ void LibIPInsertPacket(void *ifarg, void *data, u32_t size); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Thu May 26 17:42:00 2011 @@ -562,7 +562,7 @@ } void -LibTCPAccept(struct tcp_pcb *pcb, void *arg) +LibTCPAccept(struct tcp_pcb *pcb, struct tcp_pcb *listen_pcb, void *arg) { DbgPrint("[LibTCPAccept] (pcb, arg) = (0x%x, 0x%x)\n", pcb, arg); @@ -573,7 +573,7 @@ tcp_sent(pcb, InternalSendEventHandler); tcp_arg(pcb, arg); - tcp_accepted(pcb->listener); + tcp_accepted(listen_pcb); DbgPrint("[LibTCPAccept] Done\n"); }

13 years, 7 months

[tkreuzer] 51923: [WIN32K] - add better support for font files in EngLoadModuleEx (save name information) - Fix compilation with MSVC - Fix a memory leak when unloading drivers

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu May 26 14:15:11 2011 New Revision: 51923 URL: http://svn.reactos.org/svn/reactos?rev=51923&view=rev Log: [WIN32K] - add better support for font files in EngLoadModuleEx (save name information) - Fix compilation with MSVC - Fix a memory leak when unloading drivers Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h (with props) Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/dib/stretchblt.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/eng.h branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32kp.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/dib/stretchblt.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/dib/stretchblt.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/dib/stretchblt.c [iso-8859-1] Thu May 26 14:15:11 2011 @@ -34,6 +34,7 @@ ULONG Dest, Source = 0, Pattern = 0; ULONG xxBPPMask; BOOLEAN CanDraw; + BOOL UsesSource, UsesPattern; PFN_DIB_GetPixel fnSource_GetPixel = NULL; PFN_DIB_GetPixel fnDest_GetPixel = NULL; @@ -45,8 +46,8 @@ ASSERT(IS_VALID_ROP4(ROP)); - BOOL UsesSource = ROP4_USES_SOURCE(ROP); - BOOL UsesPattern = ROP4_USES_PATTERN(ROP); + UsesSource = ROP4_USES_SOURCE(ROP); + UsesPattern = ROP4_USES_PATTERN(ROP); fnDest_GetPixel = DibFunctionsForBitmapFormat[DestSurf->iBitmapFormat].DIB_GetPixel; fnDest_PutPixel = DibFunctionsForBitmapFormat[DestSurf->iBitmapFormat].DIB_PutPixel; Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/mapping.c [iso-8859-1] Thu May 26 14:15:11 2011 @@ -11,49 +11,8 @@ #define NDEBUG #include <debug.h> -// HACK!!! -#define MmMapViewInSessionSpace MmMapViewInSystemSpace -#define MmUnmapViewInSessionSpace MmUnmapViewInSystemSpace - -typedef struct _ENGSECTION -{ - PVOID pvSectionObject; - PVOID pvMappedBase; - SIZE_T cjViewSize; - ULONG ulTag; -} ENGSECTION, *PENGSECTION; - -typedef struct _FILEVIEW -{ - LARGE_INTEGER LastWriteTime; - PVOID pvKView; - PVOID pvViewFD; - SIZE_T cjView; - PVOID pSection; -} FILEVIEW, *PFILEVIEW; - -typedef struct _FONTFILEVIEW -{ - FILEVIEW; - DWORD reserved[2]; - PWSTR pwszPath; - SIZE_T ulRegionSize; - ULONG cKRefCount; - ULONG cRefCountFD; - PVOID pvSpoolerBase; - DWORD dwSpoolerPid; -} FONTFILEVIEW, *PFONTFILEVIEW; - -enum -{ - FVF_SYSTEMROOT = 1, - FVF_READONLY = 2, - FVF_FONTFILE = 4, -}; - HANDLE ghSystem32Directory; HANDLE ghRootDirectory; - PVOID NTAPI @@ -156,7 +115,7 @@ } else { - DPRINT1("Failed to unmap a section @ &p Status=0x%x\n", + DPRINT1("Failed to unmap a section @ &p Status=0x%x\n", pSection->pvMappedBase, Status); } } @@ -256,26 +215,17 @@ FLONG fl) { PFILEVIEW pFileView = NULL; + PFONTFILEVIEW pffv; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hRootDir; UNICODE_STRING ustrFileName; IO_STATUS_BLOCK IoStatusBlock; FILE_BASIC_INFORMATION FileInformation; + POBJECT_NAME_INFORMATION pNameInfo; HANDLE hFile; NTSTATUS Status; LARGE_INTEGER liSize; - - if (fl & FVF_FONTFILE) - { - pFileView = EngAllocMem(0, sizeof(FONTFILEVIEW), 'vffG'); - } - else - { - pFileView = EngAllocMem(0, sizeof(FILEVIEW), 'liFg'); - } - - /* Check for success */ - if (!pFileView) return NULL; + ULONG cjInfo, cjDesired; /* Check if the file is relative to system32 */ if (fl & FVF_SYSTEMROOT) @@ -308,6 +258,56 @@ NULL, 0); + /* Check if this is a font file */ + if (fl & FVF_FONTFILE) + { + /* Query name information length */ + Status = ZwQueryObject(hFile, ObjectNameInformation, NULL, 0, &cjInfo); + if (Status != STATUS_INFO_LENGTH_MISMATCH) goto cleanup; + + /* Allocate a FONTFILEVIEW structure */ + pffv = EngAllocMem(0, sizeof(FONTFILEVIEW) + cjInfo, 'vffG'); + pFileView = (PFILEVIEW)pffv; + if (!pffv) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + + /* Query name information */ + pNameInfo = (POBJECT_NAME_INFORMATION)(pffv + 1); + Status = ZwQueryObject(hFile, + ObjectNameInformation, + pNameInfo, + cjInfo, + &cjDesired); + if (!NT_SUCCESS(Status)) goto cleanup; + + /* Initialize extended fields */ + pffv->pwszPath = pNameInfo->Name.Buffer; + pffv->ulRegionSize = 0; + pffv->cKRefCount = 0; + pffv->cRefCountFD = 0; + pffv->pvSpoolerBase = NULL; + pffv->dwSpoolerPid = 0; + } + else + { + /* Allocate a FILEVIEW structure */ + pFileView = EngAllocMem(0, sizeof(FILEVIEW), 'liFg'); + if (!pFileView) + { + Status = STATUS_NO_MEMORY; + goto cleanup; + } + } + + /* Initialize the structure */ + pFileView->pvKView = NULL; + pFileView->pvViewFD = NULL; + pFileView->cjView = 0; + + /* Query the last write time */ Status = ZwQueryInformationFile(hFile, &IoStatusBlock, &FileInformation, @@ -329,6 +329,7 @@ hFile, NULL); +cleanup: /* Close the file handle */ ZwClose(hFile); @@ -338,11 +339,6 @@ EngFreeMem(pFileView); return NULL; } - - - pFileView->pvKView = NULL; - pFileView->pvViewFD = NULL; - pFileView->cjView = 0; return pFileView; } Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Thu May 26 14:15:11 2011 @@ -193,7 +193,7 @@ { PGRAPHICS_DEVICE pGraphicsDevice; PDEVMODEW pdmCurrent; - INT i; + ULONG i; DWORD dwFields; pGraphicsDevice = ppdev->pGraphicsDevice; Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/eng.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/eng.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/eng.h [iso-8859-1] Thu May 26 14:15:11 2011 @@ -22,18 +22,4 @@ VOID FASTCALL IntGdiReleaseSemaphore ( HSEMAPHORE hsem ); ULONGLONG APIENTRY EngGetTickCount(VOID); -BOOL -APIENTRY -EngFreeSectionMem( - IN PVOID pvSection OPTIONAL, - IN PVOID pvMappedBase OPTIONAL); - -PVOID -APIENTRY -EngAllocSectionMem( - OUT PVOID *ppvSection, - IN ULONG fl, - IN SIZE_T cjSize, - IN ULONG ulTag); - VOID DecompressBitmap(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta, ULONG iFormat); Added: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h (added) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h [iso-8859-1] Thu May 26 14:15:11 2011 @@ -1,0 +1,76 @@ + +// HACK!!! +#define MmMapViewInSessionSpace MmMapViewInSystemSpace +#define MmUnmapViewInSessionSpace MmUnmapViewInSystemSpace + +typedef struct _ENGSECTION +{ + PVOID pvSectionObject; + PVOID pvMappedBase; + SIZE_T cjViewSize; + ULONG ulTag; +} ENGSECTION, *PENGSECTION; + +typedef struct _FILEVIEW +{ + LARGE_INTEGER LastWriteTime; + PVOID pvKView; + PVOID pvViewFD; + SIZE_T cjView; + PVOID pSection; +} FILEVIEW, *PFILEVIEW; + +typedef struct _FONTFILEVIEW +{ + FILEVIEW; + DWORD reserved[2]; + PWSTR pwszPath; + SIZE_T ulRegionSize; + ULONG cKRefCount; + ULONG cRefCountFD; + PVOID pvSpoolerBase; + DWORD dwSpoolerPid; +} FONTFILEVIEW, *PFONTFILEVIEW; + +enum +{ + FVF_SYSTEMROOT = 1, + FVF_READONLY = 2, + FVF_FONTFILE = 4, +}; + +PVOID +NTAPI +EngCreateSection( + IN ULONG fl, + IN SIZE_T cjSize, + IN ULONG ulTag); + +BOOL +APIENTRY +EngMapSection( + IN PVOID pvSection, + IN BOOL bMap, + IN HANDLE hProcess, + OUT PVOID* pvBaseAddress); + +BOOL +APIENTRY +EngFreeSectionMem( + IN PVOID pvSection OPTIONAL, + IN PVOID pvMappedBase OPTIONAL); + +PVOID +APIENTRY +EngAllocSectionMem( + OUT PVOID *ppvSection, + IN ULONG fl, + IN SIZE_T cjSize, + IN ULONG ulTag); + +PFILEVIEW +NTAPI +EngLoadModuleEx( + LPWSTR pwsz, + ULONG cjSizeOfModule, + FLONG fl); Propchange: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/mapping.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Thu May 26 14:15:11 2011 @@ -91,5 +91,6 @@ #include <include/engevent.h> #include <include/ldevobj.h> #include <include/device.h> +#include <include/mapping.h> #include <dib/dib.h> #include <include/gdidebug.h>

13 years, 7 months

[janderwald] 51922: [USBOHCI] - Set up periodic threshold (90 %) - Add function to retrieve interrupt endpoints - Add function to retrieve specific descriptors from interface. These are used by HID...

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu May 26 12:37:18 2011 New Revision: 51922 URL: http://svn.reactos.org/svn/reactos?rev=51922&view=rev Log: [USBOHCI] - Set up periodic threshold (90 %) - Add function to retrieve interrupt endpoints - Add function to retrieve specific descriptors from interface. These are used by HID devices such as mice / keyboards - Add function to retrieve interrupt interval - Enqueue all endpoint descriptors at the end of the associated queue - Only notify hardware of insertion when it is an bulk / control request - Scan interrupt endpoint list to find the completed transfer descriptor - Add debugging function to print out linked endpoint descriptors - Interrupt transfers are now implemented. - Tested in Windows XP SP3 + Vbox 4.04 + Microsoft 5-Button Mouse. The HID mouse installs, initializes and starts up. Unfortunately the mouse does not work as expected yet Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp branches/usb-bringup/drivers/usb/usbohci/hardware.h branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup/drivers/usb/usbohci/interfaces.h branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Thu May 26 12:37:18 2011 @@ -61,6 +61,7 @@ NTSTATUS GetDeviceDetails(PUSHORT VendorId, PUSHORT DeviceId, PULONG NumberOfPorts, PULONG Speed); NTSTATUS GetBulkHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor); NTSTATUS GetControlHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor); + NTSTATUS GetInterruptEndpointDescriptors(struct _OHCI_ENDPOINT_DESCRIPTOR *** OutDescriptor); VOID HeadEndpointDescriptorModified(ULONG HeadType); NTSTATUS GetDMA(OUT struct IDMAMemoryManager **m_DmaManager); @@ -113,16 +114,16 @@ PHYSICAL_ADDRESS m_HCCAPhysicalAddress; // hcca physical address POHCI_ENDPOINT_DESCRIPTOR m_ControlEndpointDescriptor; // dummy control endpoint descriptor POHCI_ENDPOINT_DESCRIPTOR m_BulkEndpointDescriptor; // dummy control endpoint descriptor - POHCI_ENDPOINT_DESCRIPTOR m_IsoEndpointDescriptor; // iso endpoint descriptor + POHCI_ENDPOINT_DESCRIPTOR m_IsoEndpointDescriptor; // iso endpoint descriptor POHCI_ENDPOINT_DESCRIPTOR m_InterruptEndpoints[OHCI_STATIC_ENDPOINT_COUNT]; // endpoints for interrupt / iso transfers ULONG m_NumberOfPorts; // number of ports OHCI_PORT_STATUS m_PortStatus[OHCI_MAX_PORT_COUNT]; // port change status PDMAMEMORYMANAGER m_MemoryManager; // memory manager HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine PVOID m_SCEContext; // status change callback routine context - BOOLEAN m_DoorBellRingInProgress; // door bell ring in progress WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback ULONG m_SyncFramePhysAddr; // periodic frame list physical address + ULONG m_IntervalValue; // periodic interval value }; //================================================================================================= @@ -489,7 +490,7 @@ NTSTATUS CUSBHardwareDevice::StartController(void) { - ULONG Control, NumberOfPorts, Index, Descriptor, FrameInterval, Periodic, IntervalValue; + ULONG Control, NumberOfPorts, Index, Descriptor, FrameInterval, Periodic; // // first write address of HCCA @@ -545,16 +546,19 @@ // // get frame interval // - //FrameInterval = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)) & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE; - //FrameInterval |= OHCI_FSMPS(IntervalValue) | IntervalValue; + FrameInterval = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)) & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE; + FrameInterval |= OHCI_FSMPS(m_IntervalValue) | m_IntervalValue; // // write frame interval // - //WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET), FrameInterval); - // 90% periodic - //Periodic = OHCI_PERIODIC(intervalValue); - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + 0x40 /*OHCI_PERIODIC_START_OFFSET*/), 0x3E67); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET), FrameInterval); + + // + // 90 % periodic + // + Periodic = OHCI_PERIODIC(m_IntervalValue); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic); // @@ -686,6 +690,14 @@ return STATUS_SUCCESS; } +NTSTATUS +CUSBHardwareDevice::GetInterruptEndpointDescriptors( + struct _OHCI_ENDPOINT_DESCRIPTOR *** OutDescriptor) +{ + *OutDescriptor = m_InterruptEndpoints; + return STATUS_SUCCESS; +} + VOID CUSBHardwareDevice::HeadEndpointDescriptorModified( ULONG Type) @@ -846,7 +858,7 @@ CUSBHardwareDevice::StopController(void) { ULONG Control, Reset; - ULONG Index; + ULONG Index, FrameInterval; // // first turn off all interrupts @@ -877,6 +889,16 @@ // wait a bit // KeStallExecutionProcessor(100); + + // + // read from interval + // + FrameInterval = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)); + + // + // store interval value for later + // + m_IntervalValue = OHCI_GET_INTERVAL_VALUE(FrameInterval); // // now reset controller Modified: branches/usb-bringup/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hardware.h [iso-8859-1] Thu May 26 12:37:18 2011 @@ -90,6 +90,19 @@ #define OHCI_RH_NO_OVER_CURRENT_PROTECTION 0x1000 #define OHCI_RH_GET_POWER_ON_TO_POWER_GOOD_TIME(s) ((s) >> 24) +// +// Frame interval register (section 7.3.1) +// +#define OHCI_FRAME_INTERVAL_OFFSET 0x34 +#define OHCI_GET_INTERVAL_VALUE(s) ((s) & 0x3fff) +#define OHCI_GET_FS_LARGEST_DATA_PACKET(s) (((s) >> 16) & 0x7fff) +#define OHCI_FRAME_INTERVAL_TOGGLE 0x80000000 + +// +// periodic start register +// +#define OHCI_PERIODIC_START_OFFSET 0x40 +#define OHCI_PERIODIC(i) ((i) * 9 / 10) // // Root Hub Descriptor B register (section 7.4.2) Modified: branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Thu May 26 12:37:18 2011 @@ -60,6 +60,7 @@ VOID SetNotification(PVOID CallbackContext, PRH_INIT_CALLBACK CallbackRoutine); // internal ioctl routines NTSTATUS HandleGetDescriptor(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleGetDescriptorFromInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassDevice(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleGetStatusFromDevice(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleSelectConfiguration(IN OUT PIRP Irp, PURB Urb); @@ -1223,6 +1224,55 @@ return Status; } + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleGetDescriptorFromInterface( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + PUSBDEVICE UsbDevice; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + + // + // sanity check + // + ASSERT(Urb->UrbControlDescriptorRequest.TransferBufferLength); + ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); + + // + // check if this is a valid usb device handle + // + ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + // + // generate setup packet + // + CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; + CtrlSetup.wValue.LowByte = Urb->UrbControlDescriptorRequest.Index; + CtrlSetup.wValue.HiByte = Urb->UrbControlDescriptorRequest.DescriptorType; + CtrlSetup.wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; + CtrlSetup.wLength = (USHORT)Urb->UrbControlDescriptorRequest.TransferBufferLength; + CtrlSetup.bmRequestType.B = 0x81; + + // + // submit setup packet + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); + ASSERT(Status == STATUS_SUCCESS); + + // + // done + // + return Status; +} + //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleGetDescriptor( @@ -1492,8 +1542,8 @@ // // sanity check // - PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); - PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength); + //ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer || Urb->UrbControlVendorClassRequest.TransferBufferMDL); + //ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength); PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); // @@ -1520,7 +1570,7 @@ // // initialize setup packet // - CtrlSetup.bmRequestType.B = 0xa1; //FIXME: Const. + CtrlSetup.bmRequestType.B = 0xa1; CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; @@ -1579,6 +1629,9 @@ switch (Urb->UrbHeader.Function) { + case URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE: + Status = HandleGetDescriptorFromInterface(Irp, Urb); + break; case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: Status = HandleGetDescriptor(Irp, Urb); break; Modified: branches/usb-bringup/drivers/usb/usbohci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/interfaces.h [iso-8859-1] Thu May 26 12:37:18 2011 @@ -187,6 +187,14 @@ // Description: returns the control head endpoint descriptor virtual NTSTATUS GetControlHeadEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR ** OutDescriptor) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetInterruptEndpointDescriptors +// +// Description: returns interrupt endpoint descriptors + + virtual NTSTATUS GetInterruptEndpointDescriptors(struct _OHCI_ENDPOINT_DESCRIPTOR *** OutDescriptorArray) = 0; //----------------------------------------------------------------------------------------- // @@ -451,6 +459,15 @@ // Description: frees the associated endpoint descriptor and its general descriptors virtual VOID FreeEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetInterruptInterval +// +// Description: returns interval of the iso / interrupt + + virtual UCHAR GetInterval() = 0; + }; Modified: branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Thu May 26 12:37:18 2011 @@ -44,7 +44,12 @@ // local functions BOOLEAN IsTransferDescriptorInEndpoint(IN POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG TransferDescriptorLogicalAddress); NTSTATUS FindTransferDescriptorInEndpoint(IN POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG TransferDescriptorLogicalAddress, OUT POHCI_ENDPOINT_DESCRIPTOR *OutEndpointDescriptor, OUT POHCI_ENDPOINT_DESCRIPTOR *OutPreviousEndpointDescriptor); + NTSTATUS FindTransferDescriptorInInterruptHeadEndpoints(IN ULONG TransferDescriptorLogicalAddress, OUT POHCI_ENDPOINT_DESCRIPTOR *OutEndpointDescriptor, OUT POHCI_ENDPOINT_DESCRIPTOR *OutPreviousEndpointDescriptor); + VOID CleanupEndpointDescriptor(POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, POHCI_ENDPOINT_DESCRIPTOR PreviousEndpointDescriptor); + POHCI_ENDPOINT_DESCRIPTOR FindInterruptEndpointDescriptor(UCHAR InterruptInterval); + VOID PrintEndpointList(POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor); + VOID LinkEndpoint(POHCI_ENDPOINT_DESCRIPTOR HeadEndpointDescriptor, POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor); // constructor / destructor CUSBQueue(IUnknown *OuterUnknown){} @@ -56,6 +61,7 @@ PUSBHARDWAREDEVICE m_Hardware; // hardware POHCI_ENDPOINT_DESCRIPTOR m_BulkHeadEndpointDescriptor; // bulk head descriptor POHCI_ENDPOINT_DESCRIPTOR m_ControlHeadEndpointDescriptor; // control head descriptor + POHCI_ENDPOINT_DESCRIPTOR * m_InterruptEndpoints; }; //================================================================================================= @@ -95,6 +101,11 @@ Hardware->GetControlHeadEndpointDescriptor(&m_ControlHeadEndpointDescriptor); // + // get interrupt endpoints + // + Hardware->GetInterruptEndpointDescriptors(&m_InterruptEndpoints); + + // // initialize spinlock // KeInitializeSpinLock(&m_Lock); @@ -116,6 +127,32 @@ // return 0; +} + +VOID +CUSBQueue::LinkEndpoint( + POHCI_ENDPOINT_DESCRIPTOR HeadEndpointDescriptor, + POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor) +{ + POHCI_ENDPOINT_DESCRIPTOR CurrentEndpointDescriptor = HeadEndpointDescriptor; + + // + // get last descriptor in queue + // + while(CurrentEndpointDescriptor->NextDescriptor) + { + // + // move to last descriptor + // + CurrentEndpointDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)CurrentEndpointDescriptor->NextDescriptor; + } + + // + // link endpoints + // + CurrentEndpointDescriptor->NextPhysicalEndpoint = EndpointDescriptor->PhysicalAddress.LowPart; + CurrentEndpointDescriptor->NextDescriptor = EndpointDescriptor; + } NTSTATUS @@ -146,10 +183,10 @@ switch(Type) { case USB_ENDPOINT_TYPE_ISOCHRONOUS: - case USB_ENDPOINT_TYPE_INTERRUPT: /* NOT IMPLEMENTED IN QUEUE */ Status = STATUS_NOT_SUPPORTED; break; + case USB_ENDPOINT_TYPE_INTERRUPT: case USB_ENDPOINT_TYPE_CONTROL: case USB_ENDPOINT_TYPE_BULK: Status = STATUS_SUCCESS; @@ -213,31 +250,35 @@ // HeadDescriptor = m_ControlHeadEndpointDescriptor; } - - // - // link endpoints - // - Descriptor->NextPhysicalEndpoint = HeadDescriptor->NextPhysicalEndpoint; - Descriptor->NextDescriptor = HeadDescriptor->NextDescriptor; - - HeadDescriptor->NextPhysicalEndpoint = Descriptor->PhysicalAddress.LowPart; - HeadDescriptor->NextDescriptor = Descriptor; + else if (Type == USB_ENDPOINT_TYPE_INTERRUPT) + { + // + // get head descriptor + // + HeadDescriptor = FindInterruptEndpointDescriptor(Request->GetInterval()); + ASSERT(HeadDescriptor); + } + + // + // insert endpoint at end + // + LinkEndpoint(HeadDescriptor, Descriptor); // // set descriptor active // Descriptor->Flags &= ~OHCI_ENDPOINT_SKIP; - //HeadDescriptor->Flags &= ~OHCI_ENDPOINT_SKIP; DPRINT("Request %x Logical %x added to queue Queue %p Logical %x\n", Descriptor, Descriptor->PhysicalAddress.LowPart, HeadDescriptor, HeadDescriptor->PhysicalAddress.LowPart); - // - // notify hardware of our request - // - m_Hardware->HeadEndpointDescriptorModified(Type); - - + if (Type == USB_ENDPOINT_TYPE_CONTROL || Type == USB_ENDPOINT_TYPE_BULK) + { + // + // notify hardware of our request + // + m_Hardware->HeadEndpointDescriptorModified(Type); + } return STATUS_SUCCESS; } @@ -318,6 +359,35 @@ return STATUS_NOT_FOUND; } +NTSTATUS +CUSBQueue::FindTransferDescriptorInInterruptHeadEndpoints(IN ULONG TransferDescriptorLogicalAddress, OUT POHCI_ENDPOINT_DESCRIPTOR *OutEndpointDescriptor, OUT POHCI_ENDPOINT_DESCRIPTOR *OutPreviousEndpointDescriptor) +{ + ULONG Index; + NTSTATUS Status; + + // + // search descriptor in endpoint list + // + for(Index = 0; Index < OHCI_STATIC_ENDPOINT_COUNT; Index++) + { + // + // is it in current endpoint + // + Status = FindTransferDescriptorInEndpoint(m_InterruptEndpoints[Index], TransferDescriptorLogicalAddress, OutEndpointDescriptor, OutPreviousEndpointDescriptor); + if (NT_SUCCESS(Status)) + { + // + // found transfer descriptor + // + return STATUS_SUCCESS; + } + } + + // + // not found + // + return STATUS_NOT_FOUND; +} BOOLEAN CUSBQueue::IsTransferDescriptorInEndpoint( @@ -399,7 +469,27 @@ Request->Release(); } - +VOID +CUSBQueue::PrintEndpointList( + POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor) +{ + DPRINT1("CUSBQueue::PrintEndpointList HeadEndpoint %p Logical %x\n", EndpointDescriptor, EndpointDescriptor->PhysicalAddress.LowPart); + + // + // get first general transfer descriptor + // + EndpointDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)EndpointDescriptor->NextDescriptor; + + while(EndpointDescriptor) + { + DPRINT1(" CUSBQueue::PrintEndpointList Endpoint %p Logical %x\n", EndpointDescriptor, EndpointDescriptor->PhysicalAddress.LowPart); + + // + // move to next + // + EndpointDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)EndpointDescriptor->NextDescriptor; + } +} VOID CUSBQueue::TransferDescriptorCompletionCallback( @@ -445,13 +535,72 @@ } // + // find transfer descriptor in interrupt list + // + Status = FindTransferDescriptorInInterruptHeadEndpoints(TransferDescriptorLogicalAddress, &EndpointDescriptor, &PreviousEndpointDescriptor); + if (NT_SUCCESS(Status)) + { + // + // cleanup endpoint + // + CleanupEndpointDescriptor(EndpointDescriptor, PreviousEndpointDescriptor); + + // + // done + // + return; + } + + + // // hardware reported dead endpoint completed // - DPRINT1("CUSBQueue::TransferDescriptorCompletionCallback invalid transfer descriptor %x\n", TransferDescriptorLogicalAddress); + DPRINT("CUSBQueue::TransferDescriptorCompletionCallback invalid transfer descriptor %x\n", TransferDescriptorLogicalAddress); ASSERT(FALSE); } +POHCI_ENDPOINT_DESCRIPTOR +CUSBQueue::FindInterruptEndpointDescriptor( + UCHAR InterruptInterval) +{ + ULONG Index = 0; + ULONG Power = 1; + + // + // sanity check + // + ASSERT(InterruptInterval < OHCI_BIGGEST_INTERVAL); + + // + // find interrupt index + // + while (Power <= OHCI_BIGGEST_INTERVAL / 2) + { + // + // is current interval greater + // + if (Power * 2 > InterruptInterval) + break; + + // + // increment power + // + Power *= 2; + + // + // move to next interrupt + // + Index++; + } + + DPRINT("InterruptInterval %lu Selected InterruptIndex %lu Choosen Interval %lu\n", InterruptInterval, Index, Power); + + // + // return endpoint + // + return m_InterruptEndpoints[Index]; +} NTSTATUS CreateUSBQueue( Modified: branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbohci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Thu May 26 12:37:18 2011 @@ -46,6 +46,8 @@ virtual BOOLEAN IsQueueHeadComplete(struct _QUEUE_HEAD * QueueHead); virtual VOID CompletionCallback(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor); virtual VOID FreeEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor); + virtual UCHAR GetInterval(); + // local functions ULONG InternalGetTransferType(); @@ -378,6 +380,18 @@ } UCHAR +CUSBRequest::GetInterval() +{ + ASSERT(m_EndpointDescriptor); + ASSERT((m_EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT); + + // + // return interrupt interval + // + return m_EndpointDescriptor->bInterval; +} + +UCHAR CUSBRequest::GetEndpointAddress() { if (!m_EndpointDescriptor) @@ -786,7 +800,7 @@ FirstDescriptor = CurrentDescriptor; } - DPRINT("PreviousDescriptor %p CurrentDescriptor %p Buffer Logical %p Physical %x Last Physical %x CurrentSize %lu\n", PreviousDescriptor, CurrentDescriptor, CurrentDescriptor->BufferLogical, CurrentDescriptor->BufferPhysical, CurrentDescriptor->LastPhysicalByteAddress, CurrentSize); + DPRINT("PreviousDescriptor %p CurrentDescriptor %p Logical %x Buffer Logical %p Physical %x Last Physical %x CurrentSize %lu\n", PreviousDescriptor, CurrentDescriptor, CurrentDescriptor->PhysicalAddress.LowPart, CurrentDescriptor->BufferLogical, CurrentDescriptor->BufferPhysical, CurrentDescriptor->LastPhysicalByteAddress, CurrentSize); // // set previous descriptor @@ -847,7 +861,6 @@ // done // return STATUS_SUCCESS; - }

13 years, 7 months

← Newer
1
...
8
9
10
11
12
13
14
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011