Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[ion] 21916: - Check the Image Config Data in MmCreatePeb for address abusing (bug #1487). - Speed-up the ElfpIsPowerOf2 function (bug #1464).

by ion＠svn.reactos.org

Author: ion Date: Tue May 16 19:04:50 2006 New Revision: 21916 URL: http://svn.reactos.ru/svn/reactos?rev=21916&view=rev Log: - Check the Image Config Data in MmCreatePeb for address abusing (bug #1487). - Speed-up the ElfpIsPowerOf2 function (bug #1464). Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/ntoskrnl/mm/elf.inc.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/elf.inc.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/elf.inc.h (original) +++ trunk/reactos/ntoskrnl/mm/elf.inc.h Tue May 16 19:04:50 2006 @@ -294,10 +294,7 @@ if(Number == 0) return FALSE; - while((Number % 2) == 0) - Number /= 2; - - return Number == 1; + return (Number & (Number - 1)) == 0; } static __inline Elf_Addr ElfFmtpModPow2 Modified: trunk/reactos/ntoskrnl/mm/process.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/process.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/process.c (original) +++ trunk/reactos/ntoskrnl/mm/process.c Tue May 16 19:04:50 2006 @@ -297,12 +297,6 @@ /* Image Data */ if ((NtHeaders = RtlImageNtHeader(Peb->ImageBaseAddress))) { - /* Get the Image Config Data too */ - ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, - TRUE, - IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, - &ViewSize); - /* Write subsystem data */ Peb->ImageSubSystem = NtHeaders->OptionalHeader.Subsystem; Peb->ImageSubSystemMajorVersion = NtHeaders->OptionalHeader.MajorSubsystemVersion; @@ -315,22 +309,10 @@ Peb->OSMinorVersion = (NtHeaders->OptionalHeader.Win32VersionValue >> 8) & 0xFF; Peb->OSBuildNumber = (NtHeaders->OptionalHeader.Win32VersionValue >> 16) & 0x3FFF; - /* Lie about the version if requested */ - if (ImageConfigData && ImageConfigData->CSDVersion) - { - Peb->OSCSDVersion = ImageConfigData->CSDVersion; - } - /* Set the Platform ID */ Peb->OSPlatformId = (NtHeaders->OptionalHeader.Win32VersionValue >> 30) ^ 2; } - /* Check for affinity override */ - if (ImageConfigData && ImageConfigData->ProcessAffinityMask) - { - ProcessAffinityMask = ImageConfigData->ProcessAffinityMask; - } - /* Check if the image is not safe for SMP */ if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY) { @@ -342,6 +324,37 @@ /* Use affinity from Image Header */ Peb->ImageProcessAffinityMask = ProcessAffinityMask; } + + _SEH_TRY + { + /* Get the Image Config Data too */ + ImageConfigData = RtlImageDirectoryEntryToData(Peb->ImageBaseAddress, + TRUE, + IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG, + &ViewSize); + + ProbeForRead(ImageConfigData, + sizeof(IMAGE_LOAD_CONFIG_DIRECTORY), + sizeof(ULONG)); + + /* Process the image config data overrides if specfied. */ + if (ImageConfigData != NULL) + { + if (ImageConfigData->CSDVersion) + { + Peb->OSCSDVersion = ImageConfigData->CSDVersion; + } + if (ImageConfigData->ProcessAffinityMask) + { + ProcessAffinityMask = ImageConfigData->ProcessAffinityMask; + } + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } /* Misc data */ @@ -352,7 +365,7 @@ KeDetachProcess(); DPRINT("MmCreatePeb: Peb created at %p\n", Peb); - return STATUS_SUCCESS; + return Status; } PTEB

18 years, 4 months

[gedmurphy] 21915: french translation by usurp

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue May 16 02:56:07 2006 New Revision: 21915 URL: http://svn.reactos.ru/svn/reactos?rev=21915&view=rev Log: french translation by usurp Added: trunk/reactos/dll/cpl/ncpa/fr.rc Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc Added: trunk/reactos/dll/cpl/ncpa/fr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/fr.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/fr.rc (added) +++ trunk/reactos/dll/cpl/ncpa/fr.rc Tue May 16 02:56:07 2006 @@ -1,0 +1,98 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_PROPPAGENETWORK DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Propriétés réseau" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Cartes réseau",-1,9,9,217,8 + LISTBOX IDC_NETCARDLIST,9,21,229,73,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Ajouter",IDC_ADD,9,100,60,14 + PUSHBUTTON "&Enlever",IDC_REMOVE,72,100,60,14 + PUSHBUTTON "&Propriétés",IDC_PROPERTIES,179,100,60,14 +END + +IDD_NETPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Général" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Se connecter en utilisant:", -1, 9,9,217,8 + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + PUSHBUTTON "&Configurer", IDC_CONFIGURE, 189, 38, 50, 14 + LTEXT "Les composants cochés sont utilisés par cette connection:", -1, 9, 59, 217, 8 + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT + PUSHBUTTON "&Installer", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Désinstaller", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP + PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 174, 130, 65, 14 + GROUPBOX "Description", -1, 9, 153, 230, 46, BS_GROUPBOX + LTEXT "Description du composant...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP + CHECKBOX "Afficher l'icone dans la barre des taches", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP +END + + +IDD_CARDPROPERTIES DIALOG DISCARDABLE 0, 0, 200,180 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Général" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Connection", -1, 9, 8, 182, 58, BS_GROUPBOX + LTEXT "Etat:", -1, 19, 20, 60, 8 + LTEXT "Durée:", -1, 19, 34, 60, 8 + LTEXT "Vitesse:", -1, 19, 48, 60, 8 + GROUPBOX "Activité", -1, 9, 74, 182, 70, BS_GROUPBOX + RTEXT "Envoyés", -1, 26, 90, 60, 8 + ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 + ICON IDI_NETSTAT, -1, 110, 85, 18, 20 + ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 + LTEXT "Reçus", -1, 149, 90, 37, 8 + LTEXT "Paquets:", -1, 17, 115, 32, 8 + RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 + ICON IDI_VERTICAL, -1, 110, 108, 18, 20 + RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 + PUSHBUTTON "&Propriétés", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "&Désactiver", IDC_ENDISABLE, 66, 150, 50, 14 +END + +IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 +STYLE DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Général" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Vous pouvez automatiquement régler les paramètres si votre réseau supporte cette possibilité. Sinon, vous devez demander les réglages IP nécessaires à votre administrateur réseau.", -1, 9, 9, 228, 27 + CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "&Utiliser l'adresse IP suivante:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 105, 12 + LTEXT "Adresse IP :", -1, 14, 75, 135, 8 + CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP,150,75-2,80,12 + LTEXT "Masque de sous réseau:", -1, 14, 90, 135, 8 + CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP,150,90-2,80,12 + LTEXT "Passerelle par défaut:", -1, 14, 105, 135, 8 + CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP,150,105-2,80,12 + CONTROL "Obtenir automatiquement l'adresse du serveur DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "&Utiliser les adresses de serveur DNS suivantes", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 142, 12 + LTEXT "Serveur DNS primaire:", -1, 14, 171, 135, 8 + CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP,150,171-2,80,12 + LTEXT "Serveur DNS secondaire:", -1, 14, 186, 135, 8 + CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP,150,186-2,80,12 + PUSHBUTTON "&Avancé", IDC_ADVANCED, 186, 209, 50, 14, WS_DISABLED | WS_TABSTOP +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Propriétés réseau" + IDS_CPLSYSTEMDESCRIPTION "Modifie les paramètres réseau." +END + +STRINGTABLE +BEGIN + IDS_ERROR "Erreur" + IDS_ENTER_VALID_IPADDRESS "Vous devez entrer une adresse IP valide" + IDS_ENTER_VALID_SUBNET "Vous devez entrer un masque de sous réseau valide" + IDS_CANNOT_LOAD_CONFIG "Impossible de charger les données de configuration" + IDS_CANNOT_CREATE_PROPSHEET "Impossible de créer la page de propriétés" + IDS_OUT_OF_MEMORY "Plus de mémoire" + IDS_CANNOT_SAVE_CHANGES "Impossible de sauvegarder les changements" +END Modified: trunk/reactos/dll/cpl/ncpa/ncpa.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.rc?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.rc (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.rc Tue May 16 02:56:07 2006 @@ -18,13 +18,18 @@ IDI_VERTICAL ICON "resources/VERTIC.ICO" IDI_NETSTAT ICON "resources/NETCONN.ICO" -#include "en.rc" #include "cz.rc" #include "de.rc" #include "dk.rc" +#include "en.rc" +#include "es.rc" +#include "fr.rc" +#include "hu.rc" +#include "Ja.rc" #include "nl.rc" +#include "ru.rc" #include "sv.rc" -#include "es.rc" -#include "Ja.rc" -#include "hu.rc" -#include "ru.rc" + + + +

18 years, 4 months

[mbosma] 21914: Merge r21839

by mbosma＠svn.reactos.org

Author: mbosma Date: Mon May 15 23:50:43 2006 New Revision: 21914 URL: http://svn.reactos.ru/svn/reactos?rev=21914&view=rev Log: Merge r21839 Modified: branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/direntry.c branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/finfo.c branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/vfat.h Modified: branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/direntry.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/dr… ============================================================================== --- branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/direntry.c (original) +++ branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/direntry.c Mon May 15 23:50:43 2006 @@ -22,8 +22,8 @@ if (pDeviceExt->FatInfo.FatType == FAT32) { - cluster = pFatDirEntry->Fat.FirstCluster + - pFatDirEntry->Fat.FirstClusterHigh * 65536; + cluster = pFatDirEntry->Fat.FirstCluster | + (pFatDirEntry->Fat.FirstClusterHigh << 16); } else if (pDeviceExt->Flags & VCB_IS_FATX) { Modified: branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/finfo.c URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/dr… ============================================================================== --- branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/finfo.c (original) +++ branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/finfo.c Mon May 15 23:50:43 2006 @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/finfo.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr * Herve Poussineau (reactos(a)poussine.freesurf.fr) * */ @@ -100,34 +99,6 @@ } static NTSTATUS -VfatGetAttributeTagInformation(PVFATFCB FCB, - PFILE_ATTRIBUTE_TAG_INFORMATION AttributeTagInfo, - PULONG BufferLength) -{ - if (*BufferLength < sizeof(FILE_ATTRIBUTE_TAG_INFORMATION)) - return STATUS_BUFFER_OVERFLOW; - - /* PRECONDITION */ - ASSERT(AttributeTagInfo != NULL); - ASSERT(FCB != NULL); - - AttributeTagInfo->FileAttributes = *FCB->Attributes & 0x3f; - /* Synthesize FILE_ATTRIBUTE_NORMAL */ - if (0 == (AttributeTagInfo->FileAttributes & (FILE_ATTRIBUTE_DIRECTORY | - FILE_ATTRIBUTE_ARCHIVE | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_READONLY))) - { - AttributeTagInfo->FileAttributes |= FILE_ATTRIBUTE_NORMAL; - } - AttributeTagInfo->ReparseTag = 0; - - *BufferLength -= sizeof(FILE_ATTRIBUTE_TAG_INFORMATION); - return(STATUS_SUCCESS); -} - -static NTSTATUS VfatSetPositionInformation(PFILE_OBJECT FileObject, PFILE_POSITION_INFORMATION PositionInfo) { @@ -470,6 +441,28 @@ *BufferLength -= sizeof(FILE_NETWORK_OPEN_INFORMATION); return STATUS_SUCCESS; +} + + +static NTSTATUS +VfatGetEaInformation(PFILE_OBJECT FileObject, + PVFATFCB Fcb, + PDEVICE_OBJECT DeviceObject, + PFILE_EA_INFORMATION Info, + PULONG BufferLength) +{ + PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; + + /* FIXME - use SEH to access the buffer! */ + Info->EaSize = 0; + *BufferLength -= sizeof(*Info); + if (DeviceExt->FatInfo.FatType == FAT12 || + DeviceExt->FatInfo.FatType == FAT16) + { + /* FIXME */ + DPRINT1("VFAT: FileEaInformation not implemented!\n"); + } + return STATUS_SUCCESS; } @@ -614,8 +607,16 @@ } else { - Fcb->entry.Fat.FirstCluster = (unsigned short)(FirstCluster & 0x0000FFFF); - Fcb->entry.Fat.FirstClusterHigh = (unsigned short)((FirstCluster & 0xFFFF0000) >> 16); + if (DeviceExt->FatInfo.FatType == FAT32) + { + Fcb->entry.Fat.FirstCluster = (unsigned short)(FirstCluster & 0x0000FFFF); + Fcb->entry.Fat.FirstClusterHigh = FirstCluster >> 16; + } + else + { + ASSERT((FirstCluster >> 16) == 0); + Fcb->entry.Fat.FirstCluster = (unsigned short)(FirstCluster & 0x0000FFFF); + } } } else @@ -699,8 +700,15 @@ } else { - Fcb->entry.Fat.FirstCluster = 0; - Fcb->entry.Fat.FirstClusterHigh = 0; + if (DeviceExt->FatInfo.FatType == FAT32) + { + Fcb->entry.Fat.FirstCluster = 0; + Fcb->entry.Fat.FirstClusterHigh = 0; + } + else + { + Fcb->entry.Fat.FirstCluster = 0; + } } NCluster = Cluster = FirstCluster; @@ -809,10 +817,12 @@ &BufferLength); break; - case FileAttributeTagInformation: - RC = VfatGetAttributeTagInformation(FCB, - SystemBuffer, - &BufferLength); + case FileEaInformation: + RC = VfatGetEaInformation(IrpContext->FileObject, + FCB, + IrpContext->DeviceObject, + SystemBuffer, + &BufferLength); break; case FileAlternateNameInformation: @@ -901,7 +911,6 @@ SystemBuffer); break; case FileRenameInformation: - case FileAttributeTagInformation: RC = STATUS_NOT_IMPLEMENTED; break; default: Modified: branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/vfat.h URL: http://svn.reactos.ru/svn/reactos/branches/cache_manager_rewrite/reactos/dr… ============================================================================== --- branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/vfat.h (original) +++ branches/cache_manager_rewrite/reactos/drivers/filesystems/vfat/vfat.h Mon May 15 23:50:43 2006 @@ -97,11 +97,50 @@ unsigned char lCase; unsigned char CreationTimeMs; unsigned short CreationTime,CreationDate,AccessDate; - unsigned short FirstClusterHigh; // higher + union + { + unsigned short FirstClusterHigh; // FAT32 + unsigned short ExtendedAttributes; // FAT12/FAT16 + }; unsigned short UpdateTime; //time create/update unsigned short UpdateDate; //date create/update unsigned short FirstCluster; unsigned long FileSize; +}; + +#define FAT_EAFILE "EA DATA. SF" + +typedef struct _EAFileHeader FAT_EA_FILE_HEADER, *PFAT_EA_FILE_HEADER; + +struct _EAFileHeader +{ + unsigned short Signature; // ED + unsigned short Unknown[15]; + unsigned short EASetTable[240]; +}; + +typedef struct _EASetHeader FAT_EA_SET_HEADER, *PFAT_EA_SET_HEADER; + +struct _EASetHeader +{ + unsigned short Signature; // EA + unsigned short Offset; // relative offset, same value as in the EASetTable + unsigned short Unknown1[2]; + char TargetFileName[12]; + unsigned short Unknown2[3]; + unsigned int EALength; + // EA Header +}; + +typedef struct _EAHeader FAT_EA_HEADER, *PFAT_EA_HEADER; + +struct _EAHeader +{ + unsigned char Unknown; + unsigned char EANameLength; + unsigned short EAValueLength; + // Name Data + // Value Data }; typedef struct _FATDirEntry FAT_DIR_ENTRY, *PFAT_DIR_ENTRY;

18 years, 4 months

[cwittich] 21913: -fix build

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon May 15 22:56:42 2006 New Revision: 21913 URL: http://svn.reactos.ru/svn/reactos?rev=21913&view=rev Log: -fix build Modified: trunk/reactos/dll/cpl/ncpa/dk.rc Modified: trunk/reactos/dll/cpl/ncpa/dk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/dk.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/dk.rc (original) +++ trunk/reactos/dll/cpl/ncpa/dk.rc Mon May 15 22:56:42 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigure", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Komponeter mærkeret med et flueben er brugt af den forbindelse:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHTs + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installere", IDC_INSTALL, 9, 133, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Afinstallere", IDC_UNINSTALL, 90, 133, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 174, 133, 65, 14

18 years, 4 months

[gedmurphy] 21912: - size listbox correctly - fixes bug 1490

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon May 15 22:35:50 2006 New Revision: 21912 URL: http://svn.reactos.ru/svn/reactos?rev=21912&view=rev Log: - size listbox correctly - fixes bug 1490 Modified: trunk/reactos/dll/cpl/ncpa/Ja.rc trunk/reactos/dll/cpl/ncpa/cz.rc trunk/reactos/dll/cpl/ncpa/de.rc trunk/reactos/dll/cpl/ncpa/dk.rc trunk/reactos/dll/cpl/ncpa/en.rc trunk/reactos/dll/cpl/ncpa/es.rc trunk/reactos/dll/cpl/ncpa/hu.rc trunk/reactos/dll/cpl/ncpa/nl.rc trunk/reactos/dll/cpl/ncpa/ru.rc trunk/reactos/dll/cpl/ncpa/sv.rc Modified: trunk/reactos/dll/cpl/ncpa/Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/Ja.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/Ja.rc (original) +++ trunk/reactos/dll/cpl/ncpa/Ja.rc Mon May 15 22:35:50 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "Ýè(&C)", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "±ÌÚ±Í`FbN }[NªIÉÈÁÄ¢éR|[lgðgpµÄ¢Ü·:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "CXg[(&I)", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "í(&U)", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "vpeB(&P)", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/cz.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/cz.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/cz.rc (original) +++ trunk/reactos/dll/cpl/ncpa/cz.rc Mon May 15 22:35:50 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Nastavit", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Vybrané komponenty jsou pouívány tímto pøipojením:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalovat", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Odstranit", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/de.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/de.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/de.rc (original) +++ trunk/reactos/dll/cpl/ncpa/de.rc Mon May 15 22:35:50 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigurieren", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Diese &Verbindung verwendet folgende Elemente:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installieren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Deinstallieren", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eigenschaften", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/dk.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/dk.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/dk.rc (original) +++ trunk/reactos/dll/cpl/ncpa/dk.rc Mon May 15 22:35:50 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigure", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Komponeter mærkeret med et flueben er brugt af den forbindelse:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHTs PUSHBUTTON "&Installere", IDC_INSTALL, 9, 133, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Afinstallere", IDC_UNINSTALL, 90, 133, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Egenskaber", IDC_PROPERTIES, 174, 133, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/en.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/en.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/en.rc (original) +++ trunk/reactos/dll/cpl/ncpa/en.rc Mon May 15 22:35:50 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configure", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Install", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Uninstall", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Properties", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/es.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/es.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/es.rc (original) +++ trunk/reactos/dll/cpl/ncpa/es.rc Mon May 15 22:35:50 2006 @@ -27,7 +27,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configurar", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Los componentes marcados son utilizados por esta conección:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Instalar", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Desinstalar", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Propiedades", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/hu.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/hu.rc (original) +++ trunk/reactos/dll/cpl/ncpa/hu.rc Mon May 15 22:35:50 2006 @@ -22,7 +22,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Beállítás", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "A megjelölt alkotóelemek vannak használatban ennél a kapcsolatnál:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Telepítés", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eltávolítás", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Tulajdonságok", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/nl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/nl.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/nl.rc (original) +++ trunk/reactos/dll/cpl/ncpa/nl.rc Mon May 15 22:35:50 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Configureren", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Components checked are used by this connection:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installeren", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Verwijderen", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Eigenschappen", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/ru.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/ru.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ru.rc (original) +++ trunk/reactos/dll/cpl/ncpa/ru.rc Mon May 15 22:35:50 2006 @@ -21,7 +21,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Íàñòðîèòü", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Îòìå÷åííûå êîìïîíåíòû èñïîëüçóþòñÿ ýòèì ïîäêëþ÷åíèåì:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Óñòàíîâèòü", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Óäàëèòü", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Ñâîéñòâà", IDC_PROPERTIES, 174, 130, 65, 14 Modified: trunk/reactos/dll/cpl/ncpa/sv.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/ncpa/sv.rc?rev=2191… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/sv.rc (original) +++ trunk/reactos/dll/cpl/ncpa/sv.rc Mon May 15 22:35:50 2006 @@ -23,7 +23,7 @@ EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP PUSHBUTTON "&Konfigurera", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Markerade komponenter används av denna anslutning:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 67, LBS_STANDARD + LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_STANDARD | LBS_NOINTEGRALHEIGHT PUSHBUTTON "&Installera", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Avinstallera", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Egenskaper", IDC_PROPERTIES, 174, 130, 65, 14

18 years, 4 months

[mbosma] 21911: Merge r21910 to the branch.

by mbosma＠svn.reactos.org

Author: mbosma Date: Mon May 15 21:33:09 2006 New Revision: 21911 URL: http://svn.reactos.ru/svn/reactos?rev=21911&view=rev Log: Merge r21910 to the branch. Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/hivecls.inf Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.ru/svn/reactos/branches/ros-branch-0_3_0/reactos/boot/bo… ============================================================================== --- branches/ros-branch-0_3_0/reactos/boot/bootdata/hivecls.inf (original) +++ branches/ros-branch-0_3_0/reactos/boot/bootdata/hivecls.inf Mon May 15 21:33:09 2006 @@ -5,21 +5,81 @@ HKLM,"SOFTWARE\Classes",,0x00000010 ; Folders -;HKCR,"Folder\Defaulticon","",0x00000000,"%SystemRoot%\System32\shell32.dll,-4" +HKCR,"Folder","",0x00000000,"Folder" +;HKCR,"Folder\Defaulticon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" HKCR,"Folder\shell\open\command","",0x00000000,"explorer.exe ""%1""" HKCR,"Folder\shell\explore\command","",0x00000000,"explorer.exe /e,""%1""" HKCR,"Folder\shell\rootexplore","",0x00000000,"Explore from here" HKCR,"Folder\shell\rootexplore\command","",0x00000000,"explorer.exe /e,/root,""%1""" +; Virtual Device Drivers +HKCR,".386","",0x00000000,"vxdfile" +HKCR,".vxd","",0x00000000,"vxdfile" +HKCR,"vxdfile","",0x00000000,"Virtual Device Driver" + +; Animated Cursors +HKCR,".ani","",0x00000000,"anifile" +HKCR,"anifile","",0x00000000,"Animated Cursor" +HKCR,"anifile\DefaultIcon","",0x00000000,"%1" + +; DOS Batch-Files +HKCR,".bat","",0x00000000,"batfile" +HKCR,"batfile","",0x00000000,"DOS Batch File" +HKCR,"batfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153" +HKCR,"batfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"batfile\shell\open\command","",0x00000000,"""%1"" %*" + +HKCR,".cmd","",0x00000000,"cmdfile" +HKCR,"cmdfile","",0x00000000,"ReactOS Command Script" +HKCR,"cmdfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153" +HKCR,"cmdfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"cmdfile\shell\open\command","",0x00000000,"""%1"" %*" + +; Get DOS Applications a Icon +HKCR,".com","",0x00000000,"comfile" +HKCR,"comfile","",0x00000000,"DOS Application" +HKCR,"comfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-3" + ; Control Panel extensions HKCR,".cpl","",0x00000000,"cplfile" +HKCR,"cplfile","",0x00000000,"Control Panel Extension" +HKCR,"cplfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" HKCR,"cplfile\shell\cplopen","",0x00000000,"Open with Control Panel" HKCR,"cplfile\shell\cplopen\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %1,%*" -; Show icons for executables in shell views +; Cursors +HKCR,".cur","",0x00000000,"curfile" +HKCR,"curfile","",0x00000000,"Cursor" +HKCR,"curfile\DefaultIcon","",0x00000000,"%1" + +; Dynamic Link Libraries +HKCR,".dll","",0x00000000,"dllfile" +HKCR,"dllfile","",0x00000000,"Dynamic Link Library" +HKCR,"dllfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + +; Device Drivers +HKCR,".drv","",0x00000000,"drvfile" +HKCR,"drvfile","",0x00000000,"Device Driver" + +; Applicatons HKCR,".exe","",0x00000000,"exefile" +HKCR,"exefile","",0x00000000,"ReactOS Applicaton" HKCR,"exefile\Defaulticon","",0x00000000,"%1" HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*" + +; Fonts +HKCR,".fon","",0x00000000,"fonfile" +HKCR,"fonfile","",0x00000000,"Font File" +HKCR,"fonfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-155" + +HKCR,".ttf","",0x00000000,"ttffile" +HKCR,"ttffile","",0x00000000,"TrueType Font File" +HKCR,"ttffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156" + +; Help Files +HKCR,".hlp","",0x00000000,"hlpfile" +HKCR,"hlpfile","",0x00000000,"Help File" +HKCR,"hlpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-24" ; set MIME type for .html and .htm because Tiny webserver needs it HKCR,".htm","",0x00000000,"html" @@ -28,15 +88,24 @@ HKCR,".html","",0x00000000,"html" HKCR,".html","Content Type",0x00000000,"text/html" -; ini (configuration) files +; Icons +HKCR,".ico","",0x00000000,"icofile" +HKCR,"icofile","",0x00000000,"Icon" +HKCR,"icofile\DefaultIcon","",0x00000000,"%1" + +; Configuration Files HKCR,".ini","",0x00000000,"inifile" +HKCR,"inifile","",0x00000000,"Configuration Settings" +HKCR,"inifile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" HKCR,"inifile\shell\open\command","",0x00000000,"notepad.exe ""%1""" -; Show icons for inf (installation) files +; Setup Information Files HKCR,".inf","",0x00000000,"inffile" +HKCR,"inffile","",0x00000000,"Setup Information" +HKCR,"inffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" HKCR,"inffile\shell\open\command","",0x00000000,"notepad.exe ""%1""" -HKCR,"inffile\DefaultIcon","",0x00000000,"%SystemRoot%\System32\shell32.dll,-151" -HKCR,"inffile\shell\Install\command","",0x00020000,"%SystemRoot%\System32\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" +HKCR,"inffile\shell\Install","",0x00000000,"Install" +HKCR,"inffile\shell\Install\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" ; Show icons for shortcuts in shell views (lnkfile is handled specially in shell32) ; Don't display extension for shortcuts @@ -47,12 +116,41 @@ HKCR,"lnkfile\shellex\IconHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,, +; Text Documents +HKCR,".log","",0x00000000,"txtfile" +HKCR,".txt","",0x00000000,"txtfile" +HKCR,"txtfile","",0x00000000,"Text Document" +HKCR,".txt","Content Type",0x00000000,"text/plain" +HKCR,"txtfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-152" +HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" + ; MSI files HKCR,".msi","",0x00000000,"MSI.Package" HKCR,"Msi.Package\DefaultIcon","",0x00000000,"msiexec.exe" -HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\System32\msiexec /i %1" -HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\System32\msiexec /f %1" -HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\System32\msiexec /x %1" +HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec /i %1" +HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec /f %1" +HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec /x %1" + +HKCR,".pif","",0x00000000,"piffile" + +; Registration Entries +HKCR,".reg","",0x00000000,"regfile" +HKCR,"regfile","",0x00000000,"Registration Entries" +HKCR,"regfile\DefaultIcon","",0x00020000,"%SystemRoot%\regedit.exe,1" +HKCR,"regfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"regfile\shell\open","",0x00000000,"Merge" +HKCR,"regfile\shell\open\command","",0x00000000,"regedit.exe ""%1""" + +; Screen Savers +HKCR,".scr","",0x00000000,"scrfile" +HKCR,"scrfile","",0x00000000,"Screen Saver" +HKCR,"scrfile\Defaulticon","",0x00000000,"%1" +HKCR,"scrfile\shell\config","",0x00000000,"Configure" +HKCR,"scrfile\shell\config\command","",0x00000000,"""%1""" +HKCR,"scrfile\shell\install","",0x00000000,"Install" +HKCR,"scrfile\shell\install\command","",0x00000000,"rundll32.exe desk.cpl,InstallScreenSaver %l" +HKCR,"scrfile\shell\open","",0x00000000,"Test" +HKCR,"scrfile\shell\open\command","",0x00000000,"""%1"" /S" ; shell command files (e.g. "Show Desktop" in quicklaunch bar) HKCR,".scf","",0x00000000,"SHCmdFile" @@ -62,10 +160,10 @@ HKCR,"SHCmdFile\CLSID","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" HKCR,"SHCmdFile\shellex\IconHandler","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" -; install notepad as handler for .txt files -HKCR,".txt","",0x00000000,"txtfile" -HKCR,".txt","Content Type",0x00000000,"text/plain" -HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\System32\notepad.exe %1" +System-Files +HKCR,".sys","",0x00000000,"sysfile" +HKCR,"sysfile","",0x00000000,"System File" +HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" ; URL shortcuts (e.g. used in favorites folder of IExplorer) HKCR,".url","",0x00000000,"InternetShortcut" @@ -73,6 +171,11 @@ HKCR,"InternetShortcut","IsShortcut",0x00000000,"yes" HKCR,"InternetShortcut\shell\open\command","",0x00000000,"rundll32.exe shdocvw.dll,OpenURL %l" HKCR,"InternetShortcut\DefaultIcon","",0x00020000,"%SystemRoot%\system32\url.dll,0" + +; Wave Sounds +HKCR,".wav","",0x00000000,"SoundRec" +HKCR,"SoundRec","",0x00000000,"Wave Sound" +HKCR,"SoundRec\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225" HKCR,"CLSID",,0x00000012 @@ -105,15 +208,15 @@ HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -; Recycle bin is not implemented (yet???) +; Recycle bin is not implemented ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"Recycle Bin" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","LocalizedString",0x00020000,"@%SystemRoot%\system32\shell32.dll,-8964" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","InfoTip",0x00020000,"@%SystemRoot%\system32\shell32.dll,-22915" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","IntroText",0x00020000,"@%SystemRoot%\system32\shell32.dll,-31748" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","SortOrderIndex",0x00010001,0x00000060 -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","",0x00020000,"%SystemRoot%\System32\shell32.dll,31" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Empty",0x00020000,"%SystemRoot%\System32\shell32.dll,31" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Full",0x00020000,"%SystemRoot%\System32\shell32.dll,32" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,31" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Empty",0x00020000,"%SystemRoot%\system32\shell32.dll,31" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Full",0x00020000,"%SystemRoot%\system32\shell32.dll,32" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\InProcServer32","ThreadingModel",0x00000000,"Apartment" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\ShellFolder","Attributes",0x00010001,0x20000140

18 years, 4 months

[frik85] 21910: Add icons for several filetypes registry keys written by Daniel "EmuandCo" Reimer <reimer [dot] daniel [at] freenet [dot] de>

by frik85＠svn.reactos.org

Author: frik85 Date: Mon May 15 21:28:50 2006 New Revision: 21910 URL: http://svn.reactos.ru/svn/reactos?rev=21910&view=rev Log: Add icons for several filetypes registry keys written by Daniel "EmuandCo" Reimer <reimer [dot] daniel [at] freenet [dot] de> Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Mon May 15 21:28:50 2006 @@ -5,21 +5,81 @@ HKLM,"SOFTWARE\Classes",,0x00000010 ; Folders -;HKCR,"Folder\Defaulticon","",0x00000000,"%SystemRoot%\System32\shell32.dll,-4" +HKCR,"Folder","",0x00000000,"Folder" +;HKCR,"Folder\Defaulticon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" HKCR,"Folder\shell\open\command","",0x00000000,"explorer.exe ""%1""" HKCR,"Folder\shell\explore\command","",0x00000000,"explorer.exe /e,""%1""" HKCR,"Folder\shell\rootexplore","",0x00000000,"Explore from here" HKCR,"Folder\shell\rootexplore\command","",0x00000000,"explorer.exe /e,/root,""%1""" +; Virtual Device Drivers +HKCR,".386","",0x00000000,"vxdfile" +HKCR,".vxd","",0x00000000,"vxdfile" +HKCR,"vxdfile","",0x00000000,"Virtual Device Driver" + +; Animated Cursors +HKCR,".ani","",0x00000000,"anifile" +HKCR,"anifile","",0x00000000,"Animated Cursor" +HKCR,"anifile\DefaultIcon","",0x00000000,"%1" + +; DOS Batch-Files +HKCR,".bat","",0x00000000,"batfile" +HKCR,"batfile","",0x00000000,"DOS Batch File" +HKCR,"batfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153" +HKCR,"batfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"batfile\shell\open\command","",0x00000000,"""%1"" %*" + +HKCR,".cmd","",0x00000000,"cmdfile" +HKCR,"cmdfile","",0x00000000,"ReactOS Command Script" +HKCR,"cmdfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-153" +HKCR,"cmdfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"cmdfile\shell\open\command","",0x00000000,"""%1"" %*" + +; Get DOS Applications a Icon +HKCR,".com","",0x00000000,"comfile" +HKCR,"comfile","",0x00000000,"DOS Application" +HKCR,"comfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-3" + ; Control Panel extensions HKCR,".cpl","",0x00000000,"cplfile" +HKCR,"cplfile","",0x00000000,"Control Panel Extension" +HKCR,"cplfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" HKCR,"cplfile\shell\cplopen","",0x00000000,"Open with Control Panel" HKCR,"cplfile\shell\cplopen\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe shell32.dll,Control_RunDLL %1,%*" -; Show icons for executables in shell views +; Cursors +HKCR,".cur","",0x00000000,"curfile" +HKCR,"curfile","",0x00000000,"Cursor" +HKCR,"curfile\DefaultIcon","",0x00000000,"%1" + +; Dynamic Link Libraries +HKCR,".dll","",0x00000000,"dllfile" +HKCR,"dllfile","",0x00000000,"Dynamic Link Library" +HKCR,"dllfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" + +; Device Drivers +HKCR,".drv","",0x00000000,"drvfile" +HKCR,"drvfile","",0x00000000,"Device Driver" + +; Applicatons HKCR,".exe","",0x00000000,"exefile" +HKCR,"exefile","",0x00000000,"ReactOS Applicaton" HKCR,"exefile\Defaulticon","",0x00000000,"%1" HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*" + +; Fonts +HKCR,".fon","",0x00000000,"fonfile" +HKCR,"fonfile","",0x00000000,"Font File" +HKCR,"fonfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-155" + +HKCR,".ttf","",0x00000000,"ttffile" +HKCR,"ttffile","",0x00000000,"TrueType Font File" +HKCR,"ttffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156" + +; Help Files +HKCR,".hlp","",0x00000000,"hlpfile" +HKCR,"hlpfile","",0x00000000,"Help File" +HKCR,"hlpfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-24" ; set MIME type for .html and .htm because Tiny webserver needs it HKCR,".htm","",0x00000000,"html" @@ -28,15 +88,24 @@ HKCR,".html","",0x00000000,"html" HKCR,".html","Content Type",0x00000000,"text/html" -; ini (configuration) files +; Icons +HKCR,".ico","",0x00000000,"icofile" +HKCR,"icofile","",0x00000000,"Icon" +HKCR,"icofile\DefaultIcon","",0x00000000,"%1" + +; Configuration Files HKCR,".ini","",0x00000000,"inifile" +HKCR,"inifile","",0x00000000,"Configuration Settings" +HKCR,"inifile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" HKCR,"inifile\shell\open\command","",0x00000000,"notepad.exe ""%1""" -; Show icons for inf (installation) files +; Setup Information Files HKCR,".inf","",0x00000000,"inffile" +HKCR,"inffile","",0x00000000,"Setup Information" +HKCR,"inffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-151" HKCR,"inffile\shell\open\command","",0x00000000,"notepad.exe ""%1""" -HKCR,"inffile\DefaultIcon","",0x00000000,"%SystemRoot%\System32\shell32.dll,-151" -HKCR,"inffile\shell\Install\command","",0x00020000,"%SystemRoot%\System32\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" +HKCR,"inffile\shell\Install","",0x00000000,"Install" +HKCR,"inffile\shell\Install\command","",0x00020000,"%SystemRoot%\system32\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" ; Show icons for shortcuts in shell views (lnkfile is handled specially in shell32) ; Don't display extension for shortcuts @@ -47,12 +116,41 @@ HKCR,"lnkfile\shellex\IconHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,, +; Text Documents +HKCR,".log","",0x00000000,"txtfile" +HKCR,".txt","",0x00000000,"txtfile" +HKCR,"txtfile","",0x00000000,"Text Document" +HKCR,".txt","Content Type",0x00000000,"text/plain" +HKCR,"txtfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-152" +HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" + ; MSI files HKCR,".msi","",0x00000000,"MSI.Package" HKCR,"Msi.Package\DefaultIcon","",0x00000000,"msiexec.exe" -HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\System32\msiexec /i %1" -HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\System32\msiexec /f %1" -HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\System32\msiexec /x %1" +HKCR,"Msi.Package\shell\Open\command","",0x00020000,"%SystemRoot%\system32\msiexec /i %1" +HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\system32\msiexec /f %1" +HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\system32\msiexec /x %1" + +HKCR,".pif","",0x00000000,"piffile" + +; Registration Entries +HKCR,".reg","",0x00000000,"regfile" +HKCR,"regfile","",0x00000000,"Registration Entries" +HKCR,"regfile\DefaultIcon","",0x00020000,"%SystemRoot%\regedit.exe,1" +HKCR,"regfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" +HKCR,"regfile\shell\open","",0x00000000,"Merge" +HKCR,"regfile\shell\open\command","",0x00000000,"regedit.exe ""%1""" + +; Screen Savers +HKCR,".scr","",0x00000000,"scrfile" +HKCR,"scrfile","",0x00000000,"Screen Saver" +HKCR,"scrfile\Defaulticon","",0x00000000,"%1" +HKCR,"scrfile\shell\config","",0x00000000,"Configure" +HKCR,"scrfile\shell\config\command","",0x00000000,"""%1""" +HKCR,"scrfile\shell\install","",0x00000000,"Install" +HKCR,"scrfile\shell\install\command","",0x00000000,"rundll32.exe desk.cpl,InstallScreenSaver %l" +HKCR,"scrfile\shell\open","",0x00000000,"Test" +HKCR,"scrfile\shell\open\command","",0x00000000,"""%1"" /S" ; shell command files (e.g. "Show Desktop" in quicklaunch bar) HKCR,".scf","",0x00000000,"SHCmdFile" @@ -62,10 +160,10 @@ HKCR,"SHCmdFile\CLSID","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" HKCR,"SHCmdFile\shellex\IconHandler","",0x00000000,"{57651662-CE3E-11D0-8D77-00C04FC99D61}" -; install notepad as handler for .txt files -HKCR,".txt","",0x00000000,"txtfile" -HKCR,".txt","Content Type",0x00000000,"text/plain" -HKCR,"txtfile\shell\open\command","",0x00020000,"%SystemRoot%\System32\notepad.exe %1" +System-Files +HKCR,".sys","",0x00000000,"sysfile" +HKCR,"sysfile","",0x00000000,"System File" +HKCR,"sysfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" ; URL shortcuts (e.g. used in favorites folder of IExplorer) HKCR,".url","",0x00000000,"InternetShortcut" @@ -73,6 +171,11 @@ HKCR,"InternetShortcut","IsShortcut",0x00000000,"yes" HKCR,"InternetShortcut\shell\open\command","",0x00000000,"rundll32.exe shdocvw.dll,OpenURL %l" HKCR,"InternetShortcut\DefaultIcon","",0x00020000,"%SystemRoot%\system32\url.dll,0" + +; Wave Sounds +HKCR,".wav","",0x00000000,"SoundRec" +HKCR,"SoundRec","",0x00000000,"Wave Sound" +HKCR,"SoundRec\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-225" HKCR,"CLSID",,0x00000012 @@ -105,15 +208,15 @@ HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" HKCR,"CLSID\{4657278A-411B-11d2-839A-00C04FD918D0}\InProcServer32","ThreadingModel",0x00000000,"Apartment" -; Recycle bin is not implemented (yet???) +; Recycle bin is not implemented ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","",0x00000000,"Recycle Bin" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","LocalizedString",0x00020000,"@%SystemRoot%\system32\shell32.dll,-8964" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","InfoTip",0x00020000,"@%SystemRoot%\system32\shell32.dll,-22915" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","IntroText",0x00020000,"@%SystemRoot%\system32\shell32.dll,-31748" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}","SortOrderIndex",0x00010001,0x00000060 -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","",0x00020000,"%SystemRoot%\System32\shell32.dll,31" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Empty",0x00020000,"%SystemRoot%\System32\shell32.dll,31" -;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Full",0x00020000,"%SystemRoot%\System32\shell32.dll,32" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,31" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Empty",0x00020000,"%SystemRoot%\system32\shell32.dll,31" +;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\DefaultIcon","Full",0x00020000,"%SystemRoot%\system32\shell32.dll,32" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\InProcServer32","",0x00020000,"%SystemRoot%\system32\shell32.dll" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\InProcServer32","ThreadingModel",0x00000000,"Apartment" ;HKCR,"CLSID\{645FF040-5081-101B-9F08-00AA002F954E}\ShellFolder","Attributes",0x00010001,0x20000140

18 years, 4 months

[hpoussin] 21909: Rename IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE to IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO, and send it with major code IRP_MJ_INTERNAL_DEVICE_CONTROL

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon May 15 20:38:49 2006 New Revision: 21909 URL: http://svn.reactos.ru/svn/reactos?rev=21909&view=rev Log: Rename IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE to IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO, and send it with major code IRP_MJ_INTERNAL_DEVICE_CONTROL Modified: trunk/reactos/drivers/usb/miniport/common/main.c trunk/reactos/drivers/usb/miniport/common/pdo.c trunk/reactos/drivers/usb/miniport/common/usbcommon.h trunk/reactos/drivers/usb/miniport/sys/linuxwrapper.c trunk/reactos/drivers/usb/miniport/usb_wrapper.h trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbhub/usbhub.c trunk/reactos/drivers/usb/usbhub/usbhub.h Modified: trunk/reactos/drivers/usb/miniport/common/main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/miniport/common… ============================================================================== --- trunk/reactos/drivers/usb/miniport/common/main.c (original) +++ trunk/reactos/drivers/usb/miniport/common/main.c Mon May 15 20:38:49 2006 @@ -381,7 +381,7 @@ if (((PUSBMP_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) return UsbMpFdoDeviceControl(DeviceObject, Irp); else - return UsbMpPdoDeviceControl(DeviceObject, Irp); + return IrpStub(DeviceObject, Irp); } static NTSTATUS NTAPI Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/miniport/common… ============================================================================== --- trunk/reactos/drivers/usb/miniport/common/pdo.c (original) +++ trunk/reactos/drivers/usb/miniport/common/pdo.c Mon May 15 20:38:49 2006 @@ -60,7 +60,7 @@ } NTSTATUS -UsbMpPdoDeviceControl( +UsbMpPdoInternalDeviceControlCore( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -68,18 +68,18 @@ ULONG_PTR Information = 0; NTSTATUS Status; - DPRINT("UsbMpDeviceControlPdo() called\n"); + DPRINT("UsbMpPdoInternalDeviceControl() called\n"); Stack = IoGetCurrentIrpStackLocation(Irp); Status = Irp->IoStatus.Status; switch (Stack->Parameters.DeviceIoControl.IoControlCode) { - case IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE: + case IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO: { PUSBMP_DEVICE_EXTENSION DeviceExtension; - DPRINT("IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE\n"); + DPRINT("IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); if (Irp->AssociatedIrp.SystemBuffer == NULL || Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(PVOID)) { @@ -609,9 +609,7 @@ } else { - DPRINT("We got IOCTL for UsbCore\n"); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + return UsbMpPdoInternalDeviceControlCore(DeviceObject, Irp); } Modified: trunk/reactos/drivers/usb/miniport/common/usbcommon.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/miniport/common… ============================================================================== --- trunk/reactos/drivers/usb/miniport/common/usbcommon.h (original) +++ trunk/reactos/drivers/usb/miniport/common/usbcommon.h Mon May 15 20:38:49 2006 @@ -90,7 +90,7 @@ IN PIRP Irp); NTSTATUS -UsbMpPdoDeviceControl( +UsbMpInternalPdoDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); Modified: trunk/reactos/drivers/usb/miniport/sys/linuxwrapper.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/miniport/sys/li… ============================================================================== --- trunk/reactos/drivers/usb/miniport/sys/linuxwrapper.c (original) +++ trunk/reactos/drivers/usb/miniport/sys/linuxwrapper.c Mon May 15 20:38:49 2006 @@ -198,7 +198,7 @@ if (drvs_num<MAX_DRVS) { - printk("driver_register %i: %p %p",drvs_num,driver,driver->probe); + printk("driver_register %i: %p %p\n",drvs_num,driver,driver->probe); m_drivers[drvs_num++]=driver; return 0; Modified: trunk/reactos/drivers/usb/miniport/usb_wrapper.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/miniport/usb_wr… ============================================================================== --- trunk/reactos/drivers/usb/miniport/usb_wrapper.h (original) +++ trunk/reactos/drivers/usb/miniport/usb_wrapper.h Mon May 15 20:38:49 2006 @@ -46,5 +46,3 @@ #include "linux/usb.h" #include "linux/pci_ids.h" -#define IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE \ - CTL_CODE(FILE_DEVICE_USB, 4000, METHOD_BUFFERED, FILE_ANY_ACCESS) Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?re… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c Mon May 15 20:38:49 2006 @@ -4,7 +4,7 @@ * FILE: drivers/usb/cromwell/hub/pdo.c * PURPOSE: IRP_MJ_PNP operations for PDOs * - * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.com) + * PROGRAMMERS: Copyright 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) */ #define NDEBUG @@ -14,7 +14,7 @@ #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) NTSTATUS -UsbhubDeviceControlPdo( +UsbhubInternalDeviceControlPdo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -22,18 +22,18 @@ ULONG_PTR Information = 0; NTSTATUS Status; - DPRINT("Usbhub: UsbhubDeviceControlPdo() called\n"); + DPRINT("Usbhub: UsbhubInternalDeviceControlPdo() called\n"); Stack = IoGetCurrentIrpStackLocation(Irp); Status = Irp->IoStatus.Status; switch (Stack->Parameters.DeviceIoControl.IoControlCode) { - case IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE: + case IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO: { PHUB_DEVICE_EXTENSION DeviceExtension; - DPRINT("Usbhub: IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE\n"); + DPRINT("Usbhub: IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); if (Irp->AssociatedIrp.SystemBuffer == NULL || Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(PVOID)) { Modified: trunk/reactos/drivers/usb/usbhub/usbhub.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.c… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.c (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.c Mon May 15 20:38:49 2006 @@ -38,7 +38,7 @@ KeInitializeEvent (&Event, NotificationEvent, FALSE); - Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE, + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO, Pdo, NULL, sizeof(NULL), RootHubPointer, sizeof(*RootHubPointer), @@ -52,6 +52,7 @@ } /* Initialize the status block before sending the IRP */ + IoGetNextIrpStackLocation(Irp)->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; IoStatus.Status = STATUS_NOT_SUPPORTED; IoStatus.Information = 0; @@ -94,7 +95,7 @@ RtlZeroMemory(DeviceExtension, sizeof(HUB_DEVICE_EXTENSION)); /* Get a pointer to the linux structure created by the USB controller, - * by sending IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE to lower device. + * by sending IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO to lower device. */ Status = GetRootHubPointer(Pdo, (PVOID*)&DeviceExtension->dev); if (!NT_SUCCESS(Status)) @@ -159,7 +160,16 @@ if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) return UsbhubDeviceControlFdo(DeviceObject, Irp); else - return UsbhubDeviceControlPdo(DeviceObject, Irp); + return IrpStub(DeviceObject, Irp); +} + +static NTSTATUS STDCALL +DispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) + return IrpStub(DeviceObject, Irp); + else + return UsbhubInternalDeviceControlPdo(DeviceObject, Irp); } static NTSTATUS STDCALL @@ -190,6 +200,7 @@ DriverObject->MajorFunction[IRP_MJ_CLOSE] = UsbhubClose; DriverObject->MajorFunction[IRP_MJ_CLEANUP] = UsbhubCleanup; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = DispatchInternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.h… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h Mon May 15 20:38:49 2006 @@ -80,6 +80,6 @@ IN PIRP Irp); NTSTATUS -UsbhubDeviceControlPdo( +UsbhubInternalDeviceControlPdo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp);

18 years, 4 months

[hpoussin] 21908: Correctly support USB hubs

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon May 15 20:05:02 2006 New Revision: 21908 URL: http://svn.reactos.ru/svn/reactos?rev=21908&view=rev Log: Correctly support USB hubs Modified: trunk/reactos/drivers/usb/usbhub/pdo.c Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?re… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c Mon May 15 20:05:02 2006 @@ -29,6 +29,28 @@ switch (Stack->Parameters.DeviceIoControl.IoControlCode) { + case IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE: + { + PHUB_DEVICE_EXTENSION DeviceExtension; + + DPRINT("Usbhub: IOCTL_INTERNAL_USB_GET_ROOT_USB_DEVICE\n"); + if (Irp->AssociatedIrp.SystemBuffer == NULL + || Stack->Parameters.DeviceIoControl.OutputBufferLength != sizeof(PVOID)) + { + Status = STATUS_INVALID_PARAMETER; + } + else + { + PVOID* pHubPointer; + DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + pHubPointer = (PVOID*)Irp->AssociatedIrp.SystemBuffer; + *pHubPointer = DeviceExtension->dev; + Information = sizeof(PVOID); + Status = STATUS_SUCCESS; + } + break; + } default: { DPRINT1("Usbhub: Unknown IOCTL code 0x%lx\n", Stack->Parameters.DeviceIoControl.IoControlCode); @@ -52,7 +74,6 @@ NTSTATUS Status; DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - DbgBreakPoint(); /* Register and activate device interface */ Status = IoRegisterDeviceInterface(

18 years, 4 months

[cwittich] 21907: added usb.inf for generic usb-hubs

by cwittich＠svn.reactos.org

Author: cwittich Date: Mon May 15 19:47:56 2006 New Revision: 21907 URL: http://svn.reactos.ru/svn/reactos?rev=21907&view=rev Log: added usb.inf for generic usb-hubs Added: trunk/reactos/media/inf/usb.inf Added: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=21907… ============================================================================== --- trunk/reactos/media/inf/usb.inf (added) +++ trunk/reactos/media/inf/usb.inf Mon May 15 19:47:56 2006 @@ -1,0 +1,45 @@ +;USB.INF + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = USB +ClassGUID = {36FC9E60-C465-11CF-8056-444553540000} +Provider = %ReactOS% +DriverVer = 10/02/2005,1.00.0.0 + +[DestinationDirs] +DefaultDestDir = 12 + +[Manufacturer] +%GenericMfg% = GenericMfg + +[GenericMfg] +%USB\CLASS_09.DeviceDesc% = usbhub_Inst,USB\CLASS_09 + +;----------------------- GENERIC USB HUB DRIVER ------------------------- + +[usbhub_Inst.NT] +CopyFiles = usbhub_CopyFiles.NT + +[usbhub_CopyFiles.NT] +usbhub.sys + +[usbhub_Inst.NT.Services] +AddService = usbhub, 0x00000002, usbhub_Service_Inst + +[usbhub_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 1 +ServiceBinary = %12%\usbhub.sys +LoadOrderGroup = Base + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" + +GenericMfg = "(Generic USB-Hub)" +USB\CLASS_09.DeviceDesc = "Generic USB-Hub"

18 years, 4 months

← Newer
1
...
20
21
22
23
24
25
26
...
38
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 2006