Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 70572: [NDK] Add PLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA.
by ekohl＠svn.reactos.org 10 Jan '16

10 Jan '16

Author: ekohl Date: Sun Jan 10 21:26:46 2016 New Revision: 70572 URL: http://svn.reactos.org/svn/reactos?rev=70572&view=rev Log: [NDK] Add PLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA. Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] Sun Jan 10 21:26:46 2016 @@ -471,6 +471,13 @@ PWCHAR Buffer; } PLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA, *PPLUGPLAY_CONTROL_DEVICE_RELATIONS_DATA; +// Class 0x13 +typedef struct _PLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA +{ + ULONG DeviceInstanceLength; + PWSTR DeviceInstance; +} PLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA, *PPLUGPLAY_CONTROL_RETRIEVE_DOCK_DATA; + // Class 0x14 typedef struct _PLUGPLAY_CONTROL_RESET_DEVICE_DATA {

1 0

[ekohl] 70571: [INTL] - Remove the Advanced page for non-admin users. - Disable the 'complex script' and 'east asian language' checkboxes for non-admin users.
by ekohl＠svn.reactos.org 10 Jan '16

10 Jan '16

Author: ekohl Date: Sun Jan 10 21:12:23 2016 New Revision: 70571 URL: http://svn.reactos.org/svn/reactos?rev=70571&view=rev Log: [INTL] - Remove the Advanced page for non-admin users. - Disable the 'complex script' and 'east asian language' checkboxes for non-admin users. Modified: trunk/reactos/dll/cpl/intl/intl.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/languages.c Modified: trunk/reactos/dll/cpl/intl/intl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.c?rev=70… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.c [iso-8859-1] Sun Jan 10 21:12:23 2016 @@ -168,6 +168,7 @@ return FALSE; pGlobalData->SystemLCID = GetSystemDefaultLCID(); + pGlobalData->bIsUserAdmin = IsUserAdmin(); LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -178,13 +179,20 @@ psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); psh.pszCaption = Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nPages = 0; //sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = psp; InitPropSheetPage(&psp[0], IDD_GENERALPAGE, GeneralPageProc, (LPARAM)pGlobalData); + psh.nPages++; InitPropSheetPage(&psp[1], IDD_LANGUAGESPAGE, LanguagesPageProc, (LPARAM)pGlobalData); - InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData); + psh.nPages++; + + if (pGlobalData->bIsUserAdmin) + { + InitPropSheetPage(&psp[2], IDD_ADVANCEDPAGE, AdvancedPageProc, (LPARAM)pGlobalData); + psh.nPages++; + } ret = (LONG)(PropertySheet(&psh) != -1); Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=70… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Sun Jan 10 21:12:23 2016 @@ -116,6 +116,8 @@ GEOID geoid; BOOL fGeoIdChanged; + /* Misc */ + BOOL bIsUserAdmin; } GLOBALDATA, *PGLOBALDATA; typedef struct Modified: trunk/reactos/dll/cpl/intl/languages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/languages.c?r… ============================================================================== --- trunk/reactos/dll/cpl/intl/languages.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/languages.c [iso-8859-1] Sun Jan 10 21:12:23 2016 @@ -10,10 +10,21 @@ LPARAM lParam) { SHELLEXECUTEINFOW shInputDll; + PGLOBALDATA pGlobalData; + + pGlobalData = (PGLOBALDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { case WM_INITDIALOG: + pGlobalData = (PGLOBALDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + if (!pGlobalData->bIsUserAdmin) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_RTOL_LANG), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_INST_FILES_FOR_ASIAN), FALSE); + } break; case WM_COMMAND:

1 0

[tkreuzer] 70570: [PSDK] Add missing dbghelp.h definitions
by tkreuzer＠svn.reactos.org 10 Jan '16

10 Jan '16

Author: tkreuzer Date: Sun Jan 10 19:46:16 2016 New Revision: 70570 URL: http://svn.reactos.org/svn/reactos?rev=70570&view=rev Log: [PSDK] Add missing dbghelp.h definitions Modified: trunk/reactos/include/psdk/dbghelp.h Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] Sun Jan 10 19:46:16 2016 @@ -487,10 +487,8 @@ #define SYMOPT_EXACT_SYMBOLS 0x00000400 #define SYMOPT_WILD_UNDERSCORE 0x00000800 #define SYMOPT_USE_DEFAULTS 0x00001000 -/* latest SDK defines: #define SYMOPT_ALLOW_ABSOLUTE_SYMBOLS 0x00000800 #define SYMOPT_IGNORE_NT_SYMPATH 0x00001000 -*/ #define SYMOPT_INCLUDE_32BIT_MODULES 0x00002000 #define SYMOPT_PUBLICS_ONLY 0x00004000 #define SYMOPT_NO_PUBLICS 0x00008000 @@ -500,7 +498,12 @@ #define SYMOPT_NO_PROMPTS 0x00080000 #define SYMOPT_OVERWRITE 0x00100000 #define SYMOPT_IGNORE_IMAGEDIR 0x00200000 - +#define SYMOPT_FLAT_DIRECTORY 0x00400000 +#define SYMOPT_FAVOR_COMPRESSED 0x00800000 +#define SYMOPT_ALLOW_ZERO_ADDRESS 0x01000000 +#define SYMOPT_DISABLE_SYMSRV_AUTODETECT 0x02000000 +#define SYMOPT_READONLY_CACHE 0x04000000 +#define SYMOPT_SYMPATH_LAST 0x08000000 #define SYMOPT_DEBUG 0x80000000 typedef struct _IMAGEHLP_STACK_FRAME @@ -2541,6 +2544,12 @@ BOOL WINAPI SymUnloadModule(_In_ HANDLE, _In_ DWORD); +BOOL +IMAGEAPI +SymSrvIsStore( + _In_opt_ HANDLE hProcess, + _In_ PCSTR path); + #endif #ifdef __cplusplus

1 0

[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 10 Jan '16

10 Jan '16

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;

1 0

[ekohl] 70568: [LSASRV] Add credential function stubs to the lsa dispatch table.
by ekohl＠svn.reactos.org 10 Jan '16

10 Jan '16

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,

1 0

[ekohl] 70567: [LSASRV] Add missing exports.
by ekohl＠svn.reactos.org 10 Jan '16

10 Jan '16

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)

1 0

[ekohl] 70566: [ADVAPI32] Implement LsaOpenPolicySce. [LSASRV] Update the LsarOpenPolicySce prototype.
by ekohl＠svn.reactos.org 10 Jan '16

10 Jan '16

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(

1 0

[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 10 Jan '16

10 Jan '16

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,

1 0

[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 10 Jan '16

10 Jan '16

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,

1 0

[hbelusca] 70563: [CMLIB]: Use the HvGetCell* macros where it's possible.
by hbelusca＠svn.reactos.org 09 Jan '16

09 Jan '16

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;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs