Ros-diffs January 2016

ros-diffs@reactos.org

13 participants
192 discussions

[tkreuzer] 70569: [CREATESPEC] - Implement retrieving export names from forwarders - Add error() function to print errors - Refactor image/symbol loading - Fix some bugs and add some hacks, so that...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 10 18:50:36 2016 New Revision: 70569 URL: http://svn.reactos.org/svn/reactos?rev=70569&view=rev Log: [CREATESPEC] - Implement retrieving export names from forwarders - Add error() function to print errors - Refactor image/symbol loading - Fix some bugs and add some hacks, so that it compiles in out tree - Add to build Modified: trunk/rosapps/applications/devutils/CMakeLists.txt trunk/rosapps/applications/devutils/createspec/createspec.c Modified: trunk/rosapps/applications/devutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/CMak… ============================================================================== --- trunk/rosapps/applications/devutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/CMakeLists.txt [iso-8859-1] Sun Jan 10 18:50:36 2016 @@ -1,4 +1,5 @@ add_subdirectory(bootvid_font_generator) +add_subdirectory(createspec) add_subdirectory(gdb2) add_subdirectory(gdihv) add_subdirectory(genguid) Modified: trunk/rosapps/applications/devutils/createspec/createspec.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/crea… ============================================================================== --- trunk/rosapps/applications/devutils/createspec/createspec.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/createspec/createspec.c [iso-8859-1] Sun Jan 10 18:50:36 2016 @@ -8,18 +8,31 @@ - Resolve forwarders */ +#define MINGW_HAS_SECURE_API #include <stdio.h> #include <stdlib.h> #include <windows.h> +#ifdef __REACTOS__ +#include <dbghelp.h> +#include <cvconst.h> + +// dirty hacks! +#define sprintf_s(dst, size, format, ...) sprintf(dst, format, __VA_ARGS__) +#define vsprintf_s(dst, size, format, ap) vsprintf(dst, format, ap) +#define fopen_s(pfile, name, mode) ((*pfile = fopen(name, mode)), (*pfile != 0) ? 0 : -1) +#define strcpy_s(dst, size, src) strncpy(dst, src, size) +#define strcat_s(dst, size, src) strncat(dst, src, size) + +#else #ifdef _MSC_VER #pragma warning(disable:4091) #endif #define _NO_CVCONST_H #include <dbghelp.h> -// doesn't seem to be defined anywhere -enum BasicType { +// This is from cvconst.h, but win sdk lacks this file +enum BasicType { btNoType = 0, btVoid = 1, btChar = 2, @@ -40,7 +53,7 @@ btHresult = 31 }; -typedef enum CV_call_e { +typedef enum CV_call_e { CV_CALL_NEAR_C = 0x00, CV_CALL_NEAR_FAST = 0x04, CV_CALL_NEAR_STD = 0x07, @@ -49,12 +62,20 @@ CV_CALL_CLRCALL = 0x16 } CV_call_e; -#define MAX_SYMBOL_NAME 1024 +#endif // __REACTOS__ + +#define MAX_SYMBOL_NAME 1024 typedef struct _SYMINFO_EX { SYMBOL_INFO si; CHAR achName[MAX_SYMBOL_NAME]; } SYMINFO_EX; + +typedef struct _SYMBOL64_EX +{ + IMAGEHLP_SYMBOL64 sym64; + CHAR achName[MAX_SYMBOL_NAME]; +} SYMBOL64_EX, *PSYMBOL64_EX; typedef enum _PARAM_TYPES { @@ -99,57 +120,203 @@ } EXPORT_DATA, *PEXPORT_DATA; HANDLE ghProcess; -CHAR gszModuleFileName[MAX_PATH+1]; - -HRESULT -OpenFileFromName( - _In_ PCSTR pszDllName, - _Out_ PHANDLE phFile) -{ - HANDLE hFile; - - /* Try current directory */ - GetCurrentDirectoryA(MAX_PATH, gszModuleFileName); - strcat_s(gszModuleFileName, sizeof(gszModuleFileName), "\\"); - strcat_s(gszModuleFileName, sizeof(gszModuleFileName), pszDllName); - hFile = CreateFileA(gszModuleFileName, - FILE_READ_DATA, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (hFile != INVALID_HANDLE_VALUE) - { - *phFile = hFile; - return S_OK; - } - - /* Try system32 directory */ - strcat_s(gszModuleFileName, sizeof(gszModuleFileName), "%systemroot%\\system32\\"); - strcat_s(gszModuleFileName, sizeof(gszModuleFileName), pszDllName); - hFile = CreateFileA(gszModuleFileName, - FILE_READ_DATA, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL, - NULL); - if (hFile != INVALID_HANDLE_VALUE) - { - *phFile = hFile; - return S_OK; - } - - return HRESULT_FROM_WIN32(GetLastError()); + +void +error( + _In_ const char* pszFormat, + ...) +{ + CHAR szBuffer[512]; + SIZE_T cchBuffer; + DWORD dwLastError; + va_list argptr; + + /* Get last error */ + dwLastError = GetLastError(); + + va_start(argptr, pszFormat); + cchBuffer = vsprintf_s(szBuffer, sizeof(szBuffer), pszFormat, argptr); + va_end(argptr); + + /* Strip trailing newlines */ + _Analysis_assume_(cchBuffer < sizeof(szBuffer)); + while ((cchBuffer >= 1) && + ((szBuffer[cchBuffer - 1] == '\r') || + (szBuffer[cchBuffer - 1] == '\n'))) + { + szBuffer[cchBuffer - 1] = '\0'; + cchBuffer--; + } + + /* Check if we have an error */ + if (dwLastError != ERROR_SUCCESS) + { + /* Append error code */ + cchBuffer += sprintf_s(szBuffer + cchBuffer, + sizeof(szBuffer) - cchBuffer, + " [error %lu: ", dwLastError); + + /* Format the last error code */ + cchBuffer += FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwLastError, + 0, + szBuffer + cchBuffer, + (DWORD)(sizeof(szBuffer) - cchBuffer), + NULL); + + /* Strip trailing newlines */ + _Analysis_assume_(cchBuffer < sizeof(szBuffer)); + while ((cchBuffer >= 1) && + ((szBuffer[cchBuffer - 1] == '\r') || + (szBuffer[cchBuffer - 1] == '\n'))) + { + szBuffer[cchBuffer - 1] = '\0'; + cchBuffer--; + } + + fprintf(stderr, "%s]\n", szBuffer); + } + else + { + fprintf(stderr, "%s\n", szBuffer); + } +} + +BOOL +InitDbgHelp( + VOID) +{ + static const char *pszMsSymbolServer = "srv**symbols*http://msdl.microsoft.com/download/symbols"; + DWORD Options; + + /* Save current process ;-) */ + ghProcess = GetCurrentProcess(); + + /* Initialize dbghelp */ + if (!SymInitialize(ghProcess, 0, FALSE)) + { + error("SymInitialize() failed."); + return FALSE; + } + + /* Set options */ + Options = SymGetOptions(); + Options |= SYMOPT_ALLOW_ABSOLUTE_SYMBOLS | SYMOPT_INCLUDE_32BIT_MODULES | SYMOPT_DEBUG;// | SYMOPT_NO_PROMPTS; + Options &= ~SYMOPT_DEFERRED_LOADS; + SymSetOptions(Options); + + /* Test if we can reach the MS symbol server */ + if (!SymSrvIsStore(ghProcess, pszMsSymbolServer)) + { + error("Failed to connect to symbol server."); + return FALSE; + } + + /* Set MS symbol server as symbol search path */ + SymSetSearchPath(ghProcess, pszMsSymbolServer); + + return TRUE; +} + +HMODULE +LoadModuleWithSymbolsFullPath( + _In_ PSTR pszFullModuleFileName) +{ + HMODULE hmod; + DWORD64 dwModuleBase; + + /* Load the DLL */ + hmod = LoadLibraryExA(pszFullModuleFileName, + NULL, + LOAD_IGNORE_CODE_AUTHZ_LEVEL | + DONT_RESOLVE_DLL_REFERENCES | + LOAD_WITH_ALTERED_SEARCH_PATH); + if (hmod == NULL) + { + return NULL; + } + + /* Load symbols for this module */ + dwModuleBase = SymLoadModule64(ghProcess, + NULL, + pszFullModuleFileName, + NULL, + (DWORD_PTR)hmod, + 0); + if (dwModuleBase == 0) + { + /* ERROR_SUCCESS means, we have symbols already */ + if (GetLastError() != ERROR_SUCCESS) + { + return NULL; + } + } + else + { + printf("Successfully loaded symbols for '%s'\n", + pszFullModuleFileName); + } + + return hmod; +} + +HMODULE +LoadModuleWithSymbols( + _In_ PSTR pszModuleName) +{ + CHAR szFullFileName[MAX_PATH]; + HMODULE hmod; + + /* Check if the file name has a path */ + if (strchr(pszModuleName, '\\') != NULL) + { + /* Try as it is */ + hmod = LoadModuleWithSymbolsFullPath(pszModuleName); + if (hmod != NULL) + { + return hmod; + } + } + + /* Try current directory */ + GetCurrentDirectoryA(MAX_PATH, szFullFileName); + strcat_s(szFullFileName, sizeof(szFullFileName), "\\"); + strcat_s(szFullFileName, sizeof(szFullFileName), pszModuleName); + hmod = LoadModuleWithSymbolsFullPath(szFullFileName); + if (hmod != NULL) + { + return hmod; + } + + /* Try system32 */ + strcpy_s(szFullFileName, sizeof(szFullFileName), "%systemroot%\\system32"); + strcat_s(szFullFileName, sizeof(szFullFileName), pszModuleName); + hmod = LoadModuleWithSymbolsFullPath(szFullFileName); + if (hmod != NULL) + { + return hmod; + } + +#ifdef _WIN64 + /* Try SysWoW64 */ + strcpy_s(szFullFileName, sizeof(szFullFileName), "%systemroot%\\system32"); + strcat_s(szFullFileName, sizeof(szFullFileName), pszModuleName); + hmod = LoadModuleWithSymbolsFullPath(szFullFileName); + if (hmod != NULL) + { + return hmod; + } +#endif // _WIN64 + + return NULL; } HRESULT GetExportsFromFile( - _In_ HANDLE hFile, + _In_ HMODULE hmod, _Out_ PEXPORT_DATA* ppExportData) { - HANDLE hMap; PBYTE pjImageBase; PIMAGE_EXPORT_DIRECTORY pExportDir; ULONG i, cjExportSize, cFunctions, cjTableSize; @@ -157,28 +324,18 @@ PULONG pulAddressTable, pulNameTable; PUSHORT pusOrdinalTable; - /* Create an image file mapping */ - hMap = CreateFileMappingA(hFile, NULL, PAGE_READONLY | SEC_IMAGE, 0, 0, NULL); - if (!hMap) - { - fprintf(stderr, "CreateFileMapping() failed: %ld\n", GetLastError()); - return HRESULT_FROM_WIN32(GetLastError()); - } - - /* Map the file */ - pjImageBase = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0); - if(pjImageBase == NULL) - { - fprintf(stderr, "MapViewOfFile() failed: %ld\n", GetLastError()); - CloseHandle(hMap); - return HRESULT_FROM_WIN32(GetLastError()); - } - - /* Get the export directory */ - pExportDir = ImageDirectoryEntryToData(pjImageBase, + pjImageBase = (PBYTE)hmod; + + /* Get the export directory */ + pExportDir = ImageDirectoryEntryToData(pjImageBase, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &cjExportSize); + if (pExportDir == NULL) + { + fprintf(stderr, "Failed to get export directory\n"); + return E_FAIL; + } cFunctions = pExportDir->NumberOfFunctions; cjTableSize = FIELD_OFFSET(EXPORT_DATA, aExports[cFunctions]); @@ -186,6 +343,7 @@ pExportData = malloc(cjTableSize); if (pExportData == NULL) { + error("Failed to allocate %u bytes of memory for export table\n", cjTableSize); return E_OUTOFMEMORY; } @@ -199,7 +357,8 @@ for (i = 0; i < cFunctions; i++) { PVOID pvFunction = (pjImageBase + pulAddressTable[i]); - + + /* Check if this is a forwarder */ if ((ULONG_PTR)((PUCHAR)pvFunction - (PUCHAR)pExportDir) < cjExportSize) { pExportData->aExports[i].pszForwarder = _strdup(pvFunction); @@ -223,8 +382,6 @@ } *ppExportData = pExportData; - UnmapViewOfFile(pjImageBase); - CloseHandle(hMap); return S_OK; } @@ -233,7 +390,7 @@ EnumParametersCallback( _In_ PSYMBOL_INFO pSymInfo, _In_ ULONG SymbolSize, - _In_opt_ PVOID UserContext) + _In_ PVOID UserContext) { PEXPORT pExport = (PEXPORT)UserContext; enum SymTagEnum eSymTag; @@ -282,7 +439,8 @@ break; } } - /* 'long' type */ + + /* Default to 'long' type */ pExport->aeParameters[pExport->cParameters - 1] = TYPE_LONG; break; @@ -309,12 +467,15 @@ TI_GET_BASETYPE, &eBaseType)) { + /* Check for string types */ if (eBaseType == btChar) { + /* 'str' type */ pExport->aeParameters[pExport->cParameters - 1] = TYPE_STR; } else if (eBaseType == btWChar) { + /* 'wstr' type */ pExport->aeParameters[pExport->cParameters - 1] = TYPE_WSTR; } } @@ -335,46 +496,92 @@ return TRUE; } +ULONG64 +GetFunctionFromForwarder( + _In_ PCSTR pszForwarder) +{ + CHAR szDllName[MAX_SYMBOL_NAME]; + PCH pchDot, pszName; + ULONG64 ullFunction; + HMODULE hmod; + + /* Copy the forwarder name */ + strcpy_s(szDllName, sizeof(szDllName), pszForwarder); + + /* Find the '.' */ + pchDot = strchr(szDllName, '.'); + if (pchDot == NULL) + { + error("Invalid name for forwarder '%s'!", pszForwarder); + return 0; + } + + /* Terminate DLL name */ + *pchDot = '\0'; + + /* Load the DLL */ + hmod = LoadModuleWithSymbols(szDllName); + if (hmod == NULL) + { + error("Failed to load module for forwarder '%s'!", pszForwarder); + return 0; + } + + /* Get the function name and check for ordinal */ + pszName = pchDot + 1; + if (pszName[0] == '#') + { + ULONG iOrdinal = strtoul(pszName + 1, NULL, 10); + if ((iOrdinal == 0) || (iOrdinal > 0xFFFF)) + { + error("Got invalid ordinal %u for ''", iOrdinal, pszForwarder); + return 0; + } + + pszName = (PSTR)(ULONG_PTR)iOrdinal; + } + + /* Get the function address */ + ullFunction = (ULONG_PTR)GetProcAddress(hmod, pszName); + if (ullFunction == 0) + { + error("Failed to resolve '%s' in '%s'.", pchDot + 1, szDllName); + return 0; + } + + return ullFunction; +} + HRESULT -ParseExportSymbols( - _In_ HANDLE hFile, +ParseImageSymbols( + _In_ HMODULE hmod, _Inout_ PEXPORT_DATA pExportData) { - DWORD Options; DWORD64 dwModuleBase; ULONG i; IMAGEHLP_STACK_FRAME StackFrame; SYMINFO_EX sym; - - /* Initialize dbghelp */ - if (!SymInitialize(ghProcess, 0, FALSE)) - return E_FAIL; - - Options = SymGetOptions(); - Options |= SYMOPT_ALLOW_ABSOLUTE_SYMBOLS | SYMOPT_DEBUG;// | SYMOPT_NO_PROMPTS; - Options &= ~SYMOPT_DEFERRED_LOADS; - SymSetOptions(Options); - SymSetSearchPath(ghProcess, "srv**symbols*http://msdl.microsoft.com/download/symbols"); - - printf("Loading symbols, please wait...\n"); - dwModuleBase = SymLoadModule64(ghProcess, 0, gszModuleFileName, 0, 0, 0); - if (dwModuleBase == 0) - { - fprintf(stderr, "SymLoadModule64() failed: %ld\n", GetLastError()); - return E_FAIL; - } - - + dwModuleBase = (DWORD_PTR)hmod; + + /* Loop through all exports */ for (i = 0; i < pExportData->cNumberOfExports; i++) { PEXPORT pExport = &pExportData->aExports[i]; ULONG64 ullFunction = dwModuleBase + pExportData->aExports[i].ulRva; ULONG64 ullDisplacement; - /* Skip forwarder */ + /* Check if this is a forwarder */ if (pExport->pszForwarder != NULL) - continue; + { + /* Load the module and get the function address */ + ullFunction = GetFunctionFromForwarder(pExport->pszForwarder); + if (ullFunction == 0) + { + printf("Failed to get function for forwarder '%s'. Skipping.\n", pExport->pszForwarder); + continue; + } + } RtlZeroMemory(&sym, sizeof(sym)); sym.si.SizeOfStruct = sizeof(SYMBOL_INFO); @@ -383,16 +590,16 @@ /* Try to find the symbol */ if (!SymFromAddr(ghProcess, ullFunction, &ullDisplacement, &sym.si)) { - printf("Error: SymFromAddr() failed. Error code: %u \n", GetLastError()); + error("Error: SymFromAddr() failed."); continue; } - /* Symbol found. Check if it is a function */ + /* Get the symbol name */ + pExport->pszSymbol = _strdup(sym.si.Name); + + /* Check if it is a function */ if (sym.si.Tag == SymTagFunction) { - /* If we don't have a name yet, get one */ - pExport->pszSymbol = _strdup(sym.si.Name); - /* Get the calling convention */ if (!SymGetTypeInfo(ghProcess, dwModuleBase, @@ -401,7 +608,7 @@ &pExport->dwCallingConvention)) { /* Fall back to __stdcall */ - pExport->dwCallingConvention = 0x07; // CV_CALL_NEAR_STD + pExport->dwCallingConvention = CV_CALL_NEAR_STD; } /* Set the context to the function address */ @@ -409,8 +616,7 @@ StackFrame.InstructionOffset = ullFunction; if (!SymSetContext(ghProcess, &StackFrame, NULL)) { - DWORD dwLastError = GetLastError(); - __debugbreak(); + error("SymSetContext failed for i = %u.", i); continue; } @@ -421,10 +627,13 @@ EnumParametersCallback, pExport)) { - DWORD dwLastError = GetLastError(); - __debugbreak(); + error("SymEnumSymbols failed for i = %u.", i); continue; } + } + else if (sym.si.Tag == SymTagPublicSymbol) + { + pExport->dwCallingConvention = CV_CALL_NEAR_STD; } else if (sym.si.Tag == SymTagData) { @@ -457,8 +666,6 @@ return "syscall"; case CV_CALL_THISCALL: return "thiscall"; - case CV_CALL_CLRCALL: - return "clrcall"; default: __debugbreak(); } @@ -478,7 +685,7 @@ /* Create the spec file */ if (fopen_s(&file, pszSpecFile, "w") != 0) { - fprintf(stderr, "Failed to open spec file: '%s'\n", pszSpecFile); + error("Failed to open spec file: '%s'\n", pszSpecFile); return E_FAIL; } @@ -487,7 +694,7 @@ { pExport = &pExportData->aExports[i]; - fprintf(file, "%u %s ", i + 1, GetCallingConvention(pExport)); + fprintf(file, "%lu %s ", i + 1, GetCallingConvention(pExport)); //if (pExport->fNoName) if (pExport->pszName == NULL) { @@ -504,7 +711,7 @@ } else { - fprintf(file, "NamelessExport_%u", i); + fprintf(file, "NamelessExport_%lu", i); } if (!pExport->fData) @@ -539,43 +746,24 @@ HRESULT hr; CHAR szSpecFile[MAX_PATH]; PSTR pszSpecFile; - HANDLE hFile; PEXPORT_DATA pExportData; - - // check params - // help - - ghProcess = GetCurrentProcess(); - - /* Open the file */ - hr = OpenFileFromName(argv[1], &hFile); - if (!SUCCEEDED(hr)) - { - fprintf(stderr, "Failed to open file: %lx\n", hr); - return hr; - } - - /* Get the exports */ - hr = GetExportsFromFile(hFile, &pExportData); - if (!SUCCEEDED(hr)) - { - fprintf(stderr, "Failed to get exports: %lx\n", hr); - return hr; - } - - /* Get additional info from symbols */ - hr = ParseExportSymbols(hFile, pExportData); - if (!SUCCEEDED(hr)) - { - fprintf(stderr, "Failed to get symbol information: %lx\n", hr); - } - + HMODULE hmod; + + /* Check parameters */ + if ((argc < 2) || !strcmp(argv[1], "/?")) + { + printf("syntax: createspec <image file> [<spec file>]\n"); + return 0; + } + + /* Check if we have a spec file name */ if (argc > 2) { pszSpecFile = argv[2]; } else { + /* Create spec file name from image file name */ PSTR pszStart = strrchr(argv[1], '\\'); if (pszStart == 0) pszStart = argv[1]; @@ -585,10 +773,41 @@ pszSpecFile = szSpecFile; } + /* Initialize dbghelp.dll */ + if (!InitDbgHelp()) + { + error("Failed to init dbghelp!\n" + "Make sure you have dbghelp.dll and symsrv.dll in the same folder.\n"); + return E_FAIL; + } + + /* Load the file including symbols */ + printf("Loading symbols for '%s', please wait...\n", argv[1]); + hmod = LoadModuleWithSymbols(argv[1]); + if (hmod == NULL) + { + error("Failed to load module '%s'!", argv[1]); + return E_FAIL; + } + + /* Get the exports */ + hr = GetExportsFromFile(hmod, &pExportData); + if (!SUCCEEDED(hr)) + { + error("Failed to get exports: %lx\n", hr); + return hr; + } + + /* Get additional info from symbols */ + hr = ParseImageSymbols(hmod, pExportData); + if (!SUCCEEDED(hr)) + { + error("Failed to get symbol information: hr=%lx\n", hr); + } + + /* Write the spec file */ hr = CreateSpecFile(pszSpecFile, pExportData); - CloseHandle(hFile); - printf("Spec file '%s' was successfully written.\n", szSpecFile); return hr;

8 years, 8 months

[ekohl] 70568: [LSASRV] Add credential function stubs to the lsa dispatch table.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 10 13:01:29 2016 New Revision: 70568 URL: http://svn.reactos.org/svn/reactos?rev=70568&view=rev Log: [LSASRV] Add credential function stubs to the lsa dispatch table. Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/session.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Sun Jan 10 13:01:29 2016 @@ -32,7 +32,9 @@ typedef NTSTATUS (NTAPI *PLSA_CREATE_LOGON_SESSION)(PLUID); typedef NTSTATUS (NTAPI *PLSA_DELETE_LOGON_SESSION)(PLUID); - +typedef NTSTATUS (NTAPI *PLSA_ADD_CREDENTIAL)(PLUID, ULONG, PLSA_STRING, PLSA_STRING); +typedef NTSTATUS (NTAPI *PLSA_GET_CREDENTIALS)(PLUID, ULONG, PULONG, BOOLEAN, PLSA_STRING, PULONG, PLSA_STRING); +typedef NTSTATUS (NTAPI *PLSA_DELETE_CREDENTIAL)(PLUID, ULONG, PLSA_STRING); typedef PVOID (NTAPI *PLSA_ALLOCATE_LSA_HEAP)(ULONG); typedef VOID (NTAPI *PLSA_FREE_LSA_HEAP)(PVOID); typedef NTSTATUS (NTAPI *PLSA_ALLOCATE_CLIENT_BUFFER)(PLSA_CLIENT_REQUEST, ULONG, PVOID*); @@ -46,9 +48,9 @@ { PLSA_CREATE_LOGON_SESSION CreateLogonSession; PLSA_DELETE_LOGON_SESSION DeleteLogonSession; - PVOID /*PLSA_ADD_CREDENTIAL */ AddCredential; - PVOID /*PLSA_GET_CREDENTIALS */ GetCredentials; - PVOID /*PLSA_DELETE_CREDENTIAL */ DeleteCredential; + PLSA_ADD_CREDENTIAL AddCredential; + PLSA_GET_CREDENTIALS GetCredentials; + PLSA_DELETE_CREDENTIAL DeleteCredential; PLSA_ALLOCATE_LSA_HEAP AllocateLsaHeap; PLSA_FREE_LSA_HEAP FreeLsaHeap; PLSA_ALLOCATE_CLIENT_BUFFER AllocateClientBuffer; @@ -481,9 +483,9 @@ /* Initialize the dispatch table */ DispatchTable.CreateLogonSession = &LsapCreateLogonSession; DispatchTable.DeleteLogonSession = &LsapDeleteLogonSession; - DispatchTable.AddCredential = NULL; - DispatchTable.GetCredentials = NULL; - DispatchTable.DeleteCredential = NULL; + DispatchTable.AddCredential = &LsapAddCredential; + DispatchTable.GetCredentials = &LsapGetCredentials; + DispatchTable.DeleteCredential = &LsapDeleteCredential; DispatchTable.AllocateLsaHeap = &LsapAllocateHeap; DispatchTable.FreeLsaHeap = &LsapFreeHeap; DispatchTable.AllocateClientBuffer = &LsapAllocateClientBuffer; @@ -1602,7 +1604,7 @@ goto done; } - TokenHandle = NULL; +// TokenHandle = NULL; Status = LsapSetLogonSessionData(&RequestMsg->LogonUser.Reply.LogonId); if (!NT_SUCCESS(Status)) @@ -1612,11 +1614,11 @@ } done: - if (!NT_SUCCESS(Status)) - { +// if (!NT_SUCCESS(Status)) +// { if (TokenHandle != NULL) NtClose(TokenHandle); - } +// } /* Free the local groups */ if (LocalGroups != NULL) Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Jan 10 13:01:29 2016 @@ -415,6 +415,32 @@ LsapDeleteLogonSession(IN PLUID LogonId); NTSTATUS +NTAPI +LsapAddCredential( + _In_ PLUID LogonId, + _In_ ULONG AuthenticationPackage, + _In_ PLSA_STRING PrimaryKeyValue, + _In_ PLSA_STRING Credential); + +NTSTATUS +NTAPI +LsapGetCredentials( + _In_ PLUID LogonId, + _In_ ULONG AuthenticationPackage, + _Inout_ PULONG QueryContext, + _In_ BOOLEAN RetrieveAllCredentials, + _Inout_ PLSA_STRING PrimaryKeyValue, + _Out_ PULONG PrimaryKeyLength, + _Out_ PLSA_STRING Credentials); + +NTSTATUS +NTAPI +LsapDeleteCredential( + _In_ PLUID LogonId, + _In_ ULONG AuthenticationPackage, + _In_ PLSA_STRING PrimaryKeyValue); + +NTSTATUS LsapSetLogonSessionData(IN PLUID LogonId); NTSTATUS Modified: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Sun Jan 10 13:01:29 2016 @@ -177,6 +177,47 @@ NTSTATUS +NTAPI +LsapAddCredential( + _In_ PLUID LogonId, + _In_ ULONG AuthenticationPackage, + _In_ PLSA_STRING PrimaryKeyValue, + _In_ PLSA_STRING Credential) +{ + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +LsapGetCredentials( + _In_ PLUID LogonId, + _In_ ULONG AuthenticationPackage, + _Inout_ PULONG QueryContext, + _In_ BOOLEAN RetrieveAllCredentials, + _Inout_ PLSA_STRING PrimaryKeyValue, + _Out_ PULONG PrimaryKeyLength, + _Out_ PLSA_STRING Credentials) +{ + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +LsapDeleteCredential( + _In_ PLUID LogonId, + _In_ ULONG AuthenticationPackage, + _In_ PLSA_STRING PrimaryKeyValue) +{ + + return STATUS_SUCCESS; +} + + +NTSTATUS LsapEnumLogonSessions(IN OUT PLSA_API_MSG RequestMsg) { OBJECT_ATTRIBUTES ObjectAttributes; @@ -290,9 +331,10 @@ if (Session == NULL) return STATUS_NO_SUCH_LOGON_SESSION; - Length = sizeof(SECURITY_LOGON_SESSION_DATA); + /* Calculate the required buffer size */ + Length = sizeof(SECURITY_LOGON_SESSION_DATA) + + Session->UserName.MaximumLength; /* - Session->UserName.MaximumLength + Session->LogonDomain.MaximumLength + Session->AuthenticationPackage.MaximumLength + Session->LogonServer.MaximumLength + @@ -305,6 +347,7 @@ TRACE("Length: %lu\n", Length); + /* Allocate the buffer */ LocalSessionData = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Length); @@ -318,6 +361,19 @@ RtlCopyLuid(&LocalSessionData->LogonId, &RequestMsg->GetLogonSessionData.Request.LogonId); + + LocalSessionData->UserName.Length = Session->UserName.Length; + LocalSessionData->UserName.MaximumLength = Session->UserName.MaximumLength; + LocalSessionData->UserName.Buffer = Ptr; + +// RtlCopyMemory(Ptr) + + + LocalSessionData->LogonType = Session->LogonType; + LocalSessionData->Session = 0; + + + InitializeObjectAttributes(&ObjectAttributes, NULL,

8 years, 8 months

[ekohl] 70567: [LSASRV] Add missing exports.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 10 12:44:35 2016 New Revision: 70567 URL: http://svn.reactos.org/svn/reactos?rev=70567&view=rev Log: [LSASRV] Add missing exports. Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sun Jan 10 12:44:35 2016 @@ -1,10 +1,39 @@ + @ stub DsRolerDcAsDc + @ stub DsRolerDcAsReplica + @ stub DsRolerDemoteDc + @ stub DsRolerGetDcOperationProgress + @ stub DsRolerGetDcOperationResults + @ stub LsaIAddNameToLogonSession + @ stub LsaIAllocateHeap + @ stub LsaIAllocateHeapZero + @ stub LsaIAuditAccountLogon + @ stub LsaIAuditAccountLogonEx + @ stub LsaIAuditKdcEvent + @ stub LsaIAuditKerberosLogon + @ stub LsaIAuditLogonUsingExplicitCreds @ stub LsaIAuditNotifyPackageLoad + @ stub LsaIAuditPasswordAccessEvent @ stub LsaIAuditSamEvent + @ stub LsaICallPackage + @ stub LsaICallPackageEx + @ stub LsaICallPackagePassthrough + @ stub LsaICancelNotification + @ stub LsaIChangeSecretCipherKey + @ stub LsaICryptProtectData + @ stub LsaICryptUnprotectData + @ stub LsaIDsNotifiedObjectChange @ stub LsaIEnumerateSecrets + @ stub LsaIEventNotify + @ stub LsaIFilterSids + @ stub LsaIForestTrustFindMatch + @ stub LsaIFreeForestTrustInfo + @ stub LsaIFreeHeap + @ stub LsaIFreeReturnBuffer @ stub LsaIFree_LSAI_PRIVATE_DATA #DATA @ stub LsaIFree_LSAI_SECRET_ENUM_BUFFER @ stub LsaIFree_LSAPR_ACCOUNT_ENUM_BUFFER @ stub LsaIFree_LSAPR_CR_CIPHER_VALUE + @ stub LsaIFree_LSAPR_POLICY_DOMIN_INFORMATION @ stdcall LsaIFree_LSAPR_POLICY_INFORMATION(long ptr) @ stub LsaIFree_LSAPR_PRIVILEGE_ENUM_BUFFER @ stdcall LsaIFree_LSAPR_PRIVILEGE_SET(ptr) @@ -14,20 +43,62 @@ @ stub LsaIFree_LSAPR_TRANSLATED_SIDS @ stub LsaIFree_LSAPR_TRUSTED_DOMAIN_INFO @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER + @ stub LsaIFree_LSAPR_TRUSTED_ENUM_BUFFER_EX @ stub LsaIFree_LSAPR_TRUST_INFORMATION @ stub LsaIFree_LSAPR_UNICODE_STRING + @ stub LsaIFree_LSAPR_UNICODE_STRING_BUFFER + @ stub LsaIFree_LSAP_SITENAME_INFO + @ stub LsaIFree_LSAP_SITE_INFO + @ stub LsaIFree_LSAP_SUBNET_INFO + @ stub LsaIFree_LSAP_UPN_SUFFIXES + @ stub LsaIFree_LSA_FOREST_TRUST_COLLISION_INFORMATION + @ stub LsaIFree_LSA_FOREST_TRUST_INFORMATION + @ stub LsaIGetBootOption + @ stub LsaIGetCallInfo + @ stub LsaIGetForestTrustInformation + @ stub LsaIGetLogonGuid + @ stub LsaIGetNbAndDnsDomainNames @ stub LsaIGetPrivateData @ stub LsaIGetSerialNumberPolicy @ stub LsaIGetSerialNumberPolicy2 + @ stub LsaIGetSiteName @ stub LsaIHealthCheck + @ stub LsaIImpersonateClient @ stub LsaIInitializeWellKnownSids + @ stub LsaIIsClassIdLsaClass + @ stub LsaIIsDsPaused + @ stub LsaIKerberosRegisterTrustNotification + @ stub LsaILookupWellKnownName + @ stub LsaINotifyChangeNotification + @ stub LsaINotifyNetlogonParametersChangeW + @ stub LsaINotifyPasswordChanged @ stdcall LsaIOpenPolicyTrusted(ptr) + @ stub LsaIQueryForestTrustInfo @ stub LsaIQueryInformationPolicyTrusted + @ stub LsaIQuerySiteInfo + @ stub LsaIQuerySubnetInfo + @ stub LsaIQueryUpnSuffixes + @ stub LsaIRegisterNotification + @ stub LsaIRegisterPolicyChangeNotificationCallback + @ stub LsaISafeMode + @ stub LsaISamIndicatedDsStarted + @ stub LsaISetBootOption + @ stub LsaISetClientDnsHostName + @ stub LsaISetLogonGuidInLogonSession @ stub LsaISetPrivateData @ stub LsaISetSerialNumberPolicy @ stub LsaISetTimesSecret @ stub LsaISetupWasRun + @ stub LsaITestCall + @ stub LsaIUnregisterAllPolicyChangeNotificationCallback + @ stub LsaIUnregisterPolicyChangeNotificationCallback + @ stub LsaIUpdateForestTrustInformation + @ stub LsaIWriteAuditEvent @ stub LsapAuOpenSam + @ stub LsapCheckBootMode + @ stub LsapDsDebugInitialize + @ stub LsapDsInitializeDsStateInfo + @ stub LsapDsInitializePromoteInterface @ stdcall LsapInitLsa() @ stdcall LsarAddPrivilegesToAccount(ptr ptr) @ stdcall LsarClose(ptr)

8 years, 8 months

[ekohl] 70566: [ADVAPI32] Implement LsaOpenPolicySce. [LSASRV] Update the LsarOpenPolicySce prototype.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 10 10:27:46 2016 New Revision: 70566 URL: http://svn.reactos.org/svn/reactos?rev=70566&view=rev Log: [ADVAPI32] Implement LsaOpenPolicySce. [LSASRV] Update the LsarOpenPolicySce prototype. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.spec trunk/reactos/include/reactos/idl/lsa.idl Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sun Jan 10 10:27:46 2016 @@ -1164,7 +1164,7 @@ /* - * @unimplemented + * @implemented */ NTSTATUS WINAPI @@ -1173,10 +1173,34 @@ IN ACCESS_MASK DesiredAccess, OUT PLSA_HANDLE PolicyHandle) { - FIXME("LsaOpenPolicySce(%s %p 0x%08lx %p)\n", + NTSTATUS Status; + + TRACE("LsaOpenPolicySce(%s %p 0x%08lx %p)\n", SystemName ? debugstr_w(SystemName->Buffer) : "(null)", ObjectAttributes, DesiredAccess, PolicyHandle); - return STATUS_NOT_IMPLEMENTED; + + /* FIXME: RPC should take care of this */ + if (!LsapIsLocalComputer(SystemName)) + return RPC_NT_SERVER_UNAVAILABLE; + + RpcTryExcept + { + *PolicyHandle = NULL; + + Status = LsarOpenPolicySce(SystemName ? SystemName->Buffer : NULL, + (PLSAPR_OBJECT_ATTRIBUTES)ObjectAttributes, + DesiredAccess, + PolicyHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + TRACE("LsaOpenPolicySce() done (Status: 0x%08lx)\n", Status); + + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Jan 10 10:27:46 2016 @@ -3153,7 +3153,10 @@ /* Function 78 */ NTSTATUS WINAPI LsarOpenPolicySce( - handle_t hBinding) + LPWSTR SystemName, + PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, + ACCESS_MASK DesiredAccess, + LSAPR_HANDLE *PolicyHandle) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.sp… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.spec [iso-8859-1] Sun Jan 10 10:27:46 2016 @@ -51,7 +51,7 @@ @ stdcall LsarLookupSids2(ptr ptr ptr ptr long long long long) @ stdcall LsarOpenAccount(ptr ptr long ptr) @ stdcall LsarOpenPolicy(ptr ptr long ptr) - @ stdcall LsarOpenPolicySce(ptr) + @ stdcall LsarOpenPolicySce(ptr ptr long ptr) @ stdcall LsarOpenSecret(ptr ptr long ptr) @ stdcall LsarOpenTrustedDomain(ptr ptr long ptr) @ stdcall LsarOpenTrustedDomainByName(ptr ptr long ptr) Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Jan 10 10:27:46 2016 @@ -1091,7 +1091,10 @@ /* Function 78 */ NTSTATUS __stdcall LsarOpenPolicySce( - [in] handle_t hBinding); /* FIXME */ + [in, unique] PLSAPR_SERVER_NAME SystemName, + [in] PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes, + [in] ACCESS_MASK DesiredAccess, + [out] LSAPR_HANDLE *PolicyHandle); /* Function 79 */ NTSTATUS __stdcall LsarAdtRegisterSecurityEventSource(

8 years, 8 months

[hbelusca] 70565: [CMLIB][NTOS:CONFIG] - The BaseBlock->Length member is really the size in bytes of the full hive, minus the header (base) block size. - Remove the last remnents of the "hack of do...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 10 02:16:39 2016 New Revision: 70565 URL: http://svn.reactos.org/svn/reactos?rev=70565&view=rev Log: [CMLIB][NTOS:CONFIG] - The BaseBlock->Length member is really the size in bytes of the full hive, minus the header (base) block size. - Remove the last remnents of the "hack of doom" aka. the one similar in magnitude to the US national debt, addendum to r61621 and r26712. The FileSize can be computed with BaseBlock->Length. Modified: trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/ntoskrnl/config/cminit.c Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sun Jan 10 02:16:39 2016 @@ -113,10 +113,8 @@ /* Hive identifier "regf" (0x66676572) */ ULONG Signature; - /* Update counter */ + /* Update counters */ ULONG Sequence1; - - /* Update counter */ ULONG Sequence2; /* When this hive file was last modified */ @@ -139,7 +137,7 @@ If the hive is volatile, this is the actual pointer to the CM_KEY_NODE */ HCELL_INDEX RootCell; - /* Size of each hive block ? */ + /* Size in bytes of the full hive, minus the header */ ULONG Length; /* (1?) */ Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Sun Jan 10 02:16:39 2016 @@ -353,14 +353,14 @@ } NTSTATUS CMAPI -HvLoadHive(IN PHHIVE Hive, - IN ULONG FileSize) +HvLoadHive(IN PHHIVE Hive) { PHBASE_BLOCK BaseBlock = NULL; ULONG Result; LARGE_INTEGER TimeStamp; ULONG Offset = 0; PVOID HiveData; + ULONG FileSize; /* Get the hive header */ Result = HvpGetHiveHeader(Hive, &BaseBlock, &TimeStamp); @@ -394,6 +394,7 @@ Hive->Version = Hive->BaseBlock->Minor; /* Allocate a buffer large enough to hold the hive */ + FileSize = HBLOCK_SIZE + BaseBlock->Length; HiveData = Hive->Allocate(FileSize, TRUE, TAG_CM); if (!HiveData) return STATUS_INSUFFICIENT_RESOURCES; @@ -405,7 +406,7 @@ FileSize); if (!Result) return STATUS_NOT_REGISTRY_FILE; - + // This is a HACK! /* Free our base block... it's usless in this implementation */ Hive->Free(BaseBlock, 0); @@ -480,7 +481,7 @@ Hive->StorageTypeCount = HTYPE_COUNT; Hive->Cluster = 1; Hive->Version = HSYS_MINOR; - Hive->HiveFlags = HiveFlags &~ HIVE_NOLAZYFLUSH; + Hive->HiveFlags = HiveFlags & ~HIVE_NOLAZYFLUSH; switch (OperationType) { @@ -498,8 +499,7 @@ case HINIT_FILE: { - /* HACK of doom: Cluster is actually the file size. */ - Status = HvLoadHive(Hive, Cluster); + Status = HvLoadHive(Hive); if ((Status != STATUS_SUCCESS) && (Status != STATUS_REGISTRY_RECOVERED)) { Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sun Jan 10 02:16:39 2016 @@ -28,7 +28,6 @@ IN ULONG CheckFlags) { PCMHIVE Hive; - FILE_STANDARD_INFORMATION FileInformation; IO_STATUS_BLOCK IoStatusBlock; FILE_FS_SIZE_INFORMATION FileSizeInformation; NTSTATUS Status; @@ -168,21 +167,6 @@ /* Setup flags */ Hive->Flags = 0; Hive->FlushCount = 0; - - /* Set flags */ - Hive->Flags = HiveFlags; - - /* Check if this is a primary */ - if (Primary) - { - /* Check how large the file is */ - ZwQueryInformationFile(Primary, - &IoStatusBlock, - &FileInformation, - sizeof(FileInformation), - FileStandardInformation); - Cluster = FileInformation.EndOfFile.LowPart; - } /* Initialize it */ Status = HvInitialize(&Hive->Hive,

8 years, 8 months

[hbelusca] 70564: [NTOS:CONFIG] - Use the standard "CmHive" naming (that is used in all the rest of the 'config' module) for the first parameter of CmpInitializeHive. [CMLIB] - Fix the order of the...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 10 01:28:04 2016 New Revision: 70564 URL: http://svn.reactos.org/svn/reactos?rev=70564&view=rev Log: [NTOS:CONFIG] - Use the standard "CmHive" naming (that is used in all the rest of the 'config' module) for the first parameter of CmpInitializeHive. [CMLIB] - Fix the order of the 'HiveFlags'/'FileType' parameters in HvInitialize (the function 'CmGetSystemControlValues' in ntoskrnl/config/cmcontrl.c got them right already). Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7056… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sun Jan 10 01:28:04 2016 @@ -310,19 +310,19 @@ */ NTSTATUS CMAPI HvInitialize( - PHHIVE RegistryHive, - ULONG Operation, - ULONG HiveType, - ULONG HiveFlags, - PVOID HiveData OPTIONAL, - PALLOCATE_ROUTINE Allocate, - PFREE_ROUTINE Free, - PFILE_SET_SIZE_ROUTINE FileSetSize, - PFILE_WRITE_ROUTINE FileWrite, - PFILE_READ_ROUTINE FileRead, - PFILE_FLUSH_ROUTINE FileFlush, - ULONG Cluster OPTIONAL, - PCUNICODE_STRING FileName OPTIONAL); + PHHIVE RegistryHive, + ULONG OperationType, + ULONG HiveFlags, + ULONG FileType, + PVOID HiveData OPTIONAL, + PALLOCATE_ROUTINE Allocate, + PFREE_ROUTINE Free, + PFILE_SET_SIZE_ROUTINE FileSetSize, + PFILE_WRITE_ROUTINE FileWrite, + PFILE_READ_ROUTINE FileRead, + PFILE_FLUSH_ROUTINE FileFlush, + ULONG Cluster OPTIONAL, + PCUNICODE_STRING FileName OPTIONAL); VOID CMAPI HvFree( Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Sun Jan 10 01:28:04 2016 @@ -420,7 +420,7 @@ * * @param RegistryHive * Output variable to store pointer to the hive descriptor. - * @param Operation + * @param OperationType * - HV_OPERATION_CREATE_HIVE * Create a new hive for read/write access. * - HV_OPERATION_MEMORY @@ -447,9 +447,9 @@ NTSTATUS CMAPI HvInitialize( PHHIVE RegistryHive, - ULONG Operation, - ULONG HiveType, + ULONG OperationType, ULONG HiveFlags, + ULONG FileType, PVOID HiveData OPTIONAL, PALLOCATE_ROUTINE Allocate, PFREE_ROUTINE Free, @@ -463,7 +463,7 @@ NTSTATUS Status; PHHIVE Hive = RegistryHive; - UNREFERENCED_PARAMETER(HiveType); + UNREFERENCED_PARAMETER(FileType); /* * Create a new hive structure that will hold all the maintenance data. @@ -482,7 +482,7 @@ Hive->Version = HSYS_MINOR; Hive->HiveFlags = HiveFlags &~ HIVE_NOLAZYFLUSH; - switch (Operation) + switch (OperationType) { case HINIT_CREATE: Status = HvpCreateHive(Hive, FileName); @@ -520,7 +520,7 @@ if (!NT_SUCCESS(Status)) return Status; - if (Operation != HINIT_CREATE) CmPrepareHive(Hive); + if (OperationType != HINIT_CREATE) CmPrepareHive(Hive); return Status; } Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sun Jan 10 01:28:04 2016 @@ -16,7 +16,7 @@ NTSTATUS NTAPI -CmpInitializeHive(OUT PCMHIVE *RegistryHive, +CmpInitializeHive(OUT PCMHIVE *CmHive, IN ULONG OperationType, IN ULONG HiveFlags, IN ULONG FileType, @@ -35,7 +35,7 @@ ULONG Cluster; /* Assume failure */ - *RegistryHive = NULL; + *CmHive = NULL; /* * The following are invalid: @@ -187,8 +187,8 @@ /* Initialize it */ Status = HvInitialize(&Hive->Hive, OperationType, + HiveFlags, FileType, - HiveFlags, HiveData, CmpAllocate, CmpFree, @@ -237,7 +237,7 @@ ExReleasePushLock(&CmpHiveListHeadLock); /* Return the hive and success */ - *RegistryHive = (PCMHIVE)Hive; + *CmHive = Hive; return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sun Jan 10 01:28:04 2016 @@ -792,8 +792,8 @@ NTAPI CmpInitializeHive( OUT PCMHIVE *CmHive, - IN ULONG Operation, - IN ULONG Flags, + IN ULONG OperationType, + IN ULONG HiveFlags, IN ULONG FileType, IN PVOID HiveData OPTIONAL, IN HANDLE Primary,

8 years, 8 months

[hbelusca] 70563: [CMLIB]: Use the HvGetCell* macros where it's possible.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 9 23:50:10 2016 New Revision: 70563 URL: http://svn.reactos.org/svn/reactos?rev=70563&view=rev Log: [CMLIB]: Use the HvGetCell* macros where it's possible. Modified: trunk/reactos/lib/cmlib/hivecell.c Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Sat Jan 9 23:50:10 2016 @@ -22,13 +22,10 @@ ASSERT(CellIndex != HCELL_NIL); if (!RegistryHive->Flat) { - ULONG CellType; - ULONG CellBlock; - ULONG CellOffset; - - CellType = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - CellOffset = (CellIndex & HCELL_OFFSET_MASK) >> HCELL_OFFSET_SHIFT; + ULONG CellType = HvGetCellType(CellIndex); + ULONG CellBlock = HvGetCellBlock(CellIndex); + ULONG CellOffset = (CellIndex & HCELL_OFFSET_MASK) >> HCELL_OFFSET_SHIFT; + ASSERT(CellBlock < RegistryHive->Storage[CellType].Length); Block = (PVOID)RegistryHive->Storage[CellType].BlockList[CellBlock].BlockAddress; ASSERT(Block != NULL); @@ -113,11 +110,11 @@ CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, HoldingLock %u\n", __FUNCTION__, RegistryHive, CellIndex, HoldingLock); - if ((CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT != Stable) + if (HvGetCellType(CellIndex) != Stable) return TRUE; - CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - CellLastBlock = ((CellIndex + HBLOCK_SIZE - 1) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + CellBlock = HvGetCellBlock(CellIndex); + CellLastBlock = HvGetCellBlock(CellIndex + HBLOCK_SIZE - 1); RtlSetBits(&RegistryHive->DirtyVector, CellBlock, CellLastBlock - CellBlock); @@ -187,7 +184,7 @@ ASSERT(RegistryHive != NULL); ASSERT(FreeBlock != NULL); - Storage = (FreeIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + Storage = HvGetCellType(FreeIndex); Index = HvpComputeFreeListIndex((ULONG)FreeBlock->Size); FreeBlockData = (PHCELL_INDEX)(FreeBlock + 1); @@ -212,7 +209,7 @@ ASSERT(RegistryHive->ReadOnly == FALSE); - Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + Storage = HvGetCellType(CellIndex); Index = HvpComputeFreeListIndex((ULONG)CellBlock->Size); pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[Index]; @@ -410,7 +407,7 @@ CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, Size %x\n", __FUNCTION__, RegistryHive, CellIndex, Size); - Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + Storage = HvGetCellType(CellIndex); OldCell = HvGetCell(RegistryHive, CellIndex); OldCellSize = HvGetCellSize(RegistryHive, OldCell); @@ -462,8 +459,8 @@ Free->Size = -Free->Size; - CellType = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + CellType = HvGetCellType(CellIndex); + CellBlock = HvGetCellBlock(CellIndex); /* FIXME: Merge free blocks */ Bin = (PHBIN)RegistryHive->Storage[CellType].BlockList[CellBlock].BinAddress;

8 years, 8 months

[hbelusca] 70562: [CMLIB]: Go from 3-space indentation to 4-space.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 9 23:42:45 2016 New Revision: 70562 URL: http://svn.reactos.org/svn/reactos?rev=70562&view=rev Log: [CMLIB]: Go from 3-space indentation to 4-space. Modified: trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/cminit.c trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/cmtools.c trunk/reactos/lib/cmlib/hivebin.c trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/lib/cmlib/hivesum.c trunk/reactos/lib/cmlib/hivewrt.c Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=705… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl Modified: trunk/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cminit.c?rev=705… ============================================================================== --- trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl @@ -13,124 +13,124 @@ BOOLEAN CMAPI CmCreateRootNode( - PHHIVE Hive, - PCWSTR Name) + PHHIVE Hive, + PCWSTR Name) { - PCM_KEY_NODE KeyCell; - HCELL_INDEX RootCellIndex; - ULONG NameSize; + PCM_KEY_NODE KeyCell; + HCELL_INDEX RootCellIndex; + ULONG NameSize; - /* Allocate the cell */ - NameSize = (ULONG)strlenW(Name) * sizeof(WCHAR); - RootCellIndex = HvAllocateCell(Hive, - FIELD_OFFSET(CM_KEY_NODE, Name) + NameSize, - Stable, - HCELL_NIL); - if (RootCellIndex == HCELL_NIL) return FALSE; + /* Allocate the cell */ + NameSize = (ULONG)strlenW(Name) * sizeof(WCHAR); + RootCellIndex = HvAllocateCell(Hive, + FIELD_OFFSET(CM_KEY_NODE, Name) + NameSize, + Stable, + HCELL_NIL); + if (RootCellIndex == HCELL_NIL) return FALSE; - /* Seutp the base block */ - Hive->BaseBlock->RootCell = RootCellIndex; - Hive->BaseBlock->CheckSum = HvpHiveHeaderChecksum(Hive->BaseBlock); + /* Seutp the base block */ + Hive->BaseBlock->RootCell = RootCellIndex; + Hive->BaseBlock->CheckSum = HvpHiveHeaderChecksum(Hive->BaseBlock); - /* Get the key cell */ - KeyCell = (PCM_KEY_NODE)HvGetCell(Hive, RootCellIndex); - if (!KeyCell) return FALSE; + /* Get the key cell */ + KeyCell = (PCM_KEY_NODE)HvGetCell(Hive, RootCellIndex); + if (!KeyCell) return FALSE; - /* Setup the cell */ - KeyCell->Signature = (USHORT)CM_KEY_NODE_SIGNATURE; - KeyCell->Flags = KEY_HIVE_ENTRY | KEY_NO_DELETE; - KeyCell->LastWriteTime.QuadPart = 0; - KeyCell->Parent = HCELL_NIL; - KeyCell->SubKeyCounts[Stable] = 0; - KeyCell->SubKeyCounts[Volatile] = 0; - KeyCell->SubKeyLists[Stable] = HCELL_NIL; - KeyCell->SubKeyLists[Volatile] = HCELL_NIL; - KeyCell->ValueList.Count = 0; - KeyCell->ValueList.List = HCELL_NIL; - KeyCell->Security = HCELL_NIL; - KeyCell->Class = HCELL_NIL; - KeyCell->ClassLength = 0; - KeyCell->MaxNameLen = 0; - KeyCell->MaxClassLen = 0; - KeyCell->MaxValueNameLen = 0; - KeyCell->MaxValueDataLen = 0; + /* Setup the cell */ + KeyCell->Signature = (USHORT)CM_KEY_NODE_SIGNATURE; + KeyCell->Flags = KEY_HIVE_ENTRY | KEY_NO_DELETE; + KeyCell->LastWriteTime.QuadPart = 0; + KeyCell->Parent = HCELL_NIL; + KeyCell->SubKeyCounts[Stable] = 0; + KeyCell->SubKeyCounts[Volatile] = 0; + KeyCell->SubKeyLists[Stable] = HCELL_NIL; + KeyCell->SubKeyLists[Volatile] = HCELL_NIL; + KeyCell->ValueList.Count = 0; + KeyCell->ValueList.List = HCELL_NIL; + KeyCell->Security = HCELL_NIL; + KeyCell->Class = HCELL_NIL; + KeyCell->ClassLength = 0; + KeyCell->MaxNameLen = 0; + KeyCell->MaxClassLen = 0; + KeyCell->MaxValueNameLen = 0; + KeyCell->MaxValueDataLen = 0; - /* Write the name */ - KeyCell->NameLength = (USHORT)NameSize; - RtlCopyMemory(KeyCell->Name, Name, NameSize); + /* Write the name */ + KeyCell->NameLength = (USHORT)NameSize; + RtlCopyMemory(KeyCell->Name, Name, NameSize); - /* Return success */ - HvReleaseCell(Hive, RootCellIndex); - return TRUE; + /* Return success */ + HvReleaseCell(Hive, RootCellIndex); + return TRUE; } static VOID CMAPI CmpPrepareKey( - PHHIVE RegistryHive, - PCM_KEY_NODE KeyCell); + PHHIVE RegistryHive, + PCM_KEY_NODE KeyCell); static VOID CMAPI CmpPrepareIndexOfKeys( - PHHIVE RegistryHive, - PCM_KEY_INDEX IndexCell) + PHHIVE RegistryHive, + PCM_KEY_INDEX IndexCell) { - ULONG i; + ULONG i; - if (IndexCell->Signature == CM_KEY_INDEX_ROOT || - IndexCell->Signature == CM_KEY_INDEX_LEAF) - { - for (i = 0; i < IndexCell->Count; i++) - { - PCM_KEY_INDEX SubIndexCell = HvGetCell(RegistryHive, IndexCell->List[i]); - if (SubIndexCell->Signature == CM_KEY_NODE_SIGNATURE) - CmpPrepareKey(RegistryHive, (PCM_KEY_NODE)SubIndexCell); - else - CmpPrepareIndexOfKeys(RegistryHive, SubIndexCell); - } + if (IndexCell->Signature == CM_KEY_INDEX_ROOT || + IndexCell->Signature == CM_KEY_INDEX_LEAF) + { + for (i = 0; i < IndexCell->Count; i++) + { + PCM_KEY_INDEX SubIndexCell = HvGetCell(RegistryHive, IndexCell->List[i]); + if (SubIndexCell->Signature == CM_KEY_NODE_SIGNATURE) + CmpPrepareKey(RegistryHive, (PCM_KEY_NODE)SubIndexCell); + else + CmpPrepareIndexOfKeys(RegistryHive, SubIndexCell); + } } - else if (IndexCell->Signature == CM_KEY_FAST_LEAF || - IndexCell->Signature == CM_KEY_HASH_LEAF) - { - PCM_KEY_FAST_INDEX HashCell = (PCM_KEY_FAST_INDEX)IndexCell; - for (i = 0; i < HashCell->Count; i++) - { - PCM_KEY_NODE SubKeyCell = HvGetCell(RegistryHive, HashCell->List[i].Cell); - CmpPrepareKey(RegistryHive, SubKeyCell); - } - } - else - { - DPRINT1("IndexCell->Signature %x\n", IndexCell->Signature); - ASSERT(FALSE); - } + else if (IndexCell->Signature == CM_KEY_FAST_LEAF || + IndexCell->Signature == CM_KEY_HASH_LEAF) + { + PCM_KEY_FAST_INDEX HashCell = (PCM_KEY_FAST_INDEX)IndexCell; + for (i = 0; i < HashCell->Count; i++) + { + PCM_KEY_NODE SubKeyCell = HvGetCell(RegistryHive, HashCell->List[i].Cell); + CmpPrepareKey(RegistryHive, SubKeyCell); + } + } + else + { + DPRINT1("IndexCell->Signature %x\n", IndexCell->Signature); + ASSERT(FALSE); + } } static VOID CMAPI CmpPrepareKey( - PHHIVE RegistryHive, - PCM_KEY_NODE KeyCell) + PHHIVE RegistryHive, + PCM_KEY_NODE KeyCell) { - PCM_KEY_INDEX IndexCell; + PCM_KEY_INDEX IndexCell; - ASSERT(KeyCell->Signature == CM_KEY_NODE_SIGNATURE); + ASSERT(KeyCell->Signature == CM_KEY_NODE_SIGNATURE); - KeyCell->SubKeyLists[Volatile] = HCELL_NIL; - KeyCell->SubKeyCounts[Volatile] = 0; + KeyCell->SubKeyLists[Volatile] = HCELL_NIL; + KeyCell->SubKeyCounts[Volatile] = 0; - /* Enumerate and add subkeys */ - if (KeyCell->SubKeyCounts[Stable] > 0) - { - IndexCell = HvGetCell(RegistryHive, KeyCell->SubKeyLists[Stable]); - CmpPrepareIndexOfKeys(RegistryHive, IndexCell); - } + /* Enumerate and add subkeys */ + if (KeyCell->SubKeyCounts[Stable] > 0) + { + IndexCell = HvGetCell(RegistryHive, KeyCell->SubKeyLists[Stable]); + CmpPrepareIndexOfKeys(RegistryHive, IndexCell); + } } VOID CMAPI CmPrepareHive( - PHHIVE RegistryHive) + PHHIVE RegistryHive) { - PCM_KEY_NODE RootCell; + PCM_KEY_NODE RootCell; - RootCell = HvGetCell(RegistryHive, RegistryHive->BaseBlock->RootCell); - CmpPrepareKey(RegistryHive, RootCell); + RootCell = HvGetCell(RegistryHive, RegistryHive->BaseBlock->RootCell); + CmpPrepareKey(RegistryHive, RootCell); } Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7056… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl Modified: trunk/reactos/lib/cmlib/cmtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmtools.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl Modified: trunk/reactos/lib/cmlib/hivebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivebin.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2005 Hartmut Birr @@ -10,98 +10,98 @@ PHBIN CMAPI HvpAddBin( - PHHIVE RegistryHive, - ULONG Size, - HSTORAGE_TYPE Storage) + PHHIVE RegistryHive, + ULONG Size, + HSTORAGE_TYPE Storage) { - PHMAP_ENTRY BlockList; - PHBIN Bin; - SIZE_T BinSize; - ULONG i; - ULONG BitmapSize; - ULONG BlockCount; - ULONG OldBlockListSize; - PHCELL Block; + PHMAP_ENTRY BlockList; + PHBIN Bin; + SIZE_T BinSize; + ULONG i; + ULONG BitmapSize; + ULONG BlockCount; + ULONG OldBlockListSize; + PHCELL Block; - BinSize = ROUND_UP(Size + sizeof(HBIN), HBLOCK_SIZE); - BlockCount = (ULONG)(BinSize / HBLOCK_SIZE); + BinSize = ROUND_UP(Size + sizeof(HBIN), HBLOCK_SIZE); + BlockCount = (ULONG)(BinSize / HBLOCK_SIZE); - Bin = RegistryHive->Allocate(BinSize, TRUE, TAG_CM); - if (Bin == NULL) - return NULL; - RtlZeroMemory(Bin, BinSize); + Bin = RegistryHive->Allocate(BinSize, TRUE, TAG_CM); + if (Bin == NULL) + return NULL; + RtlZeroMemory(Bin, BinSize); - Bin->Signature = HV_BIN_SIGNATURE; - Bin->FileOffset = RegistryHive->Storage[Storage].Length * - HBLOCK_SIZE; - Bin->Size = (ULONG)BinSize; + Bin->Signature = HV_BIN_SIGNATURE; + Bin->FileOffset = RegistryHive->Storage[Storage].Length * + HBLOCK_SIZE; + Bin->Size = (ULONG)BinSize; - /* Allocate new block list */ - OldBlockListSize = RegistryHive->Storage[Storage].Length; - BlockList = RegistryHive->Allocate(sizeof(HMAP_ENTRY) * - (OldBlockListSize + BlockCount), - TRUE, - TAG_CM); - if (BlockList == NULL) - { - RegistryHive->Free(Bin, 0); - return NULL; - } + /* Allocate new block list */ + OldBlockListSize = RegistryHive->Storage[Storage].Length; + BlockList = RegistryHive->Allocate(sizeof(HMAP_ENTRY) * + (OldBlockListSize + BlockCount), + TRUE, + TAG_CM); + if (BlockList == NULL) + { + RegistryHive->Free(Bin, 0); + return NULL; + } - if (OldBlockListSize > 0) - { - RtlCopyMemory(BlockList, RegistryHive->Storage[Storage].BlockList, - OldBlockListSize * sizeof(HMAP_ENTRY)); - RegistryHive->Free(RegistryHive->Storage[Storage].BlockList, 0); - } + if (OldBlockListSize > 0) + { + RtlCopyMemory(BlockList, RegistryHive->Storage[Storage].BlockList, + OldBlockListSize * sizeof(HMAP_ENTRY)); + RegistryHive->Free(RegistryHive->Storage[Storage].BlockList, 0); + } - RegistryHive->Storage[Storage].BlockList = BlockList; - RegistryHive->Storage[Storage].Length += BlockCount; + RegistryHive->Storage[Storage].BlockList = BlockList; + RegistryHive->Storage[Storage].Length += BlockCount; - for (i = 0; i < BlockCount; i++) - { - RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BlockAddress = - ((ULONG_PTR)Bin + (i * HBLOCK_SIZE)); - RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BinAddress = (ULONG_PTR)Bin; - } + for (i = 0; i < BlockCount; i++) + { + RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BlockAddress = + ((ULONG_PTR)Bin + (i * HBLOCK_SIZE)); + RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BinAddress = (ULONG_PTR)Bin; + } - /* Initialize a free block in this heap. */ - Block = (PHCELL)(Bin + 1); - Block->Size = (LONG)(BinSize - sizeof(HBIN)); + /* Initialize a free block in this heap. */ + Block = (PHCELL)(Bin + 1); + Block->Size = (LONG)(BinSize - sizeof(HBIN)); - if (Storage == Stable) - { - /* Calculate bitmap size in bytes (always a multiple of 32 bits). */ - BitmapSize = ROUND_UP(RegistryHive->Storage[Stable].Length, - sizeof(ULONG) * 8) / 8; + if (Storage == Stable) + { + /* Calculate bitmap size in bytes (always a multiple of 32 bits). */ + BitmapSize = ROUND_UP(RegistryHive->Storage[Stable].Length, + sizeof(ULONG) * 8) / 8; - /* Grow bitmap if necessary. */ - if (BitmapSize > RegistryHive->DirtyVector.SizeOfBitMap / 8) - { - PULONG BitmapBuffer; + /* Grow bitmap if necessary. */ + if (BitmapSize > RegistryHive->DirtyVector.SizeOfBitMap / 8) + { + PULONG BitmapBuffer; - BitmapBuffer = RegistryHive->Allocate(BitmapSize, TRUE, TAG_CM); - RtlZeroMemory(BitmapBuffer, BitmapSize); - if (RegistryHive->DirtyVector.SizeOfBitMap > 0) - { - ASSERT(RegistryHive->DirtyVector.Buffer); - RtlCopyMemory(BitmapBuffer, - RegistryHive->DirtyVector.Buffer, - RegistryHive->DirtyVector.SizeOfBitMap / 8); - RegistryHive->Free(RegistryHive->DirtyVector.Buffer, 0); - } - RtlInitializeBitMap(&RegistryHive->DirtyVector, BitmapBuffer, - BitmapSize * 8); - } + BitmapBuffer = RegistryHive->Allocate(BitmapSize, TRUE, TAG_CM); + RtlZeroMemory(BitmapBuffer, BitmapSize); + if (RegistryHive->DirtyVector.SizeOfBitMap > 0) + { + ASSERT(RegistryHive->DirtyVector.Buffer); + RtlCopyMemory(BitmapBuffer, + RegistryHive->DirtyVector.Buffer, + RegistryHive->DirtyVector.SizeOfBitMap / 8); + RegistryHive->Free(RegistryHive->DirtyVector.Buffer, 0); + } + RtlInitializeBitMap(&RegistryHive->DirtyVector, BitmapBuffer, + BitmapSize * 8); + } - /* Mark new bin dirty. */ - RtlSetBits(&RegistryHive->DirtyVector, - Bin->FileOffset / HBLOCK_SIZE, - BlockCount); + /* Mark new bin dirty. */ + RtlSetBits(&RegistryHive->DirtyVector, + Bin->FileOffset / HBLOCK_SIZE, + BlockCount); - /* Update size in the base block */ - RegistryHive->BaseBlock->Length += BinSize; - } + /* Update size in the base block */ + RegistryHive->BaseBlock->Length += BinSize; + } - return Bin; + return Bin; } Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl @@ -11,514 +11,515 @@ static __inline PHCELL CMAPI HvpGetCellHeader( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex) -{ - PVOID Block; - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", - __FUNCTION__, RegistryHive, CellIndex); - - ASSERT(CellIndex != HCELL_NIL); - if (!RegistryHive->Flat) - { - ULONG CellType; - ULONG CellBlock; - ULONG CellOffset; - - CellType = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - CellOffset = (CellIndex & HCELL_OFFSET_MASK) >> HCELL_OFFSET_SHIFT; - ASSERT(CellBlock < RegistryHive->Storage[CellType].Length); - Block = (PVOID)RegistryHive->Storage[CellType].BlockList[CellBlock].BlockAddress; - ASSERT(Block != NULL); - return (PVOID)((ULONG_PTR)Block + CellOffset); - } - else - { - ASSERT((CellIndex & HCELL_TYPE_MASK) == Stable); - return (PVOID)((ULONG_PTR)RegistryHive->BaseBlock + HBLOCK_SIZE + - CellIndex); - } + PHHIVE RegistryHive, + HCELL_INDEX CellIndex) +{ + PVOID Block; + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", + __FUNCTION__, RegistryHive, CellIndex); + + ASSERT(CellIndex != HCELL_NIL); + if (!RegistryHive->Flat) + { + ULONG CellType; + ULONG CellBlock; + ULONG CellOffset; + + CellType = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + CellOffset = (CellIndex & HCELL_OFFSET_MASK) >> HCELL_OFFSET_SHIFT; + ASSERT(CellBlock < RegistryHive->Storage[CellType].Length); + Block = (PVOID)RegistryHive->Storage[CellType].BlockList[CellBlock].BlockAddress; + ASSERT(Block != NULL); + return (PVOID)((ULONG_PTR)Block + CellOffset); + } + else + { + ASSERT((CellIndex & HCELL_TYPE_MASK) == Stable); + return (PVOID)((ULONG_PTR)RegistryHive->BaseBlock + HBLOCK_SIZE + + CellIndex); + } } BOOLEAN CMAPI HvIsCellAllocated(IN PHHIVE RegistryHive, IN HCELL_INDEX CellIndex) { - ULONG Type, Block; - - /* If it's a flat hive, the cell is always allocated */ - if (RegistryHive->Flat) - return TRUE; - - /* Otherwise, get the type and make sure it's valid */ - Type = HvGetCellType(CellIndex); - Block = HvGetCellBlock(CellIndex); - if (Block >= RegistryHive->Storage[Type].Length) - return FALSE; - - /* Try to get the cell block */ - if (RegistryHive->Storage[Type].BlockList[Block].BlockAddress) - return TRUE; - - /* No valid block, fail */ - return FALSE; + ULONG Type, Block; + + /* If it's a flat hive, the cell is always allocated */ + if (RegistryHive->Flat) + return TRUE; + + /* Otherwise, get the type and make sure it's valid */ + Type = HvGetCellType(CellIndex); + Block = HvGetCellBlock(CellIndex); + if (Block >= RegistryHive->Storage[Type].Length) + return FALSE; + + /* Try to get the cell block */ + if (RegistryHive->Storage[Type].BlockList[Block].BlockAddress) + return TRUE; + + /* No valid block, fail */ + return FALSE; } PVOID CMAPI HvGetCell( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex) -{ - ASSERT(CellIndex != HCELL_NIL); - return (PVOID)(HvpGetCellHeader(RegistryHive, CellIndex) + 1); + PHHIVE RegistryHive, + HCELL_INDEX CellIndex) +{ + ASSERT(CellIndex != HCELL_NIL); + return (PVOID)(HvpGetCellHeader(RegistryHive, CellIndex) + 1); } static __inline LONG CMAPI HvpGetCellFullSize( - PHHIVE RegistryHive, - PVOID Cell) -{ - UNREFERENCED_PARAMETER(RegistryHive); - return ((PHCELL)Cell - 1)->Size; + PHHIVE RegistryHive, + PVOID Cell) +{ + UNREFERENCED_PARAMETER(RegistryHive); + return ((PHCELL)Cell - 1)->Size; } LONG CMAPI HvGetCellSize(IN PHHIVE Hive, IN PVOID Address) { - PHCELL CellHeader; - LONG Size; - - UNREFERENCED_PARAMETER(Hive); - - CellHeader = (PHCELL)Address - 1; - Size = CellHeader->Size * -1; - Size -= sizeof(HCELL); - return Size; + PHCELL CellHeader; + LONG Size; + + UNREFERENCED_PARAMETER(Hive); + + CellHeader = (PHCELL)Address - 1; + Size = CellHeader->Size * -1; + Size -= sizeof(HCELL); + return Size; } BOOLEAN CMAPI HvMarkCellDirty( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex, - BOOLEAN HoldingLock) -{ - ULONG CellBlock; - ULONG CellLastBlock; - - ASSERT(RegistryHive->ReadOnly == FALSE); - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, HoldingLock %u\n", - __FUNCTION__, RegistryHive, CellIndex, HoldingLock); - - if ((CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT != Stable) - return TRUE; - - CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - CellLastBlock = ((CellIndex + HBLOCK_SIZE - 1) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - - RtlSetBits(&RegistryHive->DirtyVector, - CellBlock, CellLastBlock - CellBlock); - RegistryHive->DirtyCount++; - return TRUE; + PHHIVE RegistryHive, + HCELL_INDEX CellIndex, + BOOLEAN HoldingLock) +{ + ULONG CellBlock; + ULONG CellLastBlock; + + ASSERT(RegistryHive->ReadOnly == FALSE); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, HoldingLock %u\n", + __FUNCTION__, RegistryHive, CellIndex, HoldingLock); + + if ((CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT != Stable) + return TRUE; + + CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + CellLastBlock = ((CellIndex + HBLOCK_SIZE - 1) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + + RtlSetBits(&RegistryHive->DirtyVector, + CellBlock, CellLastBlock - CellBlock); + RegistryHive->DirtyCount++; + return TRUE; } BOOLEAN CMAPI HvIsCellDirty(IN PHHIVE Hive, IN HCELL_INDEX Cell) { - BOOLEAN IsDirty = FALSE; - - /* Sanity checks */ - ASSERT(Hive->ReadOnly == FALSE); - - /* Volatile cells are always "dirty" */ - if (HvGetCellType(Cell) == Volatile) - return TRUE; - - /* Check if the dirty bit is set */ - if (RtlCheckBit(&Hive->DirtyVector, Cell / HBLOCK_SIZE)) - IsDirty = TRUE; - - /* Return result as boolean*/ - return IsDirty; + BOOLEAN IsDirty = FALSE; + + /* Sanity checks */ + ASSERT(Hive->ReadOnly == FALSE); + + /* Volatile cells are always "dirty" */ + if (HvGetCellType(Cell) == Volatile) + return TRUE; + + /* Check if the dirty bit is set */ + if (RtlCheckBit(&Hive->DirtyVector, Cell / HBLOCK_SIZE)) + IsDirty = TRUE; + + /* Return result as boolean*/ + return IsDirty; } static __inline ULONG CMAPI HvpComputeFreeListIndex( - ULONG Size) -{ - ULONG Index; - static CCHAR FindFirstSet[128] = { - 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}; - - ASSERT(Size >= (1 << 3)); - Index = (Size >> 3) - 1; - if (Index >= 16) - { - if (Index > 127) - Index = 23; - else - Index = FindFirstSet[Index] + 16; - } - - return Index; + ULONG Size) +{ + ULONG Index; + static CCHAR FindFirstSet[128] = { + 0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6}; + + ASSERT(Size >= (1 << 3)); + Index = (Size >> 3) - 1; + if (Index >= 16) + { + if (Index > 127) + Index = 23; + else + Index = FindFirstSet[Index] + 16; + } + + return Index; } static NTSTATUS CMAPI HvpAddFree( - PHHIVE RegistryHive, - PHCELL FreeBlock, - HCELL_INDEX FreeIndex) -{ - PHCELL_INDEX FreeBlockData; - HSTORAGE_TYPE Storage; - ULONG Index; - - ASSERT(RegistryHive != NULL); - ASSERT(FreeBlock != NULL); - - Storage = (FreeIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - Index = HvpComputeFreeListIndex((ULONG)FreeBlock->Size); - - FreeBlockData = (PHCELL_INDEX)(FreeBlock + 1); - *FreeBlockData = RegistryHive->Storage[Storage].FreeDisplay[Index]; - RegistryHive->Storage[Storage].FreeDisplay[Index] = FreeIndex; - - /* FIXME: Eventually get rid of free bins. */ - - return STATUS_SUCCESS; + PHHIVE RegistryHive, + PHCELL FreeBlock, + HCELL_INDEX FreeIndex) +{ + PHCELL_INDEX FreeBlockData; + HSTORAGE_TYPE Storage; + ULONG Index; + + ASSERT(RegistryHive != NULL); + ASSERT(FreeBlock != NULL); + + Storage = (FreeIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + Index = HvpComputeFreeListIndex((ULONG)FreeBlock->Size); + + FreeBlockData = (PHCELL_INDEX)(FreeBlock + 1); + *FreeBlockData = RegistryHive->Storage[Storage].FreeDisplay[Index]; + RegistryHive->Storage[Storage].FreeDisplay[Index] = FreeIndex; + + /* FIXME: Eventually get rid of free bins. */ + + return STATUS_SUCCESS; } static VOID CMAPI HvpRemoveFree( - PHHIVE RegistryHive, - PHCELL CellBlock, - HCELL_INDEX CellIndex) -{ - PHCELL_INDEX FreeCellData; - PHCELL_INDEX pFreeCellOffset; - HSTORAGE_TYPE Storage; - ULONG Index, FreeListIndex; - - ASSERT(RegistryHive->ReadOnly == FALSE); - - Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - Index = HvpComputeFreeListIndex((ULONG)CellBlock->Size); - - pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[Index]; - while (*pFreeCellOffset != HCELL_NIL) - { - FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); - if (*pFreeCellOffset == CellIndex) - { - *pFreeCellOffset = *FreeCellData; - return; - } - pFreeCellOffset = FreeCellData; - } - - /* Something bad happened, print a useful trace info and bugcheck */ - CMLTRACE(CMLIB_HCELL_DEBUG, "-- beginning of HvpRemoveFree trace --\n"); - CMLTRACE(CMLIB_HCELL_DEBUG, "block we are about to free: %08x\n", CellIndex); - CMLTRACE(CMLIB_HCELL_DEBUG, "chosen free list index: %u\n", Index); - for (FreeListIndex = 0; FreeListIndex < 24; FreeListIndex++) - { - CMLTRACE(CMLIB_HCELL_DEBUG, "free list [%u]: ", FreeListIndex); - pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[FreeListIndex]; - while (*pFreeCellOffset != HCELL_NIL) - { - CMLTRACE(CMLIB_HCELL_DEBUG, "%08x ", *pFreeCellOffset); - FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); - pFreeCellOffset = FreeCellData; - } - CMLTRACE(CMLIB_HCELL_DEBUG, "\n"); - } - CMLTRACE(CMLIB_HCELL_DEBUG, "-- end of HvpRemoveFree trace --\n"); - - ASSERT(FALSE); + PHHIVE RegistryHive, + PHCELL CellBlock, + HCELL_INDEX CellIndex) +{ + PHCELL_INDEX FreeCellData; + PHCELL_INDEX pFreeCellOffset; + HSTORAGE_TYPE Storage; + ULONG Index, FreeListIndex; + + ASSERT(RegistryHive->ReadOnly == FALSE); + + Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + Index = HvpComputeFreeListIndex((ULONG)CellBlock->Size); + + pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[Index]; + while (*pFreeCellOffset != HCELL_NIL) + { + FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); + if (*pFreeCellOffset == CellIndex) + { + *pFreeCellOffset = *FreeCellData; + return; + } + pFreeCellOffset = FreeCellData; + } + + /* Something bad happened, print a useful trace info and bugcheck */ + CMLTRACE(CMLIB_HCELL_DEBUG, "-- beginning of HvpRemoveFree trace --\n"); + CMLTRACE(CMLIB_HCELL_DEBUG, "block we are about to free: %08x\n", CellIndex); + CMLTRACE(CMLIB_HCELL_DEBUG, "chosen free list index: %u\n", Index); + for (FreeListIndex = 0; FreeListIndex < 24; FreeListIndex++) + { + CMLTRACE(CMLIB_HCELL_DEBUG, "free list [%u]: ", FreeListIndex); + pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[FreeListIndex]; + while (*pFreeCellOffset != HCELL_NIL) + { + CMLTRACE(CMLIB_HCELL_DEBUG, "%08x ", *pFreeCellOffset); + FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); + pFreeCellOffset = FreeCellData; + } + CMLTRACE(CMLIB_HCELL_DEBUG, "\n"); + } + CMLTRACE(CMLIB_HCELL_DEBUG, "-- end of HvpRemoveFree trace --\n"); + + ASSERT(FALSE); } static HCELL_INDEX CMAPI HvpFindFree( - PHHIVE RegistryHive, - ULONG Size, - HSTORAGE_TYPE Storage) -{ - PHCELL_INDEX FreeCellData; - HCELL_INDEX FreeCellOffset; - PHCELL_INDEX pFreeCellOffset; - ULONG Index; - - for (Index = HvpComputeFreeListIndex(Size); Index < 24; Index++) - { - pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[Index]; - while (*pFreeCellOffset != HCELL_NIL) - { - FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); - if ((ULONG)HvpGetCellFullSize(RegistryHive, FreeCellData) >= Size) - { - FreeCellOffset = *pFreeCellOffset; - *pFreeCellOffset = *FreeCellData; - return FreeCellOffset; - } - pFreeCellOffset = FreeCellData; - } - } - - return HCELL_NIL; + PHHIVE RegistryHive, + ULONG Size, + HSTORAGE_TYPE Storage) +{ + PHCELL_INDEX FreeCellData; + HCELL_INDEX FreeCellOffset; + PHCELL_INDEX pFreeCellOffset; + ULONG Index; + + for (Index = HvpComputeFreeListIndex(Size); Index < 24; Index++) + { + pFreeCellOffset = &RegistryHive->Storage[Storage].FreeDisplay[Index]; + while (*pFreeCellOffset != HCELL_NIL) + { + FreeCellData = (PHCELL_INDEX)HvGetCell(RegistryHive, *pFreeCellOffset); + if ((ULONG)HvpGetCellFullSize(RegistryHive, FreeCellData) >= Size) + { + FreeCellOffset = *pFreeCellOffset; + *pFreeCellOffset = *FreeCellData; + return FreeCellOffset; + } + pFreeCellOffset = FreeCellData; + } + } + + return HCELL_NIL; } NTSTATUS CMAPI HvpCreateHiveFreeCellList( - PHHIVE Hive) -{ - HCELL_INDEX BlockOffset; - PHCELL FreeBlock; - ULONG BlockIndex; - ULONG FreeOffset; - PHBIN Bin; - NTSTATUS Status; - ULONG Index; - - /* Initialize the free cell list */ - for (Index = 0; Index < 24; Index++) - { - Hive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; - Hive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; - } - - BlockOffset = 0; - BlockIndex = 0; - while (BlockIndex < Hive->Storage[Stable].Length) - { - Bin = (PHBIN)Hive->Storage[Stable].BlockList[BlockIndex].BinAddress; - - /* Search free blocks and add to list */ - FreeOffset = sizeof(HBIN); - while (FreeOffset < Bin->Size) - { - FreeBlock = (PHCELL)((ULONG_PTR)Bin + FreeOffset); - if (FreeBlock->Size > 0) - { - Status = HvpAddFree(Hive, FreeBlock, Bin->FileOffset + FreeOffset); - if (!NT_SUCCESS(Status)) - return Status; - - FreeOffset += FreeBlock->Size; - } - else - { - FreeOffset -= FreeBlock->Size; - } - } - - BlockIndex += Bin->Size / HBLOCK_SIZE; - BlockOffset += Bin->Size; - } - - return STATUS_SUCCESS; + PHHIVE Hive) +{ + HCELL_INDEX BlockOffset; + PHCELL FreeBlock; + ULONG BlockIndex; + ULONG FreeOffset; + PHBIN Bin; + NTSTATUS Status; + ULONG Index; + + /* Initialize the free cell list */ + for (Index = 0; Index < 24; Index++) + { + Hive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; + Hive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; + } + + BlockOffset = 0; + BlockIndex = 0; + while (BlockIndex < Hive->Storage[Stable].Length) + { + Bin = (PHBIN)Hive->Storage[Stable].BlockList[BlockIndex].BinAddress; + + /* Search free blocks and add to list */ + FreeOffset = sizeof(HBIN); + while (FreeOffset < Bin->Size) + { + FreeBlock = (PHCELL)((ULONG_PTR)Bin + FreeOffset); + if (FreeBlock->Size > 0) + { + Status = HvpAddFree(Hive, FreeBlock, Bin->FileOffset + FreeOffset); + if (!NT_SUCCESS(Status)) + return Status; + + FreeOffset += FreeBlock->Size; + } + else + { + FreeOffset -= FreeBlock->Size; + } + } + + BlockIndex += Bin->Size / HBLOCK_SIZE; + BlockOffset += Bin->Size; + } + + return STATUS_SUCCESS; } HCELL_INDEX CMAPI HvAllocateCell( - PHHIVE RegistryHive, - ULONG Size, - HSTORAGE_TYPE Storage, - HCELL_INDEX Vicinity) -{ - PHCELL FreeCell; - HCELL_INDEX FreeCellOffset; - PHCELL NewCell; - PHBIN Bin; - - ASSERT(RegistryHive->ReadOnly == FALSE); - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, Size %x, %s, Vicinity %08lx\n", - __FUNCTION__, RegistryHive, Size, (Storage == 0) ? "Stable" : "Volatile", Vicinity); - - /* Round to 16 bytes multiple. */ - Size = ROUND_UP(Size + sizeof(HCELL), 16); - - /* First search in free blocks. */ - FreeCellOffset = HvpFindFree(RegistryHive, Size, Storage); - - /* If no free cell was found we need to extend the hive file. */ - if (FreeCellOffset == HCELL_NIL) - { - Bin = HvpAddBin(RegistryHive, Size, Storage); - if (Bin == NULL) - return HCELL_NIL; - FreeCellOffset = Bin->FileOffset + sizeof(HBIN); - FreeCellOffset |= Storage << HCELL_TYPE_SHIFT; - } - - FreeCell = HvpGetCellHeader(RegistryHive, FreeCellOffset); - - /* Split the block in two parts */ - - /* The free block that is created has to be at least - sizeof(HCELL) + sizeof(HCELL_INDEX) big, so that free - cell list code can work. Moreover we round cell sizes - to 16 bytes, so creating a smaller block would result in - a cell that would never be allocated. */ - if ((ULONG)FreeCell->Size > Size + 16) - { - NewCell = (PHCELL)((ULONG_PTR)FreeCell + Size); - NewCell->Size = FreeCell->Size - Size; - FreeCell->Size = Size; - HvpAddFree(RegistryHive, NewCell, FreeCellOffset + Size); - if (Storage == Stable) - HvMarkCellDirty(RegistryHive, FreeCellOffset + Size, FALSE); - } - - if (Storage == Stable) - HvMarkCellDirty(RegistryHive, FreeCellOffset, FALSE); - FreeCell->Size = -FreeCell->Size; - RtlZeroMemory(FreeCell + 1, Size - sizeof(HCELL)); - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - CellIndex %08lx\n", - __FUNCTION__, FreeCellOffset); - - return FreeCellOffset; + PHHIVE RegistryHive, + ULONG Size, + HSTORAGE_TYPE Storage, + HCELL_INDEX Vicinity) +{ + PHCELL FreeCell; + HCELL_INDEX FreeCellOffset; + PHCELL NewCell; + PHBIN Bin; + + ASSERT(RegistryHive->ReadOnly == FALSE); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, Size %x, %s, Vicinity %08lx\n", + __FUNCTION__, RegistryHive, Size, (Storage == 0) ? "Stable" : "Volatile", Vicinity); + + /* Round to 16 bytes multiple. */ + Size = ROUND_UP(Size + sizeof(HCELL), 16); + + /* First search in free blocks. */ + FreeCellOffset = HvpFindFree(RegistryHive, Size, Storage); + + /* If no free cell was found we need to extend the hive file. */ + if (FreeCellOffset == HCELL_NIL) + { + Bin = HvpAddBin(RegistryHive, Size, Storage); + if (Bin == NULL) + return HCELL_NIL; + FreeCellOffset = Bin->FileOffset + sizeof(HBIN); + FreeCellOffset |= Storage << HCELL_TYPE_SHIFT; + } + + FreeCell = HvpGetCellHeader(RegistryHive, FreeCellOffset); + + /* Split the block in two parts */ + + /* The free block that is created has to be at least + sizeof(HCELL) + sizeof(HCELL_INDEX) big, so that free + cell list code can work. Moreover we round cell sizes + to 16 bytes, so creating a smaller block would result in + a cell that would never be allocated. */ + if ((ULONG)FreeCell->Size > Size + 16) + { + NewCell = (PHCELL)((ULONG_PTR)FreeCell + Size); + NewCell->Size = FreeCell->Size - Size; + FreeCell->Size = Size; + HvpAddFree(RegistryHive, NewCell, FreeCellOffset + Size); + if (Storage == Stable) + HvMarkCellDirty(RegistryHive, FreeCellOffset + Size, FALSE); + } + + if (Storage == Stable) + HvMarkCellDirty(RegistryHive, FreeCellOffset, FALSE); + + FreeCell->Size = -FreeCell->Size; + RtlZeroMemory(FreeCell + 1, Size - sizeof(HCELL)); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - CellIndex %08lx\n", + __FUNCTION__, FreeCellOffset); + + return FreeCellOffset; } HCELL_INDEX CMAPI HvReallocateCell( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex, - ULONG Size) -{ - PVOID OldCell; - PVOID NewCell; - LONG OldCellSize; - HCELL_INDEX NewCellIndex; - HSTORAGE_TYPE Storage; - - ASSERT(CellIndex != HCELL_NIL); - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, Size %x\n", - __FUNCTION__, RegistryHive, CellIndex, Size); - - Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - - OldCell = HvGetCell(RegistryHive, CellIndex); - OldCellSize = HvGetCellSize(RegistryHive, OldCell); - ASSERT(OldCellSize > 0); - - /* - * If new data size is larger than the current, destroy current - * data block and allocate a new one. - * - * FIXME: Merge with adjacent free cell if possible. - * FIXME: Implement shrinking. - */ - if (Size > (ULONG)OldCellSize) - { - NewCellIndex = HvAllocateCell(RegistryHive, Size, Storage, HCELL_NIL); - if (NewCellIndex == HCELL_NIL) - return HCELL_NIL; - - NewCell = HvGetCell(RegistryHive, NewCellIndex); - RtlCopyMemory(NewCell, OldCell, (SIZE_T)OldCellSize); - - HvFreeCell(RegistryHive, CellIndex); - - return NewCellIndex; - } - - return CellIndex; + PHHIVE RegistryHive, + HCELL_INDEX CellIndex, + ULONG Size) +{ + PVOID OldCell; + PVOID NewCell; + LONG OldCellSize; + HCELL_INDEX NewCellIndex; + HSTORAGE_TYPE Storage; + + ASSERT(CellIndex != HCELL_NIL); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, Size %x\n", + __FUNCTION__, RegistryHive, CellIndex, Size); + + Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + + OldCell = HvGetCell(RegistryHive, CellIndex); + OldCellSize = HvGetCellSize(RegistryHive, OldCell); + ASSERT(OldCellSize > 0); + + /* + * If new data size is larger than the current, destroy current + * data block and allocate a new one. + * + * FIXME: Merge with adjacent free cell if possible. + * FIXME: Implement shrinking. + */ + if (Size > (ULONG)OldCellSize) + { + NewCellIndex = HvAllocateCell(RegistryHive, Size, Storage, HCELL_NIL); + if (NewCellIndex == HCELL_NIL) + return HCELL_NIL; + + NewCell = HvGetCell(RegistryHive, NewCellIndex); + RtlCopyMemory(NewCell, OldCell, (SIZE_T)OldCellSize); + + HvFreeCell(RegistryHive, CellIndex); + + return NewCellIndex; + } + + return CellIndex; } VOID CMAPI HvFreeCell( - PHHIVE RegistryHive, - HCELL_INDEX CellIndex) -{ - PHCELL Free; - PHCELL Neighbor; - PHBIN Bin; - ULONG CellType; - ULONG CellBlock; - - ASSERT(RegistryHive->ReadOnly == FALSE); - - CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", - __FUNCTION__, RegistryHive, CellIndex); - - Free = HvpGetCellHeader(RegistryHive, CellIndex); - - ASSERT(Free->Size < 0); - - Free->Size = -Free->Size; - - CellType = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; - CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - - /* FIXME: Merge free blocks */ - Bin = (PHBIN)RegistryHive->Storage[CellType].BlockList[CellBlock].BinAddress; - - if ((CellIndex & ~HCELL_TYPE_MASK) + Free->Size < - Bin->FileOffset + Bin->Size) - { - Neighbor = (PHCELL)((ULONG_PTR)Free + Free->Size); - if (Neighbor->Size > 0) - { - HvpRemoveFree(RegistryHive, Neighbor, - ((HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + - Bin->FileOffset)) | (CellIndex & HCELL_TYPE_MASK)); - Free->Size += Neighbor->Size; - } - } - - Neighbor = (PHCELL)(Bin + 1); - while (Neighbor < Free) - { - if (Neighbor->Size > 0) - { - if ((ULONG_PTR)Neighbor + Neighbor->Size == (ULONG_PTR)Free) - { - HCELL_INDEX NeighborCellIndex = - (HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + - Bin->FileOffset) | (CellIndex & HCELL_TYPE_MASK); - - if (HvpComputeFreeListIndex(Neighbor->Size) != - HvpComputeFreeListIndex(Neighbor->Size + Free->Size)) + PHHIVE RegistryHive, + HCELL_INDEX CellIndex) +{ + PHCELL Free; + PHCELL Neighbor; + PHBIN Bin; + ULONG CellType; + ULONG CellBlock; + + ASSERT(RegistryHive->ReadOnly == FALSE); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", + __FUNCTION__, RegistryHive, CellIndex); + + Free = HvpGetCellHeader(RegistryHive, CellIndex); + + ASSERT(Free->Size < 0); + + Free->Size = -Free->Size; + + CellType = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; + CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + + /* FIXME: Merge free blocks */ + Bin = (PHBIN)RegistryHive->Storage[CellType].BlockList[CellBlock].BinAddress; + + if ((CellIndex & ~HCELL_TYPE_MASK) + Free->Size < + Bin->FileOffset + Bin->Size) + { + Neighbor = (PHCELL)((ULONG_PTR)Free + Free->Size); + if (Neighbor->Size > 0) + { + HvpRemoveFree(RegistryHive, Neighbor, + ((HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + + Bin->FileOffset)) | (CellIndex & HCELL_TYPE_MASK)); + Free->Size += Neighbor->Size; + } + } + + Neighbor = (PHCELL)(Bin + 1); + while (Neighbor < Free) + { + if (Neighbor->Size > 0) + { + if ((ULONG_PTR)Neighbor + Neighbor->Size == (ULONG_PTR)Free) { - HvpRemoveFree(RegistryHive, Neighbor, NeighborCellIndex); - Neighbor->Size += Free->Size; - HvpAddFree(RegistryHive, Neighbor, NeighborCellIndex); + HCELL_INDEX NeighborCellIndex = + ((HCELL_INDEX)((ULONG_PTR)Neighbor - (ULONG_PTR)Bin + + Bin->FileOffset)) | (CellIndex & HCELL_TYPE_MASK); + + if (HvpComputeFreeListIndex(Neighbor->Size) != + HvpComputeFreeListIndex(Neighbor->Size + Free->Size)) + { + HvpRemoveFree(RegistryHive, Neighbor, NeighborCellIndex); + Neighbor->Size += Free->Size; + HvpAddFree(RegistryHive, Neighbor, NeighborCellIndex); + } + else + Neighbor->Size += Free->Size; + + if (CellType == Stable) + HvMarkCellDirty(RegistryHive, NeighborCellIndex, FALSE); + + return; } - else - Neighbor->Size += Free->Size; - - if (CellType == Stable) - HvMarkCellDirty(RegistryHive, NeighborCellIndex, FALSE); - - return; - } - Neighbor = (PHCELL)((ULONG_PTR)Neighbor + Neighbor->Size); - } - else - { - Neighbor = (PHCELL)((ULONG_PTR)Neighbor - Neighbor->Size); - } - } - - /* Add block to the list of free blocks */ - HvpAddFree(RegistryHive, Free, CellIndex); - - if (CellType == Stable) - HvMarkCellDirty(RegistryHive, CellIndex, FALSE); + Neighbor = (PHCELL)((ULONG_PTR)Neighbor + Neighbor->Size); + } + else + { + Neighbor = (PHCELL)((ULONG_PTR)Neighbor - Neighbor->Size); + } + } + + /* Add block to the list of free blocks */ + HvpAddFree(RegistryHive, Free, CellIndex); + + if (CellType == Stable) + HvMarkCellDirty(RegistryHive, CellIndex, FALSE); } BOOLEAN Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl @@ -17,32 +17,32 @@ BOOLEAN CMAPI HvpVerifyHiveHeader( - PHBASE_BLOCK BaseBlock) -{ - if (BaseBlock->Signature != HV_SIGNATURE || - BaseBlock->Major != HSYS_MAJOR || - BaseBlock->Minor < HSYS_MINOR || - BaseBlock->Type != HFILE_TYPE_PRIMARY || - BaseBlock->Format != HBASE_FORMAT_MEMORY || - BaseBlock->Cluster != 1 || - BaseBlock->Sequence1 != BaseBlock->Sequence2 || - HvpHiveHeaderChecksum(BaseBlock) != BaseBlock->CheckSum) - { - DPRINT1("Verify Hive Header failed: \n"); - DPRINT1(" Signature: 0x%x, expected 0x%x; Major: 0x%x, expected 0x%x\n", - BaseBlock->Signature, HV_SIGNATURE, BaseBlock->Major, HSYS_MAJOR); - DPRINT1(" Minor: 0x%x is not >= 0x%x; Type: 0x%x, expected 0x%x\n", - BaseBlock->Minor, HSYS_MINOR, BaseBlock->Type, HFILE_TYPE_PRIMARY); - DPRINT1(" Format: 0x%x, expected 0x%x; Cluster: 0x%x, expected 1\n", - BaseBlock->Format, HBASE_FORMAT_MEMORY, BaseBlock->Cluster); - DPRINT1(" Sequence: 0x%x, expected 0x%x; Checksum: 0x%x, expected 0x%x\n", - BaseBlock->Sequence1, BaseBlock->Sequence2, - HvpHiveHeaderChecksum(BaseBlock), BaseBlock->CheckSum); - - return FALSE; - } - - return TRUE; + PHBASE_BLOCK BaseBlock) +{ + if (BaseBlock->Signature != HV_SIGNATURE || + BaseBlock->Major != HSYS_MAJOR || + BaseBlock->Minor < HSYS_MINOR || + BaseBlock->Type != HFILE_TYPE_PRIMARY || + BaseBlock->Format != HBASE_FORMAT_MEMORY || + BaseBlock->Cluster != 1 || + BaseBlock->Sequence1 != BaseBlock->Sequence2 || + HvpHiveHeaderChecksum(BaseBlock) != BaseBlock->CheckSum) + { + DPRINT1("Verify Hive Header failed: \n"); + DPRINT1(" Signature: 0x%x, expected 0x%x; Major: 0x%x, expected 0x%x\n", + BaseBlock->Signature, HV_SIGNATURE, BaseBlock->Major, HSYS_MAJOR); + DPRINT1(" Minor: 0x%x is not >= 0x%x; Type: 0x%x, expected 0x%x\n", + BaseBlock->Minor, HSYS_MINOR, BaseBlock->Type, HFILE_TYPE_PRIMARY); + DPRINT1(" Format: 0x%x, expected 0x%x; Cluster: 0x%x, expected 1\n", + BaseBlock->Format, HBASE_FORMAT_MEMORY, BaseBlock->Cluster); + DPRINT1(" Sequence: 0x%x, expected 0x%x; Checksum: 0x%x, expected 0x%x\n", + BaseBlock->Sequence1, BaseBlock->Sequence2, + HvpHiveHeaderChecksum(BaseBlock), BaseBlock->CheckSum); + + return FALSE; + } + + return TRUE; } /** @@ -54,31 +54,31 @@ VOID CMAPI HvpFreeHiveBins( - PHHIVE Hive) -{ - ULONG i; - PHBIN Bin; - ULONG Storage; - - for (Storage = Stable; Storage < HTYPE_COUNT; Storage++) - { - Bin = NULL; - for (i = 0; i < Hive->Storage[Storage].Length; i++) - { - if (Hive->Storage[Storage].BlockList[i].BinAddress == (ULONG_PTR)NULL) - continue; - if (Hive->Storage[Storage].BlockList[i].BinAddress != (ULONG_PTR)Bin) - { - Bin = (PHBIN)Hive->Storage[Storage].BlockList[i].BinAddress; - Hive->Free((PHBIN)Hive->Storage[Storage].BlockList[i].BinAddress, 0); - } - Hive->Storage[Storage].BlockList[i].BinAddress = (ULONG_PTR)NULL; - Hive->Storage[Storage].BlockList[i].BlockAddress = (ULONG_PTR)NULL; - } - - if (Hive->Storage[Storage].Length) - Hive->Free(Hive->Storage[Storage].BlockList, 0); - } + PHHIVE Hive) +{ + ULONG i; + PHBIN Bin; + ULONG Storage; + + for (Storage = Stable; Storage < HTYPE_COUNT; Storage++) + { + Bin = NULL; + for (i = 0; i < Hive->Storage[Storage].Length; i++) + { + if (Hive->Storage[Storage].BlockList[i].BinAddress == (ULONG_PTR)NULL) + continue; + if (Hive->Storage[Storage].BlockList[i].BinAddress != (ULONG_PTR)Bin) + { + Bin = (PHBIN)Hive->Storage[Storage].BlockList[i].BinAddress; + Hive->Free((PHBIN)Hive->Storage[Storage].BlockList[i].BinAddress, 0); + } + Hive->Storage[Storage].BlockList[i].BinAddress = (ULONG_PTR)NULL; + Hive->Storage[Storage].BlockList[i].BlockAddress = (ULONG_PTR)NULL; + } + + if (Hive->Storage[Storage].Length) + Hive->Free(Hive->Storage[Storage].BlockList, 0); + } } /** @@ -92,60 +92,60 @@ NTSTATUS CMAPI HvpCreateHive( - PHHIVE RegistryHive, - PCUNICODE_STRING FileName OPTIONAL) -{ - PHBASE_BLOCK BaseBlock; - ULONG Index; - - BaseBlock = RegistryHive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); - if (BaseBlock == NULL) - return STATUS_NO_MEMORY; - - RtlZeroMemory(BaseBlock, sizeof(HBASE_BLOCK)); - - BaseBlock->Signature = HV_SIGNATURE; - BaseBlock->Major = HSYS_MAJOR; - BaseBlock->Minor = HSYS_MINOR; - BaseBlock->Type = HFILE_TYPE_PRIMARY; - BaseBlock->Format = HBASE_FORMAT_MEMORY; - BaseBlock->Cluster = 1; - BaseBlock->RootCell = HCELL_NIL; - BaseBlock->Length = 0; - BaseBlock->Sequence1 = 1; - BaseBlock->Sequence2 = 1; - - /* Copy the 31 last characters of the hive file name if any */ - if (FileName) - { - if (FileName->Length / sizeof(WCHAR) <= HIVE_FILENAME_MAXLEN) - { - RtlCopyMemory(BaseBlock->FileName, - FileName->Buffer, - FileName->Length); - } - else - { - RtlCopyMemory(BaseBlock->FileName, - FileName->Buffer + - FileName->Length / sizeof(WCHAR) - HIVE_FILENAME_MAXLEN, - HIVE_FILENAME_MAXLEN * sizeof(WCHAR)); - } - - /* NULL-terminate */ - BaseBlock->FileName[HIVE_FILENAME_MAXLEN] = L'\0'; - } - - BaseBlock->CheckSum = HvpHiveHeaderChecksum(BaseBlock); - - RegistryHive->BaseBlock = BaseBlock; - for (Index = 0; Index < 24; Index++) - { - RegistryHive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; - RegistryHive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; - } - - return STATUS_SUCCESS; + PHHIVE RegistryHive, + PCUNICODE_STRING FileName OPTIONAL) +{ + PHBASE_BLOCK BaseBlock; + ULONG Index; + + BaseBlock = RegistryHive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); + if (BaseBlock == NULL) + return STATUS_NO_MEMORY; + + RtlZeroMemory(BaseBlock, sizeof(HBASE_BLOCK)); + + BaseBlock->Signature = HV_SIGNATURE; + BaseBlock->Major = HSYS_MAJOR; + BaseBlock->Minor = HSYS_MINOR; + BaseBlock->Type = HFILE_TYPE_PRIMARY; + BaseBlock->Format = HBASE_FORMAT_MEMORY; + BaseBlock->Cluster = 1; + BaseBlock->RootCell = HCELL_NIL; + BaseBlock->Length = 0; + BaseBlock->Sequence1 = 1; + BaseBlock->Sequence2 = 1; + + /* Copy the 31 last characters of the hive file name if any */ + if (FileName) + { + if (FileName->Length / sizeof(WCHAR) <= HIVE_FILENAME_MAXLEN) + { + RtlCopyMemory(BaseBlock->FileName, + FileName->Buffer, + FileName->Length); + } + else + { + RtlCopyMemory(BaseBlock->FileName, + FileName->Buffer + + FileName->Length / sizeof(WCHAR) - HIVE_FILENAME_MAXLEN, + HIVE_FILENAME_MAXLEN * sizeof(WCHAR)); + } + + /* NULL-terminate */ + BaseBlock->FileName[HIVE_FILENAME_MAXLEN] = L'\0'; + } + + BaseBlock->CheckSum = HvpHiveHeaderChecksum(BaseBlock); + + RegistryHive->BaseBlock = BaseBlock; + for (Index = 0; Index < 24; Index++) + { + RegistryHive->Storage[Stable].FreeDisplay[Index] = HCELL_NIL; + RegistryHive->Storage[Volatile].FreeDisplay[Index] = HCELL_NIL; + } + + return STATUS_SUCCESS; } /** @@ -160,110 +160,110 @@ NTSTATUS CMAPI HvpInitializeMemoryHive( - PHHIVE Hive, - PVOID ChunkBase) -{ - SIZE_T BlockIndex; - PHBIN Bin, NewBin; - ULONG i; - ULONG BitmapSize; - PULONG BitmapBuffer; - SIZE_T ChunkSize; - - ChunkSize = ((PHBASE_BLOCK)ChunkBase)->Length; - DPRINT("ChunkSize: %lx\n", ChunkSize); - - if (ChunkSize < sizeof(HBASE_BLOCK) || - !HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) - { - DPRINT1("Registry is corrupt: ChunkSize %lu < sizeof(HBASE_BLOCK) %lu, " - "or HvpVerifyHiveHeader() failed\n", ChunkSize, (SIZE_T)sizeof(HBASE_BLOCK)); - return STATUS_REGISTRY_CORRUPT; - } - - Hive->BaseBlock = Hive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); - if (Hive->BaseBlock == NULL) - { - return STATUS_NO_MEMORY; - } - RtlCopyMemory(Hive->BaseBlock, ChunkBase, sizeof(HBASE_BLOCK)); - - /* - * Build a block list from the in-memory chunk and copy the data as - * we go. - */ - - Hive->Storage[Stable].Length = (ULONG)(ChunkSize / HBLOCK_SIZE); - Hive->Storage[Stable].BlockList = - Hive->Allocate(Hive->Storage[Stable].Length * - sizeof(HMAP_ENTRY), FALSE, TAG_CM); - if (Hive->Storage[Stable].BlockList == NULL) - { - DPRINT1("Allocating block list failed\n"); - Hive->Free(Hive->BaseBlock, 0); - return STATUS_NO_MEMORY; - } - - for (BlockIndex = 0; BlockIndex < Hive->Storage[Stable].Length; ) - { - Bin = (PHBIN)((ULONG_PTR)ChunkBase + (BlockIndex + 1) * HBLOCK_SIZE); - if (Bin->Signature != HV_BIN_SIGNATURE || - (Bin->Size % HBLOCK_SIZE) != 0) - { - DPRINT1("Invalid bin at BlockIndex %lu, Signature 0x%x, Size 0x%x\n", - (unsigned long)BlockIndex, (unsigned)Bin->Signature, (unsigned)Bin->Size); - Hive->Free(Hive->BaseBlock, 0); - Hive->Free(Hive->Storage[Stable].BlockList, 0); - return STATUS_REGISTRY_CORRUPT; - } - - NewBin = Hive->Allocate(Bin->Size, TRUE, TAG_CM); - if (NewBin == NULL) - { - Hive->Free(Hive->BaseBlock, 0); - Hive->Free(Hive->Storage[Stable].BlockList, 0); - return STATUS_NO_MEMORY; - } - - Hive->Storage[Stable].BlockList[BlockIndex].BinAddress = (ULONG_PTR)NewBin; - Hive->Storage[Stable].BlockList[BlockIndex].BlockAddress = (ULONG_PTR)NewBin; - - RtlCopyMemory(NewBin, Bin, Bin->Size); - - if (Bin->Size > HBLOCK_SIZE) - { - for (i = 1; i < Bin->Size / HBLOCK_SIZE; i++) - { - Hive->Storage[Stable].BlockList[BlockIndex + i].BinAddress = (ULONG_PTR)NewBin; - Hive->Storage[Stable].BlockList[BlockIndex + i].BlockAddress = - ((ULONG_PTR)NewBin + (i * HBLOCK_SIZE)); - } - } - - BlockIndex += Bin->Size / HBLOCK_SIZE; - } - - if (HvpCreateHiveFreeCellList(Hive)) - { - HvpFreeHiveBins(Hive); - Hive->Free(Hive->BaseBlock, 0); - return STATUS_NO_MEMORY; - } - - BitmapSize = ROUND_UP(Hive->Storage[Stable].Length, - sizeof(ULONG) * 8) / 8; - BitmapBuffer = (PULONG)Hive->Allocate(BitmapSize, TRUE, TAG_CM); - if (BitmapBuffer == NULL) - { - HvpFreeHiveBins(Hive); - Hive->Free(Hive->BaseBlock, 0); - return STATUS_NO_MEMORY; - } - - RtlInitializeBitMap(&Hive->DirtyVector, BitmapBuffer, BitmapSize * 8); - RtlClearAllBits(&Hive->DirtyVector); - - return STATUS_SUCCESS; + PHHIVE Hive, + PVOID ChunkBase) +{ + SIZE_T BlockIndex; + PHBIN Bin, NewBin; + ULONG i; + ULONG BitmapSize; + PULONG BitmapBuffer; + SIZE_T ChunkSize; + + ChunkSize = ((PHBASE_BLOCK)ChunkBase)->Length; + DPRINT("ChunkSize: %lx\n", ChunkSize); + + if (ChunkSize < sizeof(HBASE_BLOCK) || + !HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) + { + DPRINT1("Registry is corrupt: ChunkSize %lu < sizeof(HBASE_BLOCK) %lu, " + "or HvpVerifyHiveHeader() failed\n", ChunkSize, (SIZE_T)sizeof(HBASE_BLOCK)); + return STATUS_REGISTRY_CORRUPT; + } + + Hive->BaseBlock = Hive->Allocate(sizeof(HBASE_BLOCK), FALSE, TAG_CM); + if (Hive->BaseBlock == NULL) + { + return STATUS_NO_MEMORY; + } + RtlCopyMemory(Hive->BaseBlock, ChunkBase, sizeof(HBASE_BLOCK)); + + /* + * Build a block list from the in-memory chunk and copy the data as + * we go. + */ + + Hive->Storage[Stable].Length = (ULONG)(ChunkSize / HBLOCK_SIZE); + Hive->Storage[Stable].BlockList = + Hive->Allocate(Hive->Storage[Stable].Length * + sizeof(HMAP_ENTRY), FALSE, TAG_CM); + if (Hive->Storage[Stable].BlockList == NULL) + { + DPRINT1("Allocating block list failed\n"); + Hive->Free(Hive->BaseBlock, 0); + return STATUS_NO_MEMORY; + } + + for (BlockIndex = 0; BlockIndex < Hive->Storage[Stable].Length; ) + { + Bin = (PHBIN)((ULONG_PTR)ChunkBase + (BlockIndex + 1) * HBLOCK_SIZE); + if (Bin->Signature != HV_BIN_SIGNATURE || + (Bin->Size % HBLOCK_SIZE) != 0) + { + DPRINT1("Invalid bin at BlockIndex %lu, Signature 0x%x, Size 0x%x\n", + (unsigned long)BlockIndex, (unsigned)Bin->Signature, (unsigned)Bin->Size); + Hive->Free(Hive->BaseBlock, 0); + Hive->Free(Hive->Storage[Stable].BlockList, 0); + return STATUS_REGISTRY_CORRUPT; + } + + NewBin = Hive->Allocate(Bin->Size, TRUE, TAG_CM); + if (NewBin == NULL) + { + Hive->Free(Hive->BaseBlock, 0); + Hive->Free(Hive->Storage[Stable].BlockList, 0); + return STATUS_NO_MEMORY; + } + + Hive->Storage[Stable].BlockList[BlockIndex].BinAddress = (ULONG_PTR)NewBin; + Hive->Storage[Stable].BlockList[BlockIndex].BlockAddress = (ULONG_PTR)NewBin; + + RtlCopyMemory(NewBin, Bin, Bin->Size); + + if (Bin->Size > HBLOCK_SIZE) + { + for (i = 1; i < Bin->Size / HBLOCK_SIZE; i++) + { + Hive->Storage[Stable].BlockList[BlockIndex + i].BinAddress = (ULONG_PTR)NewBin; + Hive->Storage[Stable].BlockList[BlockIndex + i].BlockAddress = + ((ULONG_PTR)NewBin + (i * HBLOCK_SIZE)); + } + } + + BlockIndex += Bin->Size / HBLOCK_SIZE; + } + + if (HvpCreateHiveFreeCellList(Hive)) + { + HvpFreeHiveBins(Hive); + Hive->Free(Hive->BaseBlock, 0); + return STATUS_NO_MEMORY; + } + + BitmapSize = ROUND_UP(Hive->Storage[Stable].Length, + sizeof(ULONG) * 8) / 8; + BitmapBuffer = (PULONG)Hive->Allocate(BitmapSize, TRUE, TAG_CM); + if (BitmapBuffer == NULL) + { + HvpFreeHiveBins(Hive); + Hive->Free(Hive->BaseBlock, 0); + return STATUS_NO_MEMORY; + } + + RtlInitializeBitMap(&Hive->DirtyVector, BitmapBuffer, BitmapSize * 8); + RtlClearAllBits(&Hive->DirtyVector); + + return STATUS_SUCCESS; } /** @@ -278,19 +278,19 @@ NTSTATUS CMAPI HvpInitializeMemoryInplaceHive( - PHHIVE Hive, - PVOID ChunkBase) -{ - if (!HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) - { - return STATUS_REGISTRY_CORRUPT; - } - - Hive->BaseBlock = (PHBASE_BLOCK)ChunkBase; - Hive->ReadOnly = TRUE; - Hive->Flat = TRUE; - - return STATUS_SUCCESS; + PHHIVE Hive, + PVOID ChunkBase) +{ + if (!HvpVerifyHiveHeader((PHBASE_BLOCK)ChunkBase)) + { + return STATUS_REGISTRY_CORRUPT; + } + + Hive->BaseBlock = (PHBASE_BLOCK)ChunkBase; + Hive->ReadOnly = TRUE; + Hive->Flat = TRUE; + + return STATUS_SUCCESS; } typedef enum _RESULT @@ -446,83 +446,83 @@ NTSTATUS CMAPI HvInitialize( - PHHIVE RegistryHive, - ULONG Operation, - ULONG HiveType, - ULONG HiveFlags, - PVOID HiveData OPTIONAL, - PALLOCATE_ROUTINE Allocate, - PFREE_ROUTINE Free, - PFILE_SET_SIZE_ROUTINE FileSetSize, - PFILE_WRITE_ROUTINE FileWrite, - PFILE_READ_ROUTINE FileRead, - PFILE_FLUSH_ROUTINE FileFlush, - ULONG Cluster OPTIONAL, - PCUNICODE_STRING FileName OPTIONAL) -{ - NTSTATUS Status; - PHHIVE Hive = RegistryHive; - - UNREFERENCED_PARAMETER(HiveType); - - /* - * Create a new hive structure that will hold all the maintenance data. - */ - - RtlZeroMemory(Hive, sizeof(HHIVE)); - - Hive->Allocate = Allocate; - Hive->Free = Free; - Hive->FileRead = FileRead; - Hive->FileWrite = FileWrite; - Hive->FileSetSize = FileSetSize; - Hive->FileFlush = FileFlush; - Hive->StorageTypeCount = HTYPE_COUNT; - Hive->Cluster = 1; - Hive->Version = HSYS_MINOR; - Hive->HiveFlags = HiveFlags &~ HIVE_NOLAZYFLUSH; - - switch (Operation) - { - case HINIT_CREATE: - Status = HvpCreateHive(Hive, FileName); - break; - - case HINIT_MEMORY: - Status = HvpInitializeMemoryHive(Hive, HiveData); - break; - - case HINIT_FLAT: - Status = HvpInitializeMemoryInplaceHive(Hive, HiveData); - break; - - case HINIT_FILE: - { - /* HACK of doom: Cluster is actually the file size. */ - Status = HvLoadHive(Hive, Cluster); - if ((Status != STATUS_SUCCESS) && - (Status != STATUS_REGISTRY_RECOVERED)) - { - /* Unrecoverable failure */ - return Status; - } - - /* Check for previous damage */ - ASSERT(Status != STATUS_REGISTRY_RECOVERED); - break; - } - - default: - /* FIXME: A better return status value is needed */ - Status = STATUS_NOT_IMPLEMENTED; - ASSERT(FALSE); - } - - if (!NT_SUCCESS(Status)) return Status; - - if (Operation != HINIT_CREATE) CmPrepareHive(Hive); - - return Status; + PHHIVE RegistryHive, + ULONG Operation, + ULONG HiveType, + ULONG HiveFlags, + PVOID HiveData OPTIONAL, + PALLOCATE_ROUTINE Allocate, + PFREE_ROUTINE Free, + PFILE_SET_SIZE_ROUTINE FileSetSize, + PFILE_WRITE_ROUTINE FileWrite, + PFILE_READ_ROUTINE FileRead, + PFILE_FLUSH_ROUTINE FileFlush, + ULONG Cluster OPTIONAL, + PCUNICODE_STRING FileName OPTIONAL) +{ + NTSTATUS Status; + PHHIVE Hive = RegistryHive; + + UNREFERENCED_PARAMETER(HiveType); + + /* + * Create a new hive structure that will hold all the maintenance data. + */ + + RtlZeroMemory(Hive, sizeof(HHIVE)); + + Hive->Allocate = Allocate; + Hive->Free = Free; + Hive->FileRead = FileRead; + Hive->FileWrite = FileWrite; + Hive->FileSetSize = FileSetSize; + Hive->FileFlush = FileFlush; + Hive->StorageTypeCount = HTYPE_COUNT; + Hive->Cluster = 1; + Hive->Version = HSYS_MINOR; + Hive->HiveFlags = HiveFlags &~ HIVE_NOLAZYFLUSH; + + switch (Operation) + { + case HINIT_CREATE: + Status = HvpCreateHive(Hive, FileName); + break; + + case HINIT_MEMORY: + Status = HvpInitializeMemoryHive(Hive, HiveData); + break; + + case HINIT_FLAT: + Status = HvpInitializeMemoryInplaceHive(Hive, HiveData); + break; + + case HINIT_FILE: + { + /* HACK of doom: Cluster is actually the file size. */ + Status = HvLoadHive(Hive, Cluster); + if ((Status != STATUS_SUCCESS) && + (Status != STATUS_REGISTRY_RECOVERED)) + { + /* Unrecoverable failure */ + return Status; + } + + /* Check for previous damage */ + ASSERT(Status != STATUS_REGISTRY_RECOVERED); + break; + } + + default: + /* FIXME: A better return status value is needed */ + Status = STATUS_NOT_IMPLEMENTED; + ASSERT(FALSE); + } + + if (!NT_SUCCESS(Status)) return Status; + + if (Operation != HINIT_CREATE) CmPrepareHive(Hive); + + return Status; } /** @@ -534,25 +534,25 @@ VOID CMAPI HvFree( - PHHIVE RegistryHive) -{ - if (!RegistryHive->ReadOnly) - { - /* Release hive bitmap */ - if (RegistryHive->DirtyVector.Buffer) - { - RegistryHive->Free(RegistryHive->DirtyVector.Buffer, 0); - } - - HvpFreeHiveBins(RegistryHive); - - /* Free the BaseBlock */ - if (RegistryHive->BaseBlock) - { - RegistryHive->Free(RegistryHive->BaseBlock, 0); - RegistryHive->BaseBlock = NULL; - } - } + PHHIVE RegistryHive) +{ + if (!RegistryHive->ReadOnly) + { + /* Release hive bitmap */ + if (RegistryHive->DirtyVector.Buffer) + { + RegistryHive->Free(RegistryHive->DirtyVector.Buffer, 0); + } + + HvpFreeHiveBins(RegistryHive); + + /* Free the BaseBlock */ + if (RegistryHive->BaseBlock) + { + RegistryHive->Free(RegistryHive->BaseBlock, 0); + RegistryHive->BaseBlock = NULL; + } + } } /* EOF */ Modified: trunk/reactos/lib/cmlib/hivesum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivesum.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/hivesum.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivesum.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl @@ -15,18 +15,18 @@ ULONG CMAPI HvpHiveHeaderChecksum( - PHBASE_BLOCK HiveHeader) + PHBASE_BLOCK HiveHeader) { - PULONG Buffer = (PULONG)HiveHeader; - ULONG Sum = 0; - ULONG i; + PULONG Buffer = (PULONG)HiveHeader; + ULONG Sum = 0; + ULONG i; - for (i = 0; i < 127; i++) - Sum ^= Buffer[i]; - if (Sum == (ULONG)-1) - Sum = (ULONG)-2; - if (Sum == 0) - Sum = 1; + for (i = 0; i < 127; i++) + Sum ^= Buffer[i]; + if (Sum == (ULONG)-1) + Sum = (ULONG)-2; + if (Sum == 0) + Sum = 1; - return Sum; + return Sum; } Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Sat Jan 9 23:42:45 2016 @@ -1,5 +1,5 @@ /* - * PROJECT: registry manipulation library + * PROJECT: Registry manipulation library * LICENSE: GPL - See COPYING in the top level directory * COPYRIGHT: Copyright 2005 Filip Navara <navaraf(a)reactos.org> * Copyright 2001 - 2005 Eric Kohl @@ -11,267 +11,265 @@ static BOOLEAN CMAPI HvpWriteLog( - PHHIVE RegistryHive) -{ - ULONG FileOffset; - UINT32 BufferSize; - UINT32 BitmapSize; - PUCHAR Buffer; - PUCHAR Ptr; - ULONG BlockIndex; - ULONG LastIndex; - PVOID BlockPtr; - BOOLEAN Success; - static ULONG PrintCount = 0; - - if (PrintCount++ == 0) - { - UNIMPLEMENTED; - } - return TRUE; - - ASSERT(RegistryHive->ReadOnly == FALSE); - ASSERT(RegistryHive->BaseBlock->Length == - RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); - - DPRINT("HvpWriteLog called\n"); - - if (RegistryHive->BaseBlock->Sequence1 != - RegistryHive->BaseBlock->Sequence2) - { - return FALSE; - } - - BitmapSize = RegistryHive->DirtyVector.SizeOfBitMap; - BufferSize = HV_LOG_HEADER_SIZE + sizeof(ULONG) + BitmapSize; - BufferSize = ROUND_UP(BufferSize, HBLOCK_SIZE); - - DPRINT("Bitmap size %u buffer size: %u\n", BitmapSize, BufferSize); - - Buffer = RegistryHive->Allocate(BufferSize, TRUE, TAG_CM); - if (Buffer == NULL) - { - return FALSE; - } - - /* Update first update counter and CheckSum */ - RegistryHive->BaseBlock->Type = HFILE_TYPE_LOG; - RegistryHive->BaseBlock->Sequence1++; - RegistryHive->BaseBlock->CheckSum = - HvpHiveHeaderChecksum(RegistryHive->BaseBlock); - - /* Copy hive header */ - RtlCopyMemory(Buffer, RegistryHive->BaseBlock, HV_LOG_HEADER_SIZE); - Ptr = Buffer + HV_LOG_HEADER_SIZE; - RtlCopyMemory(Ptr, "DIRT", 4); - Ptr += 4; - RtlCopyMemory(Ptr, RegistryHive->DirtyVector.Buffer, BitmapSize); - - /* Write hive block and block bitmap */ - FileOffset = 0; - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, - &FileOffset, Buffer, BufferSize); - RegistryHive->Free(Buffer, 0); - - if (!Success) - { - return FALSE; - } - - /* Write dirty blocks */ - FileOffset = BufferSize; - BlockIndex = 0; - while (BlockIndex < RegistryHive->Storage[Stable].Length) - { - LastIndex = BlockIndex; - BlockIndex = RtlFindSetBits(&RegistryHive->DirtyVector, 1, BlockIndex); - if (BlockIndex == ~0U || BlockIndex < LastIndex) - { - break; - } - - BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; - - /* Write hive block */ - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, - &FileOffset, BlockPtr, - HBLOCK_SIZE); - if (!Success) - { - return FALSE; - } - - BlockIndex++; - FileOffset += HBLOCK_SIZE; - } - - Success = RegistryHive->FileSetSize(RegistryHive, HFILE_TYPE_LOG, FileOffset, FileOffset); - if (!Success) - { - DPRINT("FileSetSize failed\n"); - return FALSE; - } - - /* Flush the log file */ - Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_LOG, NULL, 0); - if (!Success) - { - DPRINT("FileFlush failed\n"); - } - - /* Update second update counter and CheckSum. */ - RegistryHive->BaseBlock->Sequence2++; - RegistryHive->BaseBlock->CheckSum = - HvpHiveHeaderChecksum(RegistryHive->BaseBlock); - - /* Write hive header again with updated sequence counter. */ - FileOffset = 0; - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, - &FileOffset, RegistryHive->BaseBlock, - HV_LOG_HEADER_SIZE); - if (!Success) - { - return FALSE; - } - - /* Flush the log file */ - Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_LOG, NULL, 0); - if (!Success) - { - DPRINT("FileFlush failed\n"); - } - - return TRUE; + PHHIVE RegistryHive) +{ + ULONG FileOffset; + UINT32 BufferSize; + UINT32 BitmapSize; + PUCHAR Buffer; + PUCHAR Ptr; + ULONG BlockIndex; + ULONG LastIndex; + PVOID BlockPtr; + BOOLEAN Success; + static ULONG PrintCount = 0; + + if (PrintCount++ == 0) + { + UNIMPLEMENTED; + } + return TRUE; + + ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(RegistryHive->BaseBlock->Length == + RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); + + DPRINT("HvpWriteLog called\n"); + + if (RegistryHive->BaseBlock->Sequence1 != + RegistryHive->BaseBlock->Sequence2) + { + return FALSE; + } + + BitmapSize = RegistryHive->DirtyVector.SizeOfBitMap; + BufferSize = HV_LOG_HEADER_SIZE + sizeof(ULONG) + BitmapSize; + BufferSize = ROUND_UP(BufferSize, HBLOCK_SIZE); + + DPRINT("Bitmap size %u buffer size: %u\n", BitmapSize, BufferSize); + + Buffer = RegistryHive->Allocate(BufferSize, TRUE, TAG_CM); + if (Buffer == NULL) + { + return FALSE; + } + + /* Update first update counter and CheckSum */ + RegistryHive->BaseBlock->Type = HFILE_TYPE_LOG; + RegistryHive->BaseBlock->Sequence1++; + RegistryHive->BaseBlock->CheckSum = + HvpHiveHeaderChecksum(RegistryHive->BaseBlock); + + /* Copy hive header */ + RtlCopyMemory(Buffer, RegistryHive->BaseBlock, HV_LOG_HEADER_SIZE); + Ptr = Buffer + HV_LOG_HEADER_SIZE; + RtlCopyMemory(Ptr, "DIRT", 4); + Ptr += 4; + RtlCopyMemory(Ptr, RegistryHive->DirtyVector.Buffer, BitmapSize); + + /* Write hive block and block bitmap */ + FileOffset = 0; + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, + &FileOffset, Buffer, BufferSize); + RegistryHive->Free(Buffer, 0); + + if (!Success) + { + return FALSE; + } + + /* Write dirty blocks */ + FileOffset = BufferSize; + BlockIndex = 0; + while (BlockIndex < RegistryHive->Storage[Stable].Length) + { + LastIndex = BlockIndex; + BlockIndex = RtlFindSetBits(&RegistryHive->DirtyVector, 1, BlockIndex); + if (BlockIndex == ~0U || BlockIndex < LastIndex) + { + break; + } + + BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; + + /* Write hive block */ + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, + &FileOffset, BlockPtr, HBLOCK_SIZE); + if (!Success) + { + return FALSE; + } + + BlockIndex++; + FileOffset += HBLOCK_SIZE; + } + + Success = RegistryHive->FileSetSize(RegistryHive, HFILE_TYPE_LOG, FileOffset, FileOffset); + if (!Success) + { + DPRINT("FileSetSize failed\n"); + return FALSE; + } + + /* Flush the log file */ + Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_LOG, NULL, 0); + if (!Success) + { + DPRINT("FileFlush failed\n"); + } + + /* Update second update counter and CheckSum. */ + RegistryHive->BaseBlock->Sequence2++; + RegistryHive->BaseBlock->CheckSum = + HvpHiveHeaderChecksum(RegistryHive->BaseBlock); + + /* Write hive header again with updated sequence counter. */ + FileOffset = 0; + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, + &FileOffset, RegistryHive->BaseBlock, + HV_LOG_HEADER_SIZE); + if (!Success) + { + return FALSE; + } + + /* Flush the log file */ + Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_LOG, NULL, 0); + if (!Success) + { + DPRINT("FileFlush failed\n"); + } + + return TRUE; } static BOOLEAN CMAPI HvpWriteHive( - PHHIVE RegistryHive, - BOOLEAN OnlyDirty) -{ - ULONG FileOffset; - ULONG BlockIndex; - ULONG LastIndex; - PVOID BlockPtr; - BOOLEAN Success; - - ASSERT(RegistryHive->ReadOnly == FALSE); - ASSERT(RegistryHive->BaseBlock->Length == - RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); - - DPRINT("HvpWriteHive called\n"); - - if (RegistryHive->BaseBlock->Sequence1 != - RegistryHive->BaseBlock->Sequence2) - { - return FALSE; - } - - /* Update first update counter and CheckSum */ - RegistryHive->BaseBlock->Type = HFILE_TYPE_PRIMARY; - RegistryHive->BaseBlock->Sequence1++; - RegistryHive->BaseBlock->CheckSum = - HvpHiveHeaderChecksum(RegistryHive->BaseBlock); - - /* Write hive block */ - FileOffset = 0; - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, - &FileOffset, RegistryHive->BaseBlock, - sizeof(HBASE_BLOCK)); - if (!Success) - { - return FALSE; - } - - BlockIndex = 0; - while (BlockIndex < RegistryHive->Storage[Stable].Length) - { - if (OnlyDirty) - { - LastIndex = BlockIndex; - BlockIndex = RtlFindSetBits(&RegistryHive->DirtyVector, 1, BlockIndex); - if (BlockIndex == ~0U || BlockIndex < LastIndex) - { - break; - } - } - - BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; - FileOffset = (BlockIndex + 1) * HBLOCK_SIZE; - - /* Write hive block */ - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, - &FileOffset, BlockPtr, - HBLOCK_SIZE); - if (!Success) - { - return FALSE; - } - - BlockIndex++; - } - - Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_PRIMARY, NULL, 0); - if (!Success) - { - DPRINT("FileFlush failed\n"); - } - - /* Update second update counter and CheckSum */ - RegistryHive->BaseBlock->Sequence2++; - RegistryHive->BaseBlock->CheckSum = - HvpHiveHeaderChecksum(RegistryHive->BaseBlock); - - /* Write hive block */ - FileOffset = 0; - Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, - &FileOffset, RegistryHive->BaseBlock, - sizeof(HBASE_BLOCK)); - if (!Success) - { - return FALSE; - } - - Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_PRIMARY, NULL, 0); - if (!Success) - { - DPRINT("FileFlush failed\n"); - } - - return TRUE; + PHHIVE RegistryHive, + BOOLEAN OnlyDirty) +{ + ULONG FileOffset; + ULONG BlockIndex; + ULONG LastIndex; + PVOID BlockPtr; + BOOLEAN Success; + + ASSERT(RegistryHive->ReadOnly == FALSE); + ASSERT(RegistryHive->BaseBlock->Length == + RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); + + DPRINT("HvpWriteHive called\n"); + + if (RegistryHive->BaseBlock->Sequence1 != + RegistryHive->BaseBlock->Sequence2) + { + return FALSE; + } + + /* Update first update counter and CheckSum */ + RegistryHive->BaseBlock->Type = HFILE_TYPE_PRIMARY; + RegistryHive->BaseBlock->Sequence1++; + RegistryHive->BaseBlock->CheckSum = + HvpHiveHeaderChecksum(RegistryHive->BaseBlock); + + /* Write hive block */ + FileOffset = 0; + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, + &FileOffset, RegistryHive->BaseBlock, + sizeof(HBASE_BLOCK)); + if (!Success) + { + return FALSE; + } + + BlockIndex = 0; + while (BlockIndex < RegistryHive->Storage[Stable].Length) + { + if (OnlyDirty) + { + LastIndex = BlockIndex; + BlockIndex = RtlFindSetBits(&RegistryHive->DirtyVector, 1, BlockIndex); + if (BlockIndex == ~0U || BlockIndex < LastIndex) + { + break; + } + } + + BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; + FileOffset = (BlockIndex + 1) * HBLOCK_SIZE; + + /* Write hive block */ + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, + &FileOffset, BlockPtr, HBLOCK_SIZE); + if (!Success) + { + return FALSE; + } + + BlockIndex++; + } + + Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_PRIMARY, NULL, 0); + if (!Success) + { + DPRINT("FileFlush failed\n"); + } + + /* Update second update counter and CheckSum */ + RegistryHive->BaseBlock->Sequence2++; + RegistryHive->BaseBlock->CheckSum = + HvpHiveHeaderChecksum(RegistryHive->BaseBlock); + + /* Write hive block */ + FileOffset = 0; + Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, + &FileOffset, RegistryHive->BaseBlock, + sizeof(HBASE_BLOCK)); + if (!Success) + { + return FALSE; + } + + Success = RegistryHive->FileFlush(RegistryHive, HFILE_TYPE_PRIMARY, NULL, 0); + if (!Success) + { + DPRINT("FileFlush failed\n"); + } + + return TRUE; } BOOLEAN CMAPI HvSyncHive( - PHHIVE RegistryHive) -{ - ASSERT(RegistryHive->ReadOnly == FALSE); - - if (RtlFindSetBits(&RegistryHive->DirtyVector, 1, 0) == ~0U) - { - return TRUE; - } - - /* Update hive header modification time */ - KeQuerySystemTime(&RegistryHive->BaseBlock->TimeStamp); - - /* Update log file */ - if (!HvpWriteLog(RegistryHive)) - { - return FALSE; - } - - /* Update hive file */ - if (!HvpWriteHive(RegistryHive, TRUE)) - { - return FALSE; - } - - /* Clear dirty bitmap. */ - RtlClearAllBits(&RegistryHive->DirtyVector); - RegistryHive->DirtyCount = 0; - - return TRUE; + PHHIVE RegistryHive) +{ + ASSERT(RegistryHive->ReadOnly == FALSE); + + if (RtlFindSetBits(&RegistryHive->DirtyVector, 1, 0) == ~0U) + { + return TRUE; + } + + /* Update hive header modification time */ + KeQuerySystemTime(&RegistryHive->BaseBlock->TimeStamp); + + /* Update log file */ + if (!HvpWriteLog(RegistryHive)) + { + return FALSE; + } + + /* Update hive file */ + if (!HvpWriteHive(RegistryHive, TRUE)) + { + return FALSE; + } + + /* Clear dirty bitmap. */ + RtlClearAllBits(&RegistryHive->DirtyVector); + RegistryHive->DirtyCount = 0; + + return TRUE; } BOOLEAN @@ -279,23 +277,24 @@ HvHiveWillShrink(IN PHHIVE RegistryHive) { /* No shrinking yet */ + UNIMPLEMENTED; return FALSE; } BOOLEAN CMAPI HvWriteHive( - PHHIVE RegistryHive) -{ - ASSERT(RegistryHive->ReadOnly == FALSE); - - /* Update hive header modification time */ - KeQuerySystemTime(&RegistryHive->BaseBlock->TimeStamp); - - /* Update hive file */ - if (!HvpWriteHive(RegistryHive, FALSE)) - { - return FALSE; - } - - return TRUE; -} + PHHIVE RegistryHive) +{ + ASSERT(RegistryHive->ReadOnly == FALSE); + + /* Update hive header modification time */ + KeQuerySystemTime(&RegistryHive->BaseBlock->TimeStamp); + + /* Update hive file */ + if (!HvpWriteHive(RegistryHive, FALSE)) + { + return FALSE; + } + + return TRUE; +}

8 years, 8 months

[hbelusca] 70561: [CMLIB] - HV_BLOCK_SIZE and HBLOCK_SIZE are the same thing; prefer the newly introduced HBLOCK_SIZE define. - Improve the HvGetCell* macros. - Add next to the defined hive signatu...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 9 23:15:05 2016 New Revision: 70561 URL: http://svn.reactos.org/svn/reactos?rev=70561&view=rev Log: [CMLIB] - HV_BLOCK_SIZE and HBLOCK_SIZE are the same thing; prefer the newly introduced HBLOCK_SIZE define. - Improve the HvGetCell* macros. - Add next to the defined hive signatures what their corresponding strings are (for documentation purpose). - Some whitespace fixes in the headers. Modified: trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/hivebin.c trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivedata.h trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/lib/cmlib/hivewrt.c Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=705… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -7,53 +7,53 @@ #pragma once -#define REG_INIT_BLOCK_LIST_SIZE 32 -#define REG_INIT_HASH_TABLE_SIZE 3 -#define REG_EXTEND_HASH_TABLE_SIZE 4 -#define REG_VALUE_LIST_CELL_MULTIPLE 4 -#define REG_DATA_SIZE_MASK 0x7FFFFFFF -#define REG_DATA_IN_OFFSET 0x80000000 +#define REG_INIT_BLOCK_LIST_SIZE 32 +#define REG_INIT_HASH_TABLE_SIZE 3 +#define REG_EXTEND_HASH_TABLE_SIZE 4 +#define REG_VALUE_LIST_CELL_MULTIPLE 4 +#define REG_DATA_SIZE_MASK 0x7FFFFFFF +#define REG_DATA_IN_OFFSET 0x80000000 // // Key Types // -#define CM_KEY_INDEX_ROOT 0x6972 -#define CM_KEY_INDEX_LEAF 0x696c -#define CM_KEY_FAST_LEAF 0x666c -#define CM_KEY_HASH_LEAF 0x686c +#define CM_KEY_INDEX_ROOT 0x6972 // "ri" +#define CM_KEY_INDEX_LEAF 0x696c // "li" +#define CM_KEY_FAST_LEAF 0x666c // "lf" +#define CM_KEY_HASH_LEAF 0x686c // "lh" // // Key Signatures // -#define CM_KEY_NODE_SIGNATURE 0x6B6E -#define CM_LINK_NODE_SIGNATURE 0x6B6C -#define CM_KEY_VALUE_SIGNATURE 0x6B76 +#define CM_KEY_NODE_SIGNATURE 0x6B6E // "nk" +#define CM_LINK_NODE_SIGNATURE 0x6B6C // "lk" +#define CM_KEY_VALUE_SIGNATURE 0x6B76 // "vk" // // CM_KEY_NODE Flags // -#define KEY_IS_VOLATILE 0x01 -#define KEY_HIVE_EXIT 0x02 -#define KEY_HIVE_ENTRY 0x04 -#define KEY_NO_DELETE 0x08 -#define KEY_SYM_LINK 0x10 -#define KEY_COMP_NAME 0x20 -#define KEY_PREFEF_HANDLE 0x40 -#define KEY_VIRT_MIRRORED 0x80 -#define KEY_VIRT_TARGET 0x100 -#define KEY_VIRTUAL_STORE 0x200 +#define KEY_IS_VOLATILE 0x01 +#define KEY_HIVE_EXIT 0x02 +#define KEY_HIVE_ENTRY 0x04 +#define KEY_NO_DELETE 0x08 +#define KEY_SYM_LINK 0x10 +#define KEY_COMP_NAME 0x20 +#define KEY_PREFEF_HANDLE 0x40 +#define KEY_VIRT_MIRRORED 0x80 +#define KEY_VIRT_TARGET 0x100 +#define KEY_VIRTUAL_STORE 0x200 // // CM_KEY_VALUE Flags // -#define VALUE_COMP_NAME 0x0001 +#define VALUE_COMP_NAME 0x0001 // // CM_KEY_VALUE Types // -#define CM_KEY_VALUE_SMALL 0x4 -#define CM_KEY_VALUE_BIG 0x3FD8 -#define CM_KEY_VALUE_SPECIAL_SIZE 0x80000000 +#define CM_KEY_VALUE_SMALL 0x4 +#define CM_KEY_VALUE_BIG 0x3FD8 +#define CM_KEY_VALUE_SPECIAL_SIZE 0x80000000 #include <pshpack1.h> Modified: trunk/reactos/lib/cmlib/hivebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivebin.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -23,8 +23,8 @@ ULONG OldBlockListSize; PHCELL Block; - BinSize = ROUND_UP(Size + sizeof(HBIN), HV_BLOCK_SIZE); - BlockCount = (ULONG)(BinSize / HV_BLOCK_SIZE); + BinSize = ROUND_UP(Size + sizeof(HBIN), HBLOCK_SIZE); + BlockCount = (ULONG)(BinSize / HBLOCK_SIZE); Bin = RegistryHive->Allocate(BinSize, TRUE, TAG_CM); if (Bin == NULL) @@ -33,7 +33,7 @@ Bin->Signature = HV_BIN_SIGNATURE; Bin->FileOffset = RegistryHive->Storage[Storage].Length * - HV_BLOCK_SIZE; + HBLOCK_SIZE; Bin->Size = (ULONG)BinSize; /* Allocate new block list */ @@ -61,7 +61,7 @@ for (i = 0; i < BlockCount; i++) { RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BlockAddress = - ((ULONG_PTR)Bin + (i * HV_BLOCK_SIZE)); + ((ULONG_PTR)Bin + (i * HBLOCK_SIZE)); RegistryHive->Storage[Storage].BlockList[OldBlockListSize + i].BinAddress = (ULONG_PTR)Bin; } @@ -96,7 +96,7 @@ /* Mark new bin dirty. */ RtlSetBits(&RegistryHive->DirtyVector, - Bin->FileOffset / HV_BLOCK_SIZE, + Bin->FileOffset / HBLOCK_SIZE, BlockCount); /* Update size in the base block */ Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -37,7 +37,7 @@ else { ASSERT((CellIndex & HCELL_TYPE_MASK) == Stable); - return (PVOID)((ULONG_PTR)RegistryHive->BaseBlock + HV_BLOCK_SIZE + + return (PVOID)((ULONG_PTR)RegistryHive->BaseBlock + HBLOCK_SIZE + CellIndex); } } @@ -117,7 +117,7 @@ return TRUE; CellBlock = (CellIndex & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; - CellLastBlock = ((CellIndex + HV_BLOCK_SIZE - 1) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; + CellLastBlock = ((CellIndex + HBLOCK_SIZE - 1) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT; RtlSetBits(&RegistryHive->DirtyVector, CellBlock, CellLastBlock - CellBlock); @@ -139,7 +139,7 @@ return TRUE; /* Check if the dirty bit is set */ - if (RtlCheckBit(&Hive->DirtyVector, Cell / HV_BLOCK_SIZE)) + if (RtlCheckBit(&Hive->DirtyVector, Cell / HBLOCK_SIZE)) IsDirty = TRUE; /* Return result as boolean*/ @@ -322,7 +322,7 @@ } } - BlockIndex += Bin->Size / HV_BLOCK_SIZE; + BlockIndex += Bin->Size / HBLOCK_SIZE; BlockOffset += Bin->Size; } Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -10,61 +10,60 @@ // // Hive operations // -#define HINIT_CREATE 0 -#define HINIT_MEMORY 1 -#define HINIT_FILE 2 -#define HINIT_MEMORY_INPLACE 3 -#define HINIT_FLAT 4 -#define HINIT_MAPFILE 5 +#define HINIT_CREATE 0 +#define HINIT_MEMORY 1 +#define HINIT_FILE 2 +#define HINIT_MEMORY_INPLACE 3 +#define HINIT_FLAT 4 +#define HINIT_MAPFILE 5 // // Hive flags // -#define HIVE_VOLATILE 1 -#define HIVE_NOLAZYFLUSH 2 -#define HIVE_HAS_BEEN_REPLACED 4 -#define HIVE_HAS_BEEN_FREED 8 -#define HIVE_UNKNOWN 0x10 -#define HIVE_IS_UNLOADING 0x20 +#define HIVE_VOLATILE 1 +#define HIVE_NOLAZYFLUSH 2 +#define HIVE_HAS_BEEN_REPLACED 4 +#define HIVE_HAS_BEEN_FREED 8 +#define HIVE_UNKNOWN 0x10 +#define HIVE_IS_UNLOADING 0x20 // // Hive types // -#define HFILE_TYPE_PRIMARY 0 -#define HFILE_TYPE_LOG 1 -#define HFILE_TYPE_EXTERNAL 2 -#define HFILE_TYPE_MAX 3 +#define HFILE_TYPE_PRIMARY 0 +#define HFILE_TYPE_LOG 1 +#define HFILE_TYPE_EXTERNAL 2 +#define HFILE_TYPE_MAX 3 // // Hive sizes // -#define HBLOCK_SIZE 0x1000 -#define HSECTOR_SIZE 0x200 -#define HSECTOR_COUNT 8 - -#define HV_BLOCK_SIZE 4096 -#define HV_LOG_HEADER_SIZE FIELD_OFFSET(HBASE_BLOCK, Reserved2) -#define HV_SIGNATURE 0x66676572 -#define HV_BIN_SIGNATURE 0x6e696268 +#define HBLOCK_SIZE 0x1000 +#define HSECTOR_SIZE 0x200 +#define HSECTOR_COUNT 8 + +#define HV_LOG_HEADER_SIZE FIELD_OFFSET(HBASE_BLOCK, Reserved2) +#define HV_SIGNATURE 0x66676572 // "regf" +#define HV_BIN_SIGNATURE 0x6e696268 // "hbin" // // Hive versions // -#define HSYS_MAJOR 1 -#define HSYS_MINOR 3 -#define HSYS_WHISTLER_BETA1 4 -#define HSYS_WHISTLER 5 -#define HSYS_MINOR_SUPPORTED HSYS_WHISTLER +#define HSYS_MAJOR 1 +#define HSYS_MINOR 3 +#define HSYS_WHISTLER_BETA1 4 +#define HSYS_WHISTLER 5 +#define HSYS_MINOR_SUPPORTED HSYS_WHISTLER // // Hive formats // -#define HBASE_FORMAT_MEMORY 1 +#define HBASE_FORMAT_MEMORY 1 // // Hive storage // -#define HTYPE_COUNT 2 +#define HTYPE_COUNT 2 /** * @name HCELL_INDEX @@ -78,24 +77,24 @@ // // Cell Magic Values // -#define HCELL_NIL MAXULONG -#define HCELL_CACHED 1 - -#define HCELL_TYPE_MASK 0x80000000 -#define HCELL_BLOCK_MASK 0x7ffff000 -#define HCELL_OFFSET_MASK 0x00000fff -#define HCELL_TYPE_SHIFT 31 -#define HCELL_BLOCK_SHIFT 12 -#define HCELL_OFFSET_SHIFT 0 +#define HCELL_NIL MAXULONG +#define HCELL_CACHED 1 + +#define HCELL_TYPE_MASK 0x80000000 +#define HCELL_BLOCK_MASK 0x7ffff000 +#define HCELL_OFFSET_MASK 0x00000fff +#define HCELL_TYPE_SHIFT 31 +#define HCELL_BLOCK_SHIFT 12 +#define HCELL_OFFSET_SHIFT 0 #define HvGetCellType(Cell) \ - ((ULONG)((Cell & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) + ((ULONG)(((Cell) & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) #define HvGetCellBlock(Cell) \ - ((ULONG)((Cell & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT)) + ((ULONG)(((Cell) & HCELL_BLOCK_MASK) >> HCELL_BLOCK_SHIFT)) typedef enum { - Stable = 0, + Stable = 0, Volatile = 1 } HSTORAGE_TYPE; @@ -107,127 +106,142 @@ * On-disk header for registry hive file. */ -#define HIVE_FILENAME_MAXLEN 31 +#define HIVE_FILENAME_MAXLEN 31 typedef struct _HBASE_BLOCK { - /* Hive identifier "regf" (0x66676572) */ - ULONG Signature; - - /* Update counter */ - ULONG Sequence1; - - /* Update counter */ - ULONG Sequence2; - - /* When this hive file was last modified */ - LARGE_INTEGER TimeStamp; - - /* Registry format major version (1) */ - ULONG Major; - - /* Registry format minor version (3) - Version 3 added fast indexes, version 5 has large value optimizations */ - ULONG Minor; - - /* Registry file type (0 - Primary, 1 - Log) */ - ULONG Type; - - /* Registry format (1 is the only defined value so far) */ - ULONG Format; - - /* Offset into file from the byte after the end of the base block. - If the hive is volatile, this is the actual pointer to the CM_KEY_NODE */ - HCELL_INDEX RootCell; - - /* Size of each hive block ? */ - ULONG Length; - - /* (1?) */ - ULONG Cluster; - - /* Last 31 UNICODE characters, plus terminating NULL character, - of the full name of the hive file */ - WCHAR FileName[HIVE_FILENAME_MAXLEN + 1]; - - ULONG Reserved1[99]; - - /* Checksum of first 0x200 bytes */ - ULONG CheckSum; - - ULONG Reserved2[0x37E]; - ULONG BootType; - ULONG BootRecover; + /* Hive identifier "regf" (0x66676572) */ + ULONG Signature; + + /* Update counter */ + ULONG Sequence1; + + /* Update counter */ + ULONG Sequence2; + + /* When this hive file was last modified */ + LARGE_INTEGER TimeStamp; + + /* Registry format major version (1) */ + ULONG Major; + + /* Registry format minor version (3) + Version 3 added fast indexes, version 5 has large value optimizations */ + ULONG Minor; + + /* Registry file type (0 - Primary, 1 - Log) */ + ULONG Type; + + /* Registry format (1 is the only defined value so far) */ + ULONG Format; + + /* Offset into file from the byte after the end of the base block. + If the hive is volatile, this is the actual pointer to the CM_KEY_NODE */ + HCELL_INDEX RootCell; + + /* Size of each hive block ? */ + ULONG Length; + + /* (1?) */ + ULONG Cluster; + + /* Last 31 UNICODE characters, plus terminating NULL character, + of the full name of the hive file */ + WCHAR FileName[HIVE_FILENAME_MAXLEN + 1]; + + ULONG Reserved1[99]; + + /* Checksum of first 0x200 bytes */ + ULONG CheckSum; + + ULONG Reserved2[0x37E]; + ULONG BootType; + ULONG BootRecover; } HBASE_BLOCK, *PHBASE_BLOCK; typedef struct _HBIN { - /* Bin identifier "hbin" (0x6E696268) */ - ULONG Signature; - - /* Block offset of this bin */ - HCELL_INDEX FileOffset; - - /* Size in bytes, multiple of the block size (4KB) */ - ULONG Size; - - ULONG Reserved1[2]; - - /* When this bin was last modified */ - LARGE_INTEGER TimeStamp; - - /* ? (In-memory only) */ - ULONG Spare; + /* Bin identifier "hbin" (0x6E696268) */ + ULONG Signature; + + /* Block offset of this bin */ + HCELL_INDEX FileOffset; + + /* Size in bytes, multiple of the block size (4KB) */ + ULONG Size; + + ULONG Reserved1[2]; + + /* When this bin was last modified */ + LARGE_INTEGER TimeStamp; + + /* Unused (In-memory only) */ + ULONG Spare; } HBIN, *PHBIN; typedef struct _HCELL { - /* <0 if used, >0 if free */ - LONG Size; + /* <0 if used, >0 if free */ + LONG Size; } HCELL, *PHCELL; #include <poppack.h> struct _HHIVE; -typedef struct _CELL_DATA* (CMAPI *PGET_CELL_ROUTINE)( - struct _HHIVE *Hive, - HCELL_INDEX Cell); - -typedef VOID (CMAPI *PRELEASE_CELL_ROUTINE)( - struct _HHIVE *Hive, - HCELL_INDEX Cell); - -typedef PVOID (CMAPI *PALLOCATE_ROUTINE)( - SIZE_T Size, - BOOLEAN Paged, - ULONG Tag); - -typedef VOID (CMAPI *PFREE_ROUTINE)( - PVOID Ptr, - ULONG Quota); - -typedef BOOLEAN (CMAPI *PFILE_READ_ROUTINE)( - struct _HHIVE *RegistryHive, - ULONG FileType, - PULONG FileOffset, - PVOID Buffer, - SIZE_T BufferLength); - -typedef BOOLEAN (CMAPI *PFILE_WRITE_ROUTINE)( - struct _HHIVE *RegistryHive, - ULONG FileType, - PULONG FileOffset, - PVOID Buffer, - SIZE_T BufferLength); - -typedef BOOLEAN (CMAPI *PFILE_SET_SIZE_ROUTINE)( - struct _HHIVE *RegistryHive, - ULONG FileType, - ULONG FileSize, - ULONG OldfileSize); - -typedef BOOLEAN (CMAPI *PFILE_FLUSH_ROUTINE)( +typedef struct _CELL_DATA* +(CMAPI *PGET_CELL_ROUTINE)( + struct _HHIVE *Hive, + HCELL_INDEX Cell +); + +typedef VOID +(CMAPI *PRELEASE_CELL_ROUTINE)( + struct _HHIVE *Hive, + HCELL_INDEX Cell +); + +typedef PVOID +(CMAPI *PALLOCATE_ROUTINE)( + SIZE_T Size, + BOOLEAN Paged, + ULONG Tag +); + +typedef VOID +(CMAPI *PFREE_ROUTINE)( + PVOID Ptr, + ULONG Quota +); + +typedef BOOLEAN +(CMAPI *PFILE_READ_ROUTINE)( + struct _HHIVE *RegistryHive, + ULONG FileType, + PULONG FileOffset, + PVOID Buffer, + SIZE_T BufferLength +); + +typedef BOOLEAN +(CMAPI *PFILE_WRITE_ROUTINE)( + struct _HHIVE *RegistryHive, + ULONG FileType, + PULONG FileOffset, + PVOID Buffer, + SIZE_T BufferLength +); + +typedef BOOLEAN +(CMAPI *PFILE_SET_SIZE_ROUTINE)( + struct _HHIVE *RegistryHive, + ULONG FileType, + ULONG FileSize, + ULONG OldfileSize +); + +typedef BOOLEAN +(CMAPI *PFILE_FLUSH_ROUTINE)( struct _HHIVE *RegistryHive, ULONG FileType, PLARGE_INTEGER FileOffset, @@ -258,7 +272,7 @@ PHMAP_DIRECTORY Map; PHMAP_ENTRY BlockList; // PHMAP_TABLE SmallDir; ULONG Guard; - HCELL_INDEX FreeDisplay[24]; //FREE_DISPLAY FreeDisplay[24]; + HCELL_INDEX FreeDisplay[24]; // FREE_DISPLAY FreeDisplay[24]; ULONG FreeSummary; LIST_ENTRY FreeBins; } DUAL, *PDUAL; @@ -296,5 +310,5 @@ DUAL Storage[HTYPE_COUNT]; } HHIVE, *PHHIVE; -#define IsFreeCell(Cell)(Cell->Size >= 0) -#define IsUsedCell(Cell)(Cell->Size < 0) +#define IsFreeCell(Cell) ((Cell)->Size >= 0) +#define IsUsedCell(Cell) ((Cell)->Size < 0) Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=7… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -193,7 +193,7 @@ * we go. */ - Hive->Storage[Stable].Length = (ULONG)(ChunkSize / HV_BLOCK_SIZE); + Hive->Storage[Stable].Length = (ULONG)(ChunkSize / HBLOCK_SIZE); Hive->Storage[Stable].BlockList = Hive->Allocate(Hive->Storage[Stable].Length * sizeof(HMAP_ENTRY), FALSE, TAG_CM); @@ -206,9 +206,9 @@ for (BlockIndex = 0; BlockIndex < Hive->Storage[Stable].Length; ) { - Bin = (PHBIN)((ULONG_PTR)ChunkBase + (BlockIndex + 1) * HV_BLOCK_SIZE); + Bin = (PHBIN)((ULONG_PTR)ChunkBase + (BlockIndex + 1) * HBLOCK_SIZE); if (Bin->Signature != HV_BIN_SIGNATURE || - (Bin->Size % HV_BLOCK_SIZE) != 0) + (Bin->Size % HBLOCK_SIZE) != 0) { DPRINT1("Invalid bin at BlockIndex %lu, Signature 0x%x, Size 0x%x\n", (unsigned long)BlockIndex, (unsigned)Bin->Signature, (unsigned)Bin->Size); @@ -230,17 +230,17 @@ RtlCopyMemory(NewBin, Bin, Bin->Size); - if (Bin->Size > HV_BLOCK_SIZE) - { - for (i = 1; i < Bin->Size / HV_BLOCK_SIZE; i++) + if (Bin->Size > HBLOCK_SIZE) + { + for (i = 1; i < Bin->Size / HBLOCK_SIZE; i++) { Hive->Storage[Stable].BlockList[BlockIndex + i].BinAddress = (ULONG_PTR)NewBin; Hive->Storage[Stable].BlockList[BlockIndex + i].BlockAddress = - ((ULONG_PTR)NewBin + (i * HV_BLOCK_SIZE)); + ((ULONG_PTR)NewBin + (i * HBLOCK_SIZE)); } } - BlockIndex += Bin->Size / HV_BLOCK_SIZE; + BlockIndex += Bin->Size / HBLOCK_SIZE; } if (HvpCreateHiveFreeCellList(Hive)) @@ -313,7 +313,7 @@ ULONG Alignment; ULONG Result; ULONG Offset = 0; - ASSERT(sizeof(HBASE_BLOCK) >= (HV_BLOCK_SIZE * Hive->Cluster)); + ASSERT(sizeof(HBASE_BLOCK) >= (HBLOCK_SIZE * Hive->Cluster)); /* Assume failure and allocate the buffer */ *HiveBaseBlock = 0; @@ -321,7 +321,7 @@ if (!BaseBlock) return NoMemory; /* Check for, and enforce, alignment */ - Alignment = Hive->Cluster * HV_BLOCK_SIZE -1; + Alignment = Hive->Cluster * HBLOCK_SIZE -1; if ((ULONG_PTR)BaseBlock & Alignment) { /* Free the old header */ @@ -338,7 +338,7 @@ HFILE_TYPE_PRIMARY, &Offset, BaseBlock, - Hive->Cluster * HV_BLOCK_SIZE); + Hive->Cluster * HBLOCK_SIZE); /* Couldn't read: assume it's not a hive */ if (!Result) return NotHive; Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=70… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Sat Jan 9 23:15:05 2016 @@ -32,7 +32,7 @@ ASSERT(RegistryHive->ReadOnly == FALSE); ASSERT(RegistryHive->BaseBlock->Length == - RegistryHive->Storage[Stable].Length * HV_BLOCK_SIZE); + RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); DPRINT("HvpWriteLog called\n"); @@ -44,7 +44,7 @@ BitmapSize = RegistryHive->DirtyVector.SizeOfBitMap; BufferSize = HV_LOG_HEADER_SIZE + sizeof(ULONG) + BitmapSize; - BufferSize = ROUND_UP(BufferSize, HV_BLOCK_SIZE); + BufferSize = ROUND_UP(BufferSize, HBLOCK_SIZE); DPRINT("Bitmap size %u buffer size: %u\n", BitmapSize, BufferSize); @@ -95,14 +95,14 @@ /* Write hive block */ Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_LOG, &FileOffset, BlockPtr, - HV_BLOCK_SIZE); + HBLOCK_SIZE); if (!Success) { return FALSE; } BlockIndex++; - FileOffset += HV_BLOCK_SIZE; + FileOffset += HBLOCK_SIZE; } Success = RegistryHive->FileSetSize(RegistryHive, HFILE_TYPE_LOG, FileOffset, FileOffset); @@ -157,7 +157,7 @@ ASSERT(RegistryHive->ReadOnly == FALSE); ASSERT(RegistryHive->BaseBlock->Length == - RegistryHive->Storage[Stable].Length * HV_BLOCK_SIZE); + RegistryHive->Storage[Stable].Length * HBLOCK_SIZE); DPRINT("HvpWriteHive called\n"); @@ -197,12 +197,12 @@ } BlockPtr = (PVOID)RegistryHive->Storage[Stable].BlockList[BlockIndex].BlockAddress; - FileOffset = (BlockIndex + 1) * HV_BLOCK_SIZE; + FileOffset = (BlockIndex + 1) * HBLOCK_SIZE; /* Write hive block */ Success = RegistryHive->FileWrite(RegistryHive, HFILE_TYPE_PRIMARY, &FileOffset, BlockPtr, - HV_BLOCK_SIZE); + HBLOCK_SIZE); if (!Success) { return FALSE;

8 years, 8 months

[ekohl] 70560: [DEVMGR] Set the focus to the treeview when the main window recieves a WM_ACTIVATE message. CORE-10769 #resolve #comment Fixed in r70560.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jan 9 22:22:17 2016 New Revision: 70560 URL: http://svn.reactos.org/svn/reactos?rev=70560&view=rev Log: [DEVMGR] Set the focus to the treeview when the main window recieves a WM_ACTIVATE message. CORE-10769 #resolve #comment Fixed in r70560. Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sat Jan 9 22:22:17 2016 @@ -291,6 +291,7 @@ void CDeviceView::SetFocus() { + ::SetFocus(m_hTreeView); } bool Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sat Jan 9 22:22:17 2016 @@ -667,6 +667,12 @@ return RetCode; } +void +CDeviceManager::OnActivate(void) +{ + m_DeviceView->SetFocus(); +} + LRESULT CDeviceManager::OnDestroy(void) { @@ -822,7 +828,11 @@ DestroyWindow(hwnd); break; } - + + case WM_ACTIVATE: + if (LOWORD(hwnd)) + This->OnActivate(); + break; case WM_DESTROY: { Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Sat Jan 9 22:22:17 2016 @@ -66,6 +66,8 @@ LPARAM lParam ); + void OnActivate(void); + bool CreateToolBar(void); bool CreateStatusBar(void);

8 years, 8 months

← Newer
1
...
8
9
10
11
12
13
14
...
20
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 January 2016