Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 43121: - Comment out RegNotifyChangeKeyValue call until it gets implemented - WSAStartup succeeds now
by cgutman＠svn.reactos.org 23 Sep '09

23 Sep '09

Author: cgutman Date: Wed Sep 23 03:17:14 2009 New Revision: 43121 URL: http://svn.reactos.org/svn/reactos?rev=43121&view=rev Log: - Comment out RegNotifyChangeKeyValue call until it gets implemented - WSAStartup succeeds now Modified: trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] Wed Sep 23 03:17:14 2009 @@ -154,6 +154,7 @@ /* Start loop */ do { +#if 0 /* Ask for notifications */ ErrorCode = RegNotifyChangeKeyValue(CatalogKey, FALSE, @@ -166,6 +167,7 @@ ErrorCode = WSASYSCALLFAILURE; break; } +#endif /* Read the current ID */ ErrorCode = RegQueryValueEx(CatalogKey,

1 0

[arty] 43120: Allocate a TLS slot once at process join and treat TlsIndex as an alias to it.
by arty＠svn.reactos.org 23 Sep '09

23 Sep '09

Author: arty Date: Wed Sep 23 02:45:19 2009 New Revision: 43120 URL: http://svn.reactos.org/svn/reactos?rev=43120&view=rev Log: Allocate a TLS slot once at process join and treat TlsIndex as an alias to it. Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c trunk/reactos/dll/win32/ws2_32_new/src/dthread.c Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32p.h [iso-8859-1] Wed Sep 23 02:45:19 2009 @@ -251,9 +251,9 @@ extern HINSTANCE WsDllHandle; extern HANDLE WsSockHeap; extern PWAH_HANDLE_TABLE WsSockHandleTable; -extern DWORD TlsIndex; extern PWSPROCESS CurrentWsProcess; extern DWORD GlobalTlsIndex; +#define TlsIndex GlobalTlsIndex extern BOOLEAN WsAsyncThreadInitialized; extern PWS_SOCK_POST_ROUTINE WsSockPostRoutine; Modified: trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] Wed Sep 23 02:45:19 2009 @@ -19,7 +19,7 @@ HANDLE WsSockHeap; HINSTANCE WsDllHandle; -DWORD GlobalTlsIndex; +DWORD GlobalTlsIndex = TLS_OUT_OF_INDEXES; /* FUNCTIONS *****************************************************************/ @@ -35,7 +35,6 @@ switch (dwReason) { case DLL_PROCESS_ATTACH: - /* Save DLL Handle */ WsDllHandle = hModule; @@ -43,8 +42,14 @@ WsSockHeap = GetProcessHeap(); /* TLS Allocation */ - GlobalTlsIndex = TlsAlloc(); - if (GlobalTlsIndex == TLS_OUT_OF_INDEXES) return FALSE; + if (GlobalTlsIndex == TLS_OUT_OF_INDEXES) + { + GlobalTlsIndex = TlsAlloc(); + if (GlobalTlsIndex == TLS_OUT_OF_INDEXES) + { + return FALSE; + } + } /* Initialize some critical sections */ WsCreateStartupSynchronization(); @@ -61,7 +66,6 @@ break; case DLL_PROCESS_DETACH: - /* Make sure we were initialized */ if (!WsDllHandle) break; Modified: trunk/reactos/dll/win32/ws2_32_new/src/dthread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] Wed Sep 23 02:45:19 2009 @@ -9,10 +9,6 @@ /* INCLUDES ******************************************************************/ #include "ws2_32.h" -/* DATA **********************************************************************/ - -DWORD TlsIndex; - /* FUNCTIONS *****************************************************************/ DWORD @@ -156,16 +152,7 @@ INT ErrorCode = WSASYSCALLFAILURE; /* Check if we have a valid TLS */ - if (TlsIndex == TLS_OUT_OF_INDEXES) - { - /* Set the global one */ - if ((TlsIndex = GlobalTlsIndex) != TLS_OUT_OF_INDEXES) - { - /* Success! */ - ErrorCode = ERROR_SUCCESS; - } - } - else + if (TlsIndex != TLS_OUT_OF_INDEXES) { /* TLS was already OK */ ErrorCode = ERROR_SUCCESS; @@ -179,12 +166,6 @@ WSAAPI WsThreadCleanup(VOID) { - /* Check if we have a valid TLS */ - if (TlsIndex != TLS_OUT_OF_INDEXES) - { - /* We do, invalidate it */ - TlsIndex = TLS_OUT_OF_INDEXES; - } } DWORD @@ -250,6 +231,7 @@ { /* Delete it */ WsThreadDelete(Thread); + TlsSetValue(TlsIndex, 0); } } }

1 0

[fireball] 43119: [win32k] - Giannis Adamopoulos: Don't do callbacks to usermode when holding the lock. Fixes the famous "VMWare video driver installer 2nd stage hang" bug. Signed off by James Tabor. See issue #2666 for more details.
by fireball＠svn.reactos.org 22 Sep '09

22 Sep '09

Author: fireball Date: Tue Sep 22 23:50:33 2009 New Revision: 43119 URL: http://svn.reactos.org/svn/reactos?rev=43119&view=rev Log: [win32k] - Giannis Adamopoulos: Don't do callbacks to usermode when holding the lock. Fixes the famous "VMWare video driver installer 2nd stage hang" bug. Signed off by James Tabor. See issue #2666 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Tue Sep 22 23:50:33 2009 @@ -534,11 +534,6 @@ UserMode, FALSE, NULL, NULL); UserEnterCo(); - - while (co_MsqDispatchOneSentMessage(MessageQueue)) - { - ; - } } while (NT_SUCCESS(WaitStatus) && STATUS_WAIT_0 != WaitStatus);

1 0

[cfinck] 43118: - Get rid of the KDB_MODULE_INFO and operate with LDR_DATA_TABLE_ENTRYs directly. This saves us from some copy steps and unneeded search operations. - Fix loading HAL.DLL symbols. This module is not guaranteed to be the second one in PsLoadedModuleList due to the kernel loading bootvid.dll. - Don't duplicate code in KdbpSymFindModule and KdbpSymFindUserModule. Use a helper function instead and call it twice from KdbpSymFindModule. - Get rid of KdbpSymFindModuleByAddress, KdbpSymF
by cfinck＠svn.reactos.org 22 Sep '09

22 Sep '09

Author: cfinck Date: Tue Sep 22 23:31:55 2009 New Revision: 43118 URL: http://svn.reactos.org/svn/reactos?rev=43118&view=rev Log: - Get rid of the KDB_MODULE_INFO and operate with LDR_DATA_TABLE_ENTRYs directly. This saves us from some copy steps and unneeded search operations. - Fix loading HAL.DLL symbols. This module is not guaranteed to be the second one in PsLoadedModuleList due to the kernel loading bootvid.dll. - Don't duplicate code in KdbpSymFindModule and KdbpSymFindUserModule. Use a helper function instead and call it twice from KdbpSymFindModule. - Get rid of KdbpSymFindModuleByAddress, KdbpSymFindModuleByName and KdbpSymFindModuleByIndex. Instead use a single KdbpSymFindModule for all three variants. - Remove some unused functions and defines. Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb.c trunk/reactos/ntoskrnl/kdbg/kdb.h trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Tue Sep 22 23:31:55 2009 @@ -69,41 +69,13 @@ #if defined(KDBG) || DBG VOID -KdbSymLoadUserModuleSymbols( - IN PLDR_DATA_TABLE_ENTRY LdrModule); - -VOID -KdbSymFreeProcessSymbols( - IN PEPROCESS Process); - -VOID -KdbSymLoadDriverSymbols( - IN PUNICODE_STRING Filename, - IN PLDR_DATA_TABLE_ENTRY Module -); - -VOID -KdbSymUnloadDriverSymbols( - IN PLDR_DATA_TABLE_ENTRY ModuleObject); - -VOID -KdbSymProcessBootSymbols( - IN PANSI_STRING AnsiFileName, - IN BOOLEAN FullName, - IN BOOLEAN LoadFromFile); - -VOID KdbSymProcessSymbols( - IN PANSI_STRING FileName, - IN PKD_SYMBOLS_INFO SymbolInfo); + IN PLDR_DATA_TABLE_ENTRY LdrEntry); + BOOLEAN KdbSymPrintAddress( IN PVOID Address); - -VOID -KdbDeleteProcessHook( - IN PEPROCESS Process); NTSTATUS KdbSymGetAddressInformation( @@ -113,46 +85,16 @@ OUT PCH FileName OPTIONAL, OUT PCH FunctionName OPTIONAL ); - -typedef struct _KDB_MODULE_INFO -{ - WCHAR Name[256]; - ULONG_PTR Base; - ULONG Size; - PROSSYM_INFO RosSymInfo; -} -KDB_MODULE_INFO, *PKDB_MODULE_INFO; - -/* MACROS FOR NON-KDBG BUILDS ************************************************/ - -# define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) -# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) -# define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) -# define KDB_SYMBOLFILE_HOOK(FILENAME, SYMBOLINFO) KdbSymProcessSymbols((FILENAME), (SYMBOLINFO)) -#else -# define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) -# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) -# define KDB_UNLOADDRIVER_HOOK(MODULE) do { } while (0) -# define KDB_SYMBOLFILE_HOOK(FILENAME, SYMBOLINFO) do { } while (0) -# define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) -#endif - -#if defined(KDBG) || DBG -# define KeRosPrintAddress(ADDRESS) KdbSymPrintAddress(ADDRESS) -#else -# define KeRosPrintAddress(ADDRESS) KiRosPrintAddress(ADDRESS) #endif #ifdef KDBG # define KdbInit() KdbpCliInit() # define KdbModuleLoaded(FILENAME) KdbpCliModuleLoaded(FILENAME) -# define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) #else # define KdbEnterDebuggerException(ER, PM, C, TF, F) kdHandleException # define KdbInit() do { } while (0) # define KdbEnter() do { } while (0) # define KdbModuleLoaded(X) do { } while (0) -# define KDB_DELETEPROCESS_HOOK(PROCESS) do { } while (0) #endif /* KD ROUTINES ***************************************************************/ Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Tue Sep 22 23:31:55 2009 @@ -135,9 +135,13 @@ } else if (ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) { +#ifdef KDBG + PLDR_DATA_TABLE_ENTRY LdrEntry; + /* Load symbols. Currently implemented only for KDBG! */ - KDB_SYMBOLFILE_HOOK((PANSI_STRING)ExceptionRecord->ExceptionInformation[1], - (PKD_SYMBOLS_INFO)ExceptionRecord->ExceptionInformation[2]); + if(KdbpSymFindModule(((PKD_SYMBOLS_INFO)ExceptionRecord->ExceptionInformation[2])->BaseOfDll, NULL, -1, &LdrEntry)) + KdbSymProcessSymbols(LdrEntry); +#endif } /* This we can handle: simply bump EIP */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Tue Sep 22 23:31:55 2009 @@ -1678,15 +1678,6 @@ } VOID -KdbDeleteProcessHook( - IN PEPROCESS Process) -{ - KdbSymFreeProcessSymbols(Process); - - /* FIXME: Delete breakpoints for process */ -} - -VOID NTAPI KdbpGetCommandLineSettings( PCHAR p1) Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.h?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] Tue Sep 22 23:31:55 2009 @@ -142,16 +142,11 @@ /* from kdb_symbols.c */ BOOLEAN -KdbpSymFindModuleByAddress(IN PVOID Address, - OUT PKDB_MODULE_INFO pInfo); - -BOOLEAN -KdbpSymFindModuleByName(IN LPCWSTR Name, - OUT PKDB_MODULE_INFO pInfo); - -BOOLEAN -KdbpSymFindModuleByIndex(IN INT Index, - OUT PKDB_MODULE_INFO pInfo); +KdbpSymFindModule( + IN PVOID Address OPTIONAL, + IN LPCWSTR Name OPTIONAL, + IN INT Index OPTIONAL, + OUT PLDR_DATA_TABLE_ENTRY* pLdrEntry); /* from kdb.c */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Tue Sep 22 23:31:55 2009 @@ -1476,7 +1476,7 @@ { ULONGLONG Result = 0; ULONG_PTR Address; - KDB_MODULE_INFO Info; + PLDR_DATA_TABLE_ENTRY LdrEntry; BOOLEAN DisplayOnlyOneModule = FALSE; INT i = 0; @@ -1498,7 +1498,7 @@ Address = (ULONG_PTR)Result; - if (!KdbpSymFindModuleByAddress((PVOID)Address, &Info)) + if (!KdbpSymFindModule((PVOID)Address, NULL, -1, &LdrEntry)) { KdbpPrint("No module containing address 0x%p found!\n", Address); return TRUE; @@ -1508,7 +1508,7 @@ } else { - if (!KdbpSymFindModuleByIndex(0, &Info)) + if (!KdbpSymFindModule(NULL, NULL, 0, &LdrEntry)) { ULONG_PTR ntoskrnlBase = ((ULONG_PTR)KdbpCmdMod) & 0xfff00000; KdbpPrint(" Base Size Name\n"); @@ -1522,13 +1522,10 @@ KdbpPrint(" Base Size Name\n"); for (;;) { - KdbpPrint(" %08x %08x %ws\n", Info.Base, Info.Size, Info.Name); - - if ((!DisplayOnlyOneModule && !KdbpSymFindModuleByIndex(i++, &Info)) || - DisplayOnlyOneModule) - { + KdbpPrint(" %08x %08x %wZ\n", LdrEntry->DllBase, LdrEntry->SizeOfImage, &LdrEntry->BaseDllName); + + if(DisplayOnlyOneModule || !KdbpSymFindModule(NULL, NULL, i++, &LdrEntry)) break; - } } return TRUE; Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Tue Sep 22 23:31:55 2009 @@ -5,6 +5,7 @@ * PURPOSE: Getting symbol information... * * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * Colin Finck (colin(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -32,60 +33,24 @@ /* FUNCTIONS ****************************************************************/ -/*! \brief Find a user-mode module... - * - * \param Address If \a Address is not NULL the module containing \a Address - * is searched. - * \param Name If \a Name is not NULL the module named \a Name will be - * searched. - * \param Index If \a Index is >= 0 the Index'th module will be returned. - * \param pInfo Pointer to a KDB_MODULE_INFO which is filled. - * - * \retval TRUE Module was found, \a pInfo was filled. - * \retval FALSE No module was found. - * - * \sa KdbpSymFindModule - */ static BOOLEAN -KdbpSymFindUserModule( - IN PVOID Address OPTIONAL, - IN LPCWSTR Name OPTIONAL, - IN INT Index OPTIONAL, - OUT PKDB_MODULE_INFO pInfo) -{ - PLIST_ENTRY current_entry; - PLDR_DATA_TABLE_ENTRY current; - PEPROCESS CurrentProcess; - PPEB Peb = NULL; - INT Count = 0; - INT Length; - - if (!KdbpSymbolsInitialized) - return FALSE; - - CurrentProcess = PsGetCurrentProcess(); - if (CurrentProcess) - Peb = CurrentProcess->Peb; - - if (!Peb || !Peb->Ldr) - return FALSE; - - current_entry = Peb->Ldr->InLoadOrderModuleList.Flink; - - while (current_entry != &Peb->Ldr->InLoadOrderModuleList && current_entry) - { - current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - Length = min(current->BaseDllName.Length / sizeof(WCHAR), 255); - if ((Address && (Address >= (PVOID)current->DllBase && - Address < (PVOID)((char *)current->DllBase + current->SizeOfImage))) || - (Name && _wcsnicmp(current->BaseDllName.Buffer, Name, Length) == 0) || - (Index >= 0 && Count++ == Index)) +KdbpSymSearchModuleList( + IN PLIST_ENTRY current_entry, + IN PLIST_ENTRY end_entry, + IN PLONG Count, + IN PVOID Address, + IN LPCWSTR Name, + IN INT Index, + OUT PLDR_DATA_TABLE_ENTRY* pLdrEntry) +{ + while (current_entry && current_entry != end_entry) + { + *pLdrEntry = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + if ((Address && Address >= (PVOID)(*pLdrEntry)->DllBase && Address < (PVOID)((ULONG_PTR)(*pLdrEntry)->DllBase + (*pLdrEntry)->SizeOfImage)) || + (Name && !_wcsnicmp((*pLdrEntry)->BaseDllName.Buffer, Name, (*pLdrEntry)->BaseDllName.Length / sizeof(WCHAR))) || + (Index >= 0 && (*Count)++ == Index)) { - wcsncpy(pInfo->Name, current->BaseDllName.Buffer, Length); - pInfo->Name[Length] = L'\0'; - pInfo->Base = (ULONG_PTR)current->DllBase; - pInfo->Size = current->SizeOfImage; - pInfo->RosSymInfo = current->PatchInformation; return TRUE; } @@ -95,111 +60,53 @@ return FALSE; } -/*! \brief Find a kernel-mode module... - * - * Works like \a KdbpSymFindUserModule. - * - * \sa KdbpSymFindUserModule - */ -static BOOLEAN +/*! \brief Find a module... + * + * \param Address If \a Address is not NULL the module containing \a Address + * is searched. + * \param Name If \a Name is not NULL the module named \a Name will be + * searched. + * \param Index If \a Index is >= 0 the Index'th module will be returned. + * \param pLdrEntry Pointer to a PLDR_DATA_TABLE_ENTRY which is filled. + * + * \retval TRUE Module was found, \a pLdrEntry was filled. + * \retval FALSE No module was found. + */ +BOOLEAN KdbpSymFindModule( IN PVOID Address OPTIONAL, IN LPCWSTR Name OPTIONAL, IN INT Index OPTIONAL, - OUT PKDB_MODULE_INFO pInfo) -{ - PLIST_ENTRY current_entry; - PLDR_DATA_TABLE_ENTRY current; - INT Count = 0; - INT Length; - - if (!KdbpSymbolsInitialized) + OUT PLDR_DATA_TABLE_ENTRY* pLdrEntry) +{ + LONG Count = 0; + PEPROCESS CurrentProcess; + + /* First try to look up the module in the kernel module list. */ + if(KdbpSymSearchModuleList(PsLoadedModuleList.Flink, + &PsLoadedModuleList, + &Count, + Address, + Name, + Index, + pLdrEntry)) + { + return TRUE; + } + + /* That didn't succeed. Try the module list of the current process now. */ + CurrentProcess = PsGetCurrentProcess(); + + if(!CurrentProcess || !CurrentProcess->Peb || !CurrentProcess->Peb->Ldr) return FALSE; - current_entry = PsLoadedModuleList.Flink; - - while (current_entry != &PsLoadedModuleList) - { - current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - Length = min(current->BaseDllName.Length / sizeof(WCHAR), 255); - if ((Address && (Address >= (PVOID)current->DllBase && - Address < (PVOID)((ULONG_PTR)current->DllBase + current->SizeOfImage))) || - (Name && _wcsnicmp(current->BaseDllName.Buffer, Name, Length) == 0) || - (Index >= 0 && Count++ == Index)) - { - wcsncpy(pInfo->Name, current->BaseDllName.Buffer, Length); - pInfo->Name[Length] = L'\0'; - pInfo->Base = (ULONG_PTR)current->DllBase; - pInfo->Size = current->SizeOfImage; - pInfo->RosSymInfo = current->PatchInformation; - return TRUE; - } - - current_entry = current_entry->Flink; - } - - return KdbpSymFindUserModule(Address, Name, Index-Count, pInfo); -} - -/*! \brief Find module by address... - * - * \param Address Any address inside the module to look for. - * \param pInfo Pointer to a KDB_MODULE_INFO struct which is filled on - * success. - * - * \retval TRUE Success - module found. - * \retval FALSE Failure - module not found. - * - * \sa KdbpSymFindModuleByName - * \sa KdbpSymFindModuleByIndex - */ -BOOLEAN -KdbpSymFindModuleByAddress( - IN PVOID Address, - OUT PKDB_MODULE_INFO pInfo) -{ - return KdbpSymFindModule(Address, NULL, -1, pInfo); -} - -/*! \brief Find module by name... - * - * \param Name Name of the module to look for. - * \param pInfo Pointer to a KDB_MODULE_INFO struct which is filled on - * success. - * - * \retval TRUE Success - module found. - * \retval FALSE Failure - module not found. - * - * \sa KdbpSymFindModuleByAddress - * \sa KdbpSymFindModuleByIndex - */ -BOOLEAN -KdbpSymFindModuleByName( - IN LPCWSTR Name, - OUT PKDB_MODULE_INFO pInfo) -{ - return KdbpSymFindModule(NULL, Name, -1, pInfo); -} - -/*! \brief Find module by index... - * - * \param Index Index of the module to return. - * \param pInfo Pointer to a KDB_MODULE_INFO struct which is filled on - * success. - * - * \retval TRUE Success - module found. - * \retval FALSE Failure - module not found. - * - * \sa KdbpSymFindModuleByName - * \sa KdbpSymFindModuleByAddress - */ -BOOLEAN -KdbpSymFindModuleByIndex( - IN INT Index, - OUT PKDB_MODULE_INFO pInfo) -{ - return KdbpSymFindModule(NULL, NULL, Index, pInfo); + return KdbpSymSearchModuleList(CurrentProcess->Peb->Ldr->InLoadOrderModuleList.Flink, + &CurrentProcess->Peb->Ldr->InLoadOrderModuleList, + &Count, + Address, + Name, + Index, + pLdrEntry); } /*! \brief Print address... @@ -217,30 +124,30 @@ KdbSymPrintAddress( IN PVOID Address) { - KDB_MODULE_INFO Info; + PLDR_DATA_TABLE_ENTRY LdrEntry; ULONG_PTR RelativeAddress; NTSTATUS Status; ULONG LineNumber; CHAR FileName[256]; CHAR FunctionName[256]; - if (!KdbpSymbolsInitialized || !KdbpSymFindModuleByAddress(Address, &Info)) + if (!KdbpSymbolsInitialized || !KdbpSymFindModule(Address, NULL, -1, &LdrEntry)) return FALSE; - RelativeAddress = (ULONG_PTR) Address - Info.Base; - Status = KdbSymGetAddressInformation(Info.RosSymInfo, + RelativeAddress = (ULONG_PTR)Address - (ULONG_PTR)LdrEntry->DllBase; + Status = KdbSymGetAddressInformation(LdrEntry->PatchInformation, RelativeAddress, &LineNumber, FileName, FunctionName); if (NT_SUCCESS(Status)) { - DbgPrint("<%ws:%x (%s:%d (%s))>", - Info.Name, RelativeAddress, FileName, LineNumber, FunctionName); + DbgPrint("<%wZ:%x (%s:%d (%s))>", + &LdrEntry->BaseDllName, RelativeAddress, FileName, LineNumber, FunctionName); } else { - DbgPrint("<%ws:%x>", Info.Name, RelativeAddress); + DbgPrint("<%wZ:%x>", &LdrEntry->BaseDllName, RelativeAddress); } return TRUE; @@ -480,156 +387,10 @@ DPRINT("Installed symbols: %wZ %p\n", FileName, *RosSymInfo); } -/*! \brief Unloads symbol info. - * - * \param RosSymInfo Pointer to the symbol info to unload. - * - * \sa KdbpSymLoadModuleSymbols - */ -static VOID -KdbpSymUnloadModuleSymbols( - IN PROSSYM_INFO RosSymInfo) -{ - DPRINT("Unloading symbols\n"); - - if (RosSymInfo) - KdbpSymRemoveCachedFile(RosSymInfo); -} - -/*! \brief Load symbol info for a user module. - * - * \param LdrModule Pointer to the module to load symbols for. - */ -VOID -KdbSymLoadUserModuleSymbols( - IN PLDR_DATA_TABLE_ENTRY LdrModule) -{ - static WCHAR Prefix[] = L"\\??\\"; - UNICODE_STRING KernelName; - DPRINT("LdrModule %p\n", LdrModule); - - LdrModule->PatchInformation = NULL; - - KernelName.MaximumLength = sizeof(Prefix) + LdrModule->FullDllName.Length; - KernelName.Length = KernelName.MaximumLength - sizeof(WCHAR); - KernelName.Buffer = ExAllocatePoolWithTag(NonPagedPool, KernelName.MaximumLength, TAG_KDBS); - - if (!KernelName.Buffer) - return; - - memcpy(KernelName.Buffer, Prefix, sizeof(Prefix) - sizeof(WCHAR)); - memcpy(KernelName.Buffer + sizeof(Prefix) / sizeof(WCHAR) - 1, LdrModule->FullDllName.Buffer, LdrModule->FullDllName.Length); - KernelName.Buffer[KernelName.Length / sizeof(WCHAR)] = L'\0'; - - KdbpSymLoadModuleSymbols(&KernelName, (PROSSYM_INFO*)&LdrModule->PatchInformation); - - ExFreePool(KernelName.Buffer); -} - -/*! \brief Frees all symbols loaded for a process. - * - * \param Process Pointer to a process. - */ -VOID -KdbSymFreeProcessSymbols( - IN PEPROCESS Process) -{ - PLIST_ENTRY CurrentEntry; - PLDR_DATA_TABLE_ENTRY Current; - PEPROCESS CurrentProcess; - PPEB Peb; - - CurrentProcess = PsGetCurrentProcess(); - if (CurrentProcess != Process) - KeAttachProcess(&Process->Pcb); - - Peb = Process->Peb; - ASSERT(Peb); - ASSERT(Peb->Ldr); - - CurrentEntry = Peb->Ldr->InLoadOrderModuleList.Flink; - while (CurrentEntry != &Peb->Ldr->InLoadOrderModuleList && CurrentEntry) - { - Current = CONTAINING_RECORD(CurrentEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - KdbpSymUnloadModuleSymbols(Current->PatchInformation); - - CurrentEntry = CurrentEntry->Flink; - } - - if (CurrentProcess != Process) - KeDetachProcess(); -} - -/*! \brief Load symbol info for a driver. - * - * \param Filename Filename of the driver. - * \param Module Pointer to the driver LDR_DATA_TABLE_ENTRY. - */ -VOID -KdbSymLoadDriverSymbols( - IN PUNICODE_STRING Filename, - IN PLDR_DATA_TABLE_ENTRY Module) -{ - /* Load symbols for the image if available */ - DPRINT("Loading driver %wZ symbols (driver @ %08x)\n", Filename, Module->DllBase); - - Module->PatchInformation = NULL; - - KdbpSymLoadModuleSymbols(Filename, (PROSSYM_INFO*)&Module->PatchInformation); -} - -/*! \brief Unloads symbol info for a driver. - * - * \param ModuleObject Pointer to the driver LDR_DATA_TABLE_ENTRY. - */ -VOID -KdbSymUnloadDriverSymbols( - IN PLDR_DATA_TABLE_ENTRY ModuleObject) -{ - /* Unload symbols for module if available */ - KdbpSymUnloadModuleSymbols(ModuleObject->PatchInformation); - ModuleObject->PatchInformation = NULL; -} - VOID KdbSymProcessSymbols( - IN PANSI_STRING AnsiFileName, - IN PKD_SYMBOLS_INFO SymbolInfo) -{ - BOOLEAN Found = FALSE; - PLIST_ENTRY ListHead, NextEntry; - PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; - - //DPRINT("KdbSymProcessSymbols(%Z)\n", AnsiFileName); - - /* We use PsLoadedModuleList here, otherwise (in case of - using KeLoaderBlock) all our data will be just lost */ - ListHead = &PsLoadedModuleList; - - /* Found module we are interested in */ - NextEntry = ListHead->Flink; - while (ListHead != NextEntry) - { - /* Get the entry */ - LdrEntry = CONTAINING_RECORD(NextEntry, - LDR_DATA_TABLE_ENTRY, - InLoadOrderLinks); - - if (SymbolInfo->BaseOfDll == LdrEntry->DllBase) - { - Found = TRUE; - break; - } - - /* Go to the next one */ - NextEntry = NextEntry->Flink; - } - - /* Exit if we didn't find the module requested */ - if (!Found) - return; - - DPRINT("Found LdrEntry=%p\n", LdrEntry); + IN PLDR_DATA_TABLE_ENTRY LdrEntry) +{ if (!LoadSymbols) { LdrEntry->PatchInformation = NULL; @@ -689,9 +450,7 @@ PCHAR p1, p2; SHORT Found = FALSE; CHAR YesNo; - LIST_ENTRY *ModuleEntry; - PLDR_DATA_TABLE_ENTRY DataTableEntry; - KD_SYMBOLS_INFO SymbolsInfo; + PLDR_DATA_TABLE_ENTRY LdrEntry; DPRINT("KdbSymInit() BootPhase=%d\n", BootPhase); @@ -765,29 +524,16 @@ } else if (BootPhase == 1) { - /* Load symbols for NTOSKRNL.EXE */ - ModuleEntry = &KeLoaderBlock->LoadOrderListHead; - DataTableEntry = CONTAINING_RECORD(ModuleEntry, - LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - SymbolsInfo.BaseOfDll = DataTableEntry->DllBase; - SymbolsInfo.CheckSum = DataTableEntry->CheckSum; - SymbolsInfo.ProcessId = 0; - SymbolsInfo.SizeOfImage = DataTableEntry->SizeOfImage; - - KdbSymProcessSymbols(NULL, &SymbolsInfo); - - /* and HAL.DLL */ - ModuleEntry = ModuleEntry->Flink; - DataTableEntry = CONTAINING_RECORD(ModuleEntry, - LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - SymbolsInfo.BaseOfDll = DataTableEntry->DllBase; - SymbolsInfo.CheckSum = DataTableEntry->CheckSum; - SymbolsInfo.ProcessId = 0; - SymbolsInfo.SizeOfImage = DataTableEntry->SizeOfImage; - - KdbSymProcessSymbols(NULL, &SymbolsInfo); + /* Load symbols for NTOSKRNL.EXE. + It is always the first module in PsLoadedModuleList. KeLoaderBlock can't be used here as its content is just temporary. */ + LdrEntry = CONTAINING_RECORD(PsLoadedModuleList.Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + KdbSymProcessSymbols(LdrEntry); + + /* Also load them for HAL.DLL. + This module has no fixed position, so search for it. */ + if(KdbpSymFindModule(NULL, L"HAL.DLL", -1, &LdrEntry)) + KdbSymProcessSymbols(LdrEntry); + KdbpSymbolsInitialized = TRUE; } }

1 0

[hpoussin] 43117: [freeldr] Never ever define a macro as multiple instructions. It may lead to subtle bugs
by hpoussin＠svn.reactos.org 22 Sep '09

22 Sep '09

Author: hpoussin Date: Tue Sep 22 22:33:56 2009 New Revision: 43117 URL: http://svn.reactos.org/svn/reactos?rev=43117&view=rev Log: [freeldr] Never ever define a macro as multiple instructions. It may lead to subtle bugs Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Tue Sep 22 22:33:56 2009 @@ -47,7 +47,7 @@ VOID DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length); - #define DPRINTM g_file=__FILE__;g_line=__LINE__;DbgPrintMask + #define DPRINTM g_file=__FILE__, g_line=__LINE__, DbgPrintMask #define BugCheck(_x_) { DbgPrintMask(DPRINT_WARNING, "Fatal Error: %s:%d(%s)\n", __FILE__, __LINE__, __FUNCTION__); DbgPrintMask _x_ ; for (;;); } #define DbgDumpBuffer(_x_, _y_, _z_) DebugDumpBuffer(_x_, _y_, _z_)

1 0

[janderwald] 43116: - Fix memory leak - Fix displaying of random characters if there is no device name
by janderwald＠svn.reactos.org 22 Sep '09

22 Sep '09

Author: janderwald Date: Tue Sep 22 22:09:11 2009 New Revision: 43116 URL: http://svn.reactos.org/svn/reactos?rev=43116&view=rev Log: - Fix memory leak - Fix displaying of random characters if there is no device name Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.c [iso-8859-1] Tue Sep 22 22:09:11 2009 @@ -644,6 +644,11 @@ psd->str.uType = STRRET_WSTR; hr = SHStrDupW(buffer, &psd->str.u.pOleStr); } + else + { + psd->str.u.cStr[0] = '\0'; + psd->str.uType = STRRET_CSTR; + } break; case COLUMN_PHONE: case COLUMN_OWNER: @@ -651,9 +656,8 @@ psd->str.uType = STRRET_CSTR; break; } -#if 0 + NcFreeNetconProperties(pProperties); -#endif return hr; }

1 0

[hpoussin] 43115: [freeldr] Rework NTFS filesystem to not be tied to boot filesystem
by hpoussin＠svn.reactos.org 22 Sep '09

22 Sep '09

Author: hpoussin Date: Tue Sep 22 21:37:11 2009 New Revision: 43115 URL: http://svn.reactos.org/svn/reactos?rev=43115&view=rev Log: [freeldr] Rework NTFS filesystem to not be tied to boot filesystem Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/include/fs/ntfs.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] Tue Sep 22 21:37:11 2009 @@ -26,15 +26,19 @@ #include <freeldr.h> #include <debug.h> -PNTFS_BOOTSECTOR NtfsBootSector; -ULONG NtfsClusterSize; -ULONG NtfsMftRecordSize; -ULONG NtfsIndexRecordSize; -ULONG NtfsDriveNumber; -ULONG NtfsSectorOfClusterZero; -PNTFS_MFT_RECORD NtfsMasterFileTable; -/* FIXME: NtfsMFTContext is never freed. */ -PNTFS_ATTR_CONTEXT NtfsMFTContext; +typedef struct _NTFS_VOLUME_INFO +{ + NTFS_BOOTSECTOR BootSector; + ULONG ClusterSize; + ULONG MftRecordSize; + ULONG IndexRecordSize; + PNTFS_MFT_RECORD MasterFileTable; + /* FIXME: MFTContext is never freed. */ + PNTFS_ATTR_CONTEXT MFTContext; + ULONG DeviceId; +} NTFS_VOLUME_INFO; + +PNTFS_VOLUME_INFO NtfsVolumes[MAX_FDS]; static ULONGLONG NtfsGetAttributeSize(PNTFS_ATTR_RECORD AttrRecord) { @@ -123,50 +127,80 @@ MmHeapFree(Context); } -/* FIXME: Optimize for multisector reads. */ -static BOOLEAN NtfsDiskRead(ULONGLONG Offset, ULONGLONG Length, PCHAR Buffer) -{ +static BOOLEAN NtfsDiskRead(PNTFS_VOLUME_INFO Volume, ULONGLONG Offset, ULONGLONG Length, PCHAR Buffer) +{ + LARGE_INTEGER Position; + ULONG Count; USHORT ReadLength; + LONG ret; DPRINTM(DPRINT_FILESYSTEM, "NtfsDiskRead - Offset: %I64d Length: %I64d\n", Offset, Length); - RtlZeroMemory((PCHAR)DISKREADBUFFER, 0x1000); - - /* I. Read partial first sector if needed */ - if (Offset % NtfsBootSector->BytesPerSector) - { - if (!MachDiskReadLogicalSectors(NtfsDriveNumber, NtfsSectorOfClusterZero + (Offset / NtfsBootSector->BytesPerSector), 1, (PCHAR)DISKREADBUFFER)) + + // + // I. Read partial first sector if needed + // + if (Offset % Volume->BootSector.BytesPerSector) + { + Position.HighPart = 0; + Position.LowPart = Offset & ~(Volume->BootSector.BytesPerSector - 1); + ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (ret != ESUCCESS) return FALSE; - ReadLength = min(Length, NtfsBootSector->BytesPerSector - (Offset % NtfsBootSector->BytesPerSector)); - RtlCopyMemory(Buffer, (PCHAR)DISKREADBUFFER + (Offset % NtfsBootSector->BytesPerSector), ReadLength); + ReadLength = min(Length, Volume->BootSector.BytesPerSector - (Offset % Volume->BootSector.BytesPerSector)); + ret = ArcRead(Volume->DeviceId, Buffer, ReadLength, &Count); + if (ret != ESUCCESS || Count != ReadLength) + return FALSE; + + // + // Move to unfilled buffer part + // Buffer += ReadLength; Length -= ReadLength; Offset += ReadLength; } - /* II. Read all complete 64-sector blocks. */ - while (Length >= (ULONGLONG)64 * (ULONGLONG)NtfsBootSector->BytesPerSector) - { - if (!MachDiskReadLogicalSectors(NtfsDriveNumber, NtfsSectorOfClusterZero + (Offset / NtfsBootSector->BytesPerSector), 64, (PCHAR)DISKREADBUFFER)) + // + // II. Read all complete blocks + // + if (Length >= Volume->BootSector.BytesPerSector) + { + Position.HighPart = 0; + Position.LowPart = Offset; + ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (ret != ESUCCESS) return FALSE; - RtlCopyMemory(Buffer, (PCHAR)DISKREADBUFFER, 64 * NtfsBootSector->BytesPerSector); - Buffer += 64 * NtfsBootSector->BytesPerSector; - Length -= 64 * NtfsBootSector->BytesPerSector; - Offset += 64 * NtfsBootSector->BytesPerSector; - } - - /* III. Read the rest of data */ + ReadLength = Length & ~(Volume->BootSector.BytesPerSector - 1); + ret = ArcRead(Volume->DeviceId, Buffer, ReadLength, &Count); + if (ret != ESUCCESS || Count != ReadLength) + return FALSE; + + // + // Move to unfilled buffer part + // + Buffer += ReadLength; + Length -= ReadLength; + Offset += ReadLength; + } + + // + // III. Read the rest of data + // if (Length) { - ReadLength = ((Length + NtfsBootSector->BytesPerSector - 1) / NtfsBootSector->BytesPerSector); - if (!MachDiskReadLogicalSectors(NtfsDriveNumber, NtfsSectorOfClusterZero + (Offset / NtfsBootSector->BytesPerSector), ReadLength, (PCHAR)DISKREADBUFFER)) + Position.HighPart = 0; + Position.LowPart = Offset; + ret = ArcSeek(Volume->DeviceId, &Position, SeekAbsolute); + if (ret != ESUCCESS) return FALSE; - RtlCopyMemory(Buffer, (PCHAR)DISKREADBUFFER, Length); + ret = ArcRead(Volume->DeviceId, Buffer, Length, &Count); + if (ret != ESUCCESS || Count != Length) + return FALSE; } return TRUE; } -static ULONGLONG NtfsReadAttribute(PNTFS_ATTR_CONTEXT Context, ULONGLONG Offset, PCHAR Buffer, ULONGLONG Length) +static ULONGLONG NtfsReadAttribute(PNTFS_VOLUME_INFO Volume, PNTFS_ATTR_CONTEXT Context, ULONGLONG Offset, PCHAR Buffer, ULONGLONG Length) { ULONGLONG LastLCN; PUCHAR DataRun; @@ -197,7 +231,7 @@ AlreadyRead = 0; - if(Context->CacheRunOffset <= Offset && Offset < Context->CacheRunOffset + Context->CacheRunLength * NtfsClusterSize) + if(Context->CacheRunOffset <= Offset && Offset < Context->CacheRunOffset + Context->CacheRunLength * Volume->ClusterSize) { DataRun = Context->CacheRun; LastLCN = Context->CacheRunLastLCN; @@ -227,7 +261,7 @@ } if (Offset >= CurrentOffset && - Offset < CurrentOffset + (DataRunLength * NtfsClusterSize)) + Offset < CurrentOffset + (DataRunLength * Volume->ClusterSize)) { break; } @@ -237,7 +271,7 @@ return AlreadyRead; } - CurrentOffset += DataRunLength * NtfsClusterSize; + CurrentOffset += DataRunLength * Volume->ClusterSize; } } @@ -245,18 +279,18 @@ * II. Go through the run list and read the data */ - ReadLength = min(DataRunLength * NtfsClusterSize - (Offset - CurrentOffset), Length); + ReadLength = min(DataRunLength * Volume->ClusterSize - (Offset - CurrentOffset), Length); if (DataRunStartLCN == -1) RtlZeroMemory(Buffer, ReadLength); - if (NtfsDiskRead(DataRunStartLCN * NtfsClusterSize + Offset - CurrentOffset, ReadLength, Buffer)) + if (NtfsDiskRead(Volume, DataRunStartLCN * Volume->ClusterSize + Offset - CurrentOffset, ReadLength, Buffer)) { Length -= ReadLength; Buffer += ReadLength; AlreadyRead += ReadLength; - if (ReadLength == DataRunLength * NtfsClusterSize - (Offset - CurrentOffset)) - { - CurrentOffset += DataRunLength * NtfsClusterSize; + if (ReadLength == DataRunLength * Volume->ClusterSize - (Offset - CurrentOffset)) + { + CurrentOffset += DataRunLength * Volume->ClusterSize; DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); if (DataRunLength != (ULONGLONG)-1) { @@ -272,10 +306,10 @@ while (Length > 0) { - ReadLength = min(DataRunLength * NtfsClusterSize, Length); + ReadLength = min(DataRunLength * Volume->ClusterSize, Length); if (DataRunStartLCN == -1) RtlZeroMemory(Buffer, ReadLength); - else if (!NtfsDiskRead(DataRunStartLCN * NtfsClusterSize, ReadLength, Buffer)) + else if (!NtfsDiskRead(Volume, DataRunStartLCN * Volume->ClusterSize, ReadLength, Buffer)) break; Length -= ReadLength; @@ -283,7 +317,7 @@ AlreadyRead += ReadLength; /* We finished this request, but there still data in this data run. */ - if (Length == 0 && ReadLength != DataRunLength * NtfsClusterSize) + if (Length == 0 && ReadLength != DataRunLength * Volume->ClusterSize) break; /* @@ -292,7 +326,7 @@ if (*DataRun == 0) break; - CurrentOffset += DataRunLength * NtfsClusterSize; + CurrentOffset += DataRunLength * Volume->ClusterSize; DataRun = NtfsDecodeRun(DataRun, &DataRunOffset, &DataRunLength); if (DataRunOffset != -1) { @@ -319,7 +353,7 @@ return AlreadyRead; } -static PNTFS_ATTR_CONTEXT NtfsFindAttributeHelper(PNTFS_ATTR_RECORD AttrRecord, PNTFS_ATTR_RECORD AttrRecordEnd, ULONG Type, const WCHAR *Name, ULONG NameLength) +static PNTFS_ATTR_CONTEXT NtfsFindAttributeHelper(PNTFS_VOLUME_INFO Volume, PNTFS_ATTR_RECORD AttrRecord, PNTFS_ATTR_RECORD AttrRecordEnd, ULONG Type, const WCHAR *Name, ULONG NameLength) { while (AttrRecord < AttrRecordEnd) { @@ -343,9 +377,9 @@ ListAttrRecord = (PNTFS_ATTR_RECORD)ListBuffer; ListAttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)ListBuffer + ListSize); - if (NtfsReadAttribute(ListContext, 0, ListBuffer, ListSize) == ListSize) - { - Context = NtfsFindAttributeHelper(ListAttrRecord, ListAttrRecordEnd, + if (NtfsReadAttribute(Volume, ListContext, 0, ListBuffer, ListSize) == ListSize) + { + Context = NtfsFindAttributeHelper(Volume, ListAttrRecord, ListAttrRecordEnd, Type, Name, NameLength); NtfsReleaseAttributeContext(ListContext); @@ -371,27 +405,29 @@ } } + if (AttrRecord->Length == 0) + return NULL; AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)AttrRecord + AttrRecord->Length); } return NULL; } -static PNTFS_ATTR_CONTEXT NtfsFindAttribute(PNTFS_MFT_RECORD MftRecord, ULONG Type, const WCHAR *Name) +static PNTFS_ATTR_CONTEXT NtfsFindAttribute(PNTFS_VOLUME_INFO Volume, PNTFS_MFT_RECORD MftRecord, ULONG Type, const WCHAR *Name) { PNTFS_ATTR_RECORD AttrRecord; PNTFS_ATTR_RECORD AttrRecordEnd; ULONG NameLength; AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + MftRecord->AttributesOffset); - AttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + NtfsMftRecordSize); + AttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + Volume->MftRecordSize); for (NameLength = 0; Name[NameLength] != 0; NameLength++) ; - return NtfsFindAttributeHelper(AttrRecord, AttrRecordEnd, Type, Name, NameLength); -} - -static BOOLEAN NtfsFixupRecord(PNTFS_RECORD Record) + return NtfsFindAttributeHelper(Volume, AttrRecord, AttrRecordEnd, Type, Name, NameLength); +} + +static BOOLEAN NtfsFixupRecord(PNTFS_VOLUME_INFO Volume, PNTFS_RECORD Record) { USHORT *USA; USHORT USANumber; @@ -401,30 +437,30 @@ USA = (USHORT*)((PCHAR)Record + Record->USAOffset); USANumber = *(USA++); USACount = Record->USACount - 1; /* Exclude the USA Number. */ - Block = (USHORT*)((PCHAR)Record + NtfsBootSector->BytesPerSector - 2); + Block = (USHORT*)((PCHAR)Record + Volume->BootSector.BytesPerSector - 2); while (USACount) { if (*Block != USANumber) return FALSE; *Block = *(USA++); - Block = (USHORT*)((PCHAR)Block + NtfsBootSector->BytesPerSector); + Block = (USHORT*)((PCHAR)Block + Volume->BootSector.BytesPerSector); USACount--; } return TRUE; } -static BOOLEAN NtfsReadMftRecord(ULONG MFTIndex, PNTFS_MFT_RECORD Buffer) +static BOOLEAN NtfsReadMftRecord(PNTFS_VOLUME_INFO Volume, ULONG MFTIndex, PNTFS_MFT_RECORD Buffer) { ULONGLONG BytesRead; - BytesRead = NtfsReadAttribute(NtfsMFTContext, MFTIndex * NtfsMftRecordSize, (PCHAR)Buffer, NtfsMftRecordSize); - if (BytesRead != NtfsMftRecordSize) + BytesRead = NtfsReadAttribute(Volume, Volume->MFTContext, MFTIndex * Volume->MftRecordSize, (PCHAR)Buffer, Volume->MftRecordSize); + if (BytesRead != Volume->MftRecordSize) return FALSE; /* Apply update sequence array fixups. */ - return NtfsFixupRecord((PNTFS_RECORD)Buffer); + return NtfsFixupRecord(Volume, (PNTFS_RECORD)Buffer); } #if DBG @@ -479,7 +515,7 @@ return TRUE; } -static BOOLEAN NtfsFindMftRecord(ULONG MFTIndex, PCHAR FileName, ULONG *OutMFTIndex) +static BOOLEAN NtfsFindMftRecord(PNTFS_VOLUME_INFO Volume, ULONG MFTIndex, PCHAR FileName, ULONG *OutMFTIndex) { PNTFS_MFT_RECORD MftRecord; ULONG Magic; @@ -495,38 +531,38 @@ ULONG RecordOffset; ULONG IndexBlockSize; - MftRecord = MmHeapAlloc(NtfsMftRecordSize); + MftRecord = MmHeapAlloc(Volume->MftRecordSize); if (MftRecord == NULL) { return FALSE; } - if (NtfsReadMftRecord(MFTIndex, MftRecord)) + if (NtfsReadMftRecord(Volume, MFTIndex, MftRecord)) { Magic = MftRecord->Magic; - IndexRootCtx = NtfsFindAttribute(MftRecord, NTFS_ATTR_TYPE_INDEX_ROOT, L"$I30"); + IndexRootCtx = NtfsFindAttribute(Volume, MftRecord, NTFS_ATTR_TYPE_INDEX_ROOT, L"$I30"); if (IndexRootCtx == NULL) { MmHeapFree(MftRecord); return FALSE; } - IndexRecord = MmHeapAlloc(NtfsIndexRecordSize); + IndexRecord = MmHeapAlloc(Volume->IndexRecordSize); if (IndexRecord == NULL) { MmHeapFree(MftRecord); return FALSE; } - NtfsReadAttribute(IndexRootCtx, 0, IndexRecord, NtfsIndexRecordSize); + NtfsReadAttribute(Volume, IndexRootCtx, 0, IndexRecord, Volume->IndexRecordSize); IndexRoot = (PNTFS_INDEX_ROOT)IndexRecord; IndexEntry = (PNTFS_INDEX_ENTRY)((PCHAR)&IndexRoot->IndexHeader + IndexRoot->IndexHeader.EntriesOffset); /* Index root is always resident. */ IndexEntryEnd = (PNTFS_INDEX_ENTRY)(IndexRecord + IndexRootCtx->Record.Resident.ValueLength); NtfsReleaseAttributeContext(IndexRootCtx); - DPRINTM(DPRINT_FILESYSTEM, "NtfsIndexRecordSize: %x IndexBlockSize: %x\n", NtfsIndexRecordSize, IndexRoot->IndexBlockSize); + DPRINTM(DPRINT_FILESYSTEM, "IndexRecordSize: %x IndexBlockSize: %x\n", Volume->IndexRecordSize, IndexRoot->IndexBlockSize); while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) @@ -547,7 +583,7 @@ IndexBlockSize = IndexRoot->IndexBlockSize; - IndexBitmapCtx = NtfsFindAttribute(MftRecord, NTFS_ATTR_TYPE_BITMAP, L"$I30"); + IndexBitmapCtx = NtfsFindAttribute(Volume, MftRecord, NTFS_ATTR_TYPE_BITMAP, L"$I30"); if (IndexBitmapCtx == NULL) { DPRINTM(DPRINT_FILESYSTEM, "Corrupted filesystem!\n"); @@ -563,10 +599,10 @@ MmHeapFree(MftRecord); return FALSE; } - NtfsReadAttribute(IndexBitmapCtx, 0, BitmapData, BitmapDataSize); + NtfsReadAttribute(Volume, IndexBitmapCtx, 0, BitmapData, BitmapDataSize); NtfsReleaseAttributeContext(IndexBitmapCtx); - IndexAllocationCtx = NtfsFindAttribute(MftRecord, NTFS_ATTR_TYPE_INDEX_ALLOCATION, L"$I30"); + IndexAllocationCtx = NtfsFindAttribute(Volume, MftRecord, NTFS_ATTR_TYPE_INDEX_ALLOCATION, L"$I30"); if (IndexAllocationCtx == NULL) { DPRINTM(DPRINT_FILESYSTEM, "Corrupted filesystem!\n"); @@ -596,9 +632,9 @@ break; } - NtfsReadAttribute(IndexAllocationCtx, RecordOffset, IndexRecord, IndexBlockSize); - - if (!NtfsFixupRecord((PNTFS_RECORD)IndexRecord)) + NtfsReadAttribute(Volume, IndexAllocationCtx, RecordOffset, IndexRecord, IndexBlockSize); + + if (!NtfsFixupRecord(Volume, (PNTFS_RECORD)IndexRecord)) { break; } @@ -641,7 +677,7 @@ return FALSE; } -static BOOLEAN NtfsLookupFile(PCSTR FileName, PNTFS_MFT_RECORD MftRecord, PNTFS_ATTR_CONTEXT *DataContext) +static BOOLEAN NtfsLookupFile(PNTFS_VOLUME_INFO Volume, PCSTR FileName, PNTFS_MFT_RECORD MftRecord, PNTFS_ATTR_CONTEXT *DataContext) { ULONG NumberOfPathParts; CHAR PathPart[261]; @@ -661,7 +697,7 @@ FileName++; DPRINTM(DPRINT_FILESYSTEM, "- Lookup: %s\n", PathPart); - if (!NtfsFindMftRecord(CurrentMFTIndex, PathPart, &CurrentMFTIndex)) + if (!NtfsFindMftRecord(Volume, CurrentMFTIndex, PathPart, &CurrentMFTIndex)) { DPRINTM(DPRINT_FILESYSTEM, "- Failed\n"); return FALSE; @@ -669,91 +705,16 @@ DPRINTM(DPRINT_FILESYSTEM, "- Lookup: %x\n", CurrentMFTIndex); } - if (!NtfsReadMftRecord(CurrentMFTIndex, MftRecord)) + if (!NtfsReadMftRecord(Volume, CurrentMFTIndex, MftRecord)) { DPRINTM(DPRINT_FILESYSTEM, "NtfsLookupFile: Can't read MFT record\n"); return FALSE; } - *DataContext = NtfsFindAttribute(MftRecord, NTFS_ATTR_TYPE_DATA, L""); + *DataContext = NtfsFindAttribute(Volume, MftRecord, NTFS_ATTR_TYPE_DATA, L""); if (*DataContext == NULL) { DPRINTM(DPRINT_FILESYSTEM, "NtfsLookupFile: Can't find data attribute\n"); - return FALSE; - } - - return TRUE; -} - -BOOLEAN NtfsOpenVolume(UCHAR DriveNumber, ULONGLONG VolumeStartSector, ULONGLONG PartitionSectorCount) -{ - NtfsBootSector = (PNTFS_BOOTSECTOR)DISKREADBUFFER; - - DPRINTM(DPRINT_FILESYSTEM, "NtfsOpenVolume() DriveNumber = 0x%x VolumeStartSector = 0x%x\n", DriveNumber, VolumeStartSector); - - if (!MachDiskReadLogicalSectors(DriveNumber, VolumeStartSector, 1, (PCHAR)DISKREADBUFFER)) - { - FileSystemError("Failed to read the boot sector."); - return FALSE; - } - - if (!RtlEqualMemory(NtfsBootSector->SystemId, "NTFS", 4)) - { - FileSystemError("Invalid NTFS signature."); - return FALSE; - } - - NtfsBootSector = MmHeapAlloc(NtfsBootSector->BytesPerSector); - if (NtfsBootSector == NULL) - { - return FALSE; - } - - RtlCopyMemory(NtfsBootSector, (PCHAR)DISKREADBUFFER, ((PNTFS_BOOTSECTOR)DISKREADBUFFER)->BytesPerSector); - - NtfsClusterSize = NtfsBootSector->SectorsPerCluster * NtfsBootSector->BytesPerSector; - if (NtfsBootSector->ClustersPerMftRecord > 0) - NtfsMftRecordSize = NtfsBootSector->ClustersPerMftRecord * NtfsClusterSize; - else - NtfsMftRecordSize = 1 << (-NtfsBootSector->ClustersPerMftRecord); - if (NtfsBootSector->ClustersPerIndexRecord > 0) - NtfsIndexRecordSize = NtfsBootSector->ClustersPerIndexRecord * NtfsClusterSize; - else - NtfsIndexRecordSize = 1 << (-NtfsBootSector->ClustersPerIndexRecord); - - DPRINTM(DPRINT_FILESYSTEM, "NtfsClusterSize: 0x%x\n", NtfsClusterSize); - DPRINTM(DPRINT_FILESYSTEM, "ClustersPerMftRecord: %d\n", NtfsBootSector->ClustersPerMftRecord); - DPRINTM(DPRINT_FILESYSTEM, "ClustersPerIndexRecord: %d\n", NtfsBootSector->ClustersPerIndexRecord); - DPRINTM(DPRINT_FILESYSTEM, "NtfsMftRecordSize: 0x%x\n", NtfsMftRecordSize); - DPRINTM(DPRINT_FILESYSTEM, "NtfsIndexRecordSize: 0x%x\n", NtfsIndexRecordSize); - - NtfsDriveNumber = DriveNumber; - NtfsSectorOfClusterZero = VolumeStartSector; - - DPRINTM(DPRINT_FILESYSTEM, "Reading MFT index...\n"); - if (!MachDiskReadLogicalSectors(DriveNumber, - NtfsSectorOfClusterZero + - (NtfsBootSector->MftLocation * NtfsBootSector->SectorsPerCluster), - NtfsMftRecordSize / NtfsBootSector->BytesPerSector, (PCHAR)DISKREADBUFFER)) - { - FileSystemError("Failed to read the Master File Table record."); - return FALSE; - } - - NtfsMasterFileTable = MmHeapAlloc(NtfsMftRecordSize); - if (NtfsMasterFileTable == NULL) - { - MmHeapFree(NtfsBootSector); - return FALSE; - } - - RtlCopyMemory(NtfsMasterFileTable, (PCHAR)DISKREADBUFFER, NtfsMftRecordSize); - - DPRINTM(DPRINT_FILESYSTEM, "Searching for DATA attribute...\n"); - NtfsMFTContext = NtfsFindAttribute(NtfsMasterFileTable, NTFS_ATTR_TYPE_DATA, L""); - if (NtfsMFTContext == NULL) - { - FileSystemError("Can't find data attribute for Master File Table."); return FALSE; } @@ -788,6 +749,7 @@ LONG NtfsOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { + PNTFS_VOLUME_INFO Volume; PNTFS_FILE_HANDLE FileHandle; PNTFS_MFT_RECORD MftRecord; ULONG DeviceId; @@ -802,24 +764,26 @@ // Get underlying device // DeviceId = FsGetDeviceId(*FileId); + Volume = NtfsVolumes[DeviceId]; DPRINTM(DPRINT_FILESYSTEM, "NtfsOpen() FileName = %s\n", Path); // // Allocate file structure // - FileHandle = MmHeapAlloc(sizeof(NTFS_FILE_HANDLE) + NtfsMftRecordSize); + FileHandle = MmHeapAlloc(sizeof(NTFS_FILE_HANDLE) + Volume->MftRecordSize); if (!FileHandle) { return ENOMEM; } - RtlZeroMemory(FileHandle, sizeof(NTFS_FILE_HANDLE) + NtfsMftRecordSize); + RtlZeroMemory(FileHandle, sizeof(NTFS_FILE_HANDLE) + Volume->MftRecordSize); + FileHandle->Volume = Volume; // // Search file entry // MftRecord = (PNTFS_MFT_RECORD)(FileHandle + 1); - if (!NtfsLookupFile(Path, MftRecord, &FileHandle->DataContext)) + if (!NtfsLookupFile(Volume, Path, MftRecord, &FileHandle->DataContext)) { MmHeapFree(FileHandle); return ENOENT; @@ -836,7 +800,7 @@ // // Read file // - BytesRead64 = NtfsReadAttribute(FileHandle->DataContext, FileHandle->Offset, Buffer, N); + BytesRead64 = NtfsReadAttribute(FileHandle->Volume, FileHandle->DataContext, FileHandle->Offset, Buffer, N); *Count = (ULONG)BytesRead64; // @@ -876,10 +840,18 @@ const DEVVTBL* NtfsMount(ULONG DeviceId) { - NTFS_BOOTSECTOR BootSector; + PNTFS_VOLUME_INFO Volume; LARGE_INTEGER Position; ULONG Count; LONG ret; + + // + // Allocate data for volume information + // + Volume = MmHeapAlloc(sizeof(NTFS_VOLUME_INFO)); + if (!Volume) + return NULL; + RtlZeroMemory(Volume, sizeof(NTFS_VOLUME_INFO)); // // Read the BootSector @@ -888,28 +860,99 @@ Position.LowPart = 0; ret = ArcSeek(DeviceId, &Position, SeekAbsolute); if (ret != ESUCCESS) + { + MmHeapFree(Volume); return NULL; - ret = ArcRead(DeviceId, &BootSector, sizeof(BootSector), &Count); - if (ret != ESUCCESS || Count != sizeof(BootSector)) + } + ret = ArcRead(DeviceId, &Volume->BootSector, sizeof(Volume->BootSector), &Count); + if (ret != ESUCCESS || Count != sizeof(Volume->BootSector)) + { + MmHeapFree(Volume); return NULL; - - // - // Check if BootSector is valid. If yes, return NTFS function table - // - if (RtlEqualMemory(BootSector.SystemId, "NTFS", 4)) - { - // - // Compatibility hack as long as FS is not using underlying device DeviceId - // - ULONG DriveNumber; - ULONGLONG StartSector; - ULONGLONG SectorCount; - int Type; - if (!DiskGetBootVolume(&DriveNumber, &StartSector, &SectorCount, &Type)) - return NULL; - NtfsOpenVolume(DriveNumber, StartSector, SectorCount); - return &NtfsFuncTable; - } + } + + // + // Check if BootSector is valid. If no, return early + // + if (!RtlEqualMemory(Volume->BootSector.SystemId, "NTFS", 4)) + { + MmHeapFree(Volume); + return NULL; + } + + // + // Calculate cluster size and MFT record size + // + Volume->ClusterSize = Volume->BootSector.SectorsPerCluster * Volume->BootSector.BytesPerSector; + if (Volume->BootSector.ClustersPerMftRecord > 0) + Volume->MftRecordSize = Volume->BootSector.ClustersPerMftRecord * Volume->ClusterSize; else + Volume->MftRecordSize = 1 << (-Volume->BootSector.ClustersPerMftRecord); + if (Volume->BootSector.ClustersPerIndexRecord > 0) + Volume->IndexRecordSize = Volume->BootSector.ClustersPerIndexRecord * Volume->ClusterSize; + else + Volume->IndexRecordSize = 1 << (-Volume->BootSector.ClustersPerIndexRecord); + + DPRINTM(DPRINT_FILESYSTEM, "ClusterSize: 0x%x\n", Volume->ClusterSize); + DPRINTM(DPRINT_FILESYSTEM, "ClustersPerMftRecord: %d\n", Volume->BootSector.ClustersPerMftRecord); + DPRINTM(DPRINT_FILESYSTEM, "ClustersPerIndexRecord: %d\n", Volume->BootSector.ClustersPerIndexRecord); + DPRINTM(DPRINT_FILESYSTEM, "MftRecordSize: 0x%x\n", Volume->MftRecordSize); + DPRINTM(DPRINT_FILESYSTEM, "IndexRecordSize: 0x%x\n", Volume->IndexRecordSize); + + // + // Read MFT index + // + DPRINTM(DPRINT_FILESYSTEM, "Reading MFT index...\n"); + Volume->MasterFileTable = MmHeapAlloc(Volume->MftRecordSize); + if (!Volume->MasterFileTable) + { + MmHeapFree(Volume); return NULL; -} + } + Position.HighPart = 0; + Position.LowPart = Volume->BootSector.MftLocation * Volume->ClusterSize; + ret = ArcSeek(DeviceId, &Position, SeekAbsolute); + if (ret != ESUCCESS) + { + FileSystemError("Failed to seek to Master File Table record."); + MmHeapFree(Volume->MasterFileTable); + MmHeapFree(Volume); + return NULL; + } + ret = ArcRead(DeviceId, Volume->MasterFileTable, Volume->MftRecordSize, &Count); + if (ret != ESUCCESS || Count != Volume->MftRecordSize) + { + FileSystemError("Failed to read the Master File Table record."); + MmHeapFree(Volume->MasterFileTable); + MmHeapFree(Volume); + return NULL; + } + + // + // Keep device id + // + Volume->DeviceId = DeviceId; + + // + // Search DATA attribute + // + DPRINTM(DPRINT_FILESYSTEM, "Searching for DATA attribute...\n"); + Volume->MFTContext = NtfsFindAttribute(Volume, Volume->MasterFileTable, NTFS_ATTR_TYPE_DATA, L""); + if (!Volume->MFTContext) + { + FileSystemError("Can't find data attribute for Master File Table."); + MmHeapFree(Volume->MasterFileTable); + MmHeapFree(Volume); + return NULL; + } + + // + // Remember NTFS volume information + // + NtfsVolumes[DeviceId] = Volume; + + // + // Return success + // + return &NtfsFuncTable; +} Modified: trunk/reactos/boot/freeldr/freeldr/include/fs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs/ntfs.h [iso-8859-1] Tue Sep 22 21:37:11 2009 @@ -214,11 +214,14 @@ NTFS_ATTR_RECORD Record; } NTFS_ATTR_CONTEXT, *PNTFS_ATTR_CONTEXT; +typedef struct _NTFS_VOLUME_INFO *PNTFS_VOLUME_INFO; + #include <pshpack1.h> typedef struct { PNTFS_ATTR_CONTEXT DataContext; ULONGLONG Offset; + PNTFS_VOLUME_INFO Volume; } NTFS_FILE_HANDLE, *PNTFS_FILE_HANDLE; #include <poppack.h>

1 0

[hpoussin] 43114: [freeldr] Move definition of maximum number of available file descriptors to fs.h Fix typos
by hpoussin＠svn.reactos.org 22 Sep '09

22 Sep '09

Author: hpoussin Date: Tue Sep 22 21:33:34 2009 New Revision: 43114 URL: http://svn.reactos.org/svn/reactos?rev=43114&view=rev Log: [freeldr] Move definition of maximum number of available file descriptors to fs.h Fix typos Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/include/fs.h Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Tue Sep 22 21:33:34 2009 @@ -163,7 +163,7 @@ } num++; - DPRINTM(DPRINT_FILESYSTEM, "FatGetNumPathParts() Path = %s NumPathParts = %d\n", Path, num); + DPRINTM(DPRINT_FILESYSTEM, "FsGetNumPathParts() Path = %s NumPathParts = %d\n", Path, num); return num; } @@ -195,10 +195,9 @@ Buffer[i] = 0; - DPRINTM(DPRINT_FILESYSTEM, "FatGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer); -} - -#define MAX_FDS 60 + DPRINTM(DPRINT_FILESYSTEM, "FsGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer); +} + typedef struct tagFILEDATA { ULONG DeviceId; @@ -398,6 +397,8 @@ DEVICE* pNewEntry; ULONG dwLength; + DPRINTM(DPRINT_FILESYSTEM, "FsRegisterDevice() Prefix = %s\n", Prefix); + dwLength = strlen(Prefix) + 1; pNewEntry = MmHeapAlloc(sizeof(DEVICE) + dwLength); if (!pNewEntry) Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] Tue Sep 22 21:33:34 2009 @@ -57,4 +57,6 @@ ULONG FsGetNumPathParts(PCSTR Path); VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path); +#define MAX_FDS 60 + #endif // #defined __FS_H

1 0

[hpoussin] 43113: [freeldr] Accept to read blocks whose size is not a multiple of device sector size
by hpoussin＠svn.reactos.org 22 Sep '09

22 Sep '09

Author: hpoussin Date: Tue Sep 22 21:32:35 2009 New Revision: 43113 URL: http://svn.reactos.org/svn/reactos?rev=43113&view=rev Log: [freeldr] Accept to read blocks whose size is not a multiple of device sector size Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Tue Sep 22 21:32:35 2009 @@ -2,6 +2,7 @@ * FreeLoader * * Copyright (C) 2003, 2004 Eric Kohl + * Copyright (C) 2009 Hervé Poussineau * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -466,15 +467,16 @@ { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); UCHAR* Ptr = (UCHAR*)Buffer; - ULONG i; + ULONG i, Length; BOOLEAN ret; *Count = 0; - if (N & (Context->SectorSize - 1)) - return EINVAL; - - for (i = 0; i < N / Context->SectorSize; i++) - { + i = 0; + while (N > 0) + { + Length = N; + if (Length > Context->SectorSize) + Length = Context->SectorSize; ret = MachDiskReadLogicalSectors( Context->DriveNumber, Context->SectorNumber + Context->SectorOffset + i, @@ -482,11 +484,13 @@ (PVOID)DISKREADBUFFER); if (!ret) return EIO; - RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Context->SectorSize); - Ptr += Context->SectorSize; - } - - *Count = N; + RtlCopyMemory(Ptr, (PVOID)DISKREADBUFFER, Length); + Ptr += Length; + *Count += Length; + N -= Length; + i++; + } + return ESUCCESS; }

1 0

[janderwald] 43112: - Partly implement IBandSite, IMenuBand
by janderwald＠svn.reactos.org 22 Sep '09

22 Sep '09

Author: janderwald Date: Tue Sep 22 20:30:39 2009 New Revision: 43112 URL: http://svn.reactos.org/svn/reactos?rev=43112&view=rev Log: - Partly implement IBandSite, IMenuBand Modified: trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/startmenu.c Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Tue Sep 22 20:30:39 2009 @@ -68,6 +68,7 @@ extern const GUID CLSID_AdminFolderShortcut; extern const GUID CLSID_FontsFolderShortcut; extern const GUID CLSID_StartMenu; +extern const GUID CLSID_MenuBandSite; extern const GUID CLSID_OpenWith; extern const GUID CLSID_UnixFolder; extern const GUID CLSID_UnixDosFolder; Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] Tue Sep 22 20:30:39 2009 @@ -19,8 +19,9 @@ */ #include <precomp.h> -const GUID CLSID_AdminFolderShortcut = {0xD20EA4E1, 0x3957, 0x11D2, {0xA4, 0x0B, 0x0C, 0x50, 0x20, 0x52, 0x41, 0x53} }; +const GUID CLSID_AdminFolderShortcut = {0xD20EA4E1, 0x3957, 0x11D2, {0xA4, 0x0B, 0x0C, 0x50, 0x20, 0x52, 0x41, 0x53}}; const GUID CLSID_StartMenu = {0x4622AD11, 0xFF23, 0x11D0, {0x8D, 0x34, 0x00, 0xA0, 0xC9, 0x0F, 0x27, 0x19}}; +const GUID CLSID_MenuBandSite = {0xE13EF4E4, 0xD2F2, 0x11d0, {0x98, 0x16, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72}}; const GUID CLSID_OpenWith = {0x09799AFB, 0xAD67, 0x11d1, {0xAB, 0xCD, 0x00, 0xC0, 0x4F, 0xC3, 0x09, 0x36}}; const GUID CLSID_UnixFolder = {0xcc702eb2, 0x7dc5, 0x11d9, {0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd}}; const GUID CLSID_UnixDosFolder = {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}}; @@ -720,6 +721,13 @@ "shell32.dll", "Apartment" }, + { &CLSID_MenuBandSite, + "Menu Site", + 0, + NULL, + "shell32.dll", + "Apartment" + }, { NULL } /* list terminator */ }; Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Tue Sep 22 20:30:39 2009 @@ -113,6 +113,7 @@ HRESULT WINAPI SHEOW_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID *ppv); HRESULT WINAPI ShellFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); HRESULT WINAPI StartMenu_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); +HRESULT WINAPI MenuBandSite_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*); HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] Tue Sep 22 20:30:39 2009 @@ -61,6 +61,7 @@ {&CLSID_OpenWith, &SHEOW_Constructor}, {&dummy1, &INewItem_Constructor}, {&CLSID_StartMenu, &StartMenu_Constructor}, + {&CLSID_MenuBandSite, &MenuBandSite_Constructor}, {NULL,NULL} }; Modified: trunk/reactos/dll/win32/shell32/startmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/startmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/startmenu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/startmenu.c [iso-8859-1] Tue Sep 22 20:30:39 2009 @@ -26,15 +26,26 @@ const IMenuPopupVtbl *vtbl; const IObjectWithSiteVtbl *objectSiteVtbl; const IInitializeObjectVtbl *initObjectVtbl; - const IBandSiteVtbl *bandSiteVtbl; + const IMenuBandVtbl *menuBandVtbl; IUnknown *pUnkSite; LONG refCount; + IBandSite * pBandSite; } StartMenu, *LPStartMenu; + +typedef struct _tagMenuBandSite { + const IBandSiteVtbl * lpVtbl; + LONG refCount; + + IUnknown ** Objects; + LONG ObjectsCount; + +} MenuBandSite, *LPMenuBandSite; static const IMenuPopupVtbl StartMenuVtbl; static const IObjectWithSiteVtbl StartMenu_ObjectWithSiteVtbl; static const IInitializeObjectVtbl StartMenu_InitializeObjectVtbl; static const IBandSiteVtbl StartMenu_BandSiteVtbl; +static const IMenuBandVtbl StartMenu_MenuBandVtbl; static LPStartMenu __inline impl_from_IMenuPopup(IMenuPopup *iface) { @@ -67,7 +78,7 @@ This->vtbl = &StartMenuVtbl; This->objectSiteVtbl = &StartMenu_ObjectWithSiteVtbl; This->initObjectVtbl = &StartMenu_InitializeObjectVtbl; - This->bandSiteVtbl = &StartMenu_BandSiteVtbl; + This->menuBandVtbl = &StartMenu_MenuBandVtbl; This->refCount = 1; TRACE("StartMenu_Constructor returning %p\n", This); @@ -87,7 +98,7 @@ StartMenu *This = impl_from_IMenuPopup(iface); *ppvOut = NULL; - TRACE("StartMenu_Constructor (%p, %s, %p)\n", iface, debugstr_guid(iid), ppvOut); + TRACE("StartMenu_QueryInterface (%p, %s, %p)\n", iface, debugstr_guid(iid), ppvOut); if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IOleWindow) || IsEqualIID(iid, &IID_IDeskBar) || IsEqualIID(iid, &IID_IMenuPopup)) @@ -102,11 +113,6 @@ { *ppvOut = &This->initObjectVtbl; } - else if (IsEqualIID(iid, &IID_IBandSite)) - { - *ppvOut = &This->bandSiteVtbl; - } - if (*ppvOut) { @@ -159,8 +165,10 @@ static HRESULT WINAPI StartMenu_GetClient(IMenuPopup *iface, IUnknown **ppunkClient) { StartMenu * This = (StartMenu*)iface; + TRACE("StartMenu_GetClient (%p, %p)\n", iface, ppunkClient); - *ppunkClient = (IUnknown*)&This->bandSiteVtbl; + + *ppunkClient = (IUnknown*)This->pBandSite; IUnknown_AddRef(*ppunkClient); return S_OK; } @@ -291,8 +299,15 @@ static HRESULT WINAPI StartMenu_IInitializeObject_Initialize(IInitializeObject *iface) { - FIXME("StartMenu_IInitializeObject_Initialize Stub\n"); - return S_OK; + HRESULT hr; + StartMenu *This = impl_from_IInitializeObject(iface); + TRACE("StartMenu_IInitializeObject_Initialize (%p)\n", iface); + + hr = MenuBandSite_Constructor(NULL, &IID_IBandSite, (LPVOID*)&This->pBandSite); + if (FAILED(hr)) + return hr; + + return IBandSite_AddBand(This->pBandSite, (IUnknown*)&This->menuBandVtbl); } static const IInitializeObjectVtbl StartMenu_InitializeObjectVtbl = @@ -304,71 +319,248 @@ StartMenu_IInitializeObject_Initialize, }; +//-------------------------------------------------------------- +// IMenuBand interface + + +static HRESULT STDMETHODCALLTYPE StartMenu_IMenuBand_QueryInterface(IMenuBand *iface, REFIID iid, LPVOID *ppvOut) +{ + StartMenu *This = (StartMenu*)CONTAINING_RECORD(iface, StartMenu, menuBandVtbl); + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IMenuBand)) + { + *ppvOut = &This->menuBandVtbl; + IUnknown_AddRef((IUnknown*)*ppvOut); + return S_OK; + } + + WARN("unsupported interface:(%p, %s, %p)\n", iface, debugstr_guid(iid), ppvOut); + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE StartMenu_IMenuBand_AddRef(IMenuBand *iface) +{ + StartMenu *This = (StartMenu*)CONTAINING_RECORD(iface, StartMenu, menuBandVtbl); + TRACE("StartMenu_IInitializeObject_AddRef(%p)\n", This); + return StartMenu_AddRef((IMenuPopup *)This); +} + +static ULONG STDMETHODCALLTYPE StartMenu_IMenuBand_Release(IMenuBand *iface) +{ + StartMenu *This = (StartMenu*)CONTAINING_RECORD(iface, StartMenu, menuBandVtbl); + TRACE("StartMenu_IInitializeObject_Release (%p)\n", This); + return StartMenu_Release((IMenuPopup *)This); +} + +HRESULT STDMETHODCALLTYPE StartMenu_IMenuBand_IsMenuMessage(IMenuBand *iface, MSG *pmsg) +{ + StartMenu *This = (StartMenu*)CONTAINING_RECORD(iface, StartMenu, menuBandVtbl); + TRACE("StartMenu_IMenuBand_IsMenuMessage Stub(%p)\n", This); + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE StartMenu_IMenuBand_TranslateMenuMessage(IMenuBand *iface, MSG *pmsg, LRESULT *plRet) +{ + StartMenu *This = (StartMenu*)CONTAINING_RECORD(iface, StartMenu, menuBandVtbl); + TRACE("StartMenu_IMenuBand_TranslateMenuMessage Stub(%p)\n", This); + return E_NOTIMPL; +} + + +static const IMenuBandVtbl StartMenu_MenuBandVtbl = +{ + /* IUnknown methods */ + StartMenu_IMenuBand_QueryInterface, + StartMenu_IMenuBand_AddRef, + StartMenu_IMenuBand_Release, + /* IMenuBand methods */ + StartMenu_IMenuBand_IsMenuMessage, + StartMenu_IMenuBand_TranslateMenuMessage, +}; + + //--------------------------------------------------------------------------------------------------------- // IBandSite interface -static HRESULT WINAPI StartMenu_IBandSite_QueryInterface(IBandSite *iface, REFIID iid, LPVOID *ppvOut) -{ - StartMenu *This = (StartMenu*)CONTAINING_RECORD(iface, StartMenu, bandSiteVtbl); - TRACE("StartMenu_IBandSite_QueryInterface(%p, %s, %p)\n", iface, debugstr_guid(iid), ppvOut); - return StartMenu_QueryInterface((IMenuPopup *)This, iid, ppvOut); -} - -static ULONG WINAPI StartMenu_IBandSite_AddRef(IBandSite *iface) -{ - StartMenu *This = (StartMenu*)CONTAINING_RECORD(iface, StartMenu, bandSiteVtbl); - TRACE("StartMenu_IBandSite_AddRef(%p)\n", iface); - return StartMenu_AddRef((IMenuPopup *)This); -} - -static ULONG WINAPI StartMenu_IBandSite_Release(IBandSite *iface) -{ - StartMenu *This = (StartMenu*)CONTAINING_RECORD(iface, StartMenu, bandSiteVtbl); - TRACE("StartMenu_IBandSite_Release (%p)\n", iface); - return StartMenu_Release((IMenuPopup *)This); -} - - -static HRESULT STDMETHODCALLTYPE StartMenu_IBandSite_AddBand(IBandSite *iface, IUnknown *punk) -{ - FIXME("StartMenu_IBandSite_AddBand Stub punk %p\n", punk); + +HRESULT WINAPI MenuBandSite_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) +{ + MenuBandSite *This; + HRESULT hr; + + TRACE("StartMenu_Constructor(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + + if (pUnkOuter) + return E_POINTER; + + This = CoTaskMemAlloc(sizeof(MenuBandSite)); + if (!This) + return E_OUTOFMEMORY; + + ZeroMemory(This, sizeof(MenuBandSite)); + This->lpVtbl = &StartMenu_BandSiteVtbl; + + hr = IUnknown_QueryInterface((IUnknown*)&This->lpVtbl, riid, ppv); + + if (FAILED(hr)) + { + CoTaskMemFree(This); + return hr; + } + + TRACE("StartMenu_Constructor returning %p\n", This); + *ppv = (IUnknown *)This; return S_OK; } -static HRESULT STDMETHODCALLTYPE StartMenu_IBandSite_EnumBands(IBandSite *iface, UINT uBand, DWORD *pdwBandID) -{ - FIXME("StartMenu_IBandSite_EnumBands Stub uBand %uu pdwBandID %p\n", uBand, pdwBandID); +static HRESULT WINAPI BandSite_QueryInterface(IBandSite *iface, REFIID iid, LPVOID *ppvOut) +{ + MenuBandSite *This = (MenuBandSite*)CONTAINING_RECORD(iface, MenuBandSite, lpVtbl); + + if (IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IBandSite)) + { + *ppvOut = &This->lpVtbl; + IUnknown_AddRef((IUnknown*)*ppvOut); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI BandSite_AddRef(IBandSite *iface) +{ + MenuBandSite *This = (MenuBandSite*)CONTAINING_RECORD(iface, MenuBandSite, lpVtbl); + TRACE("BandSite_AddRef(%p)\n", iface); + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI BandSite_Release(IBandSite *iface) +{ + LONG ret; + MenuBandSite *This = (MenuBandSite*)CONTAINING_RECORD(iface, MenuBandSite, lpVtbl); + + ret = InterlockedDecrement(&This->refCount); + TRACE("BandSite_Release refCount %u\n", ret); + + if (ret == 0) + { + CoTaskMemFree(This->Objects); + CoTaskMemFree(This); + } + + return ret; +} + + +static HRESULT STDMETHODCALLTYPE BandSite_AddBand(IBandSite *iface, IUnknown *punk) +{ + IUnknown ** Objects; + MenuBandSite *This = (MenuBandSite*)CONTAINING_RECORD(iface, MenuBandSite, lpVtbl); + + TRACE("StartMenu_IBandSite_AddBand Stub punk %p\n", punk); + + if (!punk) + return E_FAIL; + + Objects = (IUnknown**) CoTaskMemAlloc(sizeof(IUnknown*) * (This->ObjectsCount + 1)); + if (!Objects) + return E_FAIL; + + RtlMoveMemory(Objects, This->Objects, sizeof(IUnknown*) * This->ObjectsCount); + + CoTaskMemFree(This->Objects); + + This->Objects = Objects; + Objects[This->ObjectsCount] = punk; + + IUnknown_AddRef(punk); + + This->ObjectsCount++; + + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE BandSite_EnumBands(IBandSite *iface, UINT uBand, DWORD *pdwBandID) +{ + ULONG Index, ObjectCount; + MenuBandSite *This = (MenuBandSite*)CONTAINING_RECORD(iface, MenuBandSite, lpVtbl); + + TRACE("StartMenu_IBandSite_EnumBands Stub uBand %uu pdwBandID %p\n", uBand, pdwBandID); + + if (uBand == (UINT)-1) + return This->ObjectsCount; + + ObjectCount = 0; + + for(Index = 0; Index < This->ObjectsCount; Index++) + { + if (This->Objects[Index] != NULL) + { + if (uBand == ObjectCount) + { + *pdwBandID = Index; + return S_OK; + } + ObjectCount++; + } + } return E_FAIL; } -static HRESULT STDMETHODCALLTYPE StartMenu_IBandSite_QueryBand(IBandSite *iface, DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) + +static HRESULT STDMETHODCALLTYPE BandSite_QueryBand(IBandSite *iface, DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) { FIXME("StartMenu_IBandSite_QueryBand Stub dwBandID %u IDeskBand %p pdwState %p Name %p cchName %u\n", dwBandID, ppstb, pdwState, pszName, cchName); return E_FAIL; } -static HRESULT STDMETHODCALLTYPE StartMenu_IBandSite_SetBandState(IBandSite *iface, DWORD dwBandID, DWORD dwMask, DWORD dwState) +static HRESULT STDMETHODCALLTYPE BandSite_SetBandState(IBandSite *iface, DWORD dwBandID, DWORD dwMask, DWORD dwState) { FIXME("StartMenu_IBandSite_SetBandState Stub dwBandID %u dwMask %x dwState %u\n", dwBandID, dwMask, dwState); return E_FAIL; } -static HRESULT STDMETHODCALLTYPE StartMenu_IBandSite_RemoveBand(IBandSite *iface, DWORD dwBandID) -{ - FIXME("StartMenu_IBandSite_RemoveBand Stub dwBandID %p\n", dwBandID); +static HRESULT STDMETHODCALLTYPE BandSite_RemoveBand(IBandSite *iface, DWORD dwBandID) +{ + MenuBandSite *This = (MenuBandSite*)CONTAINING_RECORD(iface, MenuBandSite, lpVtbl); + TRACE("StartMenu_IBandSite_RemoveBand Stub dwBandID %u\n", dwBandID); + + if (This->ObjectsCount <= dwBandID) + return E_FAIL; + + if (This->Objects[dwBandID]) + { + This->Objects[dwBandID]->lpVtbl->Release(This->Objects[dwBandID]); + This->Objects[dwBandID] = NULL; + } + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE BandSite_GetBandObject(IBandSite *iface, DWORD dwBandID, REFIID riid, void **ppv) +{ + MenuBandSite *This = (MenuBandSite*)CONTAINING_RECORD(iface, MenuBandSite, lpVtbl); + + TRACE("StartMenu_IBandSite_GetBandObject Stub dwBandID %u riid %p ppv %p\n", dwBandID, riid, ppv); + + if (This->ObjectsCount <= dwBandID) + return E_FAIL; + + if (This->Objects[dwBandID]) + { + return IUnknown_QueryInterface(This->Objects[dwBandID], riid, ppv); + } + return E_FAIL; } - -static HRESULT STDMETHODCALLTYPE StartMenu_IBandSite_GetBandObject(IBandSite *iface, DWORD dwBandID, REFIID riid, void **ppv) -{ - FIXME("StartMenu_IBandSite_GetBandObject Stub dwBandID %u riid %p ppv %p\n", dwBandID, riid, ppv); - return E_FAIL; -} -static HRESULT STDMETHODCALLTYPE StartMenu_IBandSite_SetBandSiteInfo(IBandSite *iface, const BANDSITEINFO *pbsinfo) +static HRESULT STDMETHODCALLTYPE BandSite_SetBandSiteInfo(IBandSite *iface, const BANDSITEINFO *pbsinfo) { FIXME("StartMenu_IBandSite_SetBandSiteInfo Stub pbsinfo %p\n", pbsinfo); return E_FAIL; } -static HRESULT STDMETHODCALLTYPE StartMenu_IBandSite_GetBandSiteInfo(IBandSite *iface, BANDSITEINFO *pbsinfo) +static HRESULT STDMETHODCALLTYPE BandSite_GetBandSiteInfo(IBandSite *iface, BANDSITEINFO *pbsinfo) { FIXME("StartMenu_IBandSite_GetBandSiteInfo Stub pbsinfo %p\n", pbsinfo); return E_FAIL; @@ -376,16 +568,16 @@ static const IBandSiteVtbl StartMenu_BandSiteVtbl = { - StartMenu_IBandSite_QueryInterface, - StartMenu_IBandSite_AddRef, - StartMenu_IBandSite_Release, - StartMenu_IBandSite_AddBand, - StartMenu_IBandSite_EnumBands, - StartMenu_IBandSite_QueryBand, - StartMenu_IBandSite_SetBandState, - StartMenu_IBandSite_RemoveBand, - StartMenu_IBandSite_GetBandObject, - StartMenu_IBandSite_SetBandSiteInfo, - StartMenu_IBandSite_GetBandSiteInfo + BandSite_QueryInterface, + BandSite_AddRef, + BandSite_Release, + BandSite_AddBand, + BandSite_EnumBands, + BandSite_QueryBand, + BandSite_SetBandState, + BandSite_RemoveBand, + BandSite_GetBandObject, + BandSite_SetBandSiteInfo, + BandSite_GetBandSiteInfo };

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs