Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 56385: [NTOSKRNL] - Export base MCB functions
by tfaber＠svn.reactos.org 21 Apr '12

21 Apr '12

Author: tfaber Date: Sat Apr 21 17:52:29 2012 New Revision: 56385 URL: http://svn.reactos.org/svn/reactos?rev=56385&view=rev Log: [NTOSKRNL] - Export base MCB functions Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Sat Apr 21 17:52:29 2012 @@ -184,7 +184,7 @@ @ fastcall -arch=i386 ExiReleaseFastMutex(ptr) ExReleaseFastMutex @ fastcall -arch=i386 ExiTryToAcquireFastMutex(ptr) ExTryToAcquireFastMutex @ stdcall FsRtlAcquireFileExclusive(ptr) -;FsRtlAddBaseMcbEntry +@ stdcall FsRtlAddBaseMcbEntry(ptr long long long long long long) @ stdcall FsRtlAddLargeMcbEntry(ptr long long long long long long) @ stdcall FsRtlAddMcbEntry(ptr long long long) @ stdcall FsRtlAddToTunnelCache(ptr long long ptr ptr long long ptr) @@ -218,7 +218,7 @@ @ stdcall FsRtlFindInTunnelCache(ptr long long ptr ptr ptr ptr ptr) @ stdcall FsRtlFreeFileLock(ptr) @ stdcall FsRtlGetFileSize(ptr ptr) -;FsRtlGetNextBaseMcbEntry +@ stdcall FsRtlGetNextBaseMcbEntry(ptr long ptr ptr ptr) @ stdcall FsRtlGetNextFileLock(ptr long) @ stdcall FsRtlGetNextLargeMcbEntry(ptr long ptr ptr ptr) @ stdcall FsRtlGetNextMcbEntry(ptr long ptr ptr ptr) @@ -226,7 +226,7 @@ @ stdcall FsRtlIncrementCcFastReadNotPossible() @ stdcall FsRtlIncrementCcFastReadResourceMiss() @ stdcall FsRtlIncrementCcFastReadWait() -;FsRtlInitializeBaseMcb +@ stdcall FsRtlInitializeBaseMcb(ptr ptr) @ stdcall FsRtlInitializeFileLock(ptr ptr ptr) @ stdcall FsRtlInitializeLargeMcb(ptr long) @ stdcall FsRtlInitializeMcb(ptr long) @@ -242,10 +242,10 @@ @ stdcall FsRtlIsPagingFile(ptr) @ stdcall FsRtlIsTotalDeviceFailure(ptr) @ extern FsRtlLegalAnsiCharacterArray _FsRtlLegalAnsiCharacterArray -;FsRtlLookupBaseMcbEntry +@ stdcall FsRtlLookupBaseMcbEntry(ptr long long ptr ptr ptr ptr ptr) @ stdcall FsRtlLookupLargeMcbEntry(ptr long long ptr ptr ptr ptr ptr) -;FsRtlLookupLastBaseMcbEntry -;FsRtlLookupLastBaseMcbEntryAndIndex +@ stdcall FsRtlLookupLastBaseMcbEntry(ptr ptr ptr) +@ stdcall FsRtlLookupLastBaseMcbEntryAndIndex(ptr ptr ptr ptr) @ stdcall FsRtlLookupLastLargeMcbEntry(ptr ptr ptr) @ stdcall FsRtlLookupLastLargeMcbEntryAndIndex(ptr ptr ptr ptr) @ stdcall FsRtlLookupLastMcbEntry(ptr ptr ptr) @@ -269,7 +269,7 @@ @ stdcall FsRtlNotifyReportChange(ptr ptr ptr ptr long) @ stdcall FsRtlNotifyUninitializeSync(ptr) @ stdcall FsRtlNotifyVolumeEvent(ptr long) -;FsRtlNumberOfRunsInBaseMcb +@ stdcall FsRtlNumberOfRunsInBaseMcb(ptr) @ stdcall FsRtlNumberOfRunsInLargeMcb(ptr) @ stdcall FsRtlNumberOfRunsInMcb(ptr) @ stdcall FsRtlOplockFsctrl(ptr ptr long) @@ -283,21 +283,21 @@ @ stdcall FsRtlRegisterFileSystemFilterCallbacks(ptr ptr) @ stdcall FsRtlRegisterUncProvider(ptr ptr long) @ stdcall FsRtlReleaseFile(ptr) -;FsRtlRemoveBaseMcbEntry +@ stdcall FsRtlRemoveBaseMcbEntry(ptr long long long long) @ stdcall FsRtlRemoveLargeMcbEntry(ptr long long long long) @ stdcall FsRtlRemoveMcbEntry(ptr long long) @ stdcall FsRtlRemovePerFileObjectContext(ptr ptr ptr) @ stdcall FsRtlRemovePerStreamContext(ptr ptr ptr) -;FsRtlResetBaseMcb +@ stdcall FsRtlResetBaseMcb(ptr) @ stdcall FsRtlResetLargeMcb(ptr long) -;FsRtlSplitBaseMcb +@ stdcall FsRtlSplitBaseMcb(ptr long long long long) @ stdcall FsRtlSplitLargeMcb(ptr long long long long) @ stdcall FsRtlSyncVolumes(long long long) @ stdcall FsRtlTeardownPerStreamContexts(ptr) -;FsRtlTruncateBaseMcb +@ stdcall FsRtlTruncateBaseMcb(ptr long long) @ stdcall FsRtlTruncateLargeMcb(ptr long long) @ stdcall FsRtlTruncateMcb(ptr long) -;FsRtlUninitializeBaseMcb +@ stdcall FsRtlUninitializeBaseMcb(ptr) @ stdcall FsRtlUninitializeFileLock(ptr) @ stdcall FsRtlUninitializeLargeMcb(ptr) @ stdcall FsRtlUninitializeMcb(ptr)

1 0

[tkreuzer] 56384: [WIN32K] In NtGdiGetTextExtentExW fail when Count is negative.
by tkreuzer＠svn.reactos.org 21 Apr '12

21 Apr '12

Author: tkreuzer Date: Sat Apr 21 16:05:24 2012 New Revision: 56384 URL: http://svn.reactos.org/svn/reactos?rev=56384&view=rev Log: [WIN32K] In NtGdiGetTextExtentExW fail when Count is negative. Modified: trunk/reactos/win32ss/gdi/ntgdi/text.c Modified: trunk/reactos/win32ss/gdi/ntgdi/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.c [iso-8859-1] Sat Apr 21 16:05:24 2012 @@ -278,6 +278,12 @@ LPINT Dx; PTEXTOBJ TextObj; + if ((LONG)Count < 0) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + /* FIXME: Handle fl */ if (0 == Count)

1 0

[akhaldi] 56383: [PSDK] * Sync cryptuiapi.h with Wine. Patch by Carlo Bramini. See issue #7016 for more details.
by akhaldi＠svn.reactos.org 21 Apr '12

21 Apr '12

Author: akhaldi Date: Sat Apr 21 13:22:52 2012 New Revision: 56383 URL: http://svn.reactos.org/svn/reactos?rev=56383&view=rev Log: [PSDK] * Sync cryptuiapi.h with Wine. Patch by Carlo Bramini. See issue #7016 for more details. Modified: trunk/reactos/include/psdk/cryptuiapi.h Modified: trunk/reactos/include/psdk/cryptuiapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cryptuiapi.h?… ============================================================================== --- trunk/reactos/include/psdk/cryptuiapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/cryptuiapi.h [iso-8859-1] Sat Apr 21 13:22:52 2012 @@ -348,16 +348,18 @@ DWORD dwSize; HWND hwndParent; DWORD dwFlags; - LPCWSTR szTitle; + LPCSTR szTitle; DWORD dwDontUseColumn; - LPCWSTR szDisplayString; + LPCSTR szDisplayString; PFNCFILTERPROC pFilterCallback; PFNCCERTDISPLAYPROC pDisplayCallback; void *pvCallbackData; + DWORD cDisplayStores; + HCERTSTORE *rghDisplayStores; DWORD cStores; HCERTSTORE *rghStores; DWORD cPropSheetPages; - LPCPROPSHEETPAGEW rgPropSheetPages; + LPCPROPSHEETPAGEA rgPropSheetPages; HCERTSTORE hSelectedCertStore; } CRYPTUI_SELECTCERTIFICATE_STRUCTA, *PCRYPTUI_SELECTCERTIFICATE_STRUCTA; typedef const CRYPTUI_SELECTCERTIFICATE_STRUCTA * @@ -374,6 +376,8 @@ PFNCFILTERPROC pFilterCallback; PFNCCERTDISPLAYPROC pDisplayCallback; void *pvCallbackData; + DWORD cDisplayStores; + HCERTSTORE *rghDisplayStores; DWORD cStores; HCERTSTORE *rghStores; DWORD cPropSheetPages;

1 0

[akhaldi] 56382: [CHARMAP] * Implement LoadSettings() and SaveSettings(). Patch by Edijs Kolesnikovics with some minor changes by me. See issue #6925 for more details.
by akhaldi＠svn.reactos.org 21 Apr '12

21 Apr '12

Author: akhaldi Date: Sat Apr 21 10:57:16 2012 New Revision: 56382 URL: http://svn.reactos.org/svn/reactos?rev=56382&view=rev Log: [CHARMAP] * Implement LoadSettings() and SaveSettings(). Patch by Edijs Kolesnikovics with some minor changes by me. See issue #6925 for more details. Added: trunk/reactos/base/applications/charmap/settings.c (with props) Modified: trunk/reactos/base/applications/charmap/CMakeLists.txt trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/precomp.h Modified: trunk/reactos/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/CMakeLists.txt [iso-8859-1] Sat Apr 21 10:57:16 2012 @@ -6,13 +6,14 @@ charmap.c lrgcell.c map.c + settings.c charmap.rc) add_executable(charmap ${SOURCE}) set_module_type(charmap win32gui UNICODE) -add_importlibs(charmap msvcrt user32 gdi32 comctl32 kernel32) +add_importlibs(charmap advapi32 user32 gdi32 comctl32 msvcrt kernel32) add_pch(charmap precomp.h) Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Sat Apr 21 10:57:16 2012 @@ -11,17 +11,11 @@ #define ID_ABOUT 0x1 -typedef struct { - BOOL IsAdvancedView; -} SETTINGS; - HINSTANCE hInstance; -HWND hCharmapDlg; HWND hAdvancedDlg; HWND hStatusWnd; HICON hSmIcon; HICON hBgIcon; -SETTINGS Settings; /* Font-enumeration callback */ static @@ -103,7 +97,7 @@ } -static +extern VOID ChangeMapFont(HWND hDlg) { @@ -464,6 +458,7 @@ break; case WM_DESTROY: + SaveSettings(); PostQuitMessage(0); return 0; @@ -534,6 +529,7 @@ if (hWnd != NULL) { + LoadSettings(); ShowWindow(hWnd, SW_SHOW); UpdateWindow(hWnd); } Modified: trunk/reactos/base/applications/charmap/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/precomp.h [iso-8859-1] Sat Apr 21 10:57:16 2012 @@ -3,6 +3,8 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include <windowsx.h> +#include <tchar.h> #include <stdio.h> #include <stdlib.h> #include <commctrl.h> @@ -51,6 +53,12 @@ WCHAR ch; } MAPNOTIFY, *LPMAPNOTIFY; +typedef struct { + BOOL IsAdvancedView; +} SETTINGS; + +SETTINGS Settings; +HWND hCharmapDlg; LRESULT CALLBACK LrgCellWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -59,4 +67,11 @@ BOOL RegisterMapClasses(HINSTANCE hInstance); VOID UnregisterMapClasses(HINSTANCE hInstance); +/* charmap.c */ +extern VOID ChangeMapFont(HWND hDlg); + +/* settings.c */ +extern void LoadSettings(void); +extern void SaveSettings(void); + #endif /* __CHARMAP_PRECOMP_H */ Added: trunk/reactos/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/settings.c (added) +++ trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] Sat Apr 21 10:57:16 2012 @@ -1,0 +1,136 @@ +/* + * PROJECT: ReactOS Character Map + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/charmap/settings.c + * PURPOSE: save/load settings + * COPYRIGHT: Copyright 2012 Edijs Kolesnikovics <terminedijs(a)yahoo.com> + * + */ + +#include <precomp.h> + + +const TCHAR g_szGeneralRegKey[] = _T("Software\\Microsoft\\CharMap"); +HWND hWnd; + +LONG QueryStringValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPTSTR pszBuffer, DWORD dwBufferLen) +{ + LONG lResult; + HKEY hSubKey = NULL; + DWORD cbData, dwType; + + if (lpSubKey) + { + lResult = RegOpenKey(hKey, lpSubKey, &hSubKey); + if (lResult != ERROR_SUCCESS) + goto done; + hKey = hSubKey; + } + + cbData = (dwBufferLen - 1) * sizeof(*pszBuffer); + lResult = RegQueryValueEx(hKey, lpValueName, NULL, &dwType, (LPBYTE) pszBuffer, &cbData); + if (lResult != ERROR_SUCCESS) + goto done; + if (dwType != REG_SZ) + { + lResult = -1; + goto done; + } + + pszBuffer[cbData / sizeof(*pszBuffer)] = _T('\0'); + +done: + if (lResult != ERROR_SUCCESS) + pszBuffer[0] = _T('\0'); + if (hSubKey) + RegCloseKey(hSubKey); + return lResult; +} + +extern void LoadSettings(void) +{ + HKEY hKey = NULL; + int iItemIndex = -1; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + TCHAR szBuffer[MAX_PATH]; + DWORD dwAdvanChecked; + unsigned long type = REG_DWORD, size = 1024; + + /* Restore last selected font */ + if (QueryStringValue(HKEY_CURRENT_USER, g_szGeneralRegKey, _T("Font"), szBuffer, (sizeof(szBuffer)/sizeof(szBuffer[0]))) == ERROR_SUCCESS) + { + //Get combobox handle + hWnd = GetDlgItem(hCharmapDlg, IDC_FONTCOMBO); + + //Search for match and return index if match found + iItemIndex = ComboBox_FindStringExact(hWnd, -1, szBuffer); + if(iItemIndex != CB_ERR) + { + ComboBox_SetCurSel(hWnd, iItemIndex); + ChangeMapFont(hCharmapDlg); + } + } + + /* Restore last selected character set */ + if (QueryStringValue(HKEY_CURRENT_USER, g_szGeneralRegKey, _T("CodePage"), szBuffer, (sizeof(szBuffer)/sizeof(szBuffer[0]))) == ERROR_SUCCESS) + { + //Get combobox handle + hWnd = GetDlgItem(hCharmapDlg, IDC_COMBO_CHARSET); + + iItemIndex = ComboBox_FindStringExact(hWnd, -1, szBuffer); + if(iItemIndex != CB_ERR) + { + ComboBox_SetCurSel(hWnd, iItemIndex); + } + } + + RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvanChecked, &size); + if(dwAdvanChecked == TRUE) + SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, (dwAdvanChecked ? MF_CHECKED : MF_UNCHECKED), 0); + + RegCloseKey(hKey); + } + else + { + /* Default font seems to be Arial */ + hWnd = GetDlgItem(hCharmapDlg, IDC_FONTCOMBO); + + iItemIndex = ComboBox_FindStringExact(hWnd, -1, _T("Arial")); + if(iItemIndex != CB_ERR) + { + ComboBox_SetCurSel(hWnd, iItemIndex); + ChangeMapFont(hCharmapDlg); + } + } +} + +extern void SaveSettings(void) +{ + HKEY hKey = NULL; + + if (RegCreateKey(HKEY_CURRENT_USER, g_szGeneralRegKey, &hKey) == ERROR_SUCCESS) + { + if (RegOpenKeyEx(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, KEY_SET_VALUE, &hKey) == ERROR_SUCCESS) + { + TCHAR szBuffer[MAX_PATH]; + + hWnd = GetDlgItem(hCharmapDlg, IDC_FONTCOMBO); + ComboBox_GetText(hWnd, szBuffer, MAX_PATH); + + if(szBuffer != NULL && *szBuffer != '\0') + RegSetValueEx(hKey, _T("Font"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH); + + hWnd = GetDlgItem(hCharmapDlg, IDC_COMBO_CHARSET); + ComboBox_GetText(hWnd, szBuffer, MAX_PATH); + + if(szBuffer != NULL && *szBuffer != '\0') + RegSetValueEx(hKey, _T("CodePage"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH); + + RegSetValueEx(hKey, _T("Advanced"), 0, REG_DWORD, (LPBYTE)&Settings.IsAdvancedView, (DWORD) sizeof(DWORD)); + + RegCloseKey(hKey); + } + } +} Propchange: trunk/reactos/base/applications/charmap/settings.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 56381: [MSCONFIG] * Correctly update the selected command line text. Patch by Edijs Kolesnikovics. See issue #6963 for more details.
by akhaldi＠svn.reactos.org 21 Apr '12

21 Apr '12

Author: akhaldi Date: Sat Apr 21 10:46:07 2012 New Revision: 56381 URL: http://svn.reactos.org/svn/reactos?rev=56381&view=rev Log: [MSCONFIG] * Correctly update the selected command line text. Patch by Edijs Kolesnikovics. See issue #6963 for more details. Modified: trunk/reactos/base/applications/msconfig/toolspage.c Modified: trunk/reactos/base/applications/msconfig/toolspage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/toolspage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/toolspage.c [iso-8859-1] Sat Apr 21 10:46:07 2012 @@ -134,7 +134,7 @@ { switch (nmh->code) { - case NM_CLICK: + case LVN_ITEMCHANGED: { lpnmitem = (LPNMITEMACTIVATE) lParam; if (lpnmitem->iItem > -1)

1 0

[akhaldi] 56380: [MSCONFIG] * Get the timeout correctly. Patch by Edijs Kolesnikovics. See issue #6964 for more details.
by akhaldi＠svn.reactos.org 21 Apr '12

21 Apr '12

Author: akhaldi Date: Sat Apr 21 10:41:16 2012 New Revision: 56380 URL: http://svn.reactos.org/svn/reactos?rev=56380&view=rev Log: [MSCONFIG] * Get the timeout correctly. Patch by Edijs Kolesnikovics. See issue #6964 for more details. Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/freeldrpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/freeldrpage.c [iso-8859-1] Sat Apr 21 10:41:16 2012 @@ -64,13 +64,13 @@ if (szBuffer[0] == L'[') continue; - if (!wcsncmp(szBuffer, L"timeout=", 8)) + if (!_wcsnicmp(szBuffer, L"timeout=", 8)) { Settings.TimeOut = _wtoi(&szBuffer[8]); continue; } - if (!wcsncmp(szBuffer, L"default=", 8)) + if (!_wcsnicmp(szBuffer, L"default=", 8)) { wcscpy(Settings.szDefaultOS, &szBuffer[8]); continue;

1 0

[tfaber] 56379: [KMTESTS/OB] - Add ObTypes test that checks all object types that should be present on Windows
by tfaber＠svn.reactos.org 21 Apr '12

21 Apr '12

Author: tfaber Date: Sat Apr 21 09:06:54 2012 New Revision: 56379 URL: http://svn.reactos.org/svn/reactos?rev=56379&view=rev Log: [KMTESTS/OB] - Add ObTypes test that checks all object types that should be present on Windows Added: trunk/rostests/kmtests/ntos_ob/ObTypes.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sat Apr 21 09:06:54 2012 @@ -48,6 +48,7 @@ ntos_mm/MmSection.c ntos_ob/ObReference.c ntos_ob/ObType.c + ntos_ob/ObTypes.c ${COMMON_SOURCE} kmtest_drv/kmtest_drv.rc) Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Sat Apr 21 09:06:54 2012 @@ -36,6 +36,7 @@ KMT_TESTFUNC Test_ObType; KMT_TESTFUNC Test_ObTypeClean; KMT_TESTFUNC Test_ObTypeNoClean; +KMT_TESTFUNC Test_ObTypes; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlSplayTree; @@ -71,6 +72,7 @@ { "ObType", Test_ObType }, { "-ObTypeClean", Test_ObTypeClean }, { "-ObTypeNoClean", Test_ObTypeNoClean }, + { "ObTypes", Test_ObTypes }, { "RtlAvlTreeKM", Test_RtlAvlTree }, { "RtlMemoryKM", Test_RtlMemory }, { "RtlSplayTreeKM", Test_RtlSplayTree }, Added: trunk/rostests/kmtests/ntos_ob/ObTypes.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ob/ObTypes.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ob/ObTypes.c (added) +++ trunk/rostests/kmtests/ntos_ob/ObTypes.c [iso-8859-1] Sat Apr 21 09:06:54 2012 @@ -1,0 +1,234 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Object types test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +static +POBJECT_TYPE +GetObjectType( + IN PCWSTR TypeName) +{ + NTSTATUS Status; + UNICODE_STRING Name; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + PVOID ObjectType = NULL; + + RtlInitUnicodeString(&Name, TypeName); + InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); + Status = ObOpenObjectByName(&ObjectAttributes, NULL, KernelMode, NULL, 0, NULL, &Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(Handle != NULL, "ObjectTypeHandle = NULL\n"); + if (!skip(Status == STATUS_SUCCESS && Handle, "No handle\n")) + { + Status = ObReferenceObjectByHandle(Handle, 0, NULL, KernelMode, &ObjectType, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(ObjectType != NULL, "ObjectType = NULL\n"); + Status = ZwClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + } + return ObjectType; +} + +#define ok_eq_ustr(value, expected) ok(RtlEqualUnicodeString(value, expected, FALSE), #value " = \"%wZ\", expected \"%%wZ\"\n", value, expected) + +#define CheckObjectType(TypeName, Variable, Flags, InvalidAttr, \ + ReadMapping, WriteMapping, ExecMapping, AllMapping, \ + ValidMask) do \ +{ \ + POBJECT_TYPE ObjectType; \ + UNICODE_STRING Name; \ + ULONG Key; \ + BOOLEAN UseDefault = ((Flags) & OBT_NO_DEFAULT) == 0; \ + BOOLEAN CustomSecurityProc = ((Flags) & OBT_CUSTOM_SECURITY_PROC) != 0; \ + BOOLEAN SecurityRequired = ((Flags) & OBT_SECURITY_REQUIRED) != 0; \ + BOOLEAN CaseInsensitive = ((Flags) & OBT_CASE_INSENSITIVE) != 0; \ + BOOLEAN MaintainTypeList = ((Flags) & OBT_MAINTAIN_TYPE_LIST) != 0; \ + BOOLEAN MaintainHandleCount = ((Flags) & OBT_MAINTAIN_HANDLE_COUNT) != 0; \ + POOL_TYPE PoolType = ((Flags) & OBT_PAGED_POOL) ? PagedPool : NonPagedPool; \ + BOOLEAN CustomKey = ((Flags) & OBT_CUSTOM_KEY) != 0; \ + \ + trace(#TypeName "\n"); \ + ObjectType = GetObjectType(L"\\ObjectTypes\\" L ## #TypeName); \ + ok(ObjectType != NULL, "ObjectType = NULL\n"); \ + if (!skip(ObjectType != NULL, "No ObjectType\n")) \ + { \ + ok(!Variable || Variable == ObjectType, \ + #Variable "is %p, expected %p\n", Variable, ObjectType); \ + RtlInitUnicodeString(&Name, L ## #TypeName); \ + ok_eq_ustr(&ObjectType->Name, &Name); \ + ok_eq_ulong(ObjectType->Index, Index); \ + Index = ObjectType->Index + 1; \ + /* apparently, File and WaitablePort are evil and have other stuff \ + * in DefaultObject. All others are NULL */ \ + if (UseDefault) \ + ok_eq_pointer(ObjectType->DefaultObject, ObpDefaultObject); \ + /*ok(ObjectType->TotalNumberOfObjects >= 1, \ + "Number of objects = %lu\n", ObjectType->TotalNumberOfObjects); \ + ok(ObjectType->TotalNumberOfHandles >= ObjectType->TotalNumberOfObjects, \ + "%lu objects, but %lu handles\n", \ + ObjectType->TotalNumberOfObjects, ObjectType->TotalNumberOfHandles);*/ \ + ok(ObjectType->HighWaterNumberOfObjects >= ObjectType->TotalNumberOfObjects,\ + "%lu objects, but high water %lu\n", \ + ObjectType->TotalNumberOfObjects, ObjectType->HighWaterNumberOfObjects); \ + ok(ObjectType->HighWaterNumberOfHandles >= ObjectType->TotalNumberOfHandles,\ + "%lu handles, but high water %lu\n", \ + ObjectType->TotalNumberOfHandles, ObjectType->HighWaterNumberOfHandles); \ + ok_eq_ulong(ObjectType->TypeInfo.Length, sizeof(OBJECT_TYPE_INITIALIZER)); \ + ok_eq_bool(ObjectType->TypeInfo.UseDefaultObject, UseDefault); \ + ok_eq_bool(ObjectType->TypeInfo.CaseInsensitive, CaseInsensitive); \ + ok_eq_hex(ObjectType->TypeInfo.InvalidAttributes, InvalidAttr); \ + ok_eq_hex(ObjectType->TypeInfo.GenericMapping.GenericRead, ReadMapping); \ + ok_eq_hex(ObjectType->TypeInfo.GenericMapping.GenericWrite, WriteMapping); \ + ok_eq_hex(ObjectType->TypeInfo.GenericMapping.GenericExecute, ExecMapping); \ + ok_eq_hex(ObjectType->TypeInfo.GenericMapping.GenericAll, AllMapping); \ + ok_eq_hex(ObjectType->TypeInfo.ValidAccessMask, ValidMask); \ + ok_eq_bool(ObjectType->TypeInfo.SecurityRequired, SecurityRequired); \ + ok_eq_bool(ObjectType->TypeInfo.MaintainHandleCount, MaintainHandleCount); \ + ok_eq_bool(ObjectType->TypeInfo.MaintainTypeList, MaintainTypeList); \ + ok_eq_ulong(ObjectType->TypeInfo.PoolType, PoolType); \ + /* DefaultPagedPoolCharge */ \ + /* DefaultNonPagedPoolCharge */ \ + /* DumpProcedure */ \ + /* OpenProcedure */ \ + /* CloseProcedure */ \ + /* DeleteProcedure */ \ + /* ParseProcedure */ \ + if (CustomSecurityProc) \ + ok(ObjectType->TypeInfo.SecurityProcedure != NULL, \ + "No Security Proc\n"); \ + else \ + ok_eq_pointer(ObjectType->TypeInfo.SecurityProcedure, \ + SeDefaultObjectMethod); \ + /* QueryNameProcedure */ \ + /* OkayToCloseProcedure */ \ + Key = *(PULONG)#TypeName; \ + if (sizeof(#TypeName) <= 4) Key |= ' ' << 24; \ + if (sizeof(#TypeName) <= 3) Key |= ' ' << 16; \ + if (sizeof(#TypeName) <= 2) Key |= ' ' << 8; \ + if (!CustomKey) \ + ok_eq_hex(ObjectType->Key, Key); \ + ObDereferenceObject(ObjectType); \ + } \ +} while (0) + +static POBJECT_TYPE ObpTypeObjectType; +#define ObpDirectoryObjectType NULL +#define ObpSymbolicLinkObjectType NULL +#define DbgkDebugObjectType NULL +#define ExEventPairObjectType NULL +#define ExMutantObjectType NULL +#define ExCallbackObjectType NULL +#define ExTimerObjectType NULL +#define ExProfileObjectType NULL +#define ExpKeyedEventObjectType NULL +#define CmpKeyObjectType NULL +#define LpcWaitablePortObjectType NULL +#define IoControllerObjectType NULL +#define IoCompletionObjectType NULL +#define WmipGuidObjectType NULL + +static POBJECT_TYPE ObpDefaultObject; +static OB_SECURITY_METHOD SeDefaultObjectMethod; + +#define OBT_NO_DEFAULT 0x01 +#define OBT_CUSTOM_SECURITY_PROC 0x02 +#define OBT_SECURITY_REQUIRED 0x04 +#define OBT_CASE_INSENSITIVE 0x08 +#define OBT_MAINTAIN_TYPE_LIST 0x10 +#define OBT_MAINTAIN_HANDLE_COUNT 0x20 +#define OBT_PAGED_POOL 0x40 +#define OBT_CUSTOM_KEY 0x80 + +#define TAG(x) RtlUlongByteSwap(x) + +static +VOID +TestObjectTypes(VOID) +{ + ULONG Index; + + ObpTypeObjectType = GetObjectType(L"\\ObjectTypes\\Type"); + if (skip(ObpTypeObjectType != NULL, "No Type object type\n")) + return; + + ObpDefaultObject = ObpTypeObjectType->DefaultObject; + ok(ObpDefaultObject != NULL, "No ObpDefaultObject\n"); + SeDefaultObjectMethod = ObpTypeObjectType->TypeInfo.SecurityProcedure; + ok(SeDefaultObjectMethod != NULL, "No SeDefaultObjectMethod\n"); + + Index = 1; + CheckObjectType(Type, ObpTypeObjectType, OBT_MAINTAIN_TYPE_LIST | OBT_CUSTOM_KEY, 0x100, 0x020000, 0x020000, 0x020000, 0x0f0001, 0x1f0001); + ok_eq_hex(ObpTypeObjectType->Key, TAG('ObjT')); + CheckObjectType(Directory, ObpDirectoryObjectType, OBT_CASE_INSENSITIVE | OBT_PAGED_POOL, 0x100, 0x020003, 0x02000c, 0x020003, 0x0f000f, 0x0f000f); + CheckObjectType(SymbolicLink, ObpSymbolicLinkObjectType, OBT_CASE_INSENSITIVE | OBT_PAGED_POOL, 0x100, 0x020001, 0x020000, 0x020001, 0x0f0001, 0x0f0001); + CheckObjectType(Token, SeTokenObjectType, OBT_SECURITY_REQUIRED | OBT_PAGED_POOL, 0x100, 0x020008, 0x0200e0, 0x020000, 0x0f01ff, 0x1f01ff); + CheckObjectType(Process, PsProcessType, OBT_NO_DEFAULT | OBT_SECURITY_REQUIRED, 0x0b0, 0x020410, 0x020beb, 0x120000, 0x1f0fff, 0x1f0fff); + CheckObjectType(Thread, PsThreadType, OBT_NO_DEFAULT | OBT_SECURITY_REQUIRED, 0x0b0, 0x020048, 0x020037, 0x120000, 0x1f03ff, 0x1f03ff); + CheckObjectType(Job, PsJobType, OBT_NO_DEFAULT | OBT_SECURITY_REQUIRED, 0x000, 0x020004, 0x02000b, 0x120000, 0x1f03ff, 0x1f001f); + CheckObjectType(DebugObject, DbgkDebugObjectType, OBT_NO_DEFAULT | OBT_SECURITY_REQUIRED, 0x000, 0x020001, 0x020002, 0x120000, 0x1f000f, 0x1f000f); + CheckObjectType(Event, ExEventObjectType, OBT_NO_DEFAULT, 0x100, 0x020001, 0x020002, 0x120000, 0x1f0003, 0x1f0003); + CheckObjectType(EventPair, ExEventPairObjectType, 0, 0x100, 0x120000, 0x120000, 0x120000, 0x1f0000, 0x1f0000); + CheckObjectType(Mutant, ExMutantObjectType, OBT_NO_DEFAULT, 0x100, 0x020001, 0x020000, 0x120000, 0x1f0001, 0x1f0001); + CheckObjectType(Callback, ExCallbackObjectType, OBT_NO_DEFAULT, 0x100, 0x020000, 0x020001, 0x120000, 0x1f0001, 0x1f0001); + CheckObjectType(Semaphore, ExSemaphoreObjectType, OBT_NO_DEFAULT, 0x100, 0x020001, 0x020002, 0x120000, 0x1f0003, 0x1f0003); + CheckObjectType(Timer, ExTimerObjectType, OBT_NO_DEFAULT, 0x100, 0x020001, 0x020002, 0x120000, 0x1f0003, 0x1f0003); + CheckObjectType(Profile, ExProfileObjectType, OBT_NO_DEFAULT, 0x100, 0x020001, 0x020001, 0x020001, 0x0f0001, 0x0f0001); + CheckObjectType(KeyedEvent, ExpKeyedEventObjectType, OBT_PAGED_POOL, 0x000, 0x020001, 0x020002, 0x020000, 0x0f0003, 0x1f0003); + CheckObjectType(WindowStation, ExWindowStationObjectType, OBT_NO_DEFAULT | OBT_SECURITY_REQUIRED | OBT_MAINTAIN_HANDLE_COUNT, + 0x130, 0x020303, 0x02001c, 0x020060, 0x0f037f, 0x0f037f); + CheckObjectType(Desktop, ExDesktopObjectType, OBT_NO_DEFAULT | OBT_SECURITY_REQUIRED | OBT_MAINTAIN_HANDLE_COUNT, + 0x130, 0x020041, 0x0200be, 0x020100, 0x0f01ff, 0x0f01ff); + CheckObjectType(Section, MmSectionObjectType, OBT_PAGED_POOL, 0x100, 0x020005, 0x020002, 0x020008, 0x0f001f, 0x1f001f); + CheckObjectType(Key, CmpKeyObjectType, OBT_CUSTOM_SECURITY_PROC | OBT_SECURITY_REQUIRED | OBT_PAGED_POOL, + 0x030, 0x020019, 0x020006, 0x020019, 0x0f003f, 0x1f003f); + CheckObjectType(Port, LpcPortObjectType, OBT_PAGED_POOL, 0x7b2, 0x020001, 0x010001, 0x000000, 0x1f0001, 0x1f0001); + CheckObjectType(WaitablePort, LpcWaitablePortObjectType, OBT_NO_DEFAULT, 0x7b2, 0x020001, 0x010001, 0x000000, 0x1f0001, 0x1f0001); + CheckObjectType(Adapter, IoAdapterObjectType, 0, 0x100, 0x120089, 0x120116, 0x1200a0, 0x1f01ff, 0x1f01ff); + CheckObjectType(Controller, IoControllerObjectType, 0, 0x100, 0x120089, 0x120116, 0x1200a0, 0x1f01ff, 0x1f01ff); + CheckObjectType(Device, IoDeviceObjectType, OBT_CUSTOM_SECURITY_PROC | OBT_CASE_INSENSITIVE, + 0x100, 0x120089, 0x120116, 0x1200a0, 0x1f01ff, 0x1f01ff); + CheckObjectType(Driver, IoDriverObjectType, OBT_CASE_INSENSITIVE, 0x100, 0x120089, 0x120116, 0x1200a0, 0x1f01ff, 0x1f01ff); + CheckObjectType(IoCompletion, IoCompletionObjectType, OBT_CASE_INSENSITIVE, 0x110, 0x020001, 0x020002, 0x120000, 0x1f0003, 0x1f0003); + CheckObjectType(File, IoFileObjectType, OBT_NO_DEFAULT | OBT_CUSTOM_SECURITY_PROC | OBT_CASE_INSENSITIVE | OBT_MAINTAIN_HANDLE_COUNT, + 0x130, 0x120089, 0x120116, 0x1200a0, 0x1f01ff, 0x1f01ff); + CheckObjectType(WmiGuid, WmipGuidObjectType, OBT_NO_DEFAULT | OBT_CUSTOM_SECURITY_PROC | OBT_SECURITY_REQUIRED, + 0x100, 0x000001, 0x000002, 0x000010, 0x120fff, 0x1f0fff); + CheckObjectType(FilterConnectionPort, NULL, OBT_NO_DEFAULT | OBT_SECURITY_REQUIRED, 0x100, 0x020001, 0x010001, 0x000000, 0x1f0001, 0x1f0001); + CheckObjectType(FilterCommunicationPort, NULL, OBT_NO_DEFAULT, 0x100, 0x020001, 0x010001, 0x000000, 0x1f0001, 0x1f0001); + + // exported but not created + ok_eq_pointer(IoDeviceHandlerObjectType, NULL); + + // my Win7/x64 additionally has: + // ALPC Port + // EtwConsumer + // EtwRegistration + // IoCompletionReserve + // PcwObject + // PowerRequest + // Session + // TmEn + // TmRm + // TmTm + // TmTx + // TpWorkerFactory + // UserApcReserve + // ... and does not have: + // Port + // WaitablePort + + ObDereferenceObject(ObpTypeObjectType); +} + +START_TEST(ObTypes) +{ + TestObjectTypes(); +} Propchange: trunk/rostests/kmtests/ntos_ob/ObTypes.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 56378: [RTL/NDK] - RtlGetFullPathName_UstrEx returns NTSTATUS
by tfaber＠svn.reactos.org 21 Apr '12

21 Apr '12

Author: tfaber Date: Sat Apr 21 06:57:07 2012 New Revision: 56378 URL: http://svn.reactos.org/svn/reactos?rev=56378&view=rev Log: [RTL/NDK] - RtlGetFullPathName_UstrEx returns NTSTATUS Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Apr 21 06:57:07 2012 @@ -2606,7 +2606,7 @@ ); #endif -ULONG +NTSTATUS NTAPI RtlGetFullPathName_UstrEx( IN PUNICODE_STRING FileName, Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=56378&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sat Apr 21 06:57:07 2012 @@ -1778,7 +1778,7 @@ /* * @implemented */ -ULONG +NTSTATUS NTAPI RtlGetFullPathName_UstrEx(IN PUNICODE_STRING FileName, IN PUNICODE_STRING StaticString,

1 0

[tfaber] 56377: [NDK] - Add PsJobType, LpcPortObjectType
by tfaber＠svn.reactos.org 21 Apr '12

21 Apr '12

Author: tfaber Date: Sat Apr 21 06:44:26 2012 New Revision: 56377 URL: http://svn.reactos.org/svn/reactos?rev=56377&view=rev Log: [NDK] - Add PsJobType, LpcPortObjectType Modified: trunk/reactos/include/ndk/lpctypes.h trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/lpctypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/lpctypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/lpctypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/lpctypes.h [iso-8859-1] Sat Apr 21 06:44:26 2012 @@ -24,6 +24,15 @@ // #include <umtypes.h> //#include <pstypes.h> + +#ifndef NTOS_MODE_USER + +// +// Kernel Exported Object Types +// +extern POBJECT_TYPE NTSYSAPI LpcPortObjectType; + +#endif // !NTOS_MODE_USER // // Internal helper macro Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Sat Apr 21 06:44:26 2012 @@ -31,6 +31,15 @@ #include <extypes.h> #include <setypes.h> #endif + +#ifndef NTOS_MODE_USER + +// +// Kernel Exported Object Types +// +extern POBJECT_TYPE NTSYSAPI PsJobType; + +#endif // !NTOS_MODE_USER // // KUSER_SHARED_DATA location in User Mode

1 0

[tfaber] 56376: [NTOSKRNL] - Export SeTokenObjectType
by tfaber＠svn.reactos.org 21 Apr '12

21 Apr '12

Author: tfaber Date: Sat Apr 21 06:35:45 2012 New Revision: 56376 URL: http://svn.reactos.org/svn/reactos?rev=56376&view=rev Log: [NTOSKRNL] - Export SeTokenObjectType Modified: trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/ntoskrnl.spec trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/se/priv.c trunk/reactos/ntoskrnl/se/semgr.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -1,6 +1,4 @@ #pragma once - -extern POBJECT_TYPE SepTokenObjectType; /* SID Authorities */ extern SID_IDENTIFIER_AUTHORITY SeNullSidAuthority; Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -1384,6 +1384,7 @@ @ stdcall SeTokenIsAdmin(ptr) @ stdcall SeTokenIsRestricted(ptr) @ stdcall SeTokenIsWriteRestricted(ptr) +@ extern SeTokenObjectType @ stdcall SeTokenType(ptr) @ stdcall SeUnlockSubjectContext(ptr) @ stdcall SeUnregisterLogonSessionTerminatedRoutine(ptr) Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -190,7 +190,7 @@ /* Reference it from the handle */ Status = ObReferenceObjectByHandle(Token, TOKEN_ASSIGN_PRIMARY, - SepTokenObjectType, + SeTokenObjectType, ExGetPreviousMode(), &NewToken, NULL); @@ -231,7 +231,7 @@ /* Reference it */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_ASSIGN_PRIMARY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&NewToken, NULL); @@ -380,7 +380,7 @@ HandleAttributes, NULL, DesiredAccess, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, &hToken); ObDereferenceObject(Token); @@ -494,7 +494,7 @@ /* Get the token object */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_IMPERSONATE, - SepTokenObjectType, + SeTokenObjectType, KeGetPreviousMode(), (PVOID*)&Token, NULL); Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=563… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -531,7 +531,7 @@ not doing an anonymous impersonation */ Status = ObReferenceObjectByHandle(ClientToken, TOKEN_QUERY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, NULL); Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=56… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -947,7 +947,7 @@ /* Reference the token */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_QUERY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, NULL); Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=56… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Sat Apr 21 06:35:45 2012 @@ -19,7 +19,7 @@ /* GLOBALS ********************************************************************/ -POBJECT_TYPE SepTokenObjectType = NULL; +POBJECT_TYPE SeTokenObjectType = NULL; ERESOURCE SepTokenLock; TOKEN_SOURCE SeSystemTokenSource = {"*SYSTEM*", {0}}; @@ -240,7 +240,7 @@ PAGED_CODE(); Status = ObCreateObject(PreviousMode, - SepTokenObjectType, + SeTokenObjectType, ObjectAttributes, PreviousMode, NULL, @@ -494,7 +494,7 @@ ObjectTypeInitializer.ValidAccessMask = TOKEN_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = SepDeleteToken; - ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &SepTokenObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &SeTokenObjectType); } VOID @@ -588,7 +588,7 @@ return Status; Status = ObCreateObject(PreviousMode, - SepTokenObjectType, + SeTokenObjectType, ObjectAttributes, PreviousMode, NULL, @@ -1035,7 +1035,7 @@ Status = ObReferenceObjectByHandle(TokenHandle, (TokenInformationClass == TokenSource) ? TOKEN_QUERY_SOURCE : TOKEN_QUERY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, NULL); @@ -1602,7 +1602,7 @@ Status = ObReferenceObjectByHandle(TokenHandle, NeededAccess, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, NULL); @@ -1845,7 +1845,7 @@ Status = ObReferenceObjectByHandle(ExistingTokenHandle, TOKEN_DUPLICATE, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, &HandleInformation); @@ -2047,7 +2047,7 @@ /* Reference the token */ Status = ObReferenceObjectByHandle(TokenHandle, TOKEN_ADJUST_PRIVILEGES | (PreviousState != NULL ? TOKEN_QUERY : 0), - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&Token, NULL); @@ -2474,7 +2474,7 @@ else { Status = ObOpenObjectByPointer(Token, HandleAttributes, - NULL, DesiredAccess, SepTokenObjectType, + NULL, DesiredAccess, SeTokenObjectType, PreviousMode, &hToken); } @@ -2561,7 +2561,7 @@ Status = ObReferenceObjectByHandle(FirstTokenHandle, TOKEN_QUERY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&FirstToken, NULL); @@ -2570,7 +2570,7 @@ Status = ObReferenceObjectByHandle(SecondTokenHandle, TOKEN_QUERY, - SepTokenObjectType, + SeTokenObjectType, PreviousMode, (PVOID*)&SecondToken, NULL);

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