Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[greatlrd] 20226: add allowwarnings ="true" so telnet can be build with dgb=0

by greatlrd＠svn.reactos.com

add allowwarnings ="true" so telnet can be build with dgb=0 Modified: trunk/reactos/apps/utils/net/telnet/telnet.xml _____ Modified: trunk/reactos/apps/utils/net/telnet/telnet.xml --- trunk/reactos/apps/utils/net/telnet/telnet.xml 2005-12-17 16:06:45 UTC (rev 20225) +++ trunk/reactos/apps/utils/net/telnet/telnet.xml 2005-12-17 17:14:50 UTC (rev 20226) @@ -1,4 +1,4 @@ -<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe"> +<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" allowwarnings ="true"> <include base="telnet">.</include> <define name="__USE_W32API" /> <define name="__REACTOS__" />

18 years, 9 months

[weiden] 20225: ported the __EXCEPT_PAGE_FAULT macro for upcoming synchronizations of imported wine code

by weiden＠svn.reactos.com

ported the __EXCEPT_PAGE_FAULT macro for upcoming synchronizations of imported wine code Modified: trunk/reactos/include/wine/exception.h _____ Modified: trunk/reactos/include/wine/exception.h --- trunk/reactos/include/wine/exception.h 2005-12-17 15:45:59 UTC (rev 20224) +++ trunk/reactos/include/wine/exception.h 2005-12-17 16:06:45 UTC (rev 20225) @@ -78,6 +78,7 @@ #define __EXCEPT(func) __except((func)(GetExceptionInformation())) #define __FINALLY(func) __finally { (func)(!AbnormalTermination()); } #define __ENDTRY /*nothing*/ +#define __EXCEPT_PAGE_FAULT __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) #else /* USE_COMPILER_EXCEPTIONS */ @@ -129,6 +130,9 @@ typedef DWORD (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); +/* convenience handler for page fault exceptions */ +#define __EXCEPT_PAGE_FAULT __EXCEPT( (__WINE_FILTER)1 ) + #define WINE_EXCEPTION_FILTER(func) DWORD CALLBACK func( PEXCEPTION_POINTERS __eptr ) #define WINE_FINALLY_FUNC(func) void CALLBACK func( BOOL __normal ) @@ -156,7 +160,7 @@ #endif /* USE_COMPILER_EXCEPTIONS */ -static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) +static __inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { #if defined(__GNUC__) && defined(__i386__) EXCEPTION_REGISTRATION_RECORD *prev; @@ -173,7 +177,7 @@ #endif } -static inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) +static __inline EXCEPTION_REGISTRATION_RECORD *__wine_pop_frame( EXCEPTION_REGISTRATION_RECORD *frame ) { #if defined(__GNUC__) && defined(__i386__) __asm__ __volatile__(".byte 0x64\n\tmovl %0,(0)" @@ -199,8 +203,14 @@ if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) return ExceptionContinueSearch; - if (wine_frame->u.filter) + + if (wine_frame->u.filter == (void *)1) /* special hack for page faults */ { + if (record->ExceptionCode != EXCEPTION_ACCESS_VIOLATION) + return ExceptionContinueSearch; + } + else if (wine_frame->u.filter) + { EXCEPTION_POINTERS ptrs; ptrs.ExceptionRecord = record; ptrs.ContextRecord = context; @@ -253,4 +263,11 @@ extern void __wine_enter_vm86( CONTEXT *context ); +static __inline WINE_EXCEPTION_FILTER(__wine_pagefault_filter) +{ + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_CONTINUE_SEARCH; + return EXCEPTION_EXECUTE_HANDLER; +} + #endif /* __WINE_WINE_EXCEPTION_H */

18 years, 9 months

[weiden] 20224: fixed the definition of RtlDosPathNameToNtPathName_U

by weiden＠svn.reactos.com

fixed the definition of RtlDosPathNameToNtPathName_U Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/lib/advapi32/reg/reg.c Modified: trunk/reactos/lib/advapi32/sec/misc.c Modified: trunk/reactos/lib/kernel32/file/cnotify.c Modified: trunk/reactos/lib/kernel32/file/create.c Modified: trunk/reactos/lib/kernel32/file/delete.c Modified: trunk/reactos/lib/kernel32/file/dir.c Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/file/find.c Modified: trunk/reactos/lib/kernel32/file/hardlink.c Modified: trunk/reactos/lib/kernel32/file/mailslot.c Modified: trunk/reactos/lib/kernel32/file/move.c Modified: trunk/reactos/lib/kernel32/file/npipe.c Modified: trunk/reactos/lib/kernel32/file/volume.c Modified: trunk/reactos/lib/kernel32/misc/utils.c Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/w32api/include/winternl.h _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-12-17 15:45:59 UTC (rev 20224) @@ -1639,10 +1639,10 @@ BOOLEAN NTAPI RtlDosPathNameToNtPathName_U( - PWSTR DosName, - PUNICODE_STRING NtName, - PWSTR *ShortName, - PCURDIR CurrentDirectory + IN PCWSTR DosPathName, + OUT PUNICODE_STRING NtPathName, + OUT PCWSTR *NtFileNamePart, + OUT CURDIR *DirectoryInfo ); NTSYSAPI _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -2586,7 +2586,7 @@ return RtlNtStatusToDosError (Status); } - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFile, + if (!RtlDosPathNameToNtPathName_U (lpFile, &FileName, NULL, NULL)) @@ -3858,7 +3858,7 @@ } /* Convert new file name */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewFile, + if (!RtlDosPathNameToNtPathName_U (lpNewFile, &NewFileName, NULL, NULL)) @@ -3878,7 +3878,7 @@ NULL); /* Convert old file name */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpOldFile, + if (!RtlDosPathNameToNtPathName_U (lpOldFile, &OldFileName, NULL, NULL)) @@ -3977,7 +3977,7 @@ return RtlNtStatusToDosError (Status); } - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFile, + if (!RtlDosPathNameToNtPathName_U (lpFile, &FileName, NULL, NULL)) @@ -4070,7 +4070,7 @@ return RtlNtStatusToDosError (Status); } - if (!RtlDosPathNameToNtPathName_U ((PWSTR)lpFile, + if (!RtlDosPathNameToNtPathName_U (lpFile, &FileName, NULL, NULL)) _____ Modified: trunk/reactos/lib/advapi32/sec/misc.c --- trunk/reactos/lib/advapi32/sec/misc.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/advapi32/sec/misc.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -221,7 +221,7 @@ AccessMask |= ACCESS_SYSTEM_SECURITY; } - if (!RtlDosPathNameToNtPathName_U((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileName, NULL, NULL)) @@ -365,7 +365,7 @@ AccessMask |= ACCESS_SYSTEM_SECURITY; } - if (!RtlDosPathNameToNtPathName_U((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U(lpFileName, &FileName, NULL, NULL)) _____ Modified: trunk/reactos/lib/kernel32/file/cnotify.c --- trunk/reactos/lib/kernel32/file/cnotify.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/cnotify.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -70,7 +70,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE hDir; - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpPathName, + if (!RtlDosPathNameToNtPathName_U (lpPathName, &NtPathU, NULL, NULL)) _____ Modified: trunk/reactos/lib/kernel32/file/create.c --- trunk/reactos/lib/kernel32/file/create.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/create.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -105,7 +105,7 @@ } /* validate & translate the filename */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U (lpFileName, &NtPathU, NULL, NULL)) @@ -437,7 +437,7 @@ case DEVICE_PATH: case UNC_DOT_PATH: default: - if(!RtlDosPathNameToNtPathName_U((LPWSTR)lpTargetFileName, &TargetFileName, NULL, NULL)) + if(!RtlDosPathNameToNtPathName_U(lpTargetFileName, &TargetFileName, NULL, NULL)) { dwErr = ERROR_INVALID_PARAMETER; goto Cleanup; @@ -475,7 +475,7 @@ if(bRelativePath) pReparseData->SymbolicLinkReparseBuffer.Flags |= 1; // TODO! give this lone flag a name - if(!RtlDosPathNameToNtPathName_U((LPWSTR)lpSymlinkFileName, &SymlinkFileName, NULL, NULL)) + if(!RtlDosPathNameToNtPathName_U(lpSymlinkFileName, &SymlinkFileName, NULL, NULL)) { dwErr = ERROR_PATH_NOT_FOUND; goto Cleanup; _____ Modified: trunk/reactos/lib/kernel32/file/delete.c --- trunk/reactos/lib/kernel32/file/delete.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/delete.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -55,7 +55,7 @@ DPRINT("DeleteFileW (lpFileName %S)\n",lpFileName); - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U (lpFileName, &NtPathU, NULL, NULL)) _____ Modified: trunk/reactos/lib/kernel32/file/dir.c --- trunk/reactos/lib/kernel32/file/dir.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/dir.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -100,7 +100,7 @@ DPRINT ("lpPathName %S lpSecurityAttributes %p\n", lpPathName, lpSecurityAttributes); - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpPathName, + if (!RtlDosPathNameToNtPathName_U (lpPathName, &NtPathU, NULL, NULL)) @@ -182,7 +182,7 @@ * Translate the template directory path */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpTemplateDirectory, + if (!RtlDosPathNameToNtPathName_U (lpTemplateDirectory, &NtTemplatePathU, NULL, NULL)) @@ -239,7 +239,7 @@ * Translate the new directory path and check if they're the same */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewDirectory, + if (!RtlDosPathNameToNtPathName_U (lpNewDirectory, &NtPathU, NULL, NULL)) @@ -526,7 +526,7 @@ DPRINT("lpPathName %S\n", lpPathName); - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpPathName, + if (!RtlDosPathNameToNtPathName_U (lpPathName, &NtPathU, NULL, NULL)) _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/file.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -296,7 +296,7 @@ else RtlUnicodeStringToOemString (&FileName, &FileNameU, FALSE); - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)PathNameW, + if (!RtlDosPathNameToNtPathName_U (PathNameW, &FileNameString, NULL, NULL)) @@ -849,7 +849,7 @@ } /* Validate and translate the filename */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U (lpFileName, &FileName, NULL, NULL)) @@ -1061,7 +1061,7 @@ DPRINT ("SetFileAttributeW(%S, 0x%lx) called\n", lpFileName, dwFileAttributes); /* Validate and translate the filename */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpFileName, + if (!RtlDosPathNameToNtPathName_U (lpFileName, &FileName, NULL, NULL)) _____ Modified: trunk/reactos/lib/kernel32/file/find.c --- trunk/reactos/lib/kernel32/file/find.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/find.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -279,7 +279,7 @@ SearchPath[Length] = 0; } - bResult = RtlDosPathNameToNtPathName_U ((LPWSTR)SearchPath, + bResult = RtlDosPathNameToNtPathName_U (SearchPath, &NtPathU, NULL, NULL); _____ Modified: trunk/reactos/lib/kernel32/file/hardlink.c --- trunk/reactos/lib/kernel32/file/hardlink.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/hardlink.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -51,7 +51,7 @@ return FALSE; } - if(RtlDosPathNameToNtPathName_U((LPWSTR)lpExistingFileName, &LinkTarget, NULL, NULL)) + if(RtlDosPathNameToNtPathName_U(lpExistingFileName, &LinkTarget, NULL, NULL)) { ULONG NeededSize = RtlGetFullPathName_U((LPWSTR)lpExistingFileName, 0, NULL, NULL); if(NeededSize > 0) @@ -108,7 +108,7 @@ FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_OPEN_REPARSE_POINT); if(NT_SUCCESS(Status)) { - if(RtlDosPathNameToNtPathName_U((LPWSTR)lpFileName, &LinkName, NULL, NULL)) + if(RtlDosPathNameToNtPathName_U(lpFileName, &LinkName, NULL, NULL)) { NeededSize = sizeof(FILE_LINK_INFORMATION) + LinkName.Length + sizeof(WCHAR); LinkInformation = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, NeededSize); _____ Modified: trunk/reactos/lib/kernel32/file/mailslot.c --- trunk/reactos/lib/kernel32/file/mailslot.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/mailslot.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -63,7 +63,7 @@ ULONG Attributes = OBJ_CASE_INSENSITIVE; PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; - Result = RtlDosPathNameToNtPathName_U((LPWSTR)lpName, + Result = RtlDosPathNameToNtPathName_U(lpName, &MailslotName, NULL, NULL); _____ Modified: trunk/reactos/lib/kernel32/file/move.c --- trunk/reactos/lib/kernel32/file/move.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/move.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -91,13 +91,13 @@ DPRINT("Add support to smss for keys created by MOVEFILE_DELAY_UNTIL_REBOOT\n"); - if (!RtlDosPathNameToNtPathName_U( (LPWSTR)source, &source_name, NULL, NULL )) + if (!RtlDosPathNameToNtPathName_U( source, &source_name, NULL, NULL )) { SetLastError( ERROR_PATH_NOT_FOUND ); return FALSE; } dest_name.Buffer = NULL; - if (dest && !RtlDosPathNameToNtPathName_U( (LPWSTR)dest, &dest_name, NULL, NULL )) + if (dest && !RtlDosPathNameToNtPathName_U( dest, &dest_name, NULL, NULL )) { RtlFreeUnicodeString( &source_name ); SetLastError( ERROR_PATH_NOT_FOUND ); @@ -224,7 +224,7 @@ /* validate & translate the filename */ - if (!RtlDosPathNameToNtPathName_U ((LPWSTR)lpNewFileName, + if (!RtlDosPathNameToNtPathName_U (lpNewFileName, &DstPathU, NULL, NULL)) _____ Modified: trunk/reactos/lib/kernel32/file/npipe.c --- trunk/reactos/lib/kernel32/file/npipe.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/npipe.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -90,7 +90,7 @@ if (nMaxInstances == PIPE_UNLIMITED_INSTANCES) nMaxInstances = -1; /* Convert the name */ - Result = RtlDosPathNameToNtPathName_U((LPWSTR)lpName, + Result = RtlDosPathNameToNtPathName_U(lpName, &NamedPipeName, NULL, NULL); @@ -464,7 +464,7 @@ HANDLE FileHandle; IO_STATUS_BLOCK Iosb; - r = RtlDosPathNameToNtPathName_U((LPWSTR)lpNamedPipeName, + r = RtlDosPathNameToNtPathName_U(lpNamedPipeName, &NamedPipeName, NULL, NULL); _____ Modified: trunk/reactos/lib/kernel32/file/volume.c --- trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -38,7 +38,7 @@ IO_STATUS_BLOCK IoStatusBlock; HANDLE hFile; - if (!RtlDosPathNameToNtPathName_U((LPWSTR)DirName, + if (!RtlDosPathNameToNtPathName_U(DirName, &NtPathU, NULL, NULL)) _____ Modified: trunk/reactos/lib/kernel32/misc/utils.c --- trunk/reactos/lib/kernel32/misc/utils.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/kernel32/misc/utils.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -412,7 +412,7 @@ RelativeName.Handle = NULL; /* Find the application name */ - RtlDosPathNameToNtPathName_U((LPWSTR)lpApplicationName, + RtlDosPathNameToNtPathName_U(lpApplicationName, ApplicationName, NULL, &RelativeName); _____ Modified: trunk/reactos/lib/rtl/path.c --- trunk/reactos/lib/rtl/path.c 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/lib/rtl/path.c 2005-12-17 15:45:59 UTC (rev 20224) @@ -675,10 +675,10 @@ * @implemented */ BOOLEAN NTAPI -RtlDosPathNameToNtPathName_U(PWSTR dosname, - PUNICODE_STRING ntname, - PWSTR *FilePart, - PCURDIR nah) +RtlDosPathNameToNtPathName_U(IN PCWSTR DosPathName, + OUT PUNICODE_STRING NtPathName, + OUT PCWSTR *NtFileNamePart, + OUT CURDIR *DirectoryInfo) { UNICODE_STRING us; PCURDIR cd; @@ -693,7 +693,7 @@ RtlAcquirePebLock (); - RtlInitUnicodeString (&us, dosname); + RtlInitUnicodeString (&us, DosPathName); if (us.Length > 8) { Buffer = us.Buffer; @@ -721,10 +721,10 @@ return FALSE; } - Size = RtlGetFullPathName_U (dosname, + Size = RtlGetFullPathName_U (DosPathName, sizeof(fullname), fullname, - FilePart); + (PWSTR*)NtFileNamePart); if (Size == 0 || Size > MAX_PATH * sizeof(WCHAR)) { RtlFreeHeap (RtlGetProcessHeap (), @@ -763,18 +763,18 @@ } /* set NT filename */ - ntname->Length = Length * sizeof(WCHAR); - ntname->MaximumLength = sizeof(fullname) + MAX_PFX_SIZE; - ntname->Buffer = Buffer; + NtPathName->Length = Length * sizeof(WCHAR); + NtPathName->MaximumLength = sizeof(fullname) + MAX_PFX_SIZE; + NtPathName->Buffer = Buffer; /* set pointer to file part if possible */ - if (FilePart && *FilePart) - *FilePart = Buffer + Length - wcslen (*FilePart); + if (NtFileNamePart && *NtFileNamePart) + *NtFileNamePart = Buffer + Length - wcslen (*NtFileNamePart); /* Set name and handle structure if possible */ - if (nah) + if (DirectoryInfo) { - memset (nah, 0, sizeof(CURDIR)); + memset (DirectoryInfo, 0, sizeof(CURDIR)); cd = (PCURDIR)&(NtCurrentPeb ()->ProcessParameters->CurrentDirectory.DosPath); if (Type == 5 && cd->Handle) { @@ -782,10 +782,10 @@ if (RtlEqualUnicodeString(&us, &cd->DosPath, TRUE)) { Length = ((cd->DosPath.Length / sizeof(WCHAR)) - Offset) + ((Type == 1) ? 8 : 4); - nah->DosPath.Buffer = Buffer + Length; - nah->DosPath.Length = ntname->Length - (Length * sizeof(WCHAR)); - nah->DosPath.MaximumLength = nah->DosPath.Length; - nah->Handle = cd->Handle; + DirectoryInfo->DosPath.Buffer = Buffer + Length; + DirectoryInfo->DosPath.Length = NtPathName->Length - (Length * sizeof(WCHAR)); + DirectoryInfo->DosPath.MaximumLength = DirectoryInfo->DosPath.Length; + DirectoryInfo->Handle = cd->Handle; } } } _____ Modified: trunk/reactos/w32api/include/winternl.h --- trunk/reactos/w32api/include/winternl.h 2005-12-17 12:23:41 UTC (rev 20223) +++ trunk/reactos/w32api/include/winternl.h 2005-12-17 15:45:59 UTC (rev 20224) @@ -1965,7 +1965,7 @@ NTSTATUS WINAPI RtlDestroyQueryDebugBuffer(PDEBUG_BUFFER); DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR); BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR); -BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); +BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PCWSTR*,CURDIR*); ULONG WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*); WCHAR WINAPI RtlDowncaseUnicodeChar(WCHAR); NTSTATUS WINAPI RtlDowncaseUnicodeString(UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);

18 years, 9 months

[ekohl] 20223: - Implement CM_Disable_DevNode[_Ex], CM_Enable_DevNode[_Ex], CM_Reenumerate_DevNode[_Ex] and CM_Run_Detection[_Ex].

by ekohl＠svn.reactos.com

- Implement CM_Disable_DevNode[_Ex], CM_Enable_DevNode[_Ex], CM_Reenumerate_DevNode[_Ex] and CM_Run_Detection[_Ex]. - Implement StringTableAddStringEx and StringTableLookUpStringEx. Modified: trunk/reactos/include/idl/pnp.idl Modified: trunk/reactos/include/wine/cfgmgr32.h Modified: trunk/reactos/lib/setupapi/cfgmgr.c Modified: trunk/reactos/lib/setupapi/setupapi.spec Modified: trunk/reactos/lib/setupapi/stringtable.c Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/include/idl/pnp.idl --- trunk/reactos/include/idl/pnp.idl 2005-12-17 12:16:28 UTC (rev 20222) +++ trunk/reactos/include/idl/pnp.idl 2005-12-17 12:23:41 UTC (rev 20223) @@ -30,6 +30,9 @@ [out] unsigned long *State, [in] unsigned long Flags); + /* Function 4 */ + CONFIGRET PNP_InitDetection(handle_t BindingHandle); + /* Function 6 */ CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, @@ -106,6 +109,13 @@ [in] unsigned long DesiredAccess, [in] unsigned long Flags); + /* Function 17 */ + CONFIGRET PNP_DeleteRegistryKey(handle_t BindingHandle, + [in, string] wchar_t *DeviceId, + [in, string] wchar_t *ParentKey, + [in, string] wchar_t *ChildKey, + [in] unsigned long Flags); + /* Function 19 */ CONFIGRET PNP_GetClassName(handle_t BindingHandle, [in, string] wchar_t *ClassGuid, @@ -118,6 +128,13 @@ [in, string] wchar_t *ClassGuid, [in] unsigned long Flags); + /* Function 29 */ + CONFIGRET PNP_DeviceInstanceAction(handle_t BindingHandle, + [in] unsigned long MajorAction, + [in] unsigned long MinorAction, + [in, unique, string] wchar_t *DeviceInstance1, + [in, unique, string] wchar_t *DeviceInstance2); + /* Function 30 */ CONFIGRET PNP_GetDeviceStatus(handle_t BindingHandle, [in, string] wchar_t *DeviceInstance, @@ -137,4 +154,8 @@ /* Function 39 */ CONFIGRET PNP_RequestEjectPC(handle_t BindingHandle); + + /* Function 58 */ + CONFIGRET PNP_RunDetection(handle_t BindingHandle, + [in] unsigned long Flags); } _____ Modified: trunk/reactos/include/wine/cfgmgr32.h --- trunk/reactos/include/wine/cfgmgr32.h 2005-12-17 12:16:28 UTC (rev 20222) +++ trunk/reactos/include/wine/cfgmgr32.h 2005-12-17 12:23:41 UTC (rev 20223) @@ -139,13 +139,31 @@ #define CM_GETIDLIST_DONOTGENERATE (0x10000040) #define CM_GETIDLIST_FILTER_BITS (0x1000007F) +/* ulFlags for CM_Reenumerate_DevNode[_Ex] */ +#define CM_REENUMERATE_NORMAL 0x00000000 +#define CM_REENUMERATE_SYNCHRONOUS 0x00000001 +#define CM_REENUMERATE_RETRY_INSTALLATION 0x00000002 +#define CM_REENUMERATE_ASYNCHRONOUS 0x00000004 +#define CM_REENUMERATE_BITS 0x00000007 +/* ulFlags for CM_Run_Detection[_Ex] */ +#define CM_DETECT_NEW_PROFILE 0x00000001 +#define CM_DETECT_CRASHED 0x00000002 +#define CM_DETECT_HWPROF_FIRST_BOOT 0x00000004 +#define CM_DETECT_RUN 0x80000000 +#define CM_DETECT_BITS 0x80000007 + + CONFIGRET WINAPI CM_Connect_MachineA( PCSTR, PHMACHINE ); CONFIGRET WINAPI CM_Connect_MachineW( PCWSTR, PHMACHINE ); #define CM_Connect_Machine WINELIB_NAME_AW(CM_Connect_Machine) CONFIGRET WINAPI CM_Delete_Class_Key( LPGUID, ULONG ); CONFIGRET WINAPI CM_Delete_Class_Key_Ex( LPGUID, ULONG, HANDLE ); +CONFIGRET WINAPI CM_Disable_DevNode( DEVINST, ULONG ); +CONFIGRET WINAPI CM_Disable_DevNode_Ex( DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Disconnect_Machine( HMACHINE ); +CONFIGRET WINAPI CM_Enable_DevNode( DEVINST, ULONG ); +CONFIGRET WINAPI CM_Enable_DevNode_Ex( DEVINST, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Enumerate_Classes( ULONG, LPGUID, ULONG ); CONFIGRET WINAPI CM_Enumerate_Classes_Ex( ULONG, LPGUID, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Enumerate_EnumeratorsA( ULONG, PCHAR, PULONG, ULONG ); @@ -223,9 +241,14 @@ CONFIGRET WINAPI CM_Open_Class_Key_ExW(LPGUID, LPCWSTR, REGSAM, REGDISPOSITION, PHKEY, ULONG, HMACHINE); #define CM_Open_Class_Key_Ex WINELIB_NAME_AW(CM_Open_Class_Key_Ex) +CONFIGRET WINAPI CM_Reenumerate_DevNode( DEVINST, ULONG ); +CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex( DEVINST, ULONG, HMACHINE ); + CONFIGRET WINAPI CM_Request_Eject_PC( VOID ); CONFIGRET WINAPI CM_Request_Eject_PC_Ex( HMACHINE ); +CONFIGRET WINAPI CM_Run_Detection( ULONG ); +CONFIGRET WINAPI CM_Run_Detection_Ex( ULONG, HMACHINE ); CONFIGRET WINAPI CM_Set_DevNode_Problem( DEVINST, ULONG, ULONG ); CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex( DEVINST, ULONG, ULONG, HMACHINE ); CONFIGRET WINAPI CM_Set_DevNode_Registry_PropertyA( DEVINST, ULONG, PCVOID, ULONG, ULONG ); _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-12-17 12:16:28 UTC (rev 20222) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-12-17 12:23:41 UTC (rev 20223) @@ -174,6 +174,66 @@ /*********************************************************************** + * CM_Disable_DevNode [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Disable_DevNode( + DEVINST dnDevInst, ULONG ulFlags) +{ + TRACE("%p %lx\n", dnDevInst, ulFlags); + return CM_Disable_DevNode_Ex(dnDevInst, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Disable_DevNode_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Disable_DevNode_Ex( + DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + + FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); + +// if (!IsUserAdmin()) +// return CR_ACCESS_DENIED; + + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + return PNP_DeviceInstanceAction(BindingHandle, + 5, + ulFlags, + lpDevInst, + NULL); +} + + +/********************************************************************** * * CM_Disconnect_Machine [SETUPAPI.@] */ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE hMachine) @@ -199,6 +259,66 @@ /*********************************************************************** + * CM_Enable_DevNode [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Enable_DevNode( + DEVINST dnDevInst, ULONG ulFlags) +{ + TRACE("%p %lx\n", dnDevInst, ulFlags); + return CM_Enable_DevNode_Ex(dnDevInst, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Enable_DevNode_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Enable_DevNode_Ex( + DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + + FIXME("%p %lx %p\n", dnDevInst, ulFlags, hMachine); + +// if (!IsUserAdmin()) +// return CR_ACCESS_DENIED; + + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (ulFlags != 0) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + return PNP_DeviceInstanceAction(BindingHandle, + 4, + ulFlags, + lpDevInst, + NULL); +} + + +/********************************************************************** * * CM_Enumerate_Classes [SETUPAPI.@] */ CONFIGRET WINAPI CM_Enumerate_Classes( @@ -1875,6 +1995,64 @@ /*********************************************************************** + * CM_Reenumerate_DevNode [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Reenumerate_DevNode( + DEVINST dnDevInst, ULONG ulFlags) +{ + TRACE("%lx %lx\n", dnDevInst, ulFlags); + return CM_Reenumerate_DevNode_Ex(dnDevInst, ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Reenumerate_DevNode_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI +CM_Reenumerate_DevNode_Ex( + DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + + FIXME("%lx %lx %lx\n", dnDevInst, ulFlags, hMachine); + + if (dnDevInst == 0) + return CR_INVALID_DEVNODE; + + if (ulFlags & ~CM_REENUMERATE_BITS) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = StringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + return PNP_DeviceInstanceAction(BindingHandle, + 7, + ulFlags, + lpDevInst, + NULL); +} + + +/********************************************************************** * * CM_Request_Eject_PC [SETUPAPI.@] */ CONFIGRET WINAPI CM_Request_Eject_PC(VOID) @@ -1911,6 +2089,50 @@ /*********************************************************************** + * CM_Run_Detection [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Run_Detection( + ULONG ulFlags) +{ + TRACE("%lx\n", ulFlags); + return CM_Run_Detection_Ex(ulFlags, NULL); +} + + +/********************************************************************** * + * CM_Run_Detection_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Run_Detection_Ex( + ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + + TRACE("%lx %lx\n", ulFlags, hMachine); + +// if (!IsUserAdmin()) +// return CR_ACCESS_DENIED; + + if (ulFlags & ~CM_DETECT_BITS) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, NULL)) + return CR_FAILURE; + } + + return PNP_RunDetection(BindingHandle, + ulFlags); +} + + +/********************************************************************** * * CM_Set_DevNode_Problem [SETUPAPI.@] */ CONFIGRET WINAPI CM_Set_DevNode_Problem( _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-12-17 12:16:28 UTC (rev 20222) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-12-17 12:23:41 UTC (rev 20223) @@ -32,12 +32,12 @@ @ stub CM_Delete_Range @ stub CM_Detect_Resource_Conflict @ stub CM_Detect_Resource_Conflict_Ex -@ stub CM_Disable_DevNode -@ stub CM_Disable_DevNode_Ex +@ stdcall CM_Disable_DevNode(long long) +@ stdcall CM_Disable_DevNode_Ex(long long ptr) @ stdcall CM_Disconnect_Machine(long) @ stub CM_Dup_Range_List -@ stub CM_Enable_DevNode -@ stub CM_Enable_DevNode_Ex +@ stdcall CM_Enable_DevNode(long long) +@ stdcall CM_Enable_DevNode_Ex(long long ptr) @ stdcall CM_Enumerate_Classes(long ptr long) @ stdcall CM_Enumerate_Classes_Ex(long ptr long ptr) @ stdcall CM_Enumerate_EnumeratorsA(long str ptr long) @@ -151,8 +151,8 @@ @ stub CM_Query_Arbitrator_Free_Size_Ex @ stub CM_Query_Remove_SubTree @ stub CM_Query_Remove_SubTree_Ex -@ stub CM_Reenumerate_DevNode -@ stub CM_Reenumerate_DevNode_Ex +@ stdcall CM_Reenumerate_DevNode(long long) +@ stdcall CM_Reenumerate_DevNode_Ex(long long long) @ stub CM_Register_Device_Driver @ stub CM_Register_Device_Driver_Ex @ stub CM_Register_Device_InterfaceA @@ -165,12 +165,12 @@ @ stub CM_Remove_Unmarked_Children_Ex @ stub CM_Request_Device_EjectA @ stub CM_Request_Device_EjectW -@ stub CM_Request_Eject_PC -@ stub CM_Request_Eject_PC_Ex +@ stdcall CM_Request_Eject_PC() +@ stdcall CM_Request_Eject_PC_Ex(long) @ stub CM_Reset_Children_Marks @ stub CM_Reset_Children_Marks_Ex -@ stub CM_Run_Detection -@ stub CM_Run_Detection_Ex +@ stdcall CM_Run_Detection(long) +@ stdcall CM_Run_Detection_Ex(long long) @ stdcall CM_Set_DevNode_Problem(long long long) @ stdcall CM_Set_DevNode_Problem_Ex(long long long long) @ stdcall CM_Set_DevNode_Registry_PropertyA(long long ptr long long) _____ Modified: trunk/reactos/lib/setupapi/stringtable.c --- trunk/reactos/lib/setupapi/stringtable.c 2005-12-17 12:16:28 UTC (rev 20222) +++ trunk/reactos/lib/setupapi/stringtable.c 2005-12-17 12:23:41 UTC (rev 20223) @@ -307,7 +307,83 @@ LPVOID lpExtraData, DWORD dwExtraDataSize) { - FIXME("\n"); + PSTRING_TABLE pStringTable; + DWORD i; + + TRACE("%p %s %lx\n", (PVOID)hStringTable, debugstr_w(lpString), dwFlags); + + pStringTable = (PSTRING_TABLE)hStringTable; + if (pStringTable == NULL) + { + ERR("Invalid hStringTable!\n"); + return (DWORD)-1; + } + + /* Search for existing string in the string table */ + for (i = 0; i < pStringTable->dwMaxSlots; i++) + { + if (pStringTable->pSlots[i].pString != NULL) + { + if (dwFlags & 1) + { + if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) + { + return i + 1; + } + } + else + { + if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) + { + return i + 1; + } + } + } + } + + /* Check for filled slot table */ + if (pStringTable->dwUsedSlots == pStringTable->dwMaxSlots) + { + FIXME("Resize the string table!\n"); + return (DWORD)-1; + } + + /* Search for an empty slot */ + for (i = 0; i < pStringTable->dwMaxSlots; i++) + { + if (pStringTable->pSlots[i].pString == NULL) + { + pStringTable->pSlots[i].pString = MyMalloc((lstrlenW(lpString) + 1) * sizeof(WCHAR)); + if (pStringTable->pSlots[i].pString == NULL) + { + TRACE("Couldn't allocate memory for a new string!\n"); + return (DWORD)-1; + } + + lstrcpyW(pStringTable->pSlots[i].pString, lpString); + + pStringTable->pSlots[i].pData = MyMalloc(dwExtraDataSize); + if (pStringTable->pSlots[i].pData == NULL) + { + TRACE("Couldn't allocate memory for a new extra data!\n"); + MyFree(pStringTable->pSlots[i].pString); + pStringTable->pSlots[i].pString = NULL; + return (DWORD)-1; + } + + memcpy(pStringTable->pSlots[i].pData, + lpExtraData, + dwExtraDataSize); + pStringTable->pSlots[i].dwSize = dwExtraDataSize; + + pStringTable->dwUsedSlots++; + + return i + 1; + } + } + + TRACE("Couldn't find an empty slot!\n"); + return (DWORD)-1; } @@ -527,7 +603,48 @@ LPVOID lpExtraData, LPDWORD lpReserved) { - FIXME("\n"); + PSTRING_TABLE pStringTable; + DWORD i; + + TRACE("%p %s %lx\n", (PVOID)hStringTable, debugstr_w(lpString), dwFlags); + + pStringTable = (PSTRING_TABLE)hStringTable; + if (pStringTable == NULL) + { + ERR("Invalid hStringTable!\n"); + return (DWORD)-1; + } + + /* Search for existing string in the string table */ + for (i = 0; i < pStringTable->dwMaxSlots; i++) + { + if (pStringTable->pSlots[i].pString != NULL) + { + if (dwFlags & 1) + { + if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) + { + memcpy(lpExtraData, + pStringTable->pSlots[i].pData, + pStringTable->pSlots[i].dwSize); + *lpReserved = 0; + return i + 1; + } + } + else + { + if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) + { + memcpy(lpExtraData, + pStringTable->pSlots[i].pData, + pStringTable->pSlots[i].dwSize); + *lpReserved = 0; + return i + 1; + } + } + } + } + return (DWORD)-1; } _____ Modified: trunk/reactos/services/umpnpmgr/umpnpmgr.c --- trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-12-17 12:16:28 UTC (rev 20222) +++ trunk/reactos/services/umpnpmgr/umpnpmgr.c 2005-12-17 12:23:41 UTC (rev 20223) @@ -118,16 +118,18 @@ { switch (Status) { - case STATUS_NO_SUCH_DEVICE: - return CR_NO_SUCH_DEVINST; - default: - /* FIXME: add more mappings */ - DPRINT1("Unable to map status 0x%08lx\n", Status); - return CR_FAILURE; + case STATUS_NO_SUCH_DEVICE: + return CR_NO_SUCH_DEVINST; + + default: + /* FIXME: add more mappings */ + DPRINT1("Unable to map status 0x%08lx\n", Status); + return CR_FAILURE; } } +/* Function 2 */ CONFIGRET PNP_GetVersion(handle_t BindingHandle, unsigned short *Version) @@ -137,6 +139,7 @@ } +/* Function 3 */ CONFIGRET PNP_GetGlobalState(handle_t BindingHandle, unsigned long *State, @@ -147,7 +150,17 @@ } +/* Function 4 */ CONFIGRET +PNP_InitDetection(handle_t BindingHandle) +{ + DPRINT("PNP_InitDetection() called\n"); + return CR_SUCCESS; +} + + +/* Function 6 */ +CONFIGRET PNP_ValidateDeviceInstance(handle_t BindingHandle, wchar_t *DeviceInstance, unsigned long Flags) @@ -196,6 +209,7 @@ } +/* Function 7 */ CONFIGRET PNP_GetRootDeviceInstance(handle_t BindingHandle, wchar_t *DeviceInstance, @@ -221,6 +235,7 @@ } +/* Function 8 */ CONFIGRET PNP_GetRelatedDeviceInstance(handle_t BindingHandle, unsigned long Relationship, @@ -264,6 +279,7 @@ } +/* Function 9 */ CONFIGRET PNP_EnumerateSubKeys(handle_t BindingHandle, unsigned long Branch, @@ -317,6 +333,7 @@ } +/* Function 11 */ CONFIGRET PNP_GetDeviceListSize(handle_t BindingHandle, wchar_t *Filter, @@ -332,6 +349,7 @@ } +/* Function 12 */ CONFIGRET PNP_GetDepth(handle_t BindingHandle, wchar_t *DeviceInstance, @@ -365,119 +383,8 @@ } +/* Function 13 */ CONFIGRET -PNP_SetDeviceRegProp(handle_t BindingHandle, - wchar_t *DeviceId, - unsigned long Property, - unsigned long DataType, - char *Buffer, - unsigned long Length, - unsigned long Flags) -{ - CONFIGRET ret = CR_SUCCESS; - LPWSTR lpValueName = NULL; - HKEY hKey = 0; - - DPRINT("PNP_SetDeviceRegProp() called\n"); - - DPRINT("DeviceId: %S\n", DeviceId); - DPRINT("Property: %lu\n", Property); - DPRINT("DataType: %lu\n", DataType); - DPRINT("Length: %lu\n", Length); - - switch (Property) - { - case CM_DRP_DEVICEDESC: - lpValueName = L"DeviceDesc"; - break; - - case CM_DRP_HARDWAREID: - lpValueName = L"HardwareID"; - break; - - case CM_DRP_COMPATIBLEIDS: - lpValueName = L"CompatibleIDs"; - break; - - case CM_DRP_SERVICE: - lpValueName = L"Service"; - break; - - case CM_DRP_CLASS: - lpValueName = L"Class"; - break; - - case CM_DRP_CLASSGUID: - lpValueName = L"ClassGUID"; - break; - - case CM_DRP_DRIVER: - lpValueName = L"Driver"; - break; - - case CM_DRP_CONFIGFLAGS: - lpValueName = L"ConfigFlags"; - break; - - case CM_DRP_MFG: - lpValueName = L"Mfg"; - break; - - case CM_DRP_FRIENDLYNAME: - lpValueName = L"FriendlyName"; - break; - - case CM_DRP_LOCATION_INFORMATION: - lpValueName = L"LocationInformation"; - break; - - case CM_DRP_UPPERFILTERS: - lpValueName = L"UpperFilters"; - break; - - case CM_DRP_LOWERFILTERS: - lpValueName = L"LowerFilters"; - break; - - default: - return CR_INVALID_PROPERTY; - } - - DPRINT("Value name: %S\n", lpValueName); - - if (RegOpenKeyExW(hEnumKey, - DeviceId, - 0, - KEY_ALL_ACCESS, - &hKey)) - return CR_INVALID_DEVNODE; - - if (Length == 0) - { - if (RegDeleteValueW(hKey, - lpValueName)) - ret = CR_REGISTRY_ERROR; - } - else - { - if (RegSetValueExW(hKey, - lpValueName, - 0, - DataType, - (const BYTE*)Buffer, - Length)) - ret = CR_REGISTRY_ERROR; - } - - RegCloseKey(hKey); - - DPRINT("PNP_SetDeviceRegProp() done (returns %lx)\n", ret); - - return ret; -} - - -CONFIGRET PNP_GetDeviceRegProp(handle_t BindingHandle, wchar_t *DeviceInstance, unsigned long Property, @@ -664,7 +571,121 @@ } +/* Function 14 */ CONFIGRET +PNP_SetDeviceRegProp(handle_t BindingHandle, + wchar_t *DeviceId, + unsigned long Property, + unsigned long DataType, + char *Buffer, + unsigned long Length, + unsigned long Flags) +{ + CONFIGRET ret = CR_SUCCESS; + LPWSTR lpValueName = NULL; + HKEY hKey = 0; + + DPRINT("PNP_SetDeviceRegProp() called\n"); + + DPRINT("DeviceId: %S\n", DeviceId); + DPRINT("Property: %lu\n", Property); + DPRINT("DataType: %lu\n", DataType); + DPRINT("Length: %lu\n", Length); + + switch (Property) + { + case CM_DRP_DEVICEDESC: + lpValueName = L"DeviceDesc"; + break; + + case CM_DRP_HARDWAREID: + lpValueName = L"HardwareID"; + break; + + case CM_DRP_COMPATIBLEIDS: + lpValueName = L"CompatibleIDs"; + break; + + case CM_DRP_SERVICE: + lpValueName = L"Service"; + break; + + case CM_DRP_CLASS: + lpValueName = L"Class"; + break; + + case CM_DRP_CLASSGUID: + lpValueName = L"ClassGUID"; + break; + + case CM_DRP_DRIVER: + lpValueName = L"Driver"; + break; + + case CM_DRP_CONFIGFLAGS: + lpValueName = L"ConfigFlags"; + break; + + case CM_DRP_MFG: + lpValueName = L"Mfg"; + break; + + case CM_DRP_FRIENDLYNAME: + lpValueName = L"FriendlyName"; + break; + + case CM_DRP_LOCATION_INFORMATION: + lpValueName = L"LocationInformation"; + break; + + case CM_DRP_UPPERFILTERS: + lpValueName = L"UpperFilters"; + break; + + case CM_DRP_LOWERFILTERS: + lpValueName = L"LowerFilters"; + break; + + default: + return CR_INVALID_PROPERTY; + } + + DPRINT("Value name: %S\n", lpValueName); + + if (RegOpenKeyExW(hEnumKey, + DeviceId, + 0, + KEY_ALL_ACCESS, + &hKey)) + return CR_INVALID_DEVNODE; + + if (Length == 0) + { + if (RegDeleteValueW(hKey, + lpValueName)) + ret = CR_REGISTRY_ERROR; + } + else + { + if (RegSetValueExW(hKey, + lpValueName, + 0, + DataType, + (const BYTE*)Buffer, + Length)) + ret = CR_REGISTRY_ERROR; + } + + RegCloseKey(hKey); + + DPRINT("PNP_SetDeviceRegProp() done (returns %lx)\n", ret); + + return ret; +} + + +/* Function 16 */ +CONFIGRET PNP_CreateKey(handle_t BindingHandle, wchar_t *SubKey, unsigned long samDesired, @@ -680,7 +701,65 @@ } +/* Function 17 */ CONFIGRET +PNP_DeleteRegistryKey(handle_t BindingHandle, + wchar_t *DeviceId, + wchar_t *ParentKey, + wchar_t *ChildKey, + unsigned long Flags) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT("PNP_DeleteRegistryKey() called\n"); + + DPRINT("PNP_DeleteRegistryKey() done (returns %lx)\n", ret); + + return ret; +} + + +/* Function 18 */ +#if 0 +CONFIGRET +PNP_GetClassCount(handle_t BindingHandle, + unsigned long *ClassCount, + unsigned long Flags) +{ + HANDLE hKey = NULL; + DWORD dwError; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + pszRegPathClass, + 0, + KEY_QUERY_VALUE, + &hKey); + if (dwError != ERROR_SUCCESS) + return CR_INVALID_DATA; + + dwError = RegQueryInfoKeyW(hKey, + NULL, + NULL, + NULL, + &ClassCount, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL); + RegCloseKey(hKey); + if (dwError != ERROR_SUCCESS) + return CR_INVALID_DATA; + + return CR_SUCCESS; +} +#endif + + +/* Function 19 */ +CONFIGRET PNP_GetClassName(handle_t BindingHandle, wchar_t *ClassGuid, wchar_t *Buffer, @@ -729,6 +808,7 @@ } +/* Function 20 */ CONFIGRET PNP_DeleteClassKey(handle_t BindingHandle, wchar_t *ClassGuid, @@ -755,7 +835,45 @@ } +/* Function 29 */ CONFIGRET +PNP_DeviceInstanceAction(handle_t BindingHandle, + unsigned long MajorAction, + unsigned long MinorAction, + wchar_t *DeviceInstance1, + wchar_t *DeviceInstance2) +{ + CONFIGRET ret = CR_SUCCESS; + + DPRINT("PNP_DeviceInstanceAction() called\n"); + + switch (MajorAction) + { + case 4: + DPRINT("Enable device instance\n"); + break; + + case 5: + DPRINT("Disable device instance\n"); + break; + + case 7: + DPRINT("Reenumerate device instance\n"); + break; + + default: + DPRINT1("Unknown function %lu\n", MajorAction); + ret = CR_CALL_NOT_IMPLEMENTED; + } + + DPRINT("PNP_DeviceInstanceAction() done (returns %lx)\n", ret); + + return ret; +} + + +/* Function 30 */ +CONFIGRET PNP_GetDeviceStatus(handle_t BindingHandle, [truncated at 1000 lines; 175 more skipped]

18 years, 9 months

[navaraf] 20222: Tip of the day: Never let a sick person code.

by navaraf＠svn.reactos.com

Tip of the day: Never let a sick person code. Modified: trunk/reactos/lib/kernel32/file/volume.c _____ Modified: trunk/reactos/lib/kernel32/file/volume.c --- trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 12:13:06 UTC (rev 20221) +++ trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 12:16:28 UTC (rev 20222) @@ -826,7 +826,7 @@ * an NT acceptable name. */ - if (!RtlDosPathNameToNtPathName_U(VolumeName, &NtFileName, NULL, NULL)) + if (!RtlDosPathNameToNtPathName_U(VolumeMountPoint, &NtFileName, NULL, NULL)) { SetLastError(ERROR_PATH_NOT_FOUND); return FALSE;

18 years, 9 months

[navaraf] 20221: Fix a handle leak.

by navaraf＠svn.reactos.com

Fix a handle leak. Modified: trunk/reactos/lib/kernel32/file/volume.c _____ Modified: trunk/reactos/lib/kernel32/file/volume.c --- trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 12:09:08 UTC (rev 20220) +++ trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 12:13:06 UTC (rev 20221) @@ -946,6 +946,7 @@ else if (!NT_SUCCESS(Status)) { RtlFreeHeap(GetProcessHeap(), 0, MountPoint); + NtClose(FileHandle); SetLastErrorByStatus(Status); return FALSE; }

18 years, 9 months

[navaraf] 20220: Fix a cut & paste error.

by navaraf＠svn.reactos.com

Fix a cut & paste error. Modified: trunk/reactos/lib/kernel32/file/volume.c _____ Modified: trunk/reactos/lib/kernel32/file/volume.c --- trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 12:05:55 UTC (rev 20219) +++ trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 12:09:08 UTC (rev 20220) @@ -991,11 +991,12 @@ } else { - RtlFreeHeap(GetProcessHeap(), 0, MountPoints); SetLastError(ERROR_FILENAME_EXCED_RANGE); Result = FALSE; } + RtlFreeHeap(GetProcessHeap(), 0, MountPoints); + return Result; } }

18 years, 9 months

[navaraf] 20219: Minor cleanup of GetVolumeNameForVolumeMountPointW and fix some incorrect return codes (spotted by w3seek).

by navaraf＠svn.reactos.com

Minor cleanup of GetVolumeNameForVolumeMountPointW and fix some incorrect return codes (spotted by w3seek). Modified: trunk/reactos/lib/kernel32/file/volume.c _____ Modified: trunk/reactos/lib/kernel32/file/volume.c --- trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 11:31:12 UTC (rev 20218) +++ trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 12:05:55 UTC (rev 20219) @@ -811,7 +811,6 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE FileHandle; IO_STATUS_BLOCK Iosb; - PVOID Buffer; ULONG BufferLength; PMOUNTDEV_NAME MountDevName; PMOUNTMGR_MOUNT_POINT MountPoint; @@ -819,6 +818,7 @@ PMOUNTMGR_MOUNT_POINTS MountPoints; ULONG Index; PUCHAR SymbolicLinkName; + BOOL Result; NTSTATUS Status; /* @@ -858,30 +858,32 @@ BufferLength = sizeof(MOUNTDEV_NAME) + 50 * sizeof(WCHAR); do { - MountDevName = Buffer = RtlAllocateHeap(GetProcessHeap(), 0, BufferLength); - if (Buffer == NULL) + MountDevName = RtlAllocateHeap(GetProcessHeap(), 0, BufferLength); + if (MountDevName == NULL) { NtClose(FileHandle); - SetLastErrorByStatus(Status); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, NULL, &Iosb, IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, - NULL, 0, Buffer, BufferLength); - if (Status == STATUS_BUFFER_OVERFLOW) + NULL, 0, MountDevName, BufferLength); + if (!NT_SUCCESS(Status)) { - BufferLength = sizeof(MOUNTDEV_NAME) + MountDevName->NameLength; - RtlFreeHeap(GetProcessHeap(), 0, Buffer); - continue; + RtlFreeHeap(GetProcessHeap(), 0, MountDevName); + if (Status == STATUS_BUFFER_OVERFLOW) + { + BufferLength = sizeof(MOUNTDEV_NAME) + MountDevName->NameLength; + continue; + } + else + { + NtClose(FileHandle); + SetLastErrorByStatus(Status); + return FALSE; + } } - else if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(GetProcessHeap(), 0, Buffer); - NtClose(FileHandle); - SetLastErrorByStatus(Status); - return FALSE; - } } while (!NT_SUCCESS(Status)); @@ -920,32 +922,34 @@ BufferLength = sizeof(MOUNTMGR_MOUNT_POINTS); do { - MountPoints = Buffer = RtlAllocateHeap(GetProcessHeap(), 0, BufferLength); - if (Buffer == NULL) + MountPoints = RtlAllocateHeap(GetProcessHeap(), 0, BufferLength); + if (MountPoints == NULL) { RtlFreeHeap(GetProcessHeap(), 0, MountPoint); NtClose(FileHandle); - SetLastErrorByStatus(Status); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, NULL, &Iosb, IOCTL_MOUNTMGR_QUERY_POINTS, MountPoint, MountPointSize, - Buffer, BufferLength); - if (Status == STATUS_BUFFER_OVERFLOW) + MountPoints, BufferLength); + if (!NT_SUCCESS(Status)) { - BufferLength = MountPoints->Size; - RtlFreeHeap(GetProcessHeap(), 0, Buffer); - continue; + RtlFreeHeap(GetProcessHeap(), 0, MountPoints); + if (Status == STATUS_BUFFER_OVERFLOW) + { + BufferLength = MountPoints->Size; + continue; + } + else if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(GetProcessHeap(), 0, MountPoint); + SetLastErrorByStatus(Status); + return FALSE; + } } - else if (!NT_SUCCESS(Status)) - { - RtlFreeHeap(GetProcessHeap(), 0, MountPoint); - RtlFreeHeap(GetProcessHeap(), 0, Buffer); - SetLastErrorByStatus(Status); - return FALSE; - } } while (!NT_SUCCESS(Status)); @@ -983,14 +987,16 @@ (PUCHAR)MountPoints + MountPoint->SymbolicLinkNameOffset, MountPoint->SymbolicLinkNameLength); VolumeName[1] = L'\\'; + Result = TRUE; + } + else + { RtlFreeHeap(GetProcessHeap(), 0, MountPoints); - return TRUE; + SetLastError(ERROR_FILENAME_EXCED_RANGE); + Result = FALSE; } - RtlFreeHeap(GetProcessHeap(), 0, MountPoints); - SetLastError(ERROR_FILENAME_EXCED_RANGE); - - return FALSE; + return Result; } } }

18 years, 9 months

[navaraf] 20218: Fix bunch of bugs in GetVolumeNameForVolumeMountPointW. Thanks to w3seek.

by navaraf＠svn.reactos.com

Fix bunch of bugs in GetVolumeNameForVolumeMountPointW. Thanks to w3seek. Modified: trunk/reactos/lib/kernel32/file/volume.c _____ Modified: trunk/reactos/lib/kernel32/file/volume.c --- trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 11:08:16 UTC (rev 20217) +++ trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 11:31:12 UTC (rev 20218) @@ -826,10 +826,17 @@ * an NT acceptable name. */ - RtlDosPathNameToNtPathName_U(L"e:\\", &NtFileName, NULL, NULL); + if (!RtlDosPathNameToNtPathName_U(VolumeName, &NtFileName, NULL, NULL)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return FALSE; + } + if (NtFileName.Length > sizeof(WCHAR) && NtFileName.Buffer[(NtFileName.Length / sizeof(WCHAR)) - 1] == '\\') + { NtFileName.Length -= sizeof(WCHAR); + } /* * Query mount point device name which we will later use for determining @@ -852,17 +859,26 @@ do { MountDevName = Buffer = RtlAllocateHeap(GetProcessHeap(), 0, BufferLength); + if (Buffer == NULL) + { + NtClose(FileHandle); + SetLastErrorByStatus(Status); + return FALSE; + } + Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, NULL, &Iosb, IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, NULL, 0, Buffer, BufferLength); if (Status == STATUS_BUFFER_OVERFLOW) { BufferLength = sizeof(MOUNTDEV_NAME) + MountDevName->NameLength; + RtlFreeHeap(GetProcessHeap(), 0, Buffer); continue; } else if (!NT_SUCCESS(Status)) { RtlFreeHeap(GetProcessHeap(), 0, Buffer); + NtClose(FileHandle); SetLastErrorByStatus(Status); return FALSE; } @@ -877,6 +893,12 @@ MountPointSize = MountDevName->NameLength + sizeof(MOUNTMGR_MOUNT_POINT); MountPoint = RtlAllocateHeap(GetProcessHeap(), 0, MountPointSize); + if (MountPoint == NULL) + { + RtlFreeHeap(GetProcessHeap(), 0, MountDevName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } RtlZeroMemory(MountPoint, sizeof(MOUNTMGR_MOUNT_POINT)); MountPoint->DeviceNameOffset = sizeof(MOUNTMGR_MOUNT_POINT); MountPoint->DeviceNameLength = MountDevName->NameLength; @@ -899,6 +921,14 @@ do { MountPoints = Buffer = RtlAllocateHeap(GetProcessHeap(), 0, BufferLength); + if (Buffer == NULL) + { + RtlFreeHeap(GetProcessHeap(), 0, MountPoint); + NtClose(FileHandle); + SetLastErrorByStatus(Status); + return FALSE; + } + Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, NULL, &Iosb, IOCTL_MOUNTMGR_QUERY_POINTS, MountPoint, MountPointSize, @@ -906,6 +936,7 @@ if (Status == STATUS_BUFFER_OVERFLOW) { BufferLength = MountPoints->Size; + RtlFreeHeap(GetProcessHeap(), 0, Buffer); continue; } else if (!NT_SUCCESS(Status)) @@ -938,7 +969,7 @@ if (MountPoint->SymbolicLinkNameLength == 48 * sizeof(WCHAR) || (MountPoint->SymbolicLinkNameLength == 49 * sizeof(WCHAR) && - SymbolicLinkName[49] == L'\\')) + SymbolicLinkName[48] == L'\\')) { if (RtlCompareMemory(SymbolicLinkName, L"\\??\\Volume{", 11 * sizeof(WCHAR)) == 11 * sizeof(WCHAR) &&

18 years, 9 months

[navaraf] 20217: Implementation of GetVolumeNameForVolumeMountPointW (depends on mount manager, so it doesn't work in ROS).

by navaraf＠svn.reactos.com

Implementation of GetVolumeNameForVolumeMountPointW (depends on mount manager, so it doesn't work in ROS). Modified: trunk/reactos/lib/kernel32/file/volume.c Modified: trunk/reactos/lib/kernel32/k32.h Modified: trunk/reactos/lib/kernel32/misc/stubs.c _____ Modified: trunk/reactos/lib/kernel32/file/volume.c --- trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 06:26:20 UTC (rev 20216) +++ trunk/reactos/lib/kernel32/file/volume.c 2005-12-17 11:08:16 UTC (rev 20217) @@ -782,4 +782,192 @@ return TRUE; } +/** + * @name GetVolumeNameForVolumeMountPointW + * + * Return an unique volume name for a drive root or mount point. + * + * @param VolumeMountPoint + * Pointer to string that contains either root drive name or + * mount point name. + * @param VolumeName + * Pointer to buffer that is filled with resulting unique + * volume name on success. + * @param VolumeNameLength + * Size of VolumeName buffer in TCHARs. + * + * @return + * TRUE when the function succeeds and the VolumeName buffer is filled, + * FALSE otherwise. + */ + +BOOL WINAPI +GetVolumeNameForVolumeMountPointW( + IN LPCWSTR VolumeMountPoint, + OUT LPWSTR VolumeName, + IN DWORD VolumeNameLength) +{ + UNICODE_STRING NtFileName; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE FileHandle; + IO_STATUS_BLOCK Iosb; + PVOID Buffer; + ULONG BufferLength; + PMOUNTDEV_NAME MountDevName; + PMOUNTMGR_MOUNT_POINT MountPoint; + ULONG MountPointSize; + PMOUNTMGR_MOUNT_POINTS MountPoints; + ULONG Index; + PUCHAR SymbolicLinkName; + NTSTATUS Status; + + /* + * First step is to convert the passed volume mount point name to + * an NT acceptable name. + */ + + RtlDosPathNameToNtPathName_U(L"e:\\", &NtFileName, NULL, NULL); + if (NtFileName.Length > sizeof(WCHAR) && + NtFileName.Buffer[(NtFileName.Length / sizeof(WCHAR)) - 1] == '\\') + NtFileName.Length -= sizeof(WCHAR); + + /* + * Query mount point device name which we will later use for determining + * the volume name. + */ + + InitializeObjectAttributes(&ObjectAttributes, &NtFileName, 0, NULL, NULL); + Status = NtOpenFile(&FileHandle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, &Iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + RtlFreeUnicodeString(&NtFileName); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + BufferLength = sizeof(MOUNTDEV_NAME) + 50 * sizeof(WCHAR); + do + { + MountDevName = Buffer = RtlAllocateHeap(GetProcessHeap(), 0, BufferLength); + Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, NULL, &Iosb, + IOCTL_MOUNTDEV_QUERY_DEVICE_NAME, + NULL, 0, Buffer, BufferLength); + if (Status == STATUS_BUFFER_OVERFLOW) + { + BufferLength = sizeof(MOUNTDEV_NAME) + MountDevName->NameLength; + continue; + } + else if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(GetProcessHeap(), 0, Buffer); + SetLastErrorByStatus(Status); + return FALSE; + } + } + while (!NT_SUCCESS(Status)); + + NtClose(FileHandle); + + /* + * Get the mount point information from mount manager. + */ + + MountPointSize = MountDevName->NameLength + sizeof(MOUNTMGR_MOUNT_POINT); + MountPoint = RtlAllocateHeap(GetProcessHeap(), 0, MountPointSize); + RtlZeroMemory(MountPoint, sizeof(MOUNTMGR_MOUNT_POINT)); + MountPoint->DeviceNameOffset = sizeof(MOUNTMGR_MOUNT_POINT); + MountPoint->DeviceNameLength = MountDevName->NameLength; + RtlCopyMemory(MountPoint + 1, MountDevName->Name, MountDevName->NameLength); + RtlFreeHeap(GetProcessHeap(), 0, MountDevName); + + RtlInitUnicodeString(&NtFileName, L"\\??\\MountPointManager"); + InitializeObjectAttributes(&ObjectAttributes, &NtFileName, 0, NULL, NULL); + Status = NtOpenFile(&FileHandle, FILE_GENERIC_READ, &ObjectAttributes, + &Iosb, FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + RtlFreeHeap(GetProcessHeap(), 0, MountPoint); + return FALSE; + } + + BufferLength = sizeof(MOUNTMGR_MOUNT_POINTS); + do + { + MountPoints = Buffer = RtlAllocateHeap(GetProcessHeap(), 0, BufferLength); + Status = NtDeviceIoControlFile(FileHandle, NULL, NULL, NULL, &Iosb, + IOCTL_MOUNTMGR_QUERY_POINTS, + MountPoint, MountPointSize, + Buffer, BufferLength); + if (Status == STATUS_BUFFER_OVERFLOW) + { + BufferLength = MountPoints->Size; + continue; + } + else if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(GetProcessHeap(), 0, MountPoint); + RtlFreeHeap(GetProcessHeap(), 0, Buffer); + SetLastErrorByStatus(Status); + return FALSE; + } + } + while (!NT_SUCCESS(Status)); + + RtlFreeHeap(GetProcessHeap(), 0, MountPoint); + NtClose(FileHandle); + + /* + * Now we've gathered info about all mount points mapped to our device, so + * select the correct one and copy it into the output buffer. + */ + + for (Index = 0; Index < MountPoints->NumberOfMountPoints; Index++) + { + MountPoint = MountPoints->MountPoints + Index; + SymbolicLinkName = (PUCHAR)MountPoints + MountPoint->SymbolicLinkNameOffset; + + /* + * Check for "\\?\Volume{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}\" + * (with the last slash being optional) style symbolic links. + */ + + if (MountPoint->SymbolicLinkNameLength == 48 * sizeof(WCHAR) || + (MountPoint->SymbolicLinkNameLength == 49 * sizeof(WCHAR) && + SymbolicLinkName[49] == L'\\')) + { + if (RtlCompareMemory(SymbolicLinkName, L"\\??\\Volume{", + 11 * sizeof(WCHAR)) == 11 * sizeof(WCHAR) && + SymbolicLinkName[19] == L'-' && SymbolicLinkName[24] == L'-' && + SymbolicLinkName[29] == L'-' && SymbolicLinkName[34] == L'-' && + SymbolicLinkName[47] == L'}') + { + if (VolumeNameLength >= MountPoint->SymbolicLinkNameLength / sizeof(WCHAR)) + { + RtlCopyMemory(VolumeName, + (PUCHAR)MountPoints + MountPoint->SymbolicLinkNameOffset, + MountPoint->SymbolicLinkNameLength); + VolumeName[1] = L'\\'; + RtlFreeHeap(GetProcessHeap(), 0, MountPoints); + return TRUE; + } + + RtlFreeHeap(GetProcessHeap(), 0, MountPoints); + SetLastError(ERROR_FILENAME_EXCED_RANGE); + + return FALSE; + } + } + } + + RtlFreeHeap(GetProcessHeap(), 0, MountPoints); + SetLastError(ERROR_INVALID_PARAMETER); + + return FALSE; +} + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/k32.h --- trunk/reactos/lib/kernel32/k32.h 2005-12-17 06:26:20 UTC (rev 20216) +++ trunk/reactos/lib/kernel32/k32.h 2005-12-17 11:08:16 UTC (rev 20217) @@ -30,6 +30,8 @@ /* DDK Driver Headers */ #include <ntddbeep.h> #include <ntddser.h> +#include <mountmgr.h> +#include <mountdev.h> /* Internal Kernel32 Header */ #include "include/kernel32.h" _____ Modified: trunk/reactos/lib/kernel32/misc/stubs.c --- trunk/reactos/lib/kernel32/misc/stubs.c 2005-12-17 06:26:20 UTC (rev 20216) +++ trunk/reactos/lib/kernel32/misc/stubs.c 2005-12-17 11:08:16 UTC (rev 20217) @@ -1109,21 +1109,6 @@ */ BOOL STDCALL -GetVolumeNameForVolumeMountPointW( - LPCWSTR lpszVolumeMountPoint, - LPWSTR lpszVolumeName, - DWORD cchBufferLength - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL GetVolumePathNameW( LPCWSTR lpszFileName, LPWSTR lpszVolumePathName,

18 years, 9 months

← Newer
1
...
25
26
27
28
29
30
31
...
71
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 December 2005