Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[weiden] 17991: some Nt vs. Zw fixes; these functions shouldn't be used in ntoskrnl but since they're shared there's a chance they could be used

by weiden＠svn.reactos.com

some Nt vs. Zw fixes; these functions shouldn't be used in ntoskrnl but since they're shared there's a chance they could be used Modified: trunk/reactos/lib/rtl/time.c _____ Modified: trunk/reactos/lib/rtl/time.c --- trunk/reactos/lib/rtl/time.c 2005-09-22 23:23:00 UTC (rev 17990) +++ trunk/reactos/lib/rtl/time.c 2005-09-22 23:46:20 UTC (rev 17991) @@ -401,7 +401,7 @@ SYSTEM_TIMEOFDAY_INFORMATION TimeInformation; NTSTATUS Status; - Status = NtQuerySystemInformation(SystemTimeOfDayInformation, + Status = ZwQuerySystemInformation(SystemTimeOfDayInformation, &TimeInformation, sizeof(SYSTEM_TIMEOFDAY_INFORMATION), NULL); @@ -426,7 +426,7 @@ SYSTEM_TIMEOFDAY_INFORMATION TimeInformation; NTSTATUS Status; - Status = NtQuerySystemInformation(SystemTimeOfDayInformation, + Status = ZwQuerySystemInformation(SystemTimeOfDayInformation, &TimeInformation, sizeof(SYSTEM_TIMEOFDAY_INFORMATION), NULL);

18 years, 12 months

[weiden] 17990: some Nt vs. Zw fixes

by weiden＠svn.reactos.com

some Nt vs. Zw fixes Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/lib/rtl/security.c _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-09-22 21:09:06 UTC (rev 17989) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-09-22 23:23:00 UTC (rev 17990) @@ -1090,8 +1090,20 @@ OUT PHANDLE NewTokenHandle ); +NTSYSCALLAPI NTSTATUS NTAPI +ZwDuplicateToken( + IN HANDLE ExistingTokenHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN BOOLEAN EffectiveOnly, + IN TOKEN_TYPE TokenType, + OUT PHANDLE NewTokenHandle +); + +NTSTATUS +NTAPI NtEnumerateBootEntries( IN ULONG Unknown1, IN ULONG Unknown2 _____ Modified: trunk/reactos/lib/rtl/security.c --- trunk/reactos/lib/rtl/security.c 2005-09-22 21:09:06 UTC (rev 17989) +++ trunk/reactos/lib/rtl/security.c 2005-09-22 23:23:00 UTC (rev 17990) @@ -29,7 +29,7 @@ PAGED_CODE_RTL(); - Status = NtOpenProcessToken(NtCurrentProcess(), + Status = ZwOpenProcessToken(NtCurrentProcess(), TOKEN_DUPLICATE, &ProcessToken); if (!NT_SUCCESS(Status)) @@ -53,7 +53,7 @@ ObjAttr.SecurityQualityOfService = &Sqos; - Status = NtDuplicateToken(ProcessToken, + Status = ZwDuplicateToken(ProcessToken, TOKEN_IMPERSONATE, &ObjAttr, Sqos.EffectiveOnly, /* why both here _and_ in Sqos? */ @@ -66,7 +66,7 @@ return(Status); } - Status = NtSetInformationThread(NtCurrentThread(), + Status = ZwSetInformationThread(NtCurrentThread(), ThreadImpersonationToken, &ImpersonationToken, sizeof(HANDLE)); @@ -75,8 +75,8 @@ DPRINT1("NtSetInformationThread() failed (Status %lx)\n", Status); } - NtClose(ImpersonationToken); - NtClose(ProcessToken); + ZwClose(ImpersonationToken); + ZwClose(ProcessToken); return(Status); } @@ -103,14 +103,14 @@ if (CurrentThread) { - Status = NtOpenThreadToken (NtCurrentThread (), + Status = ZwOpenThreadToken (NtCurrentThread (), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, FALSE, &TokenHandle); } else { - Status = NtOpenProcessToken (NtCurrentProcess (), + Status = ZwOpenProcessToken (NtCurrentProcess (), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &TokenHandle); } @@ -128,13 +128,13 @@ NewState.Privileges[0].Luid.HighPart = 0; NewState.Privileges[0].Attributes = (Enable) ? SE_PRIVILEGE_ENABLED : 0; - Status = NtAdjustPrivilegesToken (TokenHandle, + Status = ZwAdjustPrivilegesToken (TokenHandle, FALSE, &NewState, sizeof(TOKEN_PRIVILEGES), &OldState, &ReturnLength); - NtClose (TokenHandle); + ZwClose (TokenHandle); if (Status == STATUS_NOT_ALL_ASSIGNED) { DPRINT1 ("Failed to assign all privileges\n");

18 years, 12 months

[weiden] 17989: fixed gcc4 warning

by weiden＠svn.reactos.com

fixed gcc4 warning Modified: trunk/reactos/lib/shell32/ros-systray.c _____ Modified: trunk/reactos/lib/shell32/ros-systray.c --- trunk/reactos/lib/shell32/ros-systray.c 2005-09-22 20:54:20 UTC (rev 17988) +++ trunk/reactos/lib/shell32/ros-systray.c 2005-09-22 21:09:06 UTC (rev 17989) @@ -54,7 +54,7 @@ data.cbData = len; data.lpData = pnotify_data; - for(hwnd=0; hwnd=FindWindowExW(0, hwnd, L"Shell_TrayWnd", NULL); ) + for(hwnd=0; (hwnd=FindWindowExW(0, hwnd, L"Shell_TrayWnd", NULL)); ) if ((unicode?SendMessageW:SendMessageA)(hwnd, WM_COPYDATA, (WPARAM)nid_hwnd, (LPARAM)&data)) ret = TRUE;

18 years, 12 months

[gvg] 17988: Bletch <npwoods@mess.org>:

by gvg＠svn.reactos.com

Bletch <npwoods(a)mess.org>: - Implements key and value renaming - Implements key deleting - Implements New Key/String/Binary/DWORD option Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/listview.c Modified: trunk/reactos/subsys/system/regedit/main.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/regproc.h Modified: trunk/reactos/subsys/system/regedit/resource.h Modified: trunk/reactos/subsys/system/regedit/security.c Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-09-22 20:54:20 UTC (rev 17988) @@ -277,6 +277,9 @@ IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" IDS_TOO_BIG_VALUE "Value is too big (%ld)" IDS_MULTI_SZ_EMPTY_STRING "Data of type REG_MULTI_SZ cannot contain empty strings.\nThe empty strings have been removed from the list." + IDS_QUERY_DELETE_KEY_ONE "Are you sure you want to delete this key?" + IDS_QUERY_DELETE_KEY_MORE "Are you sure you want to delete these keys?" + IDS_QUERY_DELETE_KEY_CONFIRM "Confirm Key Delete" IDS_QUERY_DELETE_ONE "Are you sure you want to delete this value?" IDS_QUERY_DELETE_MORE "Are you sure you want to delete these values?" IDS_QUERY_DELETE_CONFIRM "Confirm Value Delete" @@ -284,6 +287,8 @@ IDS_ERR_DELETEVALUE "Unable to delete all specified values!" IDS_ERR_RENVAL_CAPTION "Error Renaming Value" IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." + IDS_NEW_KEY "New Key #%d" + IDS_NEW_VALUE "New Value #%d" END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-09-22 20:54:20 UTC (rev 17988) @@ -25,6 +25,7 @@ #include <stdio.h> #include "main.h" +#include "regproc.h" ChildWnd* g_pChildWnd; HBITMAP SizingPattern = 0; @@ -102,6 +103,12 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { ChildWnd* pChildWnd = g_pChildWnd; + HTREEITEM hSelection; + HKEY hRootKey; + LPCTSTR keyPath; + TCHAR szConfirmTitle[256]; + TCHAR szConfirmText[256]; + switch (LOWORD(wParam)) { /* Parse the menu selections: */ case ID_REGISTRY_EXIT: @@ -120,6 +127,27 @@ SetFocus(pChildWnd->hTreeWnd); TreeView_EditLabel(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd)); break; + case ID_TREE_DELETE: + hSelection = TreeView_GetSelection(pChildWnd->hTreeWnd); + keyPath = GetItemPath(pChildWnd->hTreeWnd, hSelection, &hRootKey); + + LoadString(hInst, IDS_QUERY_DELETE_KEY_CONFIRM, szConfirmTitle, sizeof(szConfirmTitle) / sizeof(szConfirmTitle[0])); + LoadString(hInst, IDS_QUERY_DELETE_KEY_ONE, szConfirmText, sizeof(szConfirmText) / sizeof(szConfirmText[0])); + + if (MessageBox(pChildWnd->hWnd, szConfirmText, szConfirmTitle, MB_YESNO) == IDYES) + { + if (RegDeleteKeyRecursive(hRootKey, keyPath) == ERROR_SUCCESS) + TreeView_DeleteItem(pChildWnd->hTreeWnd, hSelection); + } + break; + case ID_EDIT_NEW_KEY: + CreateNewKey(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd)); + break; + case ID_EDIT_NEW_STRINGVALUE: + case ID_EDIT_NEW_BINARYVALUE: + case ID_EDIT_NEW_DWORDVALUE: + SendMessage(hFrameWnd, WM_COMMAND, wParam, lParam); + break; case ID_SWITCH_PANELS: pChildWnd->nFocusPanel = !pChildWnd->nFocusPanel; SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd); @@ -208,7 +236,7 @@ POINTS pt; pt = MAKEPOINTS(lParam); GetClientRect(hWnd, &rt); - pt.x = min(max(pt.x, SPLIT_MIN), rt.right - SPLIT_MIN); + pt.x = (SHORT) min(max(pt.x, SPLIT_MIN), rt.right - SPLIT_MIN); draw_splitbar(hWnd, last_split); last_split = -1; pChildWnd->nSplitPos = pt.x; @@ -253,7 +281,7 @@ pt = MAKEPOINTS(lParam); GetClientRect(hWnd, &rt); - pt.x = min(max(pt.x, SPLIT_MIN), rt.right - SPLIT_MIN); + pt.x = (SHORT) min(max(pt.x, SPLIT_MIN), rt.right - SPLIT_MIN); if(last_split != pt.x) { rt.left = last_split-SPLIT_WIDTH/2; @@ -308,11 +336,19 @@ break; case TVN_ENDLABELEDIT: { - TCHAR msg[32]; - _stprintf(msg, _T("rename to %s"), ((NMTVDISPINFO *) lParam)->item.pszText); - MessageBox(pChildWnd->hTreeWnd, msg, NULL, MB_OK); + LPCTSTR keyPath; + HKEY hRootKey; + LPNMTVDISPINFO ptvdi; + LONG lResult; + + ptvdi = (LPNMTVDISPINFO) lParam; + if (ptvdi->item.pszText) + { + keyPath = GetItemPath(pChildWnd->hTreeWnd, ptvdi->item.hItem, &hRootKey); + lResult = RegRenameKey(hRootKey, keyPath, ptvdi->item.pszText); + return lResult == ERROR_SUCCESS; + } } - break; default: return 0; } @@ -329,6 +365,7 @@ { goto def; } + return Result; break; } } _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-09-22 20:54:20 UTC (rev 17988) @@ -466,6 +466,69 @@ return TRUE; } +static BOOL CreateNewValue(HKEY hRootKey, LPCTSTR pszKeyPath, DWORD dwType) +{ + TCHAR szNewValueFormat[128]; + TCHAR szNewValue[128]; + int iIndex = 1; + BYTE data[128]; + DWORD dwExistingType, cbData; + LONG lResult; + HKEY hKey; + LVFINDINFO lvfi; + + if (RegOpenKey(hRootKey, pszKeyPath, &hKey) != ERROR_SUCCESS) + return FALSE; + + LoadString(hInst, IDS_NEW_VALUE, szNewValueFormat, sizeof(szNewValueFormat) + / sizeof(szNewValueFormat[0])); + + do + { + _sntprintf(szNewValue, sizeof(szNewValue) / sizeof(szNewValue[0]), + szNewValueFormat, iIndex++); + + cbData = sizeof(data); + lResult = RegQueryValueEx(hKey, szNewValue, NULL, &dwExistingType, data, &cbData); + } + while(lResult == ERROR_SUCCESS); + + switch(dwType) { + case REG_DWORD: + cbData = sizeof(DWORD); + break; + case REG_SZ: + case REG_EXPAND_SZ: + cbData = sizeof(TCHAR); + break; + case REG_MULTI_SZ: + cbData = sizeof(TCHAR) * 2; + break; + case REG_QWORD: + cbData = sizeof(DWORD) * 2; + break; + default: + cbData = 0; + break; + } + memset(data, 0, cbData); + lResult = RegSetValueEx(hKey, szNewValue, 0, dwType, data, cbData); + if (lResult != ERROR_SUCCESS) + return FALSE; + + RefreshListView(g_pChildWnd->hListWnd, hRootKey, pszKeyPath); + + /* locate the newly added value, and get ready to rename it */ + memset(&lvfi, 0, sizeof(lvfi)); + lvfi.flags = LVFI_STRING; + lvfi.psz = szNewValue; + iIndex = ListView_FindItem(g_pChildWnd->hListWnd, -1, &lvfi); + if (iIndex >= 0) + ListView_EditLabel(g_pChildWnd->hListWnd, iIndex); + + return TRUE; +} + /*********************************************************************** ******** * * FUNCTION: _CmdWndProc(HWND, unsigned, WORD, LONG) @@ -593,6 +656,15 @@ } } break; + case ID_EDIT_NEW_STRINGVALUE: + CreateNewValue(hKeyRoot, keyPath, REG_SZ); + break; + case ID_EDIT_NEW_BINARYVALUE: + CreateNewValue(hKeyRoot, keyPath, REG_BINARY); + break; + case ID_EDIT_NEW_DWORDVALUE: + CreateNewValue(hKeyRoot, keyPath, REG_DWORD); + break; } case ID_EDIT_COPYKEYNAME: CopyKeyName(hWnd, _T("")); @@ -622,6 +694,9 @@ /*case ID_OPTIONS_TOOLBAR:*/ /* toggle_child(hWnd, LOWORD(wParam), hToolBar);*/ /* break;*/ + case ID_EDIT_NEW_KEY: + CreateNewKey(g_pChildWnd->hTreeWnd, TreeView_GetSelection(g_pChildWnd->hTreeWnd)); + break; default: result = FALSE; } _____ Modified: trunk/reactos/subsys/system/regedit/listview.c --- trunk/reactos/subsys/system/regedit/listview.c 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/listview.c 2005-09-22 20:54:20 UTC (rev 17988) @@ -27,6 +27,7 @@ #include <stdio.h> #include "main.h" +#include "regproc.h" #define CX_ICON 16 #define CY_ICON 16 @@ -442,11 +443,19 @@ if(_tcslen(Info->item.pszText) == 0) { LoadString(hInst, IDS_ERR_RENVAL_TOEMPTY, msg, sizeof(msg)/sizeof(TCHAR)); + MessageBox(0, msg, NULL, 0); + *Result = TRUE; } else - _stprintf(msg, _T("rename from %s to %s"), lineinfo->name, Info->item.pszText); - MessageBox(0, msg, NULL, 0); - *Result = TRUE; + { + HKEY hKeyRoot; + LPCTSTR keyPath; + LONG lResult; + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); + lResult = RegRenameValue(hKeyRoot, keyPath, Info->item.pszText, lineinfo->name); + *Result = TRUE; + return (lResult == ERROR_SUCCESS); + } } } } _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/main.c 2005-09-22 20:54:20 UTC (rev 17988) @@ -28,6 +28,8 @@ #include <process.h> #include <stdio.h> #include <fcntl.h> +#include <aclui.h> +#include <cguid.h> #include "main.h" #include "hexedit.h" _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/main.h 2005-09-22 20:54:20 UTC (rev 17988) @@ -99,6 +99,7 @@ extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id); extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); extern LPCTSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey); +extern BOOL CreateNewKey(HWND hwndTV, HTREEITEM hItem); /* edit.c */ extern BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCTSTR valueName, BOOL EditBin); _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-09-22 20:54:20 UTC (rev 17988) @@ -27,6 +27,8 @@ #include <winnt.h> #include <winreg.h> #include <assert.h> +#include <tchar.h> +#include <malloc.h> #include "regproc.h" #define REG_VAL_BUF_SIZE 4096 @@ -1501,3 +1503,166 @@ { return app_name; } + +LONG RegDeleteKeyRecursive(HKEY hKey, LPCTSTR lpSubKey) +{ + LONG lResult; + HKEY hSubKey = NULL; + DWORD dwIndex, cbName; + TCHAR szSubKey[256]; + FILETIME ft; + + lResult = RegOpenKeyEx(hKey, lpSubKey, 0, KEY_ALL_ACCESS, &hSubKey); + if (lResult == ERROR_SUCCESS) + { + dwIndex = 0; + do + { + cbName = sizeof(szSubKey) / sizeof(szSubKey[0]); + lResult = RegEnumKeyEx(hSubKey, dwIndex++, szSubKey, &cbName, NULL, NULL, NULL, &ft); + if (lResult == ERROR_SUCCESS) + RegDeleteKeyRecursive(hSubKey, szSubKey); + } + while(lResult == ERROR_SUCCESS); + + RegCloseKey(hSubKey); + } + + return RegDeleteKey(hKey, lpSubKey); +} + +LONG RegCopyKey(HKEY hDestKey, LPCTSTR lpDestSubKey, HKEY hSrcKey, LPCTSTR lpSrcSubKey) +{ + LONG lResult; + DWORD dwDisposition; + HKEY hDestSubKey = NULL; + HKEY hSrcSubKey = NULL; + DWORD dwIndex, dwType, cbName, cbData; + TCHAR szSubKey[256]; + TCHAR szValueName[256]; + BYTE szValueData[512]; + + FILETIME ft; + + /* open the source subkey, if specified */ + if (lpSrcSubKey) + { + lResult = RegOpenKeyEx(hSrcKey, lpSrcSubKey, 0, KEY_ALL_ACCESS, &hSrcSubKey); + if (lResult) + goto done; + hSrcKey = hSrcSubKey; + } + + /* create the destination subkey */ + lResult = RegCreateKeyEx(hDestKey, lpDestSubKey, 0, NULL, 0, KEY_WRITE, NULL, + &hDestSubKey, &dwDisposition); + if (lResult) + goto done; + + /* copy all subkeys */ + dwIndex = 0; + do + { + cbName = sizeof(szSubKey) / sizeof(szSubKey[0]); + lResult = RegEnumKeyEx(hSrcKey, dwIndex++, szSubKey, &cbName, NULL, NULL, NULL, &ft); + if (lResult == ERROR_SUCCESS) + { + lResult = RegCopyKey(hDestSubKey, szSubKey, hSrcKey, szSubKey); + if (lResult) + goto done; + } + } + while(lResult == ERROR_SUCCESS); + + /* copy all subvalues */ + dwIndex = 0; + do + { + cbName = sizeof(szValueName) / sizeof(szValueName[0]); + cbData = sizeof(szValueData) / sizeof(szValueData[0]); + lResult = RegEnumValue(hSrcKey, dwIndex++, szValueName, &cbName, NULL, &dwType, szValueData, &cbData); + if (lResult == ERROR_SUCCESS) + { + lResult = RegSetValueEx(hDestSubKey, szValueName, 0, dwType, szValueData, cbData); + if (lResult) + goto done; + } + } + while(lResult == ERROR_SUCCESS); + + lResult = ERROR_SUCCESS; + +done: + if (hSrcSubKey) + RegCloseKey(hSrcSubKey); + if (hDestSubKey) + RegCloseKey(hDestSubKey); + if (lResult != ERROR_SUCCESS) + RegDeleteKeyRecursive(hDestKey, lpDestSubKey); + return lResult; + +} + +LONG RegMoveKey(HKEY hDestKey, LPCTSTR lpDestSubKey, HKEY hSrcKey, LPCTSTR lpSrcSubKey) +{ + LONG lResult; + + if (!lpSrcSubKey) + return ERROR_INVALID_FUNCTION; + + lResult = RegCopyKey(hDestKey, lpDestSubKey, hSrcKey, lpSrcSubKey); + if (lResult == ERROR_SUCCESS) + RegDeleteKeyRecursive(hSrcKey, lpSrcSubKey); + + return lResult; +} + +LONG RegRenameKey(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpNewName) +{ + LPCTSTR s; + LPTSTR lpNewSubKey; + + s = _tcsrchr(lpSubKey, '\\'); + if (s) + { + s++; + lpNewSubKey = (LPTSTR) alloca((s - lpSubKey + _tcslen(lpNewName) + 1) * sizeof(TCHAR)); + memcpy(lpNewSubKey, lpSubKey, (s - lpSubKey) * sizeof(TCHAR)); + _tcscpy(lpNewSubKey + (s - lpSubKey), lpNewName); + lpNewName = lpNewSubKey; + } + return RegMoveKey(hKey, lpNewName, hKey, lpSubKey); +} + +LONG RegRenameValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpDestValue, LPCTSTR lpSrcValue) +{ + LONG lResult; + HKEY hSubKey = NULL; + DWORD dwType, cbData; + BYTE data[512]; + + if (lpSubKey) + { + lResult = RegOpenKey(hKey, lpSubKey, &hSubKey); + if (lResult != ERROR_SUCCESS) + goto done; + hKey = hSubKey; + } + + cbData = sizeof(data); + lResult = RegQueryValueEx(hKey, lpSrcValue, NULL, &dwType, data, &cbData); + if (lResult != ERROR_SUCCESS) + goto done; + + lResult = RegSetValueEx(hKey, lpDestValue, 0, dwType, data, cbData); + if (lResult != ERROR_SUCCESS) + goto done; + + RegDeleteValue(hKey, lpSrcValue); + +done: + if (hKey) + RegCloseKey(hKey); + return lResult; +} + _____ Modified: trunk/reactos/subsys/system/regedit/regproc.h --- trunk/reactos/subsys/system/regedit/regproc.h 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/regproc.h 2005-09-22 20:54:20 UTC (rev 17988) @@ -82,4 +82,13 @@ VOID UnloadAclUiDll(VOID); BOOL RegKeyEditPermissions(HWND hWndOwner, HKEY hKey, LPCTSTR lpMachine, LPCTSTR lpKeyName); +/* + * Processing + */ +LONG RegDeleteKeyRecursive(HKEY hKey, LPCTSTR lpSubKey); +LONG RegCopyKey(HKEY hDestKey, LPCTSTR lpDestSubKey, HKEY hSrcKey, LPCTSTR lpSrcSubKey); +LONG RegMoveKey(HKEY hDestKey, LPCTSTR lpDestSubKey, HKEY hSrcKey, LPCTSTR lpSrcSubKey); +LONG RegRenameKey(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpNewName); +LONG RegRenameValue(HKEY hKey, LPCTSTR lpSubKey, LPCTSTR lpDestValue, LPCTSTR lpSrcValue); + /* EOF */ _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-09-22 20:54:20 UTC (rev 17988) @@ -130,6 +130,9 @@ #define ID_EDIT_PERMISSIONS 32872 #define ID_TREE_DELETE 32873 #define ID_TREE_RENAME 32874 +#define IDS_QUERY_DELETE_KEY_ONE 32875 +#define IDS_QUERY_DELETE_KEY_MORE 32876 +#define IDS_QUERY_DELETE_KEY_CONFIRM 32877 #define IDS_FLT_REGFILES 31001 #define IDS_FLT_REGFILES_FLT 31002 @@ -156,6 +159,8 @@ #define IDS_INHERIT_SUBKEYSONLY 31123 #define IDS_EXPAND 31124 #define IDS_COLLAPSE 31125 +#define IDS_NEW_KEY 31126 +#define IDS_NEW_VALUE 31127 #define IDD_EDIT_STRING 2000 _____ Modified: trunk/reactos/subsys/system/regedit/security.c --- trunk/reactos/subsys/system/regedit/security.c 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/security.c 2005-09-22 20:54:20 UTC (rev 17988) @@ -28,6 +28,8 @@ #include <objbase.h> #include <basetyps.h> #include <unknwn.h> +#include <aclui.h> +#include <cguid.h> #include "security.h" #include "regproc.h" #include "resource.h" _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-09-22 20:44:10 UTC (rev 17987) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-09-22 20:54:20 UTC (rev 17988) @@ -260,6 +260,55 @@ } +BOOL CreateNewKey(HWND hwndTV, HTREEITEM hItem) +{ + TCHAR szNewKeyFormat[128]; + TCHAR szNewKey[128]; + LPCTSTR pszKeyPath; + int iIndex = 1; + HKEY hRootKey; + HKEY hKey = NULL; + HKEY hNewKey = NULL; + BOOL bSuccess = FALSE; + LONG lResult; + DWORD dwDisposition; + HTREEITEM hNewItem; + + pszKeyPath = GetItemPath(g_pChildWnd->hTreeWnd, hItem, &hRootKey); + if (RegOpenKey(hRootKey, pszKeyPath, &hKey) != ERROR_SUCCESS) + goto done; + + if (LoadString(hInst, IDS_NEW_KEY, szNewKeyFormat, sizeof(szNewKeyFormat) / sizeof(szNewKeyFormat[0])) <= 0) + goto done; + + do + { + _sntprintf(szNewKey, sizeof(szNewKey) / sizeof(szNewKey[0]), szNewKeyFormat, iIndex++); + lResult = RegCreateKeyEx(hKey, szNewKey, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hNewKey, &dwDisposition); + if (hNewKey && (dwDisposition == REG_OPENED_EXISTING_KEY)) + { + RegCloseKey(hNewKey); + hNewKey = NULL; + } + } + while(!hNewKey); + + hNewItem = AddEntryToTree(hwndTV, hItem, szNewKey, NULL, 0, NULL); + if (!hNewItem) + goto done; + TreeView_EditLabel(hwndTV, hNewItem); + + bSuccess = TRUE; + +done: + if (hKey) + RegCloseKey(hKey); + if (hNewKey) + RegCloseKey(hNewKey); + return bSuccess; +} + + /* * CreateTreeView - creates a tree view control. * Returns the handle to the new control if successful, or NULL otherwise.

18 years, 12 months

[weiden] 17987: fixed uninitialized variable warning

by weiden＠svn.reactos.com

fixed uninitialized variable warning Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-09-22 20:36:07 UTC (rev 17986) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-09-22 20:44:10 UTC (rev 17987) @@ -854,7 +854,7 @@ char separators[] = " "; char *token; - char *prevtoken; + char *prevtoken = NULL; token = strtok ( buffer, separators ); while ( token != NULL )

18 years, 12 months

[navaraf] 17986: Handle some failure cases in better way.

by navaraf＠svn.reactos.com

Handle some failure cases in better way. Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c _____ Modified: trunk/reactos/lib/iphlpapi/ifenum_reactos.c --- trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-09-22 20:24:50 UTC (rev 17985) +++ trunk/reactos/lib/iphlpapi/ifenum_reactos.c 2005-09-22 20:36:07 UTC (rev 17986) @@ -304,13 +304,14 @@ static BOOL isLoopback( HANDLE tcpFile, TDIEntityID *loop_maybe ) { IFEntrySafelySized entryInfo; + NTSTATUS status; - tdiGetMibForIfEntity( tcpFile, - loop_maybe, - &entryInfo ); + status = tdiGetMibForIfEntity( tcpFile, + loop_maybe, + &entryInfo ); - return !entryInfo.ent.if_type || - entryInfo.ent.if_type == IFENT_SOFTWARE_LOOPBACK; + return NT_SUCCESS(status) && (!entryInfo.ent.if_type || + entryInfo.ent.if_type == IFENT_SOFTWARE_LOOPBACK); } NTSTATUS tdiGetEntityType( HANDLE tcpFile, TDIEntityID *ent, PULONG type ) { @@ -388,12 +389,18 @@ } } } - } - *infoSet = infoSetInt; - *numInterfaces = curInterf; + if (NT_SUCCESS(status)) { + *infoSet = infoSetInt; + *numInterfaces = curInterf; + } else { + HeapFree(GetProcessHeap(), 0, infoSetInt); + } - return STATUS_SUCCESS; + return status; + } else { + return STATUS_INSUFFICIENT_RESOURCES; + } } static DWORD getNumInterfacesInt(BOOL onlyNonLoopback)

18 years, 12 months

[gvg] 17985: Return atom length when requested. Fixes bug 793.

by gvg＠svn.reactos.com

Return atom length when requested. Fixes bug 793. Modified: trunk/reactos/lib/rtl/atom.c Modified: trunk/reactos/subsys/win32k/ntuser/class.c _____ Modified: trunk/reactos/lib/rtl/atom.c --- trunk/reactos/lib/rtl/atom.c 2005-09-22 20:17:55 UTC (rev 17984) +++ trunk/reactos/lib/rtl/atom.c 2005-09-22 20:24:50 UTC (rev 17985) @@ -610,6 +610,10 @@ *NameLength = Length; } } + else if (NameLength != NULL) + { + *NameLength = (Entry->NameLength + 1) * sizeof(WCHAR); + } return Status; } @@ -651,6 +655,10 @@ *NameLength = Length; } } + else if (NameLength != NULL) + { + *NameLength = (Entry->NameLength + 1) * sizeof(WCHAR); + } } else { _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-22 20:17:55 UTC (rev 17984) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-09-22 20:24:50 UTC (rev 17985) @@ -208,7 +208,7 @@ Length = 0; Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable, WindowObject->Class->Atom, NULL, NULL, NULL, &Length); - Name = ExAllocatePoolWithTag(PagedPool, Length + sizeof(UNICODE_NULL), TAG_STRING); + Name = ExAllocatePoolWithTag(PagedPool, Length, TAG_STRING); Status = RtlQueryAtomInAtomTable(WinStaObject->AtomTable, WindowObject->Class->Atom, NULL, NULL, Name, &Length); if (!NT_SUCCESS(Status))

18 years, 12 months

[navaraf] 17984: InfoTdiQueryInformationEx should return failure if no entity was found.

by navaraf＠svn.reactos.com

InfoTdiQueryInformationEx should return failure if no entity was found. Modified: trunk/reactos/drivers/net/tcpip/tcpip/info.c _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/info.c --- trunk/reactos/drivers/net/tcpip/tcpip/info.c 2005-09-22 19:46:36 UTC (rev 17983) +++ trunk/reactos/drivers/net/tcpip/tcpip/info.c 2005-09-22 20:17:55 UTC (rev 17984) @@ -136,7 +136,7 @@ KIRQL OldIrql; UINT i; PVOID context = NULL; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = TDI_INVALID_PARAMETER; BOOL FoundEntity = FALSE; InfoRequest_f InfoRequest = NULL;

18 years, 12 months

[weiden] 17983: minor string initialization optimizations

by weiden＠svn.reactos.com

minor string initialization optimizations Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-09-22 14:30:29 UTC (rev 17982) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-09-22 19:46:36 UTC (rev 17983) @@ -405,20 +405,15 @@ IN LPCSTR lpSubKey OPTIONAL, IN HKEY hKeyDest) { - UNICODE_STRING SubKeyName; + UNICODE_STRING SubKeyName = {0}; LONG Ret; - if (lpSubKey != NULL) + if (lpSubKey != NULL && + !RtlCreateUnicodeStringFromAsciiz(&SubKeyName, + (LPSTR)lpSubKey)) { - if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyName, - (LPSTR)lpSubKey)) - { - return ERROR_NOT_ENOUGH_MEMORY; - } + return ERROR_NOT_ENOUGH_MEMORY; } - else - RtlInitUnicodeString(&SubKeyName, - NULL); Ret = RegCopyTreeW(hKeySrc, SubKeyName.Buffer, @@ -440,20 +435,15 @@ IN HKEY hKey, OUT PHKEY phkResult) { - UNICODE_STRING MachineName; + UNICODE_STRING MachineName = {0}; LONG Ret; - if (lpMachineName != NULL) + if (lpMachineName != NULL && + !RtlCreateUnicodeStringFromAsciiz(&MachineName, + (LPSTR)lpMachineName)) { - if (!RtlCreateUnicodeStringFromAsciiz(&MachineName, - (LPSTR)lpMachineName)) - { - return ERROR_NOT_ENOUGH_MEMORY; - } + return ERROR_NOT_ENOUGH_MEMORY; } - else - RtlInitUnicodeString(&MachineName, - NULL); Ret = RegConnectRegistryW(MachineName.Buffer, hKey, @@ -951,33 +941,23 @@ IN LPCSTR lpSubKey OPTIONAL, IN LPCSTR lpValueName OPTIONAL) { - UNICODE_STRING SubKey, ValueName; + UNICODE_STRING SubKey = {0}, ValueName = {0}; LONG Ret; - if (lpSubKey != NULL) + if (lpSubKey != NULL && + !RtlCreateUnicodeStringFromAsciiz(&SubKey, + (LPSTR)lpSubKey)) { - if (!RtlCreateUnicodeStringFromAsciiz(&SubKey, - (LPSTR)lpSubKey)) - { - return ERROR_NOT_ENOUGH_MEMORY; - } + return ERROR_NOT_ENOUGH_MEMORY; } - else - RtlInitUnicodeString(&SubKey, - NULL); - if (lpValueName != NULL) + if (lpValueName != NULL && + !RtlCreateUnicodeStringFromAsciiz(&ValueName, + (LPSTR)lpValueName)) { - if (!RtlCreateUnicodeStringFromAsciiz(&ValueName, - (LPSTR)lpValueName)) - { - RtlFreeUnicodeString(&SubKey); - return ERROR_NOT_ENOUGH_MEMORY; - } + RtlFreeUnicodeString(&SubKey); + return ERROR_NOT_ENOUGH_MEMORY; } - else - RtlInitUnicodeString(&ValueName, - NULL); Ret = RegDeleteKeyValueW(hKey, SubKey.Buffer, @@ -1261,20 +1241,15 @@ RegDeleteTreeA(IN HKEY hKey, IN LPCSTR lpSubKey OPTIONAL) { - UNICODE_STRING SubKeyName; + UNICODE_STRING SubKeyName = {0}; LONG Ret; - if (lpSubKey != NULL) + if (lpSubKey != NULL && + !RtlCreateUnicodeStringFromAsciiz(&SubKeyName, + (LPSTR)lpSubKey)) { - if (!RtlCreateUnicodeStringFromAsciiz(&SubKeyName, - (LPSTR)lpSubKey)) - { - return ERROR_NOT_ENOUGH_MEMORY; - } + return ERROR_NOT_ENOUGH_MEMORY; } - else - RtlInitUnicodeString(&SubKeyName, - NULL); Ret = RegDeleteTreeW(hKey, SubKeyName.Buffer);

18 years, 12 months

[weiden] 17982: add selected principals to the list (doesn't modify the ACLs yet!)

by weiden＠svn.reactos.com

add selected principals to the list (doesn't modify the ACLs yet!) Modified: trunk/reactos/lib/aclui/aclui.c Modified: trunk/reactos/lib/aclui/aclui.xml Modified: trunk/reactos/lib/aclui/misc.c Modified: trunk/reactos/lib/aclui/precomp.h _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2005-09-22 11:20:52 UTC (rev 17981) +++ trunk/reactos/lib/aclui/aclui.c 2005-09-22 14:30:29 UTC (rev 17982) @@ -30,11 +30,6 @@ HINSTANCE hDllInstance; -static PCWSTR ObjectPickerAttributes[] = -{ - L"ObjectSid", -}; - static VOID DestroySecurityPage(IN PSECURITY_PAGE sp) { @@ -95,6 +90,225 @@ return NULL; } +static BOOL +AddPrincipalToList(IN PSECURITY_PAGE sp, + IN PSID Sid) +{ + if (!FindSidInPrincipalsList(sp->PrincipalsListHead, + Sid)) + { + DWORD SidLength, AccountNameSize, DomainNameSize; + SID_NAME_USE SidNameUse; + DWORD LookupResult; + PPRINCIPAL_LISTITEM AceListItem, *NextAcePtr; + + NextAcePtr = &sp->PrincipalsListHead; + for (AceListItem = sp->PrincipalsListHead; AceListItem != NULL; AceListItem = AceListItem->Next) + { + NextAcePtr = &AceListItem->Next; + } + + SidLength = GetLengthSid(Sid); + + AccountNameSize = 0; + DomainNameSize = 0; + + /* calculate the size of the buffer we need to calculate */ + LookupAccountSid(sp->ServerName, + Sid, + NULL, + &AccountNameSize, + NULL, + &DomainNameSize, + &SidNameUse); + + /* allocate the ace */ + AceListItem = HeapAlloc(GetProcessHeap(), + 0, + sizeof(PRINCIPAL_LISTITEM) + + SidLength + + ((AccountNameSize + DomainNameSize) * sizeof(WCHAR))); + if (AceListItem != NULL) + { + AceListItem->AccountName = (LPWSTR)((ULONG_PTR)(AceListItem + 1) + SidLength); + AceListItem->DomainName = AceListItem->AccountName + AccountNameSize; + + CopySid(SidLength, + (PSID)(AceListItem + 1), + Sid); + + LookupResult = ERROR_SUCCESS; + if (!LookupAccountSid(sp->ServerName, + Sid, + AceListItem->AccountName, + &AccountNameSize, + AceListItem->DomainName, + &DomainNameSize, + &SidNameUse)) + { + LookupResult = GetLastError(); + if (LookupResult != ERROR_NONE_MAPPED) + { + HeapFree(GetProcessHeap(), + 0, + AceListItem); + return FALSE; + } + } + + if (AccountNameSize == 0) + { + AceListItem->AccountName = NULL; + } + if (DomainNameSize == 0) + { + AceListItem->DomainName = NULL; + } + + AceListItem->Next = NULL; + if (LookupResult == ERROR_NONE_MAPPED) + { + if (!ConvertSidToStringSid(Sid, + &AceListItem->DisplayString)) + { + AceListItem->DisplayString = NULL; + } + } + else + { + LSA_HANDLE LsaHandle; + NTSTATUS Status; + + AceListItem->DisplayString = NULL; + + /* read the domain of the SID */ + if (OpenLSAPolicyHandle(sp->ServerName, + POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, + &LsaHandle)) + { + PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain; + PLSA_TRANSLATED_NAME Names; + PLSA_TRUST_INFORMATION Domain; + PLSA_UNICODE_STRING DomainName; + PPOLICY_ACCOUNT_DOMAIN_INFO PolicyAccountDomainInfo = NULL; + + Status = LsaLookupSids(LsaHandle, + 1, + &Sid, + &ReferencedDomain, + &Names); + if (NT_SUCCESS(Status)) + { + if (ReferencedDomain != NULL && + Names->DomainIndex >= 0) + { + Domain = &ReferencedDomain->Domains[Names->DomainIndex]; + DomainName = &Domain->Name; + } + else + { + Domain = NULL; + DomainName = NULL; + } + + AceListItem->SidNameUse = Names->Use; + + switch (Names->Use) + { + case SidTypeAlias: + if (Domain != NULL) + { + /* query the domain name for BUILTIN accounts */ + Status = LsaQueryInformationPolicy(LsaHandle, + PolicyAccountDomainInformation, + (PVOID*)&PolicyAccountDomainInfo); + if (NT_SUCCESS(Status)) + { + DomainName = &PolicyAccountDomainInfo->DomainName; + + /* make the user believe this is a group */ + AceListItem->SidNameUse = SidTypeGroup; + } + } + /* fall through */ + + case SidTypeUser: + { + if (Domain != NULL) + { + AceListItem->DisplayString = (LPWSTR)LocalAlloc(LMEM_FIXED, + (AccountNameSize * sizeof(WCHAR)) + + (DomainName->Length + sizeof(WCHAR)) + + (Names->Name.Length + sizeof(WCHAR)) + + (4 * sizeof(WCHAR))); + if (AceListItem->DisplayString != NULL) + { + WCHAR *s; + + /* NOTE: LSA_UNICODE_STRINGs are not always NULL-terminated! */ + + wcscpy(AceListItem->DisplayString, + AceListItem->AccountName); + wcscat(AceListItem->DisplayString, + L" ("); + s = AceListItem->DisplayString + wcslen(AceListItem->DisplayString); + CopyMemory(s, + DomainName->Buffer, + DomainName->Length); + s += DomainName->Length / sizeof(WCHAR); + *(s++) = L'\\'; + CopyMemory(s, + Names->Name.Buffer, + Names->Name.Length); + s += Names->Name.Length / sizeof(WCHAR); + *(s++) = L')'; + *s = L'\0'; + } + + /* mark the ace as a user unless it's a + BUILTIN account */ + if (PolicyAccountDomainInfo == NULL) + { + AceListItem->SidNameUse = SidTypeUser; + } + } + break; + } + + case SidTypeWellKnownGroup: + { + /* make the user believe this is a group */ + AceListItem->SidNameUse = SidTypeGroup; + break; + } + + default: + { + DPRINT("Unhandled SID type: 0x%x\n", Names->Use); + break; + } + } + + if (PolicyAccountDomainInfo != NULL) + { + LsaFreeMemory(PolicyAccountDomainInfo); + } + + LsaFreeMemory(ReferencedDomain); + LsaFreeMemory(Names); + } + LsaClose(LsaHandle); + } + } + + /* append item to the cached ACL */ + *NextAcePtr = AceListItem; + } + } + + return TRUE; +} + static VOID ReloadPrincipalsList(IN PSECURITY_PAGE sp) { @@ -118,16 +332,10 @@ &Dacl, &DaclDefaulted)) { - PPRINCIPAL_LISTITEM AceListItem, *NextAcePtr; PSID Sid; PVOID Ace; ULONG AceIndex; - DWORD AccountNameSize, DomainNameSize, SidLength; - SID_NAME_USE SidNameUse; - DWORD LookupResult; - NextAcePtr = &sp->PrincipalsListHead; - for (AceIndex = 0; AceIndex < Dacl->AceCount; AceIndex++) @@ -137,208 +345,9 @@ &Ace); Sid = (PSID)&((PACCESS_ALLOWED_ACE)Ace)->SidStart; - - if (!FindSidInPrincipalsList(sp->PrincipalsListHead, - Sid)) - { - SidLength = GetLengthSid(Sid); - - AccountNameSize = 0; - DomainNameSize = 0; - - /* calculate the size of the buffer we need to calculate */ - LookupAccountSid(sp->ServerName, - Sid, - NULL, - &AccountNameSize, - NULL, - &DomainNameSize, - &SidNameUse); - - /* allocate the ace */ - AceListItem = HeapAlloc(GetProcessHeap(), - 0, - sizeof(PRINCIPAL_LISTITEM) + - SidLength + - ((AccountNameSize + DomainNameSize) * sizeof(WCHAR))); - if (AceListItem != NULL) - { - AceListItem->AccountName = (LPWSTR)((ULONG_PTR)(AceListItem + 1) + SidLength); - AceListItem->DomainName = AceListItem->AccountName + AccountNameSize; - - CopySid(SidLength, - (PSID)(AceListItem + 1), - Sid); - - LookupResult = ERROR_SUCCESS; - if (!LookupAccountSid(sp->ServerName, - Sid, - AceListItem->AccountName, - &AccountNameSize, - AceListItem->DomainName, - &DomainNameSize, - &SidNameUse)) - { - LookupResult = GetLastError(); - if (LookupResult != ERROR_NONE_MAPPED) - { - HeapFree(GetProcessHeap(), - 0, - AceListItem); - continue; - } - } - - if (AccountNameSize == 0) - { - AceListItem->AccountName = NULL; - } - if (DomainNameSize == 0) - { - AceListItem->DomainName = NULL; - } - - AceListItem->Next = NULL; - if (LookupResult == ERROR_NONE_MAPPED) - { - if (!ConvertSidToStringSid(Sid, - &AceListItem->DisplayString)) - { - AceListItem->DisplayString = NULL; - } - } - else - { - LSA_HANDLE LsaHandle; - NTSTATUS Status; - - AceListItem->DisplayString = NULL; - - /* read the domain of the SID */ - if (OpenLSAPolicyHandle(sp->ServerName, - POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION, - &LsaHandle)) - { - PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain; - PLSA_TRANSLATED_NAME Names; - PLSA_TRUST_INFORMATION Domain; - PLSA_UNICODE_STRING DomainName; - PPOLICY_ACCOUNT_DOMAIN_INFO PolicyAccountDomainInfo = NULL; - - Status = LsaLookupSids(LsaHandle, - 1, - &Sid, - &ReferencedDomain, - &Names); - if (NT_SUCCESS(Status)) - { - if (ReferencedDomain != NULL && - Names->DomainIndex >= 0) - { - Domain = &ReferencedDomain->Domains[Names->DomainIndex]; - DomainName = &Domain->Name; - } - else - { - Domain = NULL; - DomainName = NULL; - } - - AceListItem->SidNameUse = Names->Use; - - switch (Names->Use) - { - case SidTypeAlias: - if (Domain != NULL) - { - /* query the domain name for BUILTIN accounts */ - Status = LsaQueryInformationPolicy(LsaHandle, - PolicyAccountDomainInformation, - (PVOID*)&PolicyAccountDomainInfo); - if (NT_SUCCESS(Status)) - { - DomainName = &PolicyAccountDomainInfo->DomainName; - - /* make the user believe this is a group */ - AceListItem->SidNameUse = SidTypeGroup; - } - } - /* fall through */ - - case SidTypeUser: - { - if (Domain != NULL) - { - AceListItem->DisplayString = (LPWSTR)LocalAlloc(LMEM_FIXED, - (AccountNameSize * sizeof(WCHAR)) + - (DomainName->Length + sizeof(WCHAR)) + - (Names->Name.Length + sizeof(WCHAR)) + - (4 * sizeof(WCHAR))); - if (AceListItem->DisplayString != NULL) - { - WCHAR *s; - - /* NOTE: LSA_UNICODE_STRINGs are not always NULL-terminated! */ - - wcscpy(AceListItem->DisplayString, - AceListItem->AccountName); - wcscat(AceListItem->DisplayString, - L" ("); - s = AceListItem->DisplayString + wcslen(AceListItem->DisplayString); - CopyMemory(s, - DomainName->Buffer, - DomainName->Length); - s += DomainName->Length / sizeof(WCHAR); - *(s++) = L'\\'; - CopyMemory(s, - Names->Name.Buffer, - Names->Name.Length); - s += Names->Name.Length / sizeof(WCHAR); - *(s++) = L')'; - *s = L'\0'; - } - - /* mark the ace as a user unless it's a - BUILTIN account */ - if (PolicyAccountDomainInfo == NULL) - { - AceListItem->SidNameUse = SidTypeUser; - } - } - break; - } - - case SidTypeWellKnownGroup: - { - /* make the user believe this is a group */ - AceListItem->SidNameUse = SidTypeGroup; - break; - } - - default: - { - DPRINT("Unhandled SID type: 0x%x\n", Names->Use); - break; - } - } - - if (PolicyAccountDomainInfo != NULL) - { - LsaFreeMemory(PolicyAccountDomainInfo); - } - - LsaFreeMemory(ReferencedDomain); - LsaFreeMemory(Names); - } - LsaClose(LsaHandle); - } - } - - /* append item to the cached ACL */ - *NextAcePtr = AceListItem; - NextAcePtr = &AceListItem->Next; - } - } + + AddPrincipalToList(sp, + Sid); } } LocalFree((HLOCAL)SecurityDescriptor); @@ -390,8 +399,6 @@ ListView_DeleteAllItems(sp->hWndPrincipalsList); - ReloadPrincipalsList(sp); - for (CurItem = sp->PrincipalsListHead; CurItem != NULL; CurItem = CurItem->Next) @@ -817,6 +824,20 @@ hWndDeny); } +static BOOL +AddSelectedPrincipal(IN IDsObjectPicker *pDsObjectPicker, + IN HWND hwndParent OPTIONAL, + IN PSID pSid, + IN PVOID Context OPTIONAL) +{ + PSECURITY_PAGE sp = (PSECURITY_PAGE)Context; + + AddPrincipalToList(sp, + pSid); + + return TRUE; +} + static INT_PTR CALLBACK SecurityPageProc(IN HWND hwndDlg, IN UINT uMsg, @@ -881,29 +902,34 @@ case IDC_ADD_PRINCIPAL: { HRESULT hRet; - IDsObjectPicker *pDsObjectPicker = NULL; - IDataObject *Selections = NULL; sp = (PSECURITY_PAGE)GetWindowLongPtr(hwndDlg, DWL_USER); hRet = InitializeObjectPicker(sp->ServerName, &sp->ObjectInfo, - ObjectPickerAttributes, - &pDsObjectPicker); + &sp->pDsObjectPicker); if (SUCCEEDED(hRet)) { - hRet = pDsObjectPicker->lpVtbl->InvokeDialog(pDsObjectPicker, - hwndDlg, - &Selections); + hRet = InvokeObjectPickerDialog(sp->pDsObjectPicker, + hwndDlg, + AddSelectedPrincipal, + sp); if (FAILED(hRet)) { - MessageBox(hwndDlg, L"InvokeDialog failed!\n", NULL, 0); + MessageBox(hwndDlg, L"InvokeObjectPickerDialog failed!\n", NULL, 0); } /* delete the instance */ - pDsObjectPicker->lpVtbl->Release(pDsObjectPicker); + FreeObjectPicker(sp->pDsObjectPicker); + + /* reload the principal list */ + FillPrincipalsList(sp); } + else + { + MessageBox(hwndDlg, L"InitializeObjectPicker failed!\n", NULL, 0); + } break; } } @@ -972,6 +998,8 @@ lvc.fmt = LVCFMT_LEFT; lvc.cx = rcLvClient.right; ListView_InsertColumn(sp->hWndPrincipalsList, 0, &lvc); + + ReloadPrincipalsList(sp); FillPrincipalsList(sp); _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2005-09-22 11:20:52 UTC (rev 17981) +++ trunk/reactos/lib/aclui/aclui.xml 2005-09-22 14:30:29 UTC (rev 17982) @@ -14,6 +14,7 @@ <library>gdi32</library> <library>comctl32</library> <library>ole32</library> + <library>oleaut32</library> <library>uxtheme</library> <file>aclui.c</file> <file>checklist.c</file> _____ Modified: trunk/reactos/lib/aclui/misc.c --- trunk/reactos/lib/aclui/misc.c 2005-09-22 11:20:52 UTC (rev 17981) +++ trunk/reactos/lib/aclui/misc.c 2005-09-22 14:30:29 UTC (rev 17982) @@ -32,6 +32,11 @@ #include <precomp.h> +static PCWSTR ObjectPickerAttributes[] = +{ + L"ObjectSid", +}; + static INT LengthOfStrResource(IN HINSTANCE hInst, IN UINT uID) @@ -207,7 +212,6 @@ HRESULT InitializeObjectPicker(IN PCWSTR ServerName, IN PSI_OBJECT_INFO ObjectInfo, - IN PCWSTR Attributes[], OUT IDsObjectPicker **pDsObjectPicker) { HRESULT hRet; @@ -250,8 +254,8 @@ InitInfo.cDsScopeInfos = sizeof(Scopes) / sizeof(Scopes[0]); InitInfo.aDsScopeInfos = Scopes; InitInfo.flOptions = DSOP_FLAG_MULTISELECT | DSOP_SCOPE_TYPE_TARGET_COMPUTER; - InitInfo.cAttributesToFetch = sizeof(Attributes) / sizeof(Attributes[0]); - InitInfo.apwzAttributeNames = Attributes; + InitInfo.cAttributesToFetch = sizeof(ObjectPickerAttributes) / sizeof(ObjectPickerAttributes[0]); + InitInfo.apwzAttributeNames = ObjectPickerAttributes; for (i = 0; i < InitInfo.cDsScopeInfos; i++) { @@ -278,3 +282,82 @@ return hRet; } +HRESULT +InvokeObjectPickerDialog(IN IDsObjectPicker *pDsObjectPicker, + IN HWND hwndParent OPTIONAL, + IN POBJPICK_SELECTED_SID SelectedSidCallback, + IN PVOID Context OPTIONAL) +{ + IDataObject *pdo = NULL; + HRESULT hRet; + + hRet = pDsObjectPicker->lpVtbl->InvokeDialog(pDsObjectPicker, + hwndParent, + &pdo); + if (hRet == S_OK) + { + STGMEDIUM stm; + FORMATETC fe; + + fe.cfFormat = RegisterClipboardFormat(CFSTR_DSOP_DS_SELECTION_LIST); + fe.ptd = NULL; + fe.dwAspect = DVASPECT_CONTENT; + fe.lindex = -1; + fe.tymed = TYMED_HGLOBAL; + + hRet = pdo->lpVtbl->GetData(pdo, + &fe, + &stm); + if (SUCCEEDED(hRet)) + { + PDS_SELECTION_LIST SelectionList = (PDS_SELECTION_LIST)GlobalLock(stm.hGlobal); + if (SelectionList != NULL) + { + LPVARIANT vSid; + PSID pSid; + UINT i; + BOOL contLoop = TRUE; + + for (i = 0; i < SelectionList->cItems && contLoop; i++) + { + vSid = SelectionList->aDsSelection[i].pvarFetchedAttributes; + + if (vSid != NULL && V_VT(vSid) == (VT_ARRAY | VT_UI1)) + { + hRet = SafeArrayAccessData(V_ARRAY(vSid), + (void HUGEP**)&pSid); + if (FAILED(hRet)) + { + break; + } + + if (pSid != NULL) + { + contLoop = SelectedSidCallback(pDsObjectPicker, + hwndParent, + pSid, + Context); + } + + SafeArrayUnaccessData(V_ARRAY(vSid)); + } + } + + GlobalUnlock(stm.hGlobal); + } + + ReleaseStgMedium(&stm); + } + + pdo->lpVtbl->Release(pdo); + } + + return hRet; +} + +VOID +FreeObjectPicker(IN IDsObjectPicker *pDsObjectPicker) +{ + pDsObjectPicker->lpVtbl->Release(pDsObjectPicker); +} + _____ Modified: trunk/reactos/lib/aclui/precomp.h --- trunk/reactos/lib/aclui/precomp.h 2005-09-22 11:20:52 UTC (rev 17981) +++ trunk/reactos/lib/aclui/precomp.h 2005-09-22 14:30:29 UTC (rev 17982) @@ -1,5 +1,6 @@ #include <windows.h> #include <commctrl.h> +#include <oleauto.h> #include <objsel.h> #include <prsht.h> #include <aclui.h> @@ -57,6 +58,7 @@ LPSECURITYINFO psi; SI_OBJECT_INFO ObjectInfo; + IDsObjectPicker *pDsObjectPicker; SI_ACCESS DefaultAccess; @@ -86,9 +88,22 @@ HRESULT InitializeObjectPicker(IN PCWSTR ServerName, IN PSI_OBJECT_INFO ObjectInfo, - IN PCWSTR Attributes[], OUT IDsObjectPicker **pDsObjectPicker); +VOID +FreeObjectPicker(IN IDsObjectPicker *pDsObjectPicker); + +typedef BOOL (*POBJPICK_SELECTED_SID)(IN IDsObjectPicker *pDsObjectPicker, + IN HWND hwndParent OPTIONAL, + IN PSID pSid, + IN PVOID Context OPTIONAL); + +HRESULT +InvokeObjectPickerDialog(IN IDsObjectPicker *pDsObjectPicker, + IN HWND hwndParent OPTIONAL, + IN POBJPICK_SELECTED_SID SelectedSidCallback, + IN PVOID Context OPTIONAL); + /* CHECKLIST CONTROL **********************************************************/ #define CIS_DENYDISABLED (0x8)

18 years, 12 months

← Newer
1
...
17
18
19
20
21
22
23
...
59
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 September 2005