Ros-diffs August 2016

ros-diffs@reactos.org

20 participants
462 discussions

[bfreisen] 72158: [MSPAINT] Handle settings from registry correctly. Patch by Carlo Bramini. CORE-11400

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Mon Aug 8 14:00:18 2016 New Revision: 72158 URL: http://svn.reactos.org/svn/reactos?rev=72158&view=rev Log: [MSPAINT] Handle settings from registry correctly. Patch by Carlo Bramini. CORE-11400 Modified: trunk/reactos/base/applications/mspaint/registry.cpp Modified: trunk/reactos/base/applications/mspaint/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/registry.cpp [iso-8859-1] Mon Aug 8 14:00:18 2016 @@ -13,6 +13,19 @@ #include <winreg.h> /* FUNCTIONS ********************************************************/ +static DWORD ReadDWORD(HKEY hKey, LPCTSTR lpName, DWORD *pdwValue, BOOL bCheckForDef) +{ + DWORD dwPrev = *pdwValue; + DWORD cbData = sizeof(DWORD); + + if (ERROR_SUCCESS != RegQueryValueEx(hKey, lpName, 0, NULL, (LPBYTE) pdwValue, &cbData)) + *pdwValue = dwPrev; + + if (bCheckForDef && *pdwValue == 0) + *pdwValue = dwPrev; + + return dwPrev; +} void RegistrySettings::SetWallpaper(TCHAR * FileName, DWORD dwStyle, DWORD dwTile) //FIXME: Has to be called 2x to apply the pattern (tiled/stretched) too { @@ -75,28 +88,19 @@ 0, KEY_READ | KEY_SET_VALUE, &hView) == ERROR_SUCCESS) { DWORD cbData; - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("BMPHeight"), 0, NULL, (LPBYTE) &BMPHeight, &cbData); - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("BMPWidth"), 0, NULL, (LPBYTE) &BMPWidth, &cbData); - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("GridExtent"), 0, NULL, (LPBYTE) &GridExtent, &cbData); - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("NoStretching"), 0, NULL, (LPBYTE) &NoStretching, &cbData); - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("ShowThumbnail"), 0, NULL, (LPBYTE) &ShowThumbnail, &cbData); - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("SnapToGrid"), 0, NULL, (LPBYTE) &SnapToGrid, &cbData); - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("ThumbHeight"), 0, NULL, (LPBYTE) &ThumbHeight, &cbData); - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("ThumbWidth"), 0, NULL, (LPBYTE) &ThumbWidth, &cbData); - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("ThumbXPos"), 0, NULL, (LPBYTE) &ThumbXPos, &cbData); - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("ThumbYPos"), 0, NULL, (LPBYTE) &ThumbYPos, &cbData); - cbData = sizeof(DWORD); - RegQueryValueEx(hView, _T("UnitSetting"), 0, NULL, (LPBYTE) &UnitSetting, &cbData); + + ReadDWORD(hView, _T("BMPHeight"), &BMPHeight, TRUE); + ReadDWORD(hView, _T("BMPWidth"), &BMPWidth, TRUE); + ReadDWORD(hView, _T("GridExtent"), &GridExtent, FALSE); + ReadDWORD(hView, _T("NoStretching"), &NoStretching, FALSE); + ReadDWORD(hView, _T("ShowThumbnail"), &ShowThumbnail, FALSE); + ReadDWORD(hView, _T("SnapToGrid"), &SnapToGrid, FALSE); + ReadDWORD(hView, _T("ThumbHeight"), &ThumbHeight, TRUE); + ReadDWORD(hView, _T("ThumbWidth"), &ThumbWidth, TRUE); + ReadDWORD(hView, _T("ThumbXPos"), &ThumbXPos, TRUE); + ReadDWORD(hView, _T("ThumbYPos"), &ThumbYPos, TRUE); + ReadDWORD(hView, _T("UnitSetting"), &UnitSetting, FALSE); + cbData = sizeof(WINDOWPLACEMENT); RegQueryValueEx(hView, _T("WindowPlacement"), 0, NULL, (LPBYTE) &WindowPlacement, &cbData); }

8 years, 4 months

[pschweitzer] 72157: [FASTFAT] Fix a FIXME: update the last writing date in case of null-length write.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Aug 8 12:44:15 2016 New Revision: 72157 URL: http://svn.reactos.org/svn/reactos?rev=72157&view=rev Log: [FASTFAT] Fix a FIXME: update the last writing date in case of null-length write. Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Mon Aug 8 12:44:15 2016 @@ -843,12 +843,14 @@ } } + OldFileSize = Fcb->RFCB.FileSize; + if (Length == 0) { - /* FIXME: Update last write time */ + /* Update last write time */ IrpContext->Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; - goto ByeBye; + goto Metadata; } if (IrpContext->Irp->Flags & IRP_PAGING_IO) @@ -917,8 +919,6 @@ goto ByeBye; } } - - OldFileSize = Fcb->RFCB.FileSize; Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); Status = VfatLockUserBuffer(IrpContext->Irp, Length, IoReadAccess); @@ -1000,6 +1000,7 @@ } } +Metadata: if (!(IrpContext->Irp->Flags & IRP_PAGING_IO) && !(Fcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME))) {

8 years, 4 months

[pschweitzer] 72156: [FASTFAT] Opening file by ID is not possible with FAT.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Aug 8 07:28:14 2016 New Revision: 72156 URL: http://svn.reactos.org/svn/reactos?rev=72156&view=rev Log: [FASTFAT] Opening file by ID is not possible with FAT. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Mon Aug 8 07:28:14 2016 @@ -502,6 +502,11 @@ FileObject = Stack->FileObject; DeviceExt = DeviceObject->DeviceExtension; + if (Stack->Parameters.Create.Options & FILE_OPEN_BY_FILE_ID) + { + return STATUS_NOT_IMPLEMENTED; + } + /* Check their validity. */ if (RequestedOptions & FILE_DIRECTORY_FILE && RequestedDisposition == FILE_SUPERSEDE)

8 years, 4 months

[jimtabor] 72155: [User32] - Fix bug that was uncovered by r72143. See CORE-11810. - Move System Commands to server side. Leaving Alt-Tab and Scrolls.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Aug 7 23:52:43 2016 New Revision: 72155 URL: http://svn.reactos.org/svn/reactos?rev=72155&view=rev Log: [User32] - Fix bug that was uncovered by r72143. See CORE-11810. - Move System Commands to server side. Leaving Alt-Tab and Scrolls. Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Sun Aug 7 23:52:43 2016 @@ -163,6 +163,11 @@ case SC_MOUSEMENU: case SC_KEYMENU: case SC_SCREENSAVE: + case SC_MINIMIZE: + case SC_MAXIMIZE: + case SC_RESTORE: + case SC_CLOSE: + case SC_HOTKEY: NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); return 0; @@ -179,27 +184,6 @@ switch (wParam & 0xfff0) { - case SC_MINIMIZE: - if (hWnd == GetActiveWindow()) - ShowOwnedPopups(hWnd,FALSE); - ShowWindow( hWnd, SW_MINIMIZE ); - break; - - case SC_MAXIMIZE: - if (IsIconic(hWnd) && hWnd == GetActiveWindow()) - ShowOwnedPopups(hWnd,TRUE); - ShowWindow( hWnd, SW_MAXIMIZE ); - break; - - case SC_RESTORE: - if (IsIconic(hWnd) && hWnd == GetActiveWindow()) - ShowOwnedPopups(hWnd,TRUE); - ShowWindow( hWnd, SW_RESTORE ); - break; - - case SC_CLOSE: - return SendMessageW(hWnd, WM_CLOSE, 0, 0); - case SC_VSCROLL: case SC_HSCROLL: { @@ -217,30 +201,6 @@ case SC_NEXTWINDOW: case SC_PREVWINDOW: DoAppSwitch( wParam, lParam); - break; - - case SC_HOTKEY: - { - HWND hwnd, hWndLastActive; - PWND pWnd; - - hwnd = (HWND)lParam; - pWnd = ValidateHwnd(hwnd); - if (pWnd) - { - hWndLastActive = GetLastActivePopup(hwnd); - if (hWndLastActive) - { - hwnd = hWndLastActive; - pWnd = ValidateHwnd(hwnd); - } - SetForegroundWindow(hwnd); - if (pWnd->style & WS_MINIMIZE) - { - PostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); - } - } - } break; default:

8 years, 4 months

[dchapyshev] 72154: [INPUT] - Implement list of keyboard layouts on Settings Page

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sun Aug 7 23:28:50 2016 New Revision: 72154 URL: http://svn.reactos.org/svn/reactos?rev=72154&view=rev Log: [INPUT] - Implement list of keyboard layouts on Settings Page Added: trunk/reactos/dll/cpl/input_new/layout_list.c (with props) trunk/reactos/dll/cpl/input_new/layout_list.h (with props) trunk/reactos/dll/cpl/input_new/locale_list.c (with props) trunk/reactos/dll/cpl/input_new/locale_list.h (with props) trunk/reactos/dll/cpl/input_new/settings_page.c (with props) Modified: trunk/reactos/dll/cpl/input_new/CMakeLists.txt trunk/reactos/dll/cpl/input_new/input.c trunk/reactos/dll/cpl/input_new/input.h Modified: trunk/reactos/dll/cpl/input_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/CMakeLis… ============================================================================== --- trunk/reactos/dll/cpl/input_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/CMakeLists.txt [iso-8859-1] Sun Aug 7 23:28:50 2016 @@ -3,7 +3,12 @@ list(APPEND SOURCE input.c - input.h) + input.h + layout_list.c + layout_list.h + locale_list.c + locale_list.h + settings_page.c) add_rc_deps(input.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/keyboard-shortcuts.ico) Modified: trunk/reactos/dll/cpl/input_new/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/input.c?… ============================================================================== --- trunk/reactos/dll/cpl/input_new/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/input.c [iso-8859-1] Sun Aug 7 23:28:50 2016 @@ -15,73 +15,66 @@ #define NUM_APPLETS (1) LONG CALLBACK SystemApplet(VOID); -HINSTANCE hApplet = 0; -HANDLE hProcessHeap; +HINSTANCE hApplet = NULL; HWND hCPLWindow; /* Applets */ -APPLET Applets[NUM_APPLETS] = +static APPLET Applets[NUM_APPLETS] = { {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +InitPropSheetPage(PROPSHEETPAGE *page, WORD idDlg, DLGPROC DlgProc) { - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); - psp->dwFlags = PSP_DEFAULT; - psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); - psp->pfnDlgProc = DlgProc; -} + memset(page, 0, sizeof(PROPSHEETPAGE)); - -INT_PTR CALLBACK -SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - return FALSE; + page->dwSize = sizeof(PROPSHEETPAGE); + page->dwFlags = PSP_DEFAULT; + page->hInstance = hApplet; + page->pszTemplate = MAKEINTRESOURCE(idDlg); + page->pfnDlgProc = DlgProc; } INT_PTR CALLBACK AdvancedSettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return FALSE; + return FALSE; } /* First Applet */ - LONG CALLBACK SystemApplet(VOID) { - PROPSHEETPAGE psp[2]; - PROPSHEETHEADER psh; - TCHAR Caption[1024]; + PROPSHEETPAGE page[2]; + PROPSHEETHEADER header; + WCHAR szCaption[MAX_STR_LEN]; - LoadString(hApplet, IDS_CPLSYSTEMNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + LoadString(hApplet, IDS_CPLSYSTEMNAME, szCaption, ARRAYSIZE(szCaption)); - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPSHEETPAGE; - psh.hwndParent = hCPLWindow; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); - psh.pszCaption = Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); - psh.nStartPage = 0; - psh.ppsp = psp; - psh.pfnCallback = NULL; + memset(&header, 0, sizeof(PROPSHEETHEADER)); + + header.dwSize = sizeof(PROPSHEETHEADER); + header.dwFlags = PSH_PROPSHEETPAGE; + header.hwndParent = hCPLWindow; + header.hInstance = hApplet; + header.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + header.pszCaption = szCaption; + header.nPages = ARRAYSIZE(page); + header.nStartPage = 0; + header.ppsp = page; + header.pfnCallback = NULL; /* Settings */ - InitPropSheetPage(&psp[0], IDD_PROPPAGESETTINGS, (DLGPROC)SettingsPageProc); + InitPropSheetPage(&page[0], IDD_PROPPAGESETTINGS, SettingsPageProc); /* Advanced Settings */ - InitPropSheetPage(&psp[1], IDD_PROPPAGEADVANCEDSETTINGS, (DLGPROC)AdvancedSettingsPageProc); + InitPropSheetPage(&page[1], IDD_PROPPAGEADVANCEDSETTINGS, AdvancedSettingsPageProc); - return (LONG)(PropertySheet(&psh) != -1); + return (LONG)(PropertySheet(&header) != -1); } @@ -93,6 +86,7 @@ DWORD i; i = (DWORD)lParam1; + switch (uMsg) { case CPL_INIT: @@ -129,7 +123,6 @@ case DLL_PROCESS_ATTACH: case DLL_THREAD_ATTACH: hApplet = hinstDLL; - hProcessHeap = GetProcessHeap(); break; } Modified: trunk/reactos/dll/cpl/input_new/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/input.h?… ============================================================================== --- trunk/reactos/dll/cpl/input_new/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/input.h [iso-8859-1] Sun Aug 7 23:28:50 2016 @@ -9,8 +9,11 @@ #include <winnls.h> #include <winreg.h> #include <winuser.h> +#include <wingdi.h> #include <commctrl.h> -#include <tchar.h> +#include <wchar.h> +#include <strsafe.h> +#include <stdlib.h> #include "resource.h" @@ -25,7 +28,6 @@ } APPLET, *PAPPLET; extern HINSTANCE hApplet; -extern HANDLE hProcessHeap; // Character Count of a layout ID like "00000409" #define CCH_LAYOUT_ID 8 @@ -33,44 +35,33 @@ // Maximum Character Count of a ULONG in decimal #define CCH_ULONG_DEC 10 +#define MAX_STR_LEN 256 + /* input.c */ VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc); +InitPropSheetPage(PROPSHEETPAGE *page, WORD idDlg, DLGPROC DlgProc); -/* settings.c */ +/* settings_dialog.c */ INT_PTR CALLBACK -SettingsPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam); -BOOL -GetLayoutName(LPCTSTR szLCID, LPTSTR szName); -VOID -UpdateLayoutsList(VOID); -BOOL -IsLayoutExists(LPTSTR szLayoutID, LPTSTR szLangID); - -/* advsettings.c */ -INT_PTR CALLBACK -AdvancedSettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - -/* keysettings.c */ -INT_PTR CALLBACK -KeySettingsDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); -VOID -UpdateKeySettingsList(VOID); - -/* add.c */ -INT_PTR CALLBACK -AddDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); -VOID -CreateKeyboardLayoutList(HWND hItemsList); -INT -GetLayoutCount(LPTSTR szLang); - -/* changekeyseq.c */ -INT_PTR CALLBACK -ChangeKeySeqDlgProc(HWND hDlg,UINT message,WPARAM wParam,LPARAM lParam); -BOOL -GetHotkeys(LPTSTR szHotkey, LPTSTR szLangHotkey, LPTSTR szLayoutHotkey); +SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); void ShowLastWin32Error(HWND hWndOwner); +static inline WCHAR* +DublicateString(const WCHAR *pszString) +{ + WCHAR *pszDublicate; + size_t size; + + size = (wcslen(pszString) + 1) * sizeof(WCHAR); + + pszDublicate = (WCHAR*) malloc(size); + if (pszDublicate != NULL) + { + StringCbCopyW(pszDublicate, size, pszString); + } + + return pszDublicate; +} + #endif /* _INPUT_H */ Added: trunk/reactos/dll/cpl/input_new/layout_list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/layout_l… ============================================================================== --- trunk/reactos/dll/cpl/input_new/layout_list.c (added) +++ trunk/reactos/dll/cpl/input_new/layout_list.c [iso-8859-1] Sun Aug 7 23:28:50 2016 @@ -0,0 +1,221 @@ +/* + * PROJECT: input.dll + * FILE: dll/cpl/input/layout_list.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#include "layout_list.h" + + +static LAYOUT_LIST_NODE *_LayoutList = NULL; + + +static LAYOUT_LIST_NODE* +LayoutList_Append(DWORD dwId, DWORD dwSpecialId, const WCHAR *pszName, const WCHAR *pszFile) +{ + LAYOUT_LIST_NODE *pCurrent; + LAYOUT_LIST_NODE *pNew; + + if (pszName == NULL || pszFile == NULL) + return NULL; + + pCurrent = _LayoutList; + + pNew = (LAYOUT_LIST_NODE*)malloc(sizeof(LAYOUT_LIST_NODE)); + if (pNew == NULL) + return NULL; + + memset(pNew, 0, sizeof(LAYOUT_LIST_NODE)); + + pNew->pszName = DublicateString(pszName); + if (pNew->pszName == NULL) + { + free(pNew); + return NULL; + } + + pNew->pszFile = DublicateString(pszFile); + if (pNew->pszFile == NULL) + { + free(pNew->pszName); + free(pNew); + return NULL; + } + + pNew->dwId = dwId; + pNew->dwSpecialId = dwSpecialId; + + if (pCurrent == NULL) + { + _LayoutList = pNew; + } + else + { + while (pCurrent->pNext != NULL) + { + pCurrent = pCurrent->pNext; + } + + pNew->pPrev = pCurrent; + pCurrent->pNext = pNew; + } + + return pNew; +} + + +VOID +LayoutList_Destroy(VOID) +{ + LAYOUT_LIST_NODE *pCurrent; + + if (_LayoutList == NULL) + return; + + pCurrent = _LayoutList; + + while (pCurrent != NULL) + { + LAYOUT_LIST_NODE *pNext = pCurrent->pNext; + + free(pCurrent->pszName); + free(pCurrent->pszFile); + free(pCurrent); + + pCurrent = pNext; + } + + _LayoutList = NULL; +} + + +VOID +LayoutList_Create(VOID) +{ + WCHAR szSystemDirectory[MAX_PATH]; + WCHAR szLayoutId[MAX_PATH]; + DWORD dwIndex = 0; + DWORD dwSize; + HKEY hKey; + + GetSystemDirectoryW(szSystemDirectory, ARRAYSIZE(szSystemDirectory)); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts", + 0, + KEY_ENUMERATE_SUB_KEYS, + &hKey) != ERROR_SUCCESS) + { + return; + } + + dwSize = sizeof(szLayoutId); + + while (RegEnumKeyExW(hKey, dwIndex, szLayoutId, &dwSize, + NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + HKEY hLayoutKey; + + if (RegOpenKeyExW(hKey, + szLayoutId, + 0, + KEY_QUERY_VALUE, + &hLayoutKey) == ERROR_SUCCESS) + { + WCHAR szBuffer[MAX_PATH]; + + dwSize = sizeof(szBuffer); + + if (RegQueryValueExW(hLayoutKey, + L"Layout File", + NULL, NULL, + (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS) + { + WCHAR szFilePath[MAX_PATH]; + + StringCchPrintfW(szFilePath, ARRAYSIZE(szFilePath), + L"%s\\%s", szSystemDirectory, szBuffer); + + if (GetFileAttributes(szFilePath) != INVALID_FILE_ATTRIBUTES) + { + DWORD dwSpecialId = 0; + WCHAR *pszEnd; + + dwSize = sizeof(szBuffer); + + if (RegQueryValueExW(hLayoutKey, + L"Layout Id", + NULL, NULL, + (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS) + { + dwSpecialId = wcstoul(szBuffer, &pszEnd, 16); + } + + dwSize = sizeof(szBuffer); + + if (RegQueryValueExW(hLayoutKey, + L"Layout Text", + NULL, NULL, + (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS) + { + DWORD dwLayoutId; + + dwLayoutId = wcstoul(szLayoutId, &pszEnd, 16); + + LayoutList_Append(dwLayoutId, + dwSpecialId, + szBuffer, + szFilePath); + } + } + } + + RegCloseKey(hLayoutKey); + } + + dwSize = sizeof(szLayoutId); + ++dwIndex; + } + + RegCloseKey(hKey); +} + + +WCHAR* +LayoutList_GetNameByHkl(HKL hkl) +{ + LAYOUT_LIST_NODE *pCurrent; + + if ((HIWORD(hkl) & 0xF000) == 0xF000) + { + DWORD dwSpecialId = (HIWORD(hkl) & 0x0FFF); + + for (pCurrent = _LayoutList; pCurrent != NULL; pCurrent = pCurrent->pNext) + { + if (dwSpecialId == pCurrent->dwSpecialId) + { + return pCurrent->pszName; + } + } + } + else + { + for (pCurrent = _LayoutList; pCurrent != NULL; pCurrent = pCurrent->pNext) + { + if (HIWORD(hkl) == LOWORD(pCurrent->dwId)) + { + return pCurrent->pszName; + } + } + } + + return NULL; +} + + +LAYOUT_LIST_NODE* +LayoutList_Get(VOID) +{ + return _LayoutList; +} Propchange: trunk/reactos/dll/cpl/input_new/layout_list.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input_new/layout_list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/layout_l… ============================================================================== --- trunk/reactos/dll/cpl/input_new/layout_list.h (added) +++ trunk/reactos/dll/cpl/input_new/layout_list.h [iso-8859-1] Sun Aug 7 23:28:50 2016 @@ -0,0 +1,25 @@ +#pragma once + +#include "input.h" + +typedef struct _LAYOUT_LIST_NODE +{ + WCHAR *pszName; + WCHAR *pszFile; + DWORD dwId; + DWORD dwSpecialId; + struct _LAYOUT_LIST_NODE *pPrev; + struct _LAYOUT_LIST_NODE *pNext; +} LAYOUT_LIST_NODE; + +VOID +LayoutList_Create(VOID); + +VOID +LayoutList_Destroy(VOID); + +WCHAR* +LayoutList_GetNameByHkl(HKL hkl); + +LAYOUT_LIST_NODE* +LayoutList_Get(VOID); Propchange: trunk/reactos/dll/cpl/input_new/layout_list.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input_new/locale_list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/locale_l… ============================================================================== --- trunk/reactos/dll/cpl/input_new/locale_list.c (added) +++ trunk/reactos/dll/cpl/input_new/locale_list.c [iso-8859-1] Sun Aug 7 23:28:50 2016 @@ -0,0 +1,154 @@ +/* + * PROJECT: input.dll + * FILE: dll/cpl/input/locale_list.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#include "locale_list.h" + + +static LOCALE_LIST_NODE *_LocaleList = NULL; + + +static LOCALE_LIST_NODE* +LocaleList_Append(DWORD dwId, WCHAR *pszName, WCHAR *pszIndicator) +{ + LOCALE_LIST_NODE *pCurrent; + LOCALE_LIST_NODE *pNew; + + if (pszName == NULL || pszIndicator == NULL) + return NULL; + + pCurrent = _LocaleList; + + pNew = (LOCALE_LIST_NODE*) malloc(sizeof(LOCALE_LIST_NODE)); + if (pNew == NULL) + return NULL; + + memset(pNew, 0, sizeof(LOCALE_LIST_NODE)); + + pNew->pszName = DublicateString(pszName); + if (pNew->pszName == NULL) + { + free(pNew); + return NULL; + } + + pNew->pszIndicator = DublicateString(pszIndicator); + if (pNew->pszIndicator == NULL) + { + free(pNew->pszName); + free(pNew); + return NULL; + } + + pNew->dwId = dwId; + + if (pCurrent == NULL) + { + _LocaleList = pNew; + } + else + { + while (pCurrent->pNext != NULL) + { + pCurrent = pCurrent->pNext; + } + + pNew->pPrev = pCurrent; + pCurrent->pNext = pNew; + } + + return pNew; +} + + +VOID +LocaleList_Destroy(VOID) +{ + LOCALE_LIST_NODE *pCurrent; + + if (_LocaleList == NULL) + return; + + pCurrent = _LocaleList; + + while (pCurrent != NULL) + { + LOCALE_LIST_NODE *pNext = pCurrent->pNext; + + free(pCurrent->pszName); + free(pCurrent); + + pCurrent = pNext; + } + + _LocaleList = NULL; +} + + +LOCALE_LIST_NODE* +LocaleList_Create(VOID) +{ + WCHAR szValue[MAX_PATH]; + DWORD dwIndex; + DWORD dwSize; + HKEY hKey; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\Nls\\Language", + 0, + KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + &hKey) != ERROR_SUCCESS) + { + return NULL; + } + + dwSize = sizeof(szValue); + dwIndex = 0; + + while (RegEnumValueW(hKey, dwIndex, szValue, &dwSize, + NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + WCHAR szName[MAX_STR_LEN]; + WCHAR *End; + DWORD dwId; + + dwId = wcstoul(szValue, &End, 16); + + if (GetLocaleInfoW(LOWORD(dwId), + LOCALE_SLANGUAGE, + szName, ARRAYSIZE(szName))) + { + WCHAR szIndicator[MAX_STR_LEN]; + + if (GetLocaleInfoW(LOWORD(dwId), + LOCALE_SABBREVLANGNAME | LOCALE_NOUSEROVERRIDE, + szIndicator, + ARRAYSIZE(szIndicator))) + { + size_t len = wcslen(szIndicator); + + if (len > 0) + { + szIndicator[len - 1] = 0; + } + } + + LocaleList_Append(dwId, szName, szIndicator); + } + + dwSize = sizeof(szValue); + ++dwIndex; + } + + return _LocaleList; +} + + +LOCALE_LIST_NODE* +LocaleList_Get(VOID) +{ + return _LocaleList; +} Propchange: trunk/reactos/dll/cpl/input_new/locale_list.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input_new/locale_list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/locale_l… ============================================================================== --- trunk/reactos/dll/cpl/input_new/locale_list.h (added) +++ trunk/reactos/dll/cpl/input_new/locale_list.h [iso-8859-1] Sun Aug 7 23:28:50 2016 @@ -0,0 +1,21 @@ +#pragma once + +#include "input.h" + +typedef struct _LOCALE_LIST_NODE +{ + WCHAR *pszName; + WCHAR *pszIndicator; + DWORD dwId; + struct _LOCALE_LIST_NODE *pPrev; + struct _LOCALE_LIST_NODE *pNext; +} LOCALE_LIST_NODE; + +LOCALE_LIST_NODE* +LocaleList_Create(VOID); + +VOID +LocaleList_Destroy(VOID); + +LOCALE_LIST_NODE* +LocaleList_Get(VOID); Propchange: trunk/reactos/dll/cpl/input_new/locale_list.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input_new/settings_page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/settings… ============================================================================== --- trunk/reactos/dll/cpl/input_new/settings_page.c (added) +++ trunk/reactos/dll/cpl/input_new/settings_page.c [iso-8859-1] Sun Aug 7 23:28:50 2016 @@ -0,0 +1,233 @@ +/* + * PROJECT: input.dll + * FILE: dll/cpl/input/settings_page.c + * PURPOSE: input.dll + * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + */ + +#include "input.h" +#include "layout_list.h" +#include "locale_list.h" + + +static HICON +CreateLayoutIcon(LPWSTR szLayout) +{ + HDC hdc, hdcsrc; + HBITMAP hBitmap, hBmpNew, hBmpOld; + RECT rect; + HFONT hFont = NULL; + ICONINFO IconInfo; + HICON hIcon = NULL; + + hdcsrc = GetDC(NULL); + hdc = CreateCompatibleDC(hdcsrc); + hBitmap = CreateCompatibleBitmap(hdcsrc, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON)); + ReleaseDC(NULL, hdcsrc); + + if (hdc && hBitmap) + { + hBmpNew = CreateBitmap(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 1, 1, NULL); + if (hBmpNew) + { + hBmpOld = SelectObject(hdc, hBitmap); + rect.right = GetSystemMetrics(SM_CXSMICON); + rect.left = 0; + rect.bottom = GetSystemMetrics(SM_CYSMICON); + rect.top = 0; + + SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); + SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + + ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, L"", 0, NULL); + + hFont = CreateFont(-11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + DEFAULT_QUALITY, FF_DONTCARE, L"Tahoma"); + + SelectObject(hdc, hFont); + DrawText(hdc, szLayout, 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); + SelectObject(hdc, hBmpNew); + + PatBlt(hdc, 0, 0, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + BLACKNESS); + + SelectObject(hdc, hBmpOld); + + IconInfo.hbmColor = hBitmap; + IconInfo.hbmMask = hBmpNew; + IconInfo.fIcon = TRUE; + + hIcon = CreateIconIndirect(&IconInfo); + + DeleteObject(hBmpNew); + DeleteObject(hBmpOld); + DeleteObject(hFont); + } + } + + DeleteDC(hdc); + DeleteObject(hBitmap); + + return hIcon; +} + + +static VOID +AddToLayoutListView(HWND hwndList, + WCHAR *pszLanguageName, + WCHAR *pszLayoutName, + WCHAR *pszIndicatorTitle) +{ + INT ItemIndex = -1; + INT ImageIndex = -1; + LV_ITEM item; + HIMAGELIST hImageList; + + hImageList = ListView_GetImageList(hwndList, LVSIL_SMALL); + if (hImageList != NULL) + { + HICON hLayoutIcon; + + hLayoutIcon = CreateLayoutIcon(pszIndicatorTitle); + if (hLayoutIcon != NULL) + { + ImageIndex = ImageList_AddIcon(hImageList, hLayoutIcon); + DestroyIcon(hLayoutIcon); + } + } + + memset(&item, 0, sizeof(LV_ITEM)); + + item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; + item.pszText = pszLanguageName; + item.iItem = -1; + item.lParam = (LPARAM)NULL; + item.iImage = ImageIndex; + + ItemIndex = ListView_InsertItem(hwndList, &item); + + ListView_SetItemText(hwndList, ItemIndex, 1, pszLayoutName); +} + + +static VOID +OnInitSettingsPage(HWND hwndDlg) +{ + WCHAR szBuffer[MAX_STR_LEN]; + LV_COLUMN column; + HWND hLayoutList; + HIMAGELIST hLayoutImageList; + INT iLayoutCount; + HKL *pActiveLayoutList; + + hLayoutList = GetDlgItem(hwndDlg, IDC_KEYLAYOUT_LIST); + + ListView_SetExtendedListViewStyle(hLayoutList, LVS_EX_FULLROWSELECT); + + memset(&column, 0, sizeof(LV_COLUMN)); + + column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + + LoadString(hApplet, IDS_LANGUAGE, szBuffer, ARRAYSIZE(szBuffer)); + column.fmt = LVCFMT_LEFT; + column.iSubItem = 0; + column.pszText = szBuffer; + column.cx = 175; + ListView_InsertColumn(hLayoutList, 0, &column); + + LoadString(hApplet, IDS_LAYOUT, szBuffer, ARRAYSIZE(szBuffer)); + column.fmt = LVCFMT_RIGHT; + column.cx = 155; + column.iSubItem = 1; + column.pszText = szBuffer; + ListView_InsertColumn(hLayoutList, 1, &column); + + hLayoutImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + ILC_COLOR8 | ILC_MASK, 0, 0); + if (hLayoutImageList != NULL) + { + ListView_SetImageList(hLayoutList, hLayoutImageList, LVSIL_SMALL); + } + + LayoutList_Create(); + LocaleList_Create(); + + iLayoutCount = GetKeyboardLayoutList(0, NULL); + pActiveLayoutList = (HKL*) malloc(iLayoutCount * sizeof(HKL)); + if (pActiveLayoutList != NULL) + { + if (GetKeyboardLayoutList(iLayoutCount, pActiveLayoutList) > 0) + { + INT iIndex; + + for (iIndex = 0; iIndex < iLayoutCount; iIndex++) + { + LOCALE_LIST_NODE *CurrentLocale; + + for (CurrentLocale = LocaleList_Get(); + CurrentLocale != NULL; + CurrentLocale = CurrentLocale->pNext) + { + if (LOWORD(CurrentLocale->dwId) == LOWORD(pActiveLayoutList[iIndex])) + { + AddToLayoutListView(hLayoutList, + CurrentLocale->pszName, + LayoutList_GetNameByHkl(pActiveLayoutList[iIndex]), + CurrentLocale->pszIndicator); + } + } + } + } + + free(pActiveLayoutList); + } +} + + +static VOID +OnDestroySettingsPage(HWND hwndDlg) +{ + HIMAGELIST hImageList; + + LayoutList_Destroy(); + LocaleList_Destroy(); + + hImageList = ListView_GetImageList(GetDlgItem(hwndDlg, IDC_KEYLAYOUT_LIST), + LVSIL_SMALL); + if (hImageList != NULL) + { + ImageList_Destroy(hImageList); + } +} + + +INT_PTR CALLBACK +SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + OnInitSettingsPage(hwndDlg); + break; + + case WM_DESTROY: + OnDestroySettingsPage(hwndDlg); + break; + + case WM_COMMAND: + { + + } + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/input_new/settings_page.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 4 months

[ekohl] 72153: [LSASRV] - Partital implementation of LsarRemoveAccountRights. - Simplify LsapLookupAccountRightValue. Return ACCESS_MASK instead of NTSTATUS. - LsarAddAccountRights: Check parameter...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 7 22:36:07 2016 New Revision: 72153 URL: http://svn.reactos.org/svn/reactos?rev=72153&view=rev Log: [LSASRV] - Partital implementation of LsarRemoveAccountRights. - Simplify LsapLookupAccountRightValue. Return ACCESS_MASK instead of NTSTATUS. - LsarAddAccountRights: Check parameters before referncing the policy handle. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/privileges.c 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 Aug 7 22:36:07 2016 @@ -2368,6 +2368,33 @@ TRACE("LsarAddAccountRights(%p %p %p)\n", PolicyHandle, AccountSid, UserRights); + /* Validate the AccountSid */ + if (!RtlValidSid(AccountSid)) + return STATUS_INVALID_PARAMETER; + + /* Validate the UserRights */ + if (UserRights == NULL) + return STATUS_INVALID_PARAMETER; + + /* Validate the privilege and account right names */ + for (i = 0; i < UserRights->Entries; i++) + { + if (LsarpLookupPrivilegeValue(&UserRights->UserRights[i]) != NULL) + { + ulNewPrivileges++; + } + else + { + if (LsapLookupAccountRightValue(&UserRights->UserRights[i]) == 0) + return STATUS_NO_SUCH_PRIVILEGE; + + ulNewRights++; + } + } + + TRACE("ulNewPrivileges: %lu\n", ulNewPrivileges); + TRACE("ulNewRights: %lu\n", ulNewRights); + /* Validate the PolicyHandle */ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, @@ -2378,41 +2405,6 @@ WARN("LsapValidateDbObject returned 0x%08lx\n", Status); return Status; } - - /* Validate the AccountSid */ - if (!RtlValidSid(AccountSid)) - { - Status = STATUS_INVALID_PARAMETER; - goto done; - } - - /* Validate the UserRights */ - if (UserRights == NULL) - { - Status = STATUS_INVALID_PARAMETER; - goto done; - } - - /* Validate the privilege and account right names */ - for (i = 0; i < UserRights->Entries; i++) - { - pLuid = LsarpLookupPrivilegeValue(&UserRights->UserRights[i]); - if (pLuid != NULL) - { - ulNewPrivileges++; - } - else - { - Status = LsapLookupAccountRightValue(&UserRights->UserRights[i], NULL); - if (Status == STATUS_SUCCESS) - ulNewRights++; - else - goto done; - } - } - - TRACE("ulNewPrivileges: %lu\n", ulNewPrivileges); - TRACE("ulNewRights: %lu\n", ulNewRights); /* Open the account */ Status = LsarpOpenAccount(PolicyObject, @@ -2541,9 +2533,8 @@ /* Set the new access rights */ for (i = 0; i < UserRights->Entries; i++) { - Status = LsapLookupAccountRightValue(&UserRights->UserRights[i], - &Value); - if (Status == STATUS_SUCCESS) + Value = LsapLookupAccountRightValue(&UserRights->UserRights[i]); + if (Value != 0) SystemAccess |= Value; } @@ -2572,8 +2563,190 @@ BOOL AllRights, PLSAPR_USER_RIGHT_SET UserRights) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PLSA_DB_OBJECT PolicyObject; + PLSA_DB_OBJECT AccountObject = NULL; + ULONG PrivilegesToRemove = 0, RightsToRemove = 0; + ACCESS_MASK SystemAccess = 0; + ULONG Size, Value, i, j, Index; + PPRIVILEGE_SET PrivilegeSet = NULL; + ULONG PrivilegeCount; + PLUID pLuid; + NTSTATUS Status; + + TRACE("LsarRemoveAccountRights(%p %p %lu %p)\n", + PolicyHandle, AccountSid, AllRights, UserRights); + + /* Validate the AccountSid */ + if (!RtlValidSid(AccountSid)) + return STATUS_INVALID_PARAMETER; + + /* Validate the UserRights */ + if (UserRights == NULL) + return STATUS_INVALID_PARAMETER; + + /* Validate the privilege and account right names */ + for (i = 0; i < UserRights->Entries; i++) + { + if (LsarpLookupPrivilegeValue(&UserRights->UserRights[i]) != NULL) + { + PrivilegesToRemove++; + } + else + { + if (LsapLookupAccountRightValue(&UserRights->UserRights[i]) == 0) + return STATUS_NO_SUCH_PRIVILEGE; + + RightsToRemove++; + } + } + + /* Validate the PolicyHandle */ + Status = LsapValidateDbObject(PolicyHandle, + LsaDbPolicyObject, + POLICY_LOOKUP_NAMES, + &PolicyObject); + if (!NT_SUCCESS(Status)) + { + ERR("LsapValidateDbObject returned 0x%08lx\n", Status); + return Status; + } + + /* Open the account */ + Status = LsarpOpenAccount(PolicyObject, + AccountSid, + 0, + &AccountObject); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + { + ERR("LsarpOpenAccount returned 0x%08lx\n", Status); + goto done; + } + + if (AllRights == FALSE) + { + /* Get the size of the Privilgs attribute */ + Size = 0; + Status = LsapGetObjectAttribute(AccountObject, + L"Privilgs", + NULL, + &Size); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + goto done; + + if ((Size != 0) && (PrivilegesToRemove != 0)) + { + /* Allocate the privilege set buffer */ + PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + Size); + if (PrivilegeSet == NULL) + return STATUS_NO_MEMORY; + + /* Get the privilege set */ + Status = LsapGetObjectAttribute(AccountObject, + L"Privilgs", + PrivilegeSet, + &Size); + if (!NT_SUCCESS(Status)) + { + ERR("LsapGetObjectAttribute() failed (Status 0x%08lx)\n", Status); + goto done; + } + + PrivilegeCount = PrivilegeSet->PrivilegeCount; + + for (i = 0; i < UserRights->Entries; i++) + { + pLuid = LsarpLookupPrivilegeValue(&UserRights->UserRights[i]); + if (pLuid == NULL) + continue; + + Index = -1; + for (j = 0; j < PrivilegeSet->PrivilegeCount; j++) + { + if (RtlEqualLuid(&(PrivilegeSet->Privilege[j].Luid), pLuid)) + { + Index = j; + break; + } + } + + if (Index != -1) + { + /* Remove the privilege */ + if ((PrivilegeSet->PrivilegeCount > 1) && + (Index < PrivilegeSet->PrivilegeCount - 1)) + RtlMoveMemory(&(PrivilegeSet->Privilege[Index]), + &(PrivilegeSet->Privilege[Index + 1]), + (Index - PrivilegeSet->PrivilegeCount - 1) * sizeof(LUID)); + + /* Wipe the last entry */ + RtlZeroMemory(&(PrivilegeSet->Privilege[PrivilegeSet->PrivilegeCount - 1]), + sizeof(LUID)); + + PrivilegeSet->PrivilegeCount--; + } + } + + /* Store the extended privilege set */ + if (PrivilegeCount != PrivilegeSet->PrivilegeCount) + { + Size = sizeof(PRIVILEGE_SET) + + (PrivilegeSet->PrivilegeCount - 1) * sizeof(LUID_AND_ATTRIBUTES); + + Status = LsapSetObjectAttribute(AccountObject, + L"Privilgs", + PrivilegeSet, + Size); + if (!NT_SUCCESS(Status)) + { + ERR("LsapSetObjectAttribute() failed (Status 0x%08lx)\n", Status); + goto done; + } + } + } + + /* Get the system access flags, if the attribute exists */ + Size = 0; + Status = LsapGetObjectAttribute(AccountObject, + L"ActSysAc", + &SystemAccess, + &Size); + if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND) + goto done; + + if ((Size != 0) && (RightsToRemove != 0)) + { + ERR("Rights: 0x%lx\n", SystemAccess); + + /* Set the new access rights */ + for (i = 0; i < UserRights->Entries; i++) + { + Value = LsapLookupAccountRightValue(&UserRights->UserRights[i]); + if (Value != 0) + SystemAccess &= ~Value; + } + ERR("New Rights: 0x%lx\n", SystemAccess); + + /* Set the system access flags */ + Status = LsapSetObjectAttribute(AccountObject, + L"ActSysAc", + &SystemAccess, + sizeof(ACCESS_MASK)); + } + } + else + { + } + +done: + if (PrivilegeSet != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet); + + if (AccountObject != NULL) + LsapCloseDbObject(AccountObject); + + return Status; } 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 Aug 7 22:36:07 2016 @@ -328,10 +328,9 @@ LsapLookupAccountRightName(ULONG RightValue, PRPC_UNICODE_STRING *Name); -NTSTATUS +ACCESS_MASK LsapLookupAccountRightValue( - IN PRPC_UNICODE_STRING Name, - OUT PULONG Value OPTIONAL); + IN PRPC_UNICODE_STRING Name); /* registry.h */ NTSTATUS Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Sun Aug 7 22:36:07 2016 @@ -306,27 +306,22 @@ } -NTSTATUS +ACCESS_MASK LsapLookupAccountRightValue( - IN PRPC_UNICODE_STRING Name, - OUT PULONG Value OPTIONAL) + IN PRPC_UNICODE_STRING Name) { ULONG i; if (Name->Length == 0 || Name->Buffer == NULL) - return STATUS_NO_SUCH_PRIVILEGE; + return 0; for (i = 0; i < sizeof(WellKnownRights) / sizeof(WellKnownRights[0]); i++) { if (_wcsicmp(Name->Buffer, WellKnownRights[i].Name) == 0) - { - if (Value != NULL) - *Value = WellKnownRights[i].Flag; - return STATUS_SUCCESS; - } - } - - return STATUS_NO_SUCH_PRIVILEGE; + return WellKnownRights[i].Flag; + } + + return 0; } /* EOF */

8 years, 4 months

[hbelusca] 72152: [ADVAPI32]: Addendum to r72151: It's incorrect to compare the variable of BOOL type with TRUE. Any non-zero value is considered to be "true". Caught by Thomas.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 7 19:11:08 2016 New Revision: 72152 URL: http://svn.reactos.org/svn/reactos?rev=72152&view=rev Log: [ADVAPI32]: Addendum to r72151: It's incorrect to compare the variable of BOOL type with TRUE. Any non-zero value is considered to be "true". Caught by Thomas. Modified: trunk/reactos/dll/win32/advapi32/misc/unicode.c Modified: trunk/reactos/dll/win32/advapi32/misc/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/un… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/unicode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/unicode.c [iso-8859-1] Sun Aug 7 19:11:08 2016 @@ -30,7 +30,7 @@ IN INT iSize, IN OUT LPINT lpiResult OPTIONAL) { - return (RtlIsTextUnicode(lpv, iSize, lpiResult) == TRUE); + return (RtlIsTextUnicode(lpv, iSize, lpiResult) != FALSE); } /* EOF */

8 years, 4 months

[hbelusca] 72151: [ADVAPI32]: Don't directly redirect IsTextUnicode to RtlIsTextUnicode, but use a helper function, so that the return value is correctly set to TRUE or FALSE. Indeed the former fun...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 7 19:02:07 2016 New Revision: 72151 URL: http://svn.reactos.org/svn/reactos?rev=72151&view=rev Log: [ADVAPI32]: Don't directly redirect IsTextUnicode to RtlIsTextUnicode, but use a helper function, so that the return value is correctly set to TRUE or FALSE. Indeed the former function returns a BOOL (long) while the latter returns a BOOLEAN (byte), and the high bytes in the return value could not be correctly set otherwise. Adapted from a patch by 'andy-123'. CORE-11803 #resolve #comment Fixesd, thanks! Added: trunk/reactos/dll/win32/advapi32/misc/unicode.c (with props) Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/advapi32/advapi32.spec Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sun Aug 7 19:02:07 2016 @@ -25,6 +25,7 @@ misc/msi.c misc/shutdown.c misc/sysfunc.c + misc/unicode.c reg/hkcr.c reg/reg.c sec/ac.c Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Sun Aug 7 19:02:07 2016 @@ -313,7 +313,7 @@ 313 stdcall InitiateSystemShutdownExW(wstr wstr long long long long) 314 stdcall InitiateSystemShutdownW(str str long long long) 315 stub InstallApplication -316 stdcall IsTextUnicode(ptr long ptr) ntdll.RtlIsTextUnicode +316 stdcall IsTextUnicode(ptr long ptr) 317 stdcall IsTokenRestricted(long) 318 stub IsTokenUntrusted 319 stdcall IsValidAcl(ptr) Added: trunk/reactos/dll/win32/advapi32/misc/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/un… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/unicode.c (added) +++ trunk/reactos/dll/win32/advapi32/misc/unicode.c [iso-8859-1] Sun Aug 7 19:02:07 2016 @@ -0,0 +1,36 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/advapi32/misc/unicode.c + * PURPOSE: Unicode helper. Needed because RtlIsTextUnicode returns a + * BOOLEAN (byte) while IsTextUnicode returns a BOOL (long). + * The high bytes of the return value should be correctly set, + * hence a direct redirection cannot be done. + */ + +#include <advapi32.h> + +WINE_DEFAULT_DEBUG_CHANNEL(advapi); + +/************************************************************************** + * IsTextUnicode (ADVAPI32.@) + * + * Attempt to guess whether a text buffer is Unicode. + * + * PARAMS + * lpv [I] Text buffer to test + * iSize [I] Length of lpv + * lpiResult [O] Destination for test results + * + * RETURNS + * TRUE if the buffer is likely Unicode, FALSE otherwise. + */ +BOOL WINAPI +IsTextUnicode(IN CONST VOID* lpv, + IN INT iSize, + IN OUT LPINT lpiResult OPTIONAL) +{ + return (RtlIsTextUnicode(lpv, iSize, lpiResult) == TRUE); +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/advapi32/misc/unicode.c ------------------------------------------------------------------------------ svn:eol-style = native

8 years, 4 months

[hbelusca] 72150: [SDK][RTL][NDK]: Update RtlIsTextUnicode prototype.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 7 18:52:49 2016 New Revision: 72150 URL: http://svn.reactos.org/svn/reactos?rev=72150&view=rev Log: [SDK][RTL][NDK]: Update RtlIsTextUnicode prototype. Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h trunk/reactos/sdk/lib/rtl/actctx.c trunk/reactos/sdk/lib/rtl/unicode.c Modified: trunk/reactos/sdk/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ndk/rtlfuncs.h… ============================================================================== --- trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ndk/rtlfuncs.h [iso-8859-1] Sun Aug 7 18:52:49 2016 @@ -2199,9 +2199,9 @@ BOOLEAN NTAPI RtlIsTextUnicode( - PVOID Buffer, - INT Length, - INT *Flags + _In_ CONST VOID* Buffer, + _In_ INT Size, + _Inout_opt_ INT* Flags ); _IRQL_requires_max_(PASSIVE_LEVEL) Modified: trunk/reactos/sdk/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/actctx.c?rev=7… ============================================================================== --- trunk/reactos/sdk/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/actctx.c [iso-8859-1] Sun Aug 7 18:52:49 2016 @@ -2515,7 +2515,7 @@ : ACTIVATION_CONTEXT_PATH_TYPE_NONE; unicode_tests = IS_TEXT_UNICODE_SIGNATURE | IS_TEXT_UNICODE_REVERSE_SIGNATURE; - if (RtlIsTextUnicode((PVOID)buffer, (ULONG)size, &unicode_tests )) + if (RtlIsTextUnicode(buffer, size, &unicode_tests )) { xmlbuf.ptr = buffer; xmlbuf.end = xmlbuf.ptr + size / sizeof(WCHAR); Modified: trunk/reactos/sdk/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/unicode.c?rev=… ============================================================================== --- trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/unicode.c [iso-8859-1] Sun Aug 7 18:52:49 2016 @@ -1238,7 +1238,7 @@ */ BOOLEAN NTAPI -RtlIsTextUnicode( PVOID buf, INT len, INT *pf ) +RtlIsTextUnicode(CONST VOID* buf, INT len, INT* pf) { static const WCHAR std_control_chars[] = {'\r', '\n', '\t', ' ', 0x3000, 0}; static const WCHAR byterev_control_chars[] = {0x0d00, 0x0a00, 0x0900, 0x2000, 0};

8 years, 4 months

[hbelusca] 72149: [ADVAPI32]: Cleanup file headers and whitespace.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 7 16:57:45 2016 New Revision: 72149 URL: http://svn.reactos.org/svn/reactos?rev=72149&view=rev Log: [ADVAPI32]: Cleanup file headers and whitespace. Modified: trunk/reactos/dll/win32/advapi32/misc/sysfunc.c trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/dll/win32/advapi32/token/token.c Modified: trunk/reactos/dll/win32/advapi32/misc/sysfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/sy… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/sysfunc.c [iso-8859-1] Sun Aug 7 16:57:45 2016 @@ -1,14 +1,13 @@ /* - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: dll/win32/advapi32/misc/sysfun.c * PURPOSE: advapi32.dll system functions (undocumented) * PROGRAMMER: Emanuele Aliberti * UPDATE HISTORY: - * 19990413 EA created - * 19990415 EA - * 20080424 Ported from WINE + * 19990413 EA created + * 19990415 EA + * 20080424 Ported from WINE */ #include <advapi32.h> @@ -450,8 +449,8 @@ { //NDRCContextBinding() //SystemFunction034() - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 28; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 28; } @@ -464,8 +463,8 @@ SystemFunction029(INT a, INT b) { //I_RpcBindingIsClientLocal() - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 29; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 29; } @@ -484,7 +483,7 @@ BOOL WINAPI SystemFunction030(LPCVOID b1, LPCVOID b2) { - return !memcmp(b1, b2, 0x10); + return !memcmp(b1, b2, 0x10); } @@ -524,8 +523,8 @@ WINAPI SystemFunction033(INT a, INT b) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 33; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 33; } /********************************************************************** @@ -540,8 +539,8 @@ //I_RpcMapWin32Status //RpcStringBindingParseW //RpcStringFreeW - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 34; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 34; } @@ -757,7 +756,7 @@ return STATUS_INVALID_PARAMETER; } - return KsecDeviceIoControl(IoControlCode, Memory, MemoryLength, Memory, MemoryLength); + return KsecDeviceIoControl(IoControlCode, Memory, MemoryLength, Memory, MemoryLength); } /****************************************************************************** @@ -808,7 +807,7 @@ return STATUS_INVALID_PARAMETER; } - return KsecDeviceIoControl(IoControlCode, Memory, MemoryLength, Memory, MemoryLength); + return KsecDeviceIoControl(IoControlCode, Memory, MemoryLength, Memory, MemoryLength); } /* EOF */ 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 Aug 7 16:57:45 2016 @@ -8,7 +8,6 @@ * 19990322 EA created * 19990515 EA stubs * 20030202 KJK compressed stubs - * */ #include <advapi32.h> Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Aug 7 16:57:45 2016 @@ -6,7 +6,6 @@ * COPYRIGHT: Copyright 1999 Emanuele Aliberti * Copyright 2007 Ged Murphy <gedmurphy(a)reactos.org> * Gregor Brunmar <gregor.brunmar(a)home.se> - * */ Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] Sun Aug 7 16:57:45 2016 @@ -3,7 +3,7 @@ * PROJECT: ReactOS system libraries * FILE: lib/advapi32/token/token.c * PURPOSE: Token functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * PROGRAMMER: Ariadne (ariadne(a)xs4all.nl) * UPDATE HISTORY: * Created 01/11/98 */

8 years, 4 months

← Newer
1
...
35
36
37
38
39
40
41
...
47
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 August 2016