Ros-diffs August 2017

ros-diffs@reactos.org

22 participants
262 discussions

[hbelusca] 75636: [SETUPLIB][USETUP]: Code refactoring: rename the old DoesPathExist() into DoesDirExist(), and rename the new DoesPathExistEx() back into DoesPathExist().
by hbelusca＠svn.reactos.org 21 Aug '17

21 Aug '17

Author: hbelusca Date: Mon Aug 21 19:41:40 2017 New Revision: 75636 URL: http://svn.reactos.org/svn/reactos?rev=75636&view=rev Log: [SETUPLIB][USETUP]: Code refactoring: rename the old DoesPathExist() into DoesDirExist(), and rename the new DoesPathExistEx() back into DoesPathExist(). Modified: branches/setup_improvements/base/setup/lib/filesup.c branches/setup_improvements/base/setup/lib/filesup.h branches/setup_improvements/base/setup/lib/osdetect.c branches/setup_improvements/base/setup/usetup/filesup.c branches/setup_improvements/base/setup/usetup/usetup.c Modified: branches/setup_improvements/base/setup/lib/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] Mon Aug 21 19:41:40 2017 @@ -517,7 +517,7 @@ } BOOLEAN -DoesPathExistEx( +DoesPathExist( IN HANDLE RootDirectory OPTIONAL, IN PCWSTR PathName, IN BOOLEAN IsDirectory) Modified: branches/setup_improvements/base/setup/lib/filesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] Mon Aug 21 19:41:40 2017 @@ -63,16 +63,16 @@ IN /* PCWSTR */ ...); BOOLEAN -DoesPathExistEx( +DoesPathExist( IN HANDLE RootDirectory OPTIONAL, IN PCWSTR PathName, IN BOOLEAN IsDirectory); -#define DoesPathExist(RootDirectory, PathName) \ - DoesPathExistEx((RootDirectory), (PathName), TRUE) +#define DoesDirExist(RootDirectory, DirName) \ + DoesPathExist((RootDirectory), (DirName), TRUE) #define DoesFileExist(RootDirectory, FileName) \ - DoesPathExistEx((RootDirectory), (FileName), FALSE) + DoesPathExist((RootDirectory), (FileName), FALSE) // FIXME: DEPRECATED! HACKish function that needs to be deprecated! BOOLEAN Modified: branches/setup_improvements/base/setup/lib/osdetect.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/osdetect.c [iso-8859-1] Mon Aug 21 19:41:40 2017 @@ -355,7 +355,7 @@ /* Check for the existence of \SystemRoot\System32 */ PathName = L"System32\\"; - if (!DoesPathExist(SystemRootDirectory, PathName)) + if (!DoesDirExist(SystemRootDirectory, PathName)) { // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; @@ -363,7 +363,7 @@ /* Check for the existence of \SystemRoot\System32\drivers */ PathName = L"System32\\drivers\\"; - if (!DoesPathExist(SystemRootDirectory, PathName)) + if (!DoesDirExist(SystemRootDirectory, PathName)) { // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; @@ -371,7 +371,7 @@ /* Check for the existence of \SystemRoot\System32\config */ PathName = L"System32\\config\\"; - if (!DoesPathExist(SystemRootDirectory, PathName)) + if (!DoesDirExist(SystemRootDirectory, PathName)) { // DPRINT1("Failed to open directory '%S', Status 0x%08lx\n", PathName, Status); return FALSE; Modified: branches/setup_improvements/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] Mon Aug 21 19:41:40 2017 @@ -113,7 +113,7 @@ *Ptr = 0; DPRINT("PathBuffer: %S\n", PathBuffer); - if (!DoesPathExist(NULL, PathBuffer)) + if (!DoesDirExist(NULL, PathBuffer)) { DPRINT("Create: %S\n", PathBuffer); Status = SetupCreateSingleDirectory(PathBuffer); @@ -127,7 +127,7 @@ Ptr++; } - if (!DoesPathExist(NULL, PathBuffer)) + if (!DoesDirExist(NULL, PathBuffer)) { DPRINT("Create: %S\n", PathBuffer); Status = SetupCreateSingleDirectory(PathBuffer); Modified: branches/setup_improvements/base/setup/usetup/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/usetup.c [iso-8859-1] Mon Aug 21 19:41:40 2017 @@ -4315,7 +4315,7 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { - if (DoesPathExist(NULL, L"\\Device\\Floppy0\\") == FALSE) + if (DoesDirExist(NULL, L"\\Device\\Floppy0\\") == FALSE) { MUIDisplayError(ERROR_NO_FLOPPY, Ir, POPUP_WAIT_ENTER); return BOOT_LOADER_FLOPPY_PAGE;

1 0

[hbelusca] 75635: [SETUPLIB]: Merge DoesPathExist() and DoesFileExist() into (temporarily called) DoesPathExistEx() function, and turn the previous two functions into macros.
by hbelusca＠svn.reactos.org 21 Aug '17

21 Aug '17

Author: hbelusca Date: Mon Aug 21 19:14:33 2017 New Revision: 75635 URL: http://svn.reactos.org/svn/reactos?rev=75635&view=rev Log: [SETUPLIB]: Merge DoesPathExist() and DoesFileExist() into (temporarily called) DoesPathExistEx() function, and turn the previous two functions into macros. Modified: branches/setup_improvements/base/setup/lib/filesup.c branches/setup_improvements/base/setup/lib/filesup.h Modified: branches/setup_improvements/base/setup/lib/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.c [iso-8859-1] Mon Aug 21 19:14:33 2017 @@ -516,19 +516,17 @@ return hr; } -// -// NOTE: It may be possible to merge both DoesPathExist and DoesFileExist... -// BOOLEAN -DoesPathExist( +DoesPathExistEx( IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName) + IN PCWSTR PathName, + IN BOOLEAN IsDirectory) { NTSTATUS Status; + UNICODE_STRING Name; HANDLE FileHandle; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING Name; RtlInitUnicodeString(&Name, PathName); @@ -539,48 +537,20 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_LIST_DIRECTORY | SYNCHRONIZE, + IsDirectory ? (FILE_LIST_DIRECTORY | SYNCHRONIZE) + : FILE_GENERIC_READ, // Contains SYNCHRONIZE &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + FILE_SYNCHRONOUS_IO_NONALERT | + (IsDirectory ? FILE_DIRECTORY_FILE + : FILE_NON_DIRECTORY_FILE)); if (NT_SUCCESS(Status)) NtClose(FileHandle); else - DPRINT1("Failed to open directory '%wZ', Status 0x%08lx\n", &Name, Status); - - return NT_SUCCESS(Status); -} - -BOOLEAN -DoesFileExist( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathNameToFile) -{ - NTSTATUS Status; - UNICODE_STRING FileName; - HANDLE FileHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - - RtlInitUnicodeString(&FileName, PathNameToFile); - - InitializeObjectAttributes(&ObjectAttributes, - &FileName, - OBJ_CASE_INSENSITIVE, - RootDirectory, - NULL); - - Status = NtOpenFile(&FileHandle, - FILE_GENERIC_READ, // Contains SYNCHRONIZE - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); - if (NT_SUCCESS(Status)) - NtClose(FileHandle); - else - DPRINT1("Failed to open file '%wZ', Status 0x%08lx\n", &FileName, Status); + DPRINT1("Failed to open %s '%wZ', Status 0x%08lx\n", + IsDirectory ? "directory" : "file", + &Name, Status); return NT_SUCCESS(Status); } Modified: branches/setup_improvements/base/setup/lib/filesup.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/filesup.h [iso-8859-1] Mon Aug 21 19:14:33 2017 @@ -63,14 +63,16 @@ IN /* PCWSTR */ ...); BOOLEAN -DoesPathExist( +DoesPathExistEx( IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathName); + IN PCWSTR PathName, + IN BOOLEAN IsDirectory); -BOOLEAN -DoesFileExist( - IN HANDLE RootDirectory OPTIONAL, - IN PCWSTR PathNameToFile); +#define DoesPathExist(RootDirectory, PathName) \ + DoesPathExistEx((RootDirectory), (PathName), TRUE) + +#define DoesFileExist(RootDirectory, FileName) \ + DoesPathExistEx((RootDirectory), (FileName), FALSE) // FIXME: DEPRECATED! HACKish function that needs to be deprecated! BOOLEAN

1 0

[gadamopoulos] 75634: [SHELL32] Misc fixes for CFSFolder - GetCLSIDForFileType: Check if the shell extension is blocked by the Blocked key like wine does. - CFSFolder::BindToObject: Remove a redund...
by gadamopoulos＠svn.reactos.org 21 Aug '17

21 Aug '17

Author: gadamopoulos Date: Mon Aug 21 12:18:46 2017 New Revision: 75634 URL: http://svn.reactos.org/svn/reactos?rev=75634&view=rev Log: [SHELL32] Misc fixes for CFSFolder - GetCLSIDForFileType: Check if the shell extension is blocked by the Blocked key like wine does. - CFSFolder::BindToObject: Remove a redundant check as _ILGetFileStructW already does the same check. - CFSFolder::GetUIObjectOf: Do not try to load an IconHandler or an arbitrary extension for directories. - CFSFolder::SetNameOf: Simplify and make secure by using great helpers like wcscmp and PathCombineW Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Mon Aug 21 12:18:46 2017 @@ -109,6 +109,18 @@ } } #endif + + if (RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Blocked", + wszCLSIDValue, + RRF_RT_REG_SZ, + NULL, + NULL, + NULL) == ERROR_SUCCESS) + { + ERR("Extension %S not approved\n", wszCLSIDValue); + return E_ACCESSDENIED; + } HRESULT hres = CLSIDFromString (wszCLSIDValue, pclsid); if (FAILED_UNEXPECTEDLY(hres)) @@ -683,12 +695,6 @@ return E_INVALIDARG; } - if (!_ILIsFolder(pidl) && !_ILIsValue(pidl)) - { - ERR("CFSFolder::BindToObject: Invalid pidl!\n"); - return E_INVALIDARG; - } - /* Get the pidl data */ FileStruct* pData = &_ILGetDataPointer(pidl)->u.file; FileStructW* pDataW = _ILGetFileStructW(pidl); @@ -963,7 +969,7 @@ { *ppvOut = NULL; - if (cidl == 1) + if (cidl == 1 && _ILIsValue(apidl[0])) { hr = _CreateExtensionUIObject(apidl[0], riid, ppvOut); if(hr != S_FALSE) @@ -1001,7 +1007,8 @@ } else if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1)) { - hr = _GetIconHandler(apidl[0], riid, (LPVOID*)&pObj); + if (_ILIsValue(apidl[0])) + hr = _GetIconHandler(apidl[0], riid, (LPVOID*)&pObj); if (hr != S_OK) hr = CFSExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); } @@ -1162,25 +1169,25 @@ PITEMID_CHILD *pPidlOut) { WCHAR szSrc[MAX_PATH + 1], szDest[MAX_PATH + 1]; - LPWSTR ptr; BOOL bIsFolder = _ILIsFolder (ILFindLastID (pidl)); TRACE ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", this, hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); + FileStructW* pDataW = _ILGetFileStructW(pidl); + if (!pDataW) + { + ERR("Got garbage pidl\n"); + return E_INVALIDARG; + } + /* build source path */ - lstrcpynW(szSrc, sPathTarget, MAX_PATH); - ptr = PathAddBackslashW (szSrc); - if (ptr) - _ILSimpleGetTextW (pidl, ptr, MAX_PATH + 1 - (ptr - szSrc)); + PathCombineW(szSrc, sPathTarget, pDataW->wszName); /* build destination path */ - if (dwFlags == SHGDN_NORMAL || dwFlags & SHGDN_INFOLDER) { - lstrcpynW(szDest, sPathTarget, MAX_PATH); - ptr = PathAddBackslashW (szDest); - if (ptr) - lstrcpynW(ptr, lpName, MAX_PATH + 1 - (ptr - szDest)); - } else + if (dwFlags == SHGDN_NORMAL || dwFlags & SHGDN_INFOLDER) + PathCombineW(szDest, sPathTarget, lpName); + else lstrcpynW(szDest, lpName, MAX_PATH); if(!(dwFlags & SHGDN_FORPARSING) && SHELL_FS_HideExtension(szSrc)) { @@ -1192,7 +1199,7 @@ } TRACE ("src=%s dest=%s\n", debugstr_w(szSrc), debugstr_w(szDest)); - if (!memcmp(szSrc, szDest, (wcslen(szDest) + 1) * sizeof(WCHAR))) + if (!wcscmp(szSrc, szDest)) { /* src and destination is the same */ HRESULT hr = S_OK; @@ -1201,7 +1208,6 @@ return hr; } - if (MoveFileW (szSrc, szDest)) {

1 0

[gadamopoulos] 75633: [SHELL32] -CFSFolder: Fix a couple of handle leaks.
by gadamopoulos＠svn.reactos.org 21 Aug '17

21 Aug '17

Author: gadamopoulos Date: Mon Aug 21 09:07:41 2017 New Revision: 75633 URL: http://svn.reactos.org/svn/reactos?rev=75633&view=rev Log: [SHELL32] -CFSFolder: Fix a couple of handle leaks. Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Mon Aug 21 09:07:41 2017 @@ -85,7 +85,9 @@ WCHAR wszCLSIDValue[CHARS_IN_GUID]; DWORD dwSize = sizeof(wszCLSIDValue); - if (RegGetValueW(hkeyProgId, NULL, NULL, RRF_RT_REG_SZ, NULL, wszCLSIDValue, &dwSize)) + LONG res = RegGetValueW(hkeyProgId, NULL, NULL, RRF_RT_REG_SZ, NULL, wszCLSIDValue, &dwSize); + RegCloseKey(hkeyProgId); + if (res) { ERR("OpenKeyFromFileType succeeded but RegGetValueW failed\n"); return S_FALSE; @@ -254,6 +256,9 @@ { initIcon->SetNormalIcon(swShell32Name, 0); } + + if (hkey) + RegCloseKey(hkey); } return initIcon->QueryInterface(iid, ppvOut);

1 0

[hbelusca] 75632: [SETUPLIB]: Factor out and introduce a ParseArcName() helper function that does its job. Used in exiting code and in later code in this file.
by hbelusca＠svn.reactos.org 20 Aug '17

20 Aug '17

Author: hbelusca Date: Sun Aug 20 21:30:13 2017 New Revision: 75632 URL: http://svn.reactos.org/svn/reactos?rev=75632&view=rev Log: [SETUPLIB]: Factor out and introduce a ParseArcName() helper function that does its job. Used in exiting code and in later code in this file. Modified: branches/setup_improvements/base/setup/lib/arcname.c Modified: branches/setup_improvements/base/setup/lib/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] Sun Aug 20 21:30:13 2017 @@ -345,6 +345,218 @@ /* + * ArcNamePath: + * In input, pointer to an ARC path (NULL-terminated) starting by an + * ARC name to be parsed into its different components. + * In output, ArcNamePath points to the beginning of the path after + * the ARC name part. + */ +static NTSTATUS +ParseArcName( + IN OUT PCWSTR* ArcNamePath, + OUT PULONG pAdapterKey, + OUT PULONG pControllerKey, + OUT PULONG pPeripheralKey, + OUT PULONG pPartitionNumber, + OUT PADAPTER_TYPE pAdapterType, + OUT PCONTROLLER_TYPE pControllerType, + OUT PPERIPHERAL_TYPE pPeripheralType, + OUT PBOOLEAN pUseSignature) +{ + WCHAR TokenBuffer[50]; + UNICODE_STRING Token; + PCWSTR p, q; + ULONG AdapterKey; + ULONG ControllerKey; + ULONG PeripheralKey; + ULONG PartitionNumber; + ADAPTER_TYPE AdapterType; + CONTROLLER_TYPE ControllerType; + PERIPHERAL_TYPE PeripheralType; + BOOLEAN UseSignature = FALSE; + + /* + * The format of ArcName is: + * adapter(www)[controller(xxx)peripheral(yyy)[partition(zzz)][filepath]] , + * where the [filepath] part is not being parsed. + */ + + RtlInitEmptyUnicodeString(&Token, TokenBuffer, sizeof(TokenBuffer)); + + p = *ArcNamePath; + + /* Retrieve the adapter */ + p = ArcGetNextTokenU(p, &Token, &AdapterKey); + if (!p) + { + DPRINT1("No adapter specified!\n"); + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + + /* Check for the 'signature()' pseudo-adapter, introduced in Windows 2000 */ + if (_wcsicmp(Token.Buffer, L"signature") == 0) + { + /* + * We've got a signature! Remember this for later, and set the adapter type to SCSI. + * We however check that the rest of the ARC path is valid by parsing the other tokens. + * AdapterKey stores the disk signature value (that holds in a ULONG). + */ + UseSignature = TRUE; + AdapterType = ScsiAdapter; + } + else + { + /* Check for regular adapters */ + AdapterType = (ADAPTER_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, AdapterTypes_U); + if (AdapterType >= AdapterTypeMax) + { + DPRINT1("Invalid adapter type %wZ\n", &Token); + return STATUS_OBJECT_NAME_INVALID; + } + + /* Check for adapters that don't take any extra controller or peripheral nodes */ + if (AdapterType == NetAdapter || AdapterType == RamdiskAdapter) + { + // if (*p) + // return STATUS_OBJECT_PATH_SYNTAX_BAD; + + if (AdapterType == NetAdapter) + { + DPRINT1("%S(%lu) path is not supported!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_NOT_SUPPORTED; + } + + goto Quit; + } + } + + /* Here, we have either an 'eisa', a 'scsi/signature', or a 'multi' adapter */ + + /* Check for a valid controller */ + p = ArcGetNextTokenU(p, &Token, &ControllerKey); + if (!p) + { + DPRINT1("%S(%lu) adapter doesn't have a controller!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + ControllerType = (CONTROLLER_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, ControllerTypes_U); + if (ControllerType >= ControllerTypeMax) + { + DPRINT1("Invalid controller type %wZ\n", &Token); + return STATUS_OBJECT_NAME_INVALID; + } + + /* Here the controller can only be either a disk or a CDROM */ + + /* + * Ignore the controller in case we have a 'multi' adapter. + * I guess a similar condition holds for the 'eisa' adapter too... + * + * For SignatureAdapter, as similar for ScsiAdapter, the controller key corresponds + * to the disk target ID. Note that actually, the implementation just ignores the + * target ID, as well as the LUN, and just loops over all the available disks and + * searches for the one having the correct signature. + */ + if ((AdapterType == MultiAdapter /* || AdapterType == EisaAdapter */) && ControllerKey != 0) + { + DPRINT1("%S(%lu) adapter with %S(%lu non-zero), ignored!\n", + AdapterTypes_U[AdapterType], AdapterKey, + ControllerTypes_U[ControllerType], ControllerKey); + ControllerKey = 0; + } + + /* + * Only the 'scsi' adapter supports a direct 'cdrom' controller. + * For the others, we need a 'disk' controller to which a 'cdrom' peripheral can talk to. + */ + if ((AdapterType != ScsiAdapter) && (ControllerType == CdRomController)) + { + DPRINT1("%S(%lu) adapter cannot have a CDROM controller!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_OBJECT_PATH_INVALID; + } + + /* Check for a valid peripheral */ + p = ArcGetNextTokenU(p, &Token, &PeripheralKey); + if (!p) + { + DPRINT1("%S(%lu)%S(%lu) adapter-controller doesn't have a peripheral!\n", + AdapterTypes_U[AdapterType], AdapterKey, + ControllerTypes_U[ControllerType], ControllerKey); + return STATUS_OBJECT_PATH_SYNTAX_BAD; + } + PeripheralType = (PERIPHERAL_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, PeripheralTypes_U); + if (PeripheralType >= PeripheralTypeMax) + { + DPRINT1("Invalid peripheral type %wZ\n", &Token); + return STATUS_OBJECT_NAME_INVALID; + } + + /* + * If we had a 'cdrom' controller already, the corresponding peripheral can only be 'fdisk' + * (see for example the ARC syntax for SCSI CD-ROMs: scsi(x)cdrom(y)fdisk(z) where z == 0). + */ + if ((ControllerType == CdRomController) && (PeripheralType != FDiskPeripheral)) + { + DPRINT1("%S(%lu) controller cannot have a %S(%lu) peripheral! (note that we haven't check whether the adapter was SCSI or not)\n", + ControllerTypes_U[ControllerType], ControllerKey, + PeripheralTypes_U[PeripheralType], PeripheralKey); + return STATUS_OBJECT_PATH_INVALID; + } + + /* For a 'scsi' adapter, the possible peripherals are only 'rdisk' or 'fdisk' */ + if (AdapterType == ScsiAdapter && !(PeripheralType == RDiskPeripheral || PeripheralType == FDiskPeripheral)) + { + DPRINT1("%S(%lu)%S(%lu) SCSI adapter-controller has an invalid peripheral %S(%lu) !\n", + AdapterTypes_U[AdapterType], AdapterKey, + ControllerTypes_U[ControllerType], ControllerKey, + PeripheralTypes_U[PeripheralType], PeripheralKey); + return STATUS_OBJECT_PATH_INVALID; + } + +#if 0 + if (AdapterType == SignatureAdapter && PeripheralKey != 0) + { + DPRINT1("%S(%lu) adapter with %S(%lu non-zero), ignored!\n", + AdapterTypes_U[AdapterType], AdapterKey, + PeripheralTypes_U[PeripheralType], PeripheralKey); + PeripheralKey = 0; + } +#endif + + /* Check for the optional 'partition' specifier */ + q = ArcGetNextTokenU(p, &Token, &PartitionNumber); + if (q && _wcsicmp(Token.Buffer, L"partition") == 0) + { + /* We've got a partition! */ + p = q; + } + else + { + /* + * Either no other ARC token was found, or we've got something else + * (possibly invalid or not)... + */ + PartitionNumber = 0; + } + + // TODO: Check the partition number in case of fdisks and cdroms?? + +Quit: + /* Return the results */ + *ArcNamePath = p; + *pAdapterKey = AdapterKey; + *pControllerKey = ControllerKey; + *pPeripheralKey = PeripheralKey; + *pPartitionNumber = PartitionNumber; + *pAdapterType = AdapterType; + *pControllerType = ControllerType; + *pPeripheralType = PeripheralType; + *pUseSignature = UseSignature; + + return STATUS_SUCCESS; +} + +/* * ArcName: * ARC name (counted string) to be resolved into a NT device name. * The caller should have already delimited it from within an ARC path @@ -434,12 +646,12 @@ /* * ArcNamePath: - * In input, pointer to an ARC path (NULL-terminated) starting by an ARC name - * to be resolved into a NT device name. - * In opposition to ResolveArcNameNtSymLink(), the caller does not have to - * delimit the ARC name from within an ARC path. The real ARC name is deduced - * after parsing the ARC path, and, in output, ArcNamePath points to the - * beginning of the path after the ARC name part. + * In input, pointer to an ARC path (NULL-terminated) starting by an + * ARC name to be resolved into a NT device name. + * In opposition to ResolveArcNameNtSymLink(), the caller does not have + * to delimit the ARC name from within an ARC path. The real ARC name is + * deduced after parsing the ARC path, and, in output, ArcNamePath points + * to the beginning of the path after the ARC name part. * * NtName: * Receives the resolved NT name. The buffer is NULL-terminated. @@ -452,12 +664,10 @@ ResolveArcNameManually( OUT PUNICODE_STRING NtName, IN OUT PCWSTR* ArcNamePath, - IN PPARTLIST PartList OPTIONAL) -{ + IN PPARTLIST PartList) +{ + NTSTATUS Status; HRESULT hr; - WCHAR TokenBuffer[50]; - UNICODE_STRING Token; - PCWSTR p, q; ULONG AdapterKey; ULONG ControllerKey; ULONG PeripheralKey; @@ -465,7 +675,7 @@ ADAPTER_TYPE AdapterType; CONTROLLER_TYPE ControllerType; PERIPHERAL_TYPE PeripheralType; - BOOLEAN UseSignature = FALSE; + BOOLEAN UseSignature; PDISKENTRY DiskEntry; PPARTENTRY PartEntry = NULL; @@ -478,176 +688,34 @@ NtName->Length = 0; #endif - /* - * The format of ArcName is: - * adapter(www)[controller(xxx)peripheral(yyy)[partition(zzz)][filepath]] , - * where the [filepath] part is not being parsed. - */ - - RtlInitEmptyUnicodeString(&Token, TokenBuffer, sizeof(TokenBuffer)); - - p = *ArcNamePath; - - /* Retrieve the adapter */ - p = ArcGetNextTokenU(p, &Token, &AdapterKey); - if (!p) - { - DPRINT1("No adapter specified!\n"); - return STATUS_OBJECT_PATH_SYNTAX_BAD; - } - - /* Check for the 'signature()' pseudo-adapter, introduced in Windows 2000 */ - if (_wcsicmp(Token.Buffer, L"signature") == 0) - { - /* - * We've got a signature! Remember this for later, and set the adapter type to SCSI. - * We however check that the rest of the ARC path is valid by parsing the other tokens. - * AdapterKey stores the disk signature value (that holds in a ULONG). - */ - UseSignature = TRUE; - AdapterType = ScsiAdapter; + /* Parse the ARC path */ + Status = ParseArcName(ArcNamePath, + &AdapterKey, + &ControllerKey, + &PeripheralKey, + &PartitionNumber, + &AdapterType, + &ControllerType, + &PeripheralType, + &UseSignature); + if (!NT_SUCCESS(Status)) + return Status; + + // TODO: Check the partition number in case of fdisks and cdroms?? + + /* Check for adapters that don't take any extra controller or peripheral nodes */ + if (AdapterType == NetAdapter || AdapterType == RamdiskAdapter) + { + if (AdapterType == NetAdapter) + { + DPRINT1("%S(%lu) path is not supported!\n", AdapterTypes_U[AdapterType], AdapterKey); + return STATUS_NOT_SUPPORTED; + } + + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Ramdisk%lu", AdapterKey); } else - { - /* Check for regular adapters */ - AdapterType = (ADAPTER_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, AdapterTypes_U); - if (AdapterType >= AdapterTypeMax) - { - DPRINT1("Invalid adapter type %wZ\n", &Token); - return STATUS_OBJECT_NAME_INVALID; - } - - /* Check for adapters that don't take any extra controller or peripheral nodes */ - if (AdapterType == NetAdapter || AdapterType == RamdiskAdapter) - { - // if (*p) - // return STATUS_OBJECT_PATH_SYNTAX_BAD; - - if (AdapterType == NetAdapter) - { - DPRINT1("%S(%lu) path is not supported!\n", AdapterTypes_U[AdapterType], AdapterKey); - return STATUS_NOT_SUPPORTED; - } - - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, - L"\\Device\\Ramdisk%lu", AdapterKey); - goto Quit; - } - } - - /* Here, we have either an 'eisa', a 'scsi/signature', or a 'multi' adapter */ - - /* Check for a valid controller */ - p = ArcGetNextTokenU(p, &Token, &ControllerKey); - if (!p) - { - DPRINT1("%S(%lu) adapter doesn't have a controller!\n", AdapterTypes_U[AdapterType], AdapterKey); - return STATUS_OBJECT_PATH_SYNTAX_BAD; - } - ControllerType = (CONTROLLER_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, ControllerTypes_U); - if (ControllerType >= ControllerTypeMax) - { - DPRINT1("Invalid controller type %wZ\n", &Token); - return STATUS_OBJECT_NAME_INVALID; - } - - /* Here the controller can only be either a disk or a CDROM */ - - /* - * Ignore the controller in case we have a 'multi' adapter. - * I guess a similar condition holds for the 'eisa' adapter too... - * - * For SignatureAdapter, as similar for ScsiAdapter, the controller key corresponds - * to the disk target ID. Note that actually, the implementation just ignores the - * target ID, as well as the LUN, and just loops over all the available disks and - * searches for the one having the correct signature. - */ - if ((AdapterType == MultiAdapter /* || AdapterType == EisaAdapter */) && ControllerKey != 0) - { - DPRINT1("%S(%lu) adapter with %S(%lu non-zero), ignored!\n", - AdapterTypes_U[AdapterType], AdapterKey, - ControllerTypes_U[ControllerType], ControllerKey); - ControllerKey = 0; - } - - /* - * Only the 'scsi' adapter supports a direct 'cdrom' controller. - * For the others, we need a 'disk' controller to which a 'cdrom' peripheral can talk to. - */ - if ((AdapterType != ScsiAdapter) && (ControllerType == CdRomController)) - { - DPRINT1("%S(%lu) adapter cannot have a CDROM controller!\n", AdapterTypes_U[AdapterType], AdapterKey); - return STATUS_OBJECT_PATH_INVALID; - } - - /* Check for a valid peripheral */ - p = ArcGetNextTokenU(p, &Token, &PeripheralKey); - if (!p) - { - DPRINT1("%S(%lu)%S(%lu) adapter-controller doesn't have a peripheral!\n", - AdapterTypes_U[AdapterType], AdapterKey, - ControllerTypes_U[ControllerType], ControllerKey); - return STATUS_OBJECT_PATH_SYNTAX_BAD; - } - PeripheralType = (PERIPHERAL_TYPE)/*ArcMatchTokenU*/ArcMatchToken_UStr(/*Token.Buffer*/&Token, PeripheralTypes_U); - if (PeripheralType >= PeripheralTypeMax) - { - DPRINT1("Invalid peripheral type %wZ\n", &Token); - return STATUS_OBJECT_NAME_INVALID; - } - - /* - * If we had a 'cdrom' controller already, the corresponding peripheral can only be 'fdisk' - * (see for example the ARC syntax for SCSI CD-ROMs: scsi(x)cdrom(y)fdisk(z) where z == 0). - */ - if ((ControllerType == CdRomController) && (PeripheralType != FDiskPeripheral)) - { - DPRINT1("%S(%lu) controller cannot have a %S(%lu) peripheral! (note that we haven't check whether the adapter was SCSI or not)\n", - ControllerTypes_U[ControllerType], ControllerKey, - PeripheralTypes_U[PeripheralType], PeripheralKey); - return STATUS_OBJECT_PATH_INVALID; - } - - /* For a 'scsi' adapter, the possible peripherals are only 'rdisk' or 'fdisk' */ - if (AdapterType == ScsiAdapter && !(PeripheralType == RDiskPeripheral || PeripheralType == FDiskPeripheral)) - { - DPRINT1("%S(%lu)%S(%lu) SCSI adapter-controller has an invalid peripheral %S(%lu) !\n", - AdapterTypes_U[AdapterType], AdapterKey, - ControllerTypes_U[ControllerType], ControllerKey, - PeripheralTypes_U[PeripheralType], PeripheralKey); - return STATUS_OBJECT_PATH_INVALID; - } - -#if 0 - if (AdapterType == SignatureAdapter && PeripheralKey != 0) - { - DPRINT1("%S(%lu) adapter with %S(%lu non-zero), ignored!\n", - AdapterTypes_U[AdapterType], AdapterKey, - PeripheralTypes_U[PeripheralType], PeripheralKey); - PeripheralKey = 0; - } -#endif - - /* Check for the optional 'partition' specifier */ - q = ArcGetNextTokenU(p, &Token, &PartitionNumber); - if (q && _wcsicmp(Token.Buffer, L"partition") == 0) - { - /* We've got a partition! */ - p = q; - } - else - { - /* - * Either no other ARC token was found, or we've got something else - * (possibly invalid or not)... - */ - PartitionNumber = 0; - } - - - // TODO: Check the partition number in case of fdisks and cdroms?? - - if (ControllerType == CdRomController) // and so, AdapterType == ScsiAdapter and PeripheralType == FDiskPeripheral { hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, @@ -718,7 +786,6 @@ return (NTSTATUS)hr; } - *ArcNamePath = p; return STATUS_SUCCESS; }

1 0

[hbelusca] 75631: [SETUPLIB]: Code formatting (cut out the too long lines).
by hbelusca＠svn.reactos.org 20 Aug '17

20 Aug '17

Author: hbelusca Date: Sun Aug 20 21:02:24 2017 New Revision: 75631 URL: http://svn.reactos.org/svn/reactos?rev=75631&view=rev Log: [SETUPLIB]: Code formatting (cut out the too long lines). Modified: branches/setup_improvements/base/setup/lib/arcname.c Modified: branches/setup_improvements/base/setup/lib/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/l… ============================================================================== --- branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/lib/arcname.c [iso-8859-1] Sun Aug 20 21:02:24 2017 @@ -32,6 +32,8 @@ #include <debug.h> +/* TYPEDEFS *****************************************************************/ + /* Supported adapter types */ typedef enum _ADAPTER_TYPE { @@ -110,7 +112,7 @@ /* FUNCTIONS ****************************************************************/ -PCSTR +/* static */ PCSTR ArcGetNextTokenA( IN PCSTR ArcPath, OUT PANSI_STRING TokenSpecifier, @@ -170,7 +172,7 @@ return ++p; } -PCWSTR +static PCWSTR ArcGetNextTokenU( IN PCWSTR ArcPath, OUT PUNICODE_STRING TokenSpecifier, @@ -233,7 +235,7 @@ } -ULONG +/* static */ ULONG ArcMatchTokenA( IN PCSTR CandidateToken, IN const PCSTR* TokenTable) @@ -248,7 +250,7 @@ return Index; } -ULONG +static ULONG ArcMatchTokenU( IN PCWSTR CandidateToken, IN const PCWSTR* TokenTable) @@ -263,7 +265,7 @@ return Index; } -ULONG +static ULONG ArcMatchToken_UStr( IN PCUNICODE_STRING CandidateToken, IN const PCWSTR* TokenTable) @@ -527,7 +529,8 @@ return STATUS_NOT_SUPPORTED; } - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Ramdisk%lu", AdapterKey); + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Ramdisk%lu", AdapterKey); goto Quit; } } @@ -646,14 +649,23 @@ if (ControllerType == CdRomController) // and so, AdapterType == ScsiAdapter and PeripheralType == FDiskPeripheral - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Scsi\\CdRom%lu", ControllerKey); + { + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Scsi\\CdRom%lu", ControllerKey); + } else /* Now, ControllerType == DiskController */ if (PeripheralType == CdRomPeripheral) - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\CdRom%lu", PeripheralKey); + { + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\CdRom%lu", PeripheralKey); + } else if (PeripheralType == FDiskPeripheral) - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Floppy%lu", PeripheralKey); + { + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Floppy%lu", PeripheralKey); + } else if (PeripheralType == RDiskPeripheral) { @@ -678,7 +690,8 @@ ASSERT(PartEntry->DiskEntry == DiskEntry); } - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\Harddisk%lu\\Partition%lu", + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\Harddisk%lu\\Partition%lu", DiskEntry->DiskNumber, PartitionNumber); } #if 0 @@ -686,7 +699,8 @@ if (PeripheralType == VDiskPeripheral) { // TODO: Check how Win 7+ deals with virtual disks. - hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, L"\\Device\\VirtualHarddisk%lu\\Partition%lu", + hr = StringCbPrintfW(NtName->Buffer, NtName->MaximumLength, + L"\\Device\\VirtualHarddisk%lu\\Partition%lu", PeripheralKey, PartitionNumber); } #endif

1 0

[cfinck] 75630: [FS_REC] - Add a detection routine for CDFS (ISO-9660) volumes that verifies the Primary Volume Descriptor. - Use this to also detect CDFS on disks and load the CDFS driver if it ha...
by cfinck＠svn.reactos.org 20 Aug '17

20 Aug '17

Author: cfinck Date: Sun Aug 20 15:30:59 2017 New Revision: 75630 URL: http://svn.reactos.org/svn/reactos?rev=75630&view=rev Log: [FS_REC] - Add a detection routine for CDFS (ISO-9660) volumes that verifies the Primary Volume Descriptor. - Use this to also detect CDFS on disks and load the CDFS driver if it has not been loaded yet (e.g. when a bootcd/livecd flashed USB drive is inserted at boot of an installed ReactOS). - Fix a comment in udfs.c. Added: trunk/reactos/drivers/filesystems/fs_rec/cdfs.h (with props) Modified: trunk/reactos/drivers/filesystems/fs_rec/cdfs.c trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c trunk/reactos/drivers/filesystems/fs_rec/udfs.c Modified: trunk/reactos/drivers/filesystems/fs_rec/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/cdfs.c [iso-8859-1] Sun Aug 20 15:30:59 2017 @@ -1,10 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS File System Recognizer - * FILE: drivers/filesystems/fs_rec/cdfs.c - * PURPOSE: CDFS Recognizer - * PROGRAMMER: Alex Ionescu (alex.ionescu(a)reactos.org) - * Eric Kohl + * PROJECT: ReactOS File System Recognizer + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0) + * PURPOSE: CDFS Recognizer + * COPYRIGHT: Copyright 2002 Eric Kohl + * Copyright 2007 Alex Ionescu <alex.ionescu(a)reactos.org> + * Copyright 2017 Colin Finck <colin(a)reactos.org> */ /* INCLUDES *****************************************************************/ @@ -14,13 +14,60 @@ #define NDEBUG #include <debug.h> +#include "cdfs.h" + /* FUNCTIONS ****************************************************************/ + +BOOLEAN +NTAPI +FsRecIsCdfsVolume(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize) +{ + BOOLEAN bReturnValue = FALSE; + LARGE_INTEGER Offset; + PVD_HEADER pVdHeader = NULL; + PAGED_CODE(); + + // Read the Primary Volume Descriptor. + Offset.QuadPart = VD_HEADER_OFFSET; + if (!FsRecReadBlock(DeviceObject, &Offset, sizeof(VD_HEADER), SectorSize, (PVOID*)&pVdHeader, NULL)) + { + // We cannot read this block, so no reason to let the CDFS driver try it. + goto Cleanup; + } + + // Verify the fields. + if (pVdHeader->Type != VD_TYPE_PRIMARY) + goto Cleanup; + + DPRINT("pVdHeader->Type verified!\n"); + + if (RtlCompareMemory(pVdHeader->Identifier, VD_IDENTIFIER, VD_IDENTIFIER_LENGTH) != VD_IDENTIFIER_LENGTH) + goto Cleanup; + + DPRINT("pVdHeader->Identifier verified!\n"); + + if (pVdHeader->Version != VD_VERSION) + goto Cleanup; + + DPRINT("pVdHeader->Version verified! This is a CDFS volume!\n"); + + bReturnValue = TRUE; + +Cleanup: + if (pVdHeader) + ExFreePool(pVdHeader); + + return bReturnValue; +} NTSTATUS NTAPI FsRecCdfsFsControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PDEVICE_OBJECT MountDevice; + ULONG SectorSize; PIO_STACK_LOCATION Stack; NTSTATUS Status; PAGED_CODE(); @@ -31,8 +78,21 @@ { case IRP_MN_MOUNT_VOLUME: - /* We don't validate */ - Status = STATUS_FS_DRIVER_REQUIRED; + /* Assume failure */ + Status = STATUS_UNRECOGNIZED_VOLUME; + + /* Get the device object and request the sector size */ + MountDevice = Stack->Parameters.MountVolume.DeviceObject; + if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) + { + /* Check if it's an actual CDFS (ISO-9660) volume */ + if (FsRecIsCdfsVolume(MountDevice, SectorSize)) + { + /* It is! */ + Status = STATUS_FS_DRIVER_REQUIRED; + } + } + break; case IRP_MN_LOAD_FILE_SYSTEM: Added: trunk/reactos/drivers/filesystems/fs_rec/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/cdfs.h (added) +++ trunk/reactos/drivers/filesystems/fs_rec/cdfs.h [iso-8859-1] Sun Aug 20 15:30:59 2017 @@ -0,0 +1,24 @@ +/* + * PROJECT: ReactOS File System Recognizer + * LICENSE: GPL-2.0 (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: CDFS Recognizer + * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + */ + +// Information from http://wiki.osdev.org/ISO_9660#Volume_Descriptors + +// Structures +typedef struct _VD_HEADER +{ + char Type; + char Identifier[5]; + char Version; +} +VD_HEADER, *PVD_HEADER; + +// Constants +#define VD_HEADER_OFFSET 32768 // Offset of the VD Header +#define VD_IDENTIFIER "CD001" // Identifier that must be in the Volume Descriptor +#define VD_IDENTIFIER_LENGTH 5 // Character count of VD_IDENTIFIER +#define VD_TYPE_PRIMARY 1 // Type code for Primary Volume Descriptor +#define VD_VERSION 1 // Volume Descriptor Version Propchange: trunk/reactos/drivers/filesystems/fs_rec/cdfs.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/fs_rec.c [iso-8859-1] Sun Aug 20 15:30:59 2017 @@ -316,6 +316,7 @@ { ULONG DeviceCount = 0; NTSTATUS Status; + PDEVICE_OBJECT CdfsObject; PDEVICE_OBJECT UdfsObject; PAGED_CODE(); @@ -340,14 +341,24 @@ DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = FsRecFsControl; DriverObject->DriverUnload = FsRecUnload; - /* Register CDFS */ - Status = FsRecRegisterFs(DriverObject, - NULL, - NULL, + /* Register CDFS for CDs */ + Status = FsRecRegisterFs(DriverObject, + NULL, + &CdfsObject, L"\\Cdfs", L"\\FileSystem\\CdfsRecognizer", FS_TYPE_CDFS, FILE_DEVICE_CD_ROM_FILE_SYSTEM); + if (NT_SUCCESS(Status)) DeviceCount++; + + /* Register CDFS for HDDs */ + Status = FsRecRegisterFs(DriverObject, + CdfsObject, + NULL, + L"\\CdfsHdd", + L"\\FileSystem\\CdfsHddRecognizer", + FS_TYPE_CDFS, + FILE_DEVICE_DISK_FILE_SYSTEM); if (NT_SUCCESS(Status)) DeviceCount++; /* Register UDFS for CDs */ Modified: trunk/reactos/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/udfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fs_rec/udfs.c [iso-8859-1] Sun Aug 20 15:30:59 2017 @@ -125,7 +125,7 @@ MountDevice = Stack->Parameters.MountVolume.DeviceObject; if (FsRecGetDeviceSectorSize(MountDevice, &SectorSize)) { - /* Check if it's an actual FAT volume */ + /* Check if it's an actual UDF volume */ if (FsRecIsUdfsVolume(MountDevice, SectorSize)) { /* It is! */

1 0

[tfaber] 75629: [HDAUDBUS] - Correctly disable interrupts for status change events. Fixes infinite "HDA_InterruptService c0000000" debug spam (interrupt storm) on VMware with HDAudio sound enabled....
by tfaber＠svn.reactos.org 20 Aug '17

20 Aug '17

Author: tfaber Date: Sun Aug 20 15:02:53 2017 New Revision: 75629 URL: http://svn.reactos.org/svn/reactos?rev=75629&view=rev Log: [HDAUDBUS] - Correctly disable interrupts for status change events. Fixes infinite "HDA_InterruptService c0000000" debug spam (interrupt storm) on VMware with HDAudio sound enabled. CORE-13704 #resolve Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp [iso-8859-1] Sun Aug 20 15:02:53 2017 @@ -603,7 +603,7 @@ // them, as we want to use the STATE_STATUS register to identify // available codecs. We'd have to clear that register in the interrupt // handler to 'ack' the codec change. - Value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_WAKE_ENABLE)) & HDAC_WAKE_ENABLE_MASK; + Value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_WAKE_ENABLE)) & ~HDAC_WAKE_ENABLE_MASK; WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_WAKE_ENABLE), Value); // Enable controller interrupts

1 0

[hbelusca] 75628: [BROWSEUI]: Improve the rendering of the toolbar pin buttons. By dsp8195. Sorry for the delay! CORE-10838
by hbelusca＠svn.reactos.org 20 Aug '17

20 Aug '17

Author: hbelusca Date: Sun Aug 20 12:05:25 2017 New Revision: 75628 URL: http://svn.reactos.org/svn/reactos?rev=75628&view=rev Log: [BROWSEUI]: Improve the rendering of the toolbar pin buttons. By dsp8195. Sorry for the delay! CORE-10838 Modified: trunk/reactos/dll/win32/browseui/res/barbtn.bmp Modified: trunk/reactos/dll/win32/browseui/res/barbtn.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/res/bar… ============================================================================== Binary files - no diff available.

1 0

[ekohl] 75627: [SHELL32] Folder Options: Japanese TreeView translation. Patch by Katajama Hirofumi MZ. CORE-13690
by ekohl＠svn.reactos.org 20 Aug '17

20 Aug '17

Author: ekohl Date: Sun Aug 20 08:47:23 2017 New Revision: 75627 URL: http://svn.reactos.org/svn/reactos?rev=75627&view=rev Log: [SHELL32] Folder Options: Japanese TreeView translation. Patch by Katajama Hirofumi MZ. CORE-13690 Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Sun Aug 20 08:47:23 2017 @@ -819,7 +819,7 @@ /* As in 'INI File' or 'WAV File', fallback string for no-name extensions used in the _File type_ tab of the _Folder Options_ dialog */ - IDS_FILE_EXT_TYPE "%s File" + IDS_FILE_EXT_TYPE "%s ãã¡ã¤ã«" IDS_BYTES_FORMAT "ãã¤ã" IDS_UNKNOWN_APP "æªç¥ã®ã¢ããª" @@ -829,23 +829,23 @@ IDS_OBJECTS "%d åã®ãªãã¸ã§ã¯ã" IDS_OBJECTS_SELECTED "%d åã®ãªãã¸ã§ã¯ããé¸ææ¸ã¿" - IDS_ADVANCED_FOLDER "Files and Folders" - IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers" - IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips" - IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list" - IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders" - IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar" - IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar" - IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails" - IDS_ADVANCED_HIDDEN "Hidden files and folders" - IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders" - IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders" - IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types" - IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)" - IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process" - IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings" - IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon" - IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" - IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" - IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" -END + IDS_ADVANCED_FOLDER "ãã¡ã¤ã«ã¨ãã©ã«ã" + IDS_ADVANCED_NET_CRAWLER "èªåçã«ãããã¯ã¼ã¯ãã©ã«ãã¨ããªã³ã¿ãæ¤ç´¢ãã" + IDS_ADVANCED_FOLDER_SIZE_TIP "ãã©ã«ã ãããã«ãã¡ã¤ã«ãµã¤ãºæå ±ãè¡¨ç¤ºãã" + IDS_ADVANCED_FRIENDLY_TREE "ã¨ã¯ã¹ããã¼ã©ã®ãã©ã«ã ãªã¹ãã§ã·ã³ãã«ãªãã©ã«ããã¥ã¼ãè¡¨ç¤ºãã" + IDS_ADVANCED_WEB_VIEW_BARRICADE "ã·ã¹ãã ãã©ã«ãã®ä¸èº«ãè¡¨ç¤ºãã" + IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "ã¢ãã¬ã¹ ãã¼ã§ãã«ãã¹ãè¡¨ç¤ºãã" + IDS_ADVANCED_SHOW_FULL_PATH "ã¿ã¤ãã«ãã¼ã§ãã«ãã¹ãè¡¨ç¤ºãã" + IDS_ADVANCED_DISABLE_THUMB_CACHE "ãµã ãã¤ã«ããã£ãã·ã¥ããªã" + IDS_ADVANCED_HIDDEN "é ããã¡ã¤ã«ã¨ãã©ã«ã" + IDS_ADVANCED_DONT_SHOW_HIDDEN "é ããã¡ã¤ã«ã¨ãã©ã«ããè¡¨ç¤ºããªã" + IDS_ADVANCED_SHOW_HIDDEN "é ããã¡ã¤ã«ã¨ãã©ã«ããè¡¨ç¤ºãã" + IDS_ADVANCED_HIDE_FILE_EXT "æ¢ç¥ã®ãã¡ã¤ã« ã¿ã¤ãã®æ¡å¼µåãé ã" + IDS_ADVANCED_SUPER_HIDDEN "ä¿è·ããããªãã¬ã¼ãã£ã³ã°ã·ã¹ãã ã®ãã¡ã¤ã«ãé ã (æ¨å¥¨)" + IDS_ADVANCED_DESKTOP_PROCESS "å¥ã®ããã»ã¹ã§ãã©ã«ã ã¦ã£ã³ãã¦ãèµ·åãã" + IDS_ADVANCED_CLASSIC_VIEW_STATE "ããããã®ãã©ã«ãè¡¨ç¤ºè¨å®ãè¨æ¶ãã" + IDS_ADVANCED_PERSIST_BROWSERS "ãã°ãªã³æã«ä»¥åã®ãã©ã«ã ã¦ã£ã³ãã¦ãå¾©åãã" + IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "ãã¤ ã³ã³ãã¥ã¼ã¿ã§ã³ã³ããã¼ã« ããã«ãè¡¨ç¤ºãã" + IDS_ADVANCED_SHOW_COMP_COLOR "æå·åã¾ãã¯å§ç¸®ãããNTFSãã¡ã¤ã«ãè²ä»ãã§è¡¨ç¤ºãã" + IDS_ADVANCED_SHOW_INFO_TIP "ãã©ã«ãã¨ãã¹ã¯ãããã®é ç®ã«ãããã¢ããå¼ã®èª¬æãè¡¨ç¤ºãã" +END

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2017