Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 72162: [NTOS:MM] - Accept memory areas that end at 0xffffffff CORE-11533
by tfaber＠svn.reactos.org 09 Aug '16

09 Aug '16

Author: tfaber Date: Tue Aug 9 07:43:51 2016 New Revision: 72162 URL: http://svn.reactos.org/svn/reactos?rev=72162&view=rev Log: [NTOS:MM] - Accept memory areas that end at 0xffffffff CORE-11533 Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Tue Aug 9 07:43:51 2016 @@ -175,7 +175,7 @@ marea->VadNode.u.VadFlags.Protection = MiMakeProtectionMask(marea->Protect); /* Build a lame VAD if this is a user-space allocation */ - if (MA_GetEndingAddress(marea) < (ULONG_PTR)MmSystemRangeStart) + if (marea->EndingVpn + 1 < (ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT) { ASSERT(Process != NULL); if (marea->Type != MEMORY_AREA_OWNED_BY_ARM3) @@ -360,7 +360,7 @@ //if (MemoryArea->VadNode.StartingVpn < (ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT if (MemoryArea->Vad) { - ASSERT(MA_GetEndingAddress(MemoryArea) < (ULONG_PTR)MmSystemRangeStart); + ASSERT(MemoryArea->EndingVpn + 1 < (ULONG_PTR)MmSystemRangeStart >> PAGE_SHIFT); ASSERT(MemoryArea->Type == MEMORY_AREA_SECTION_VIEW || MemoryArea->Type == MEMORY_AREA_CACHE); /* MmCleanProcessAddressSpace might have removed it (and this would be MmDeleteProcessAdressSpace) */

1 0

[tfaber] 72161: [NTOS:MM] - In debug builds, invalidate the MEMORY_AREA's Magic on destroy to catch potential uses after free
by tfaber＠svn.reactos.org 09 Aug '16

09 Aug '16

Author: tfaber Date: Tue Aug 9 07:28:02 2016 New Revision: 72161 URL: http://svn.reactos.org/svn/reactos?rev=72161&view=rev Log: [NTOS:MM] - In debug builds, invalidate the MEMORY_AREA's Magic on destroy to catch potential uses after free Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Tue Aug 9 07:28:02 2016 @@ -378,6 +378,9 @@ } } +#if DBG + MemoryArea->Magic = 'daeD'; +#endif ExFreePoolWithTag(MemoryArea, TAG_MAREA); DPRINT("MmFreeMemoryAreaByNode() succeeded\n");

1 0

[dchapyshev] 72160: [INPUT] - Implement add input methods - Some improvents
by dchapyshev＠svn.reactos.org 08 Aug '16

08 Aug '16

Author: dchapyshev Date: Mon Aug 8 20:30:36 2016 New Revision: 72160 URL: http://svn.reactos.org/svn/reactos?rev=72160&view=rev Log: [INPUT] - Implement add input methods - Some improvents Added: trunk/reactos/dll/cpl/input_new/add_dialog.c (with props) trunk/reactos/dll/cpl/input_new/advanced_settings_page.c (with props) trunk/reactos/dll/cpl/input_new/edit_dialog.c (with props) trunk/reactos/dll/cpl/input_new/input_list.c (with props) trunk/reactos/dll/cpl/input_new/input_list.h (with props) trunk/reactos/dll/cpl/input_new/key_settings_dialog.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 trunk/reactos/dll/cpl/input_new/layout_list.c trunk/reactos/dll/cpl/input_new/layout_list.h trunk/reactos/dll/cpl/input_new/locale_list.c trunk/reactos/dll/cpl/input_new/locale_list.h trunk/reactos/dll/cpl/input_new/settings_page.c 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] Mon Aug 8 20:30:36 2016 @@ -1,14 +1,21 @@ +PROJECT(INPUT_NEW) spec2def(input_new.dll input.spec) list(APPEND SOURCE input.c input.h + input_list.c + input_list.h layout_list.c layout_list.h locale_list.c locale_list.h - settings_page.c) + settings_page.c + advanced_settings_page.c + add_dialog.c + edit_dialog.c + key_settings_dialog.c) add_rc_deps(input.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/keyboard-shortcuts.ico) @@ -18,6 +25,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/input_new.def) set_module_type(input_new win32dll UNICODE) -add_importlibs(input_new advapi32 user32 comctl32 gdi32 msvcrt kernel32) +add_importlibs(input_new advapi32 user32 comctl32 gdi32 msvcrt kernel32 setupapi) add_pch(input_new input.h SOURCE) add_cd_file(TARGET input_new DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/cpl/input_new/add_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/add_dial… ============================================================================== --- trunk/reactos/dll/cpl/input_new/add_dialog.c (added) +++ trunk/reactos/dll/cpl/input_new/add_dialog.c [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -0,0 +1,192 @@ +/* +* PROJECT: input.dll +* FILE: dll/cpl/input/add_dialog.c +* PURPOSE: input.dll +* PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) +*/ + +#include "input.h" +#include "locale_list.h" +#include "layout_list.h" +#include "input_list.h" + + +static DWORD +GetDefaultLayoutForLocale(DWORD dwLocaleId) +{ + DWORD dwResult = 0; + HINF hIntlInf; + + hIntlInf = SetupOpenInfFileW(L"intl.inf", NULL, INF_STYLE_WIN4, NULL); + if (hIntlInf != INVALID_HANDLE_VALUE) + { + WCHAR szLangID[MAX_STR_LEN]; + INFCONTEXT InfContext; + + StringCchPrintfW(szLangID, ARRAYSIZE(szLangID), L"%08X", dwLocaleId); + + if (SetupFindFirstLineW(hIntlInf, L"Locales", szLangID, &InfContext)) + { + if (SetupGetFieldCount(&InfContext) >= 5) + { + WCHAR szField[MAX_STR_LEN]; + + if (SetupGetStringFieldW(&InfContext, 5, szField, ARRAYSIZE(szField), NULL)) + { + if (wcslen(szField) == 13) // like 0409:00000409 (13 chars) + { + WCHAR *pszSeparator = L":"; + WCHAR *pszToken; + + pszToken = wcstok(szField, pszSeparator); + if (pszToken != NULL) + pszToken = wcstok(NULL, pszSeparator); + + if (pszToken != NULL) + { + dwResult = DWORDfromString(pszToken); + } + } + } + } + } + + SetupCloseInfFile(hIntlInf); + } + + return dwResult; +} + + +static VOID +OnInitAddDialog(HWND hwndDlg) +{ + HWND hwndLocaleCombo = GetDlgItem(hwndDlg, IDC_INPUT_LANG_COMBO); + HWND hwndLayoutCombo = GetDlgItem(hwndDlg, IDC_KEYBOARD_LO_COMBO); + LOCALE_LIST_NODE *pCurrentLocale; + LAYOUT_LIST_NODE *pCurrentLayout; + DWORD dwDefaultLocaleId; + DWORD dwDefaultLayoutId; + INT iItemIndex; + + dwDefaultLocaleId = GetSystemDefaultLCID(); + + for (pCurrentLocale = LocaleList_Get(); + pCurrentLocale != NULL; + pCurrentLocale = pCurrentLocale->pNext) + { + iItemIndex = ComboBox_AddString(hwndLocaleCombo, pCurrentLocale->pszName); + ComboBox_SetItemData(hwndLocaleCombo, iItemIndex, pCurrentLocale); + + if (pCurrentLocale->dwId == dwDefaultLocaleId) + { + ComboBox_SetCurSel(hwndLocaleCombo, iItemIndex); + } + } + + dwDefaultLayoutId = GetDefaultLayoutForLocale(dwDefaultLocaleId); + + for (pCurrentLayout = LayoutList_Get(); + pCurrentLayout != NULL; + pCurrentLayout = pCurrentLayout->pNext) + { + iItemIndex = ComboBox_AddString(hwndLayoutCombo, pCurrentLayout->pszName); + ComboBox_SetItemData(hwndLayoutCombo, iItemIndex, pCurrentLayout); + + if (pCurrentLayout->dwId == dwDefaultLayoutId) + { + ComboBox_SetCurSel(hwndLayoutCombo, iItemIndex); + } + } + + if (dwDefaultLayoutId == 0) + ComboBox_SetCurSel(hwndLayoutCombo, 0); +} + + +static VOID +OnCommandAddDialog(HWND hwndDlg, WPARAM wParam) +{ + switch (LOWORD(wParam)) + { + case IDOK: + { + HWND hwndLocaleCombo = GetDlgItem(hwndDlg, IDC_INPUT_LANG_COMBO); + HWND hwndLayoutCombo = GetDlgItem(hwndDlg, IDC_KEYBOARD_LO_COMBO); + LOCALE_LIST_NODE *pCurrentLocale; + LAYOUT_LIST_NODE *pCurrentLayout; + + pCurrentLocale = (LOCALE_LIST_NODE*)ComboBox_GetItemData(hwndLocaleCombo, + ComboBox_GetCurSel(hwndLocaleCombo)); + pCurrentLayout = (LAYOUT_LIST_NODE*)ComboBox_GetItemData(hwndLayoutCombo, + ComboBox_GetCurSel(hwndLayoutCombo)); + + InputList_Add(pCurrentLocale, pCurrentLayout); + + EndDialog(hwndDlg, LOWORD(wParam)); + } + break; + + case IDCANCEL: + { + EndDialog(hwndDlg, LOWORD(wParam)); + } + break; + + case IDC_INPUT_LANG_COMBO: + { + if (HIWORD(wParam) == CBN_SELCHANGE) + { + HWND hwndLocaleCombo = GetDlgItem(hwndDlg, IDC_INPUT_LANG_COMBO); + HWND hwndLayoutCombo = GetDlgItem(hwndDlg, IDC_KEYBOARD_LO_COMBO); + LOCALE_LIST_NODE *pCurrentLocale; + + pCurrentLocale = (LOCALE_LIST_NODE*)ComboBox_GetItemData(hwndLocaleCombo, + ComboBox_GetCurSel(hwndLocaleCombo)); + if (pCurrentLocale != NULL) + { + DWORD dwLayoutId; + INT iIndex; + INT iCount; + + dwLayoutId = GetDefaultLayoutForLocale(pCurrentLocale->dwId); + + iCount = ComboBox_GetCount(hwndLayoutCombo); + + for (iIndex = 0; iIndex < iCount; iIndex++) + { + LAYOUT_LIST_NODE *pCurrentLayout; + + pCurrentLayout = (LAYOUT_LIST_NODE*)ComboBox_GetItemData(hwndLayoutCombo, iIndex); + if (pCurrentLayout != NULL && pCurrentLayout->dwId == dwLayoutId) + { + ComboBox_SetCurSel(hwndLayoutCombo, iIndex); + } + } + } + } + } + break; + } +} + + +INT_PTR CALLBACK +AddDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + OnInitAddDialog(hwndDlg); + break; + + case WM_COMMAND: + OnCommandAddDialog(hwndDlg, wParam); + break; + + case WM_DESTROY: + break; + } + + return FALSE; +} Propchange: trunk/reactos/dll/cpl/input_new/add_dialog.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input_new/advanced_settings_page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/advanced… ============================================================================== --- trunk/reactos/dll/cpl/input_new/advanced_settings_page.c (added) +++ trunk/reactos/dll/cpl/input_new/advanced_settings_page.c [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -0,0 +1,15 @@ +/* +* PROJECT: input.dll +* FILE: dll/cpl/input/advanced_settings_page.c +* PURPOSE: input.dll +* PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) +*/ + +#include "input.h" + + +INT_PTR CALLBACK +AdvancedSettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return FALSE; +} Propchange: trunk/reactos/dll/cpl/input_new/advanced_settings_page.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input_new/edit_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/edit_dia… ============================================================================== --- trunk/reactos/dll/cpl/input_new/edit_dialog.c (added) +++ trunk/reactos/dll/cpl/input_new/edit_dialog.c [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -0,0 +1,8 @@ +/* +* PROJECT: input.dll +* FILE: dll/cpl/input/edit_dialog.c +* PURPOSE: input.dll +* PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) +*/ + +#include "input.h" Propchange: trunk/reactos/dll/cpl/input_new/edit_dialog.c ------------------------------------------------------------------------------ svn:eol-style = native 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] Mon Aug 8 20:30:36 2016 @@ -14,9 +14,10 @@ #define NUM_APPLETS (1) -LONG CALLBACK SystemApplet(VOID); +static LONG CALLBACK SystemApplet(VOID); + HINSTANCE hApplet = NULL; -HWND hCPLWindow; +static HWND hCPLWindow; /* Applets */ static APPLET Applets[NUM_APPLETS] = @@ -25,35 +26,28 @@ }; -VOID -InitPropSheetPage(PROPSHEETPAGE *page, WORD idDlg, DLGPROC DlgProc) +static VOID +InitPropSheetPage(PROPSHEETPAGEW *page, WORD idDlg, DLGPROC DlgProc) { - memset(page, 0, sizeof(PROPSHEETPAGE)); + memset(page, 0, sizeof(PROPSHEETPAGEW)); - page->dwSize = sizeof(PROPSHEETPAGE); + page->dwSize = sizeof(PROPSHEETPAGEW); page->dwFlags = PSP_DEFAULT; page->hInstance = hApplet; - page->pszTemplate = MAKEINTRESOURCE(idDlg); + page->pszTemplate = MAKEINTRESOURCEW(idDlg); page->pfnDlgProc = DlgProc; } -INT_PTR CALLBACK -AdvancedSettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - return FALSE; -} - - /* First Applet */ -LONG CALLBACK +static LONG CALLBACK SystemApplet(VOID) { - PROPSHEETPAGE page[2]; - PROPSHEETHEADER header; + PROPSHEETPAGEW page[2]; + PROPSHEETHEADERW header; WCHAR szCaption[MAX_STR_LEN]; - LoadString(hApplet, IDS_CPLSYSTEMNAME, szCaption, ARRAYSIZE(szCaption)); + LoadStringW(hApplet, IDS_CPLSYSTEMNAME, szCaption, ARRAYSIZE(szCaption)); memset(&header, 0, sizeof(PROPSHEETHEADER)); @@ -61,7 +55,7 @@ header.dwFlags = PSH_PROPSHEETPAGE; header.hwndParent = hCPLWindow; header.hInstance = hApplet; - header.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + header.hIcon = LoadIconW(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); header.pszCaption = szCaption; header.nPages = ARRAYSIZE(page); header.nStartPage = 0; @@ -74,7 +68,7 @@ /* Advanced Settings */ InitPropSheetPage(&page[1], IDD_PROPPAGEADVANCEDSETTINGS, AdvancedSettingsPageProc); - return (LONG)(PropertySheet(&header) != -1); + return (LONG)(PropertySheetW(&header) != -1); } 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] Mon Aug 8 20:30:36 2016 @@ -11,6 +11,8 @@ #include <winuser.h> #include <wingdi.h> #include <commctrl.h> +#include <windowsx.h> +#include <setupapi.h> #include <wchar.h> #include <strsafe.h> #include <stdlib.h> @@ -37,15 +39,17 @@ #define MAX_STR_LEN 256 -/* input.c */ -VOID -InitPropSheetPage(PROPSHEETPAGE *page, WORD idDlg, DLGPROC DlgProc); - -/* settings_dialog.c */ +/* settings_page.c */ INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -void ShowLastWin32Error(HWND hWndOwner); +/* advanced_settings_page.c */ +INT_PTR CALLBACK +AdvancedSettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + +/* add_dialog.c */ +INT_PTR CALLBACK +AddDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); static inline WCHAR* DublicateString(const WCHAR *pszString) @@ -64,4 +68,12 @@ return pszDublicate; } +static inline DWORD +DWORDfromString(const WCHAR *pszString) +{ + WCHAR *pszEnd; + + return wcstoul(pszString, &pszEnd, 16); +} + #endif /* _INPUT_H */ Added: trunk/reactos/dll/cpl/input_new/input_list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/input_li… ============================================================================== --- trunk/reactos/dll/cpl/input_new/input_list.c (added) +++ trunk/reactos/dll/cpl/input_new/input_list.c [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -0,0 +1,342 @@ +/* +* PROJECT: input.dll +* FILE: dll/cpl/input/input_list.c +* PURPOSE: input.dll +* PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) +*/ + +#include "input_list.h" + + +static INPUT_LIST_NODE *_InputList = NULL; + + +static INPUT_LIST_NODE* +InputList_AppendNode(VOID) +{ + INPUT_LIST_NODE *pCurrent; + INPUT_LIST_NODE *pNew; + + pCurrent = _InputList; + + pNew = (INPUT_LIST_NODE*)malloc(sizeof(INPUT_LIST_NODE)); + if (pNew == NULL) + return NULL; + + memset(pNew, 0, sizeof(INPUT_LIST_NODE)); + + if (pCurrent == NULL) + { + _InputList = pNew; + } + else + { + while (pCurrent->pNext != NULL) + { + pCurrent = pCurrent->pNext; + } + + pNew->pPrev = pCurrent; + pCurrent->pNext = pNew; + } + + return pNew; +} + + +VOID +InputList_Remove(INPUT_LIST_NODE *pNode) +{ + INPUT_LIST_NODE *pCurrent = pNode; + + if (_InputList == NULL) + return; + + if (pCurrent != NULL) + { + INPUT_LIST_NODE *pNext = pCurrent->pNext; + INPUT_LIST_NODE *pPrev = pCurrent->pPrev; + + free(pCurrent); + + if (pNext != NULL) + pNext->pPrev = pPrev; + + if (pPrev != NULL) + pPrev->pNext = pNext; + else + _InputList = pNext; + } +} + + +VOID +InputList_Destroy(VOID) +{ + INPUT_LIST_NODE *pCurrent; + + if (_InputList == NULL) + return; + + pCurrent = _InputList; + + while (pCurrent != NULL) + { + INPUT_LIST_NODE *pNext = pCurrent->pNext; + + free(pCurrent); + + pCurrent = pNext; + } + + _InputList = NULL; +} + + +static BOOL +InputList_PrepareUserRegistry(VOID) +{ + BOOL bResult = FALSE; + HKEY hTempKey = NULL; + HKEY hKey = NULL; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"Keyboard Layout", + 0, + KEY_ALL_ACCESS, + &hKey) == ERROR_SUCCESS) + { + RegDeleteKeyW(hKey, L"Preload"); + RegDeleteKeyW(hKey, L"Substitutes"); + //RegDeleteKeyW(hKey, L"Toggle"); + + RegCloseKey(hKey); + + RegDeleteKeyW(HKEY_CURRENT_USER, L"Keyboard Layout"); + } + + if (RegCreateKeyW(HKEY_CURRENT_USER, L"Keyboard Layout", &hKey) != ERROR_SUCCESS) + { + goto Cleanup; + } + + if (RegCreateKeyW(hKey, L"Preload", &hTempKey) != ERROR_SUCCESS) + { + goto Cleanup; + } + + RegCloseKey(hTempKey); + + if (RegCreateKeyW(hKey, L"Substitutes", &hTempKey) != ERROR_SUCCESS) + { + goto Cleanup; + } + + RegCloseKey(hTempKey); + + if (RegCreateKeyW(hKey, L"Toggle", &hTempKey) != ERROR_SUCCESS) + { + goto Cleanup; + } + + RegCloseKey(hTempKey); + + bResult = TRUE; + +Cleanup: + if (hTempKey != NULL) + RegCloseKey(hTempKey); + if (hKey != NULL) + RegCloseKey(hKey); + + return bResult; +} + + +static VOID +InputList_AddInputMethodToUserRegistry(DWORD dwIndex, INPUT_LIST_NODE *pNode) +{ + WCHAR szMethodIndex[MAX_PATH]; + WCHAR szPreload[MAX_PATH]; + BOOL bIsImeMethod = FALSE; + HKEY hKey; + + StringCchPrintfW(szMethodIndex, ARRAYSIZE(szMethodIndex), L"%lu", dwIndex); + + /* Check is IME method */ + if ((HIWORD(pNode->pLayout->dwId) & 0xF000) == 0xE000) + { + StringCchPrintfW(szPreload, ARRAYSIZE(szPreload), L"%08X", pNode->pLayout->dwId); + bIsImeMethod = TRUE; + } + else + { + StringCchPrintfW(szPreload, ARRAYSIZE(szPreload), L"%08X", pNode->pLocale->dwId); + } + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"Keyboard Layout\\Preload", + 0, + KEY_SET_VALUE, + &hKey) == ERROR_SUCCESS) + { + RegSetValueExW(hKey, + szMethodIndex, + 0, + REG_SZ, + (LPBYTE)szPreload, + (wcslen(szPreload) + 1) * sizeof(WCHAR)); + + RegCloseKey(hKey); + } + + if (pNode->pLocale->dwId != pNode->pLayout->dwId && bIsImeMethod == FALSE) + { + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"Keyboard Layout\\Substitutes", + 0, + KEY_SET_VALUE, + &hKey) == ERROR_SUCCESS) + { + WCHAR szSubstitues[MAX_PATH]; + + StringCchPrintfW(szSubstitues, ARRAYSIZE(szSubstitues), L"%08X", pNode->pLayout->dwId); + + RegSetValueExW(hKey, + szPreload, + 0, + REG_SZ, + (LPBYTE)szSubstitues, + (wcslen(szSubstitues) + 1) * sizeof(WCHAR)); + + RegCloseKey(hKey); + } + } + + if (pNode->dwFlags & INPUT_LIST_NODE_FLAG_ADDED) + { + pNode->hkl = LoadKeyboardLayoutW(szPreload, KLF_SUBSTITUTE_OK | KLF_NOTELLSHELL); + } +} + + +VOID +InputList_Process(VOID) +{ + INPUT_LIST_NODE *pCurrent; + DWORD dwIndex; + + /* Process deleted input methods */ + for (pCurrent = _InputList; pCurrent != NULL; pCurrent = pCurrent->pNext) + { + if (!(pCurrent->dwFlags & INPUT_LIST_NODE_FLAG_DELETED)) + continue; + + if (UnloadKeyboardLayout(pCurrent->hkl)) + { + InputList_Remove(pCurrent); + } + } + + InputList_PrepareUserRegistry(); + + /* Find default input method */ + for (pCurrent = _InputList; pCurrent != NULL; pCurrent = pCurrent->pNext) + { + if (pCurrent->dwFlags & INPUT_LIST_NODE_FLAG_DEFAULT) + { + InputList_AddInputMethodToUserRegistry(1, pCurrent); + break; + } + } + + if (SystemParametersInfoW(SPI_SETDEFAULTINPUTLANG, + 0, + (LPVOID)((LPDWORD)&pCurrent->hkl), + 0)) + { + DWORD dwRecipients; + + dwRecipients = BSM_ALLCOMPONENTS; + + BroadcastSystemMessageW(BSF_POSTMESSAGE, + &dwRecipients, + WM_INPUTLANGCHANGEREQUEST, + 0, + (LPARAM)pCurrent->hkl); + } + + /* Add methods to registry */ + for (pCurrent = _InputList, dwIndex = 2; pCurrent != NULL; pCurrent = pCurrent->pNext, dwIndex++) + { + if (pCurrent->dwFlags & INPUT_LIST_NODE_FLAG_DEFAULT) + continue; + + InputList_AddInputMethodToUserRegistry(dwIndex, pCurrent); + } +} + + +VOID +InputList_Add(LOCALE_LIST_NODE *pLocale, LAYOUT_LIST_NODE *pLayout) +{ + INPUT_LIST_NODE *pInput; + + if (pLocale == NULL || pLayout == NULL) + { + return; + } + + pInput = InputList_AppendNode(); + + pInput->dwFlags |= INPUT_LIST_NODE_FLAG_ADDED; + + pInput->pLocale = pLocale; + pInput->pLayout = pLayout; +} + + +VOID +InputList_Create(VOID) +{ + INT iLayoutCount; + HKL *pLayoutList; + + iLayoutCount = GetKeyboardLayoutList(0, NULL); + pLayoutList = (HKL*)malloc(iLayoutCount * sizeof(HKL)); + + if (pLayoutList != NULL) + { + if (GetKeyboardLayoutList(iLayoutCount, pLayoutList) > 0) + { + INT iIndex; + + for (iIndex = 0; iIndex < iLayoutCount; iIndex++) + { + LOCALE_LIST_NODE *pLocale = LocaleList_GetByHkl(pLayoutList[iIndex]); + LAYOUT_LIST_NODE *pLayout = LayoutList_GetByHkl(pLayoutList[iIndex]); + + if (pLocale != NULL && pLayout != NULL) + { + INPUT_LIST_NODE *pInput; + + pInput = InputList_AppendNode(); + + pInput->dwFlags = 0; + pInput->pLocale = pLocale; + pInput->pLayout = pLayout; + pInput->hkl = pLayoutList[iIndex]; + } + } + } + + free(pLayoutList); + } +} + + +INPUT_LIST_NODE* +InputList_Get(VOID) +{ + return _InputList; +} Propchange: trunk/reactos/dll/cpl/input_new/input_list.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input_new/input_list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/input_li… ============================================================================== --- trunk/reactos/dll/cpl/input_new/input_list.h (added) +++ trunk/reactos/dll/cpl/input_new/input_list.h [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -0,0 +1,44 @@ +#pragma once + +#include "input.h" +#include "locale_list.h" +#include "layout_list.h" + + +#define INPUT_LIST_NODE_FLAG_EDITED 0x00000001 +#define INPUT_LIST_NODE_FLAG_ADDED 0x00000002 +#define INPUT_LIST_NODE_FLAG_DELETED 0x00000004 +#define INPUT_LIST_NODE_FLAG_DEFAULT 0x00000008 + + +typedef struct _INPUT_LIST_NODE +{ + DWORD dwFlags; + + LOCALE_LIST_NODE *pLocale; + LAYOUT_LIST_NODE *pLayout; + + HKL hkl; + + struct _INPUT_LIST_NODE *pPrev; + struct _INPUT_LIST_NODE *pNext; +} INPUT_LIST_NODE; + + +VOID +InputList_Create(VOID); + +VOID +InputList_Process(VOID); + +VOID +InputList_Add(LOCALE_LIST_NODE *pLocale, LAYOUT_LIST_NODE *pLayout); + +VOID +InputList_Remove(INPUT_LIST_NODE *pNode); + +VOID +InputList_Destroy(VOID); + +INPUT_LIST_NODE* +InputList_Get(VOID); Propchange: trunk/reactos/dll/cpl/input_new/input_list.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/input_new/key_settings_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input_new/key_sett… ============================================================================== --- trunk/reactos/dll/cpl/input_new/key_settings_dialog.c (added) +++ trunk/reactos/dll/cpl/input_new/key_settings_dialog.c [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -0,0 +1,8 @@ +/* +* PROJECT: input.dll +* FILE: dll/cpl/input/key_settings_dialog.c +* PURPOSE: input.dll +* PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) +*/ + +#include "input.h" Propchange: trunk/reactos/dll/cpl/input_new/key_settings_dialog.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/layout_list.c [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -22,7 +22,7 @@ pCurrent = _LayoutList; - pNew = (LAYOUT_LIST_NODE*)malloc(sizeof(LAYOUT_LIST_NODE)); + pNew = (LAYOUT_LIST_NODE*) malloc(sizeof(LAYOUT_LIST_NODE)); if (pNew == NULL) return NULL; @@ -99,7 +99,10 @@ DWORD dwSize; HKEY hKey; - GetSystemDirectoryW(szSystemDirectory, ARRAYSIZE(szSystemDirectory)); + if (!GetSystemDirectoryW(szSystemDirectory, ARRAYSIZE(szSystemDirectory))) + { + return; + } if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts", @@ -137,10 +140,9 @@ StringCchPrintfW(szFilePath, ARRAYSIZE(szFilePath), L"%s\\%s", szSystemDirectory, szBuffer); - if (GetFileAttributes(szFilePath) != INVALID_FILE_ATTRIBUTES) + if (GetFileAttributesW(szFilePath) != INVALID_FILE_ATTRIBUTES) { DWORD dwSpecialId = 0; - WCHAR *pszEnd; dwSize = sizeof(szBuffer); @@ -149,7 +151,7 @@ NULL, NULL, (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS) { - dwSpecialId = wcstoul(szBuffer, &pszEnd, 16); + dwSpecialId = DWORDfromString(szBuffer); } dwSize = sizeof(szBuffer); @@ -159,9 +161,7 @@ NULL, NULL, (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS) { - DWORD dwLayoutId; - - dwLayoutId = wcstoul(szLayoutId, &pszEnd, 16); + DWORD dwLayoutId = DWORDfromString(szLayoutId); LayoutList_Append(dwLayoutId, dwSpecialId, @@ -182,8 +182,8 @@ } -WCHAR* -LayoutList_GetNameByHkl(HKL hkl) +LAYOUT_LIST_NODE* +LayoutList_GetByHkl(HKL hkl) { LAYOUT_LIST_NODE *pCurrent; @@ -195,7 +195,7 @@ { if (dwSpecialId == pCurrent->dwSpecialId) { - return pCurrent->pszName; + return pCurrent; } } } @@ -205,7 +205,7 @@ { if (HIWORD(hkl) == LOWORD(pCurrent->dwId)) { - return pCurrent->pszName; + return pCurrent; } } } Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/layout_list.h [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -18,8 +18,8 @@ VOID LayoutList_Destroy(VOID); -WCHAR* -LayoutList_GetNameByHkl(HKL hkl); +LAYOUT_LIST_NODE* +LayoutList_GetByHkl(HKL hkl); LAYOUT_LIST_NODE* LayoutList_Get(VOID); Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/locale_list.c [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -12,7 +12,7 @@ static LOCALE_LIST_NODE* -LocaleList_Append(DWORD dwId, WCHAR *pszName, WCHAR *pszIndicator) +LocaleList_Append(DWORD dwId, const WCHAR *pszName, const WCHAR *pszIndicator) { LOCALE_LIST_NODE *pCurrent; LOCALE_LIST_NODE *pNew; @@ -79,6 +79,7 @@ LOCALE_LIST_NODE *pNext = pCurrent->pNext; free(pCurrent->pszName); + free(pCurrent->pszIndicator); free(pCurrent); pCurrent = pNext; @@ -112,16 +113,15 @@ NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { WCHAR szName[MAX_STR_LEN]; - WCHAR *End; DWORD dwId; - dwId = wcstoul(szValue, &End, 16); + dwId = DWORDfromString(szValue); if (GetLocaleInfoW(LOWORD(dwId), LOCALE_SLANGUAGE, szName, ARRAYSIZE(szName))) { - WCHAR szIndicator[MAX_STR_LEN]; + WCHAR szIndicator[MAX_STR_LEN] = { 0 }; if (GetLocaleInfoW(LOWORD(dwId), LOCALE_SABBREVLANGNAME | LOCALE_NOUSEROVERRIDE, @@ -148,6 +148,23 @@ LOCALE_LIST_NODE* +LocaleList_GetByHkl(HKL hkl) +{ + LOCALE_LIST_NODE *pCurrent; + + for (pCurrent = _LocaleList; pCurrent != NULL; pCurrent = pCurrent->pNext) + { + if (LOWORD(pCurrent->dwId) == LOWORD(hkl)) + { + return pCurrent; + } + } + + return NULL; +} + + +LOCALE_LIST_NODE* LocaleList_Get(VOID) { return _LocaleList; Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/locale_list.h [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -18,4 +18,7 @@ LocaleList_Destroy(VOID); LOCALE_LIST_NODE* +LocaleList_GetByHkl(HKL hkl); + +LOCALE_LIST_NODE* LocaleList_Get(VOID); Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input_new/settings_page.c [iso-8859-1] Mon Aug 8 20:30:36 2016 @@ -8,16 +8,15 @@ #include "input.h" #include "layout_list.h" #include "locale_list.h" +#include "input_list.h" static HICON CreateLayoutIcon(LPWSTR szLayout) { - HDC hdc, hdcsrc; - HBITMAP hBitmap, hBmpNew, hBmpOld; - RECT rect; - HFONT hFont = NULL; - ICONINFO IconInfo; + HDC hdc; + HDC hdcsrc; + HBITMAP hBitmap; HICON hIcon = NULL; hdcsrc = GetDC(NULL); @@ -29,11 +28,18 @@ if (hdc && hBitmap) { + HBITMAP hBmpNew; + hBmpNew = CreateBitmap(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 1, 1, NULL); if (hBmpNew) { + ICONINFO IconInfo; + HBITMAP hBmpOld; + HFONT hFont; + RECT rect; + hBmpOld = SelectObject(hdc, hBitmap); rect.right = GetSystemMetrics(SM_CXSMICON); rect.left = 0; @@ -45,12 +51,12 @@ 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"); + hFont = CreateFontW(-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); + DrawTextW(hdc, szLayout, 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); SelectObject(hdc, hBmpNew); PatBlt(hdc, 0, 0, @@ -80,10 +86,7 @@ static VOID -AddToLayoutListView(HWND hwndList, - WCHAR *pszLanguageName, - WCHAR *pszLayoutName, - WCHAR *pszIndicatorTitle) +AddToInputListView(HWND hwndList, INPUT_LIST_NODE *pInputNode) { INT ItemIndex = -1; INT ImageIndex = -1; @@ -91,11 +94,13 @@ HIMAGELIST hImageList; hImageList = ListView_GetImageList(hwndList, LVSIL_SMALL); + if (hImageList != NULL) { HICON hLayoutIcon; - hLayoutIcon = CreateLayoutIcon(pszIndicatorTitle); + hLayoutIcon = CreateLayoutIcon(pInputNode->pLocale->pszIndicator); + if (hLayoutIcon != NULL) { ImageIndex = ImageList_AddIcon(hImageList, hLayoutIcon); @@ -106,88 +111,92 @@ memset(&item, 0, sizeof(LV_ITEM)); item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; - item.pszText = pszLanguageName; + item.pszText = pInputNode->pLocale->pszName; item.iItem = -1; - item.lParam = (LPARAM)NULL; + item.lParam = (LPARAM)pInputNode; item.iImage = ImageIndex; ItemIndex = ListView_InsertItem(hwndList, &item); - ListView_SetItemText(hwndList, ItemIndex, 1, pszLayoutName); + ListView_SetItemText(hwndList, ItemIndex, 1, pInputNode->pLayout->pszName); +} + + +static VOID +UpdateInputListView(HWND hwndList) +{ + INPUT_LIST_NODE *pCurrentInputNode; + HIMAGELIST hImageList; + + hImageList = ListView_GetImageList(hwndList, LVSIL_SMALL); + if (hImageList != NULL) + { + ImageList_RemoveAll(hImageList); + } + + ListView_DeleteAllItems(hwndList); + + for (pCurrentInputNode = InputList_Get(); + pCurrentInputNode != NULL; + pCurrentInputNode = pCurrentInputNode->pNext) + { + AddToInputListView(hwndList, pCurrentInputNode); + } } 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); - } + HWND hwndInputList; 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); + InputList_Create(); + + hwndInputList = GetDlgItem(hwndDlg, IDC_KEYLAYOUT_LIST); + + if (hwndInputList != NULL) + { + INPUT_LIST_NODE *pCurrentInputNode; + WCHAR szBuffer[MAX_STR_LEN]; + HIMAGELIST hLayoutImageList; + LV_COLUMN column; + + ListView_SetExtendedListViewStyle(hwndInputList, LVS_EX_FULLROWSELECT); + + memset(&column, 0, sizeof(LV_COLUMN)); + + column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + + LoadStringW(hApplet, IDS_LANGUAGE, szBuffer, ARRAYSIZE(szBuffer)); + column.fmt = LVCFMT_LEFT; + column.iSubItem = 0; + column.pszText = szBuffer; + column.cx = 175; + ListView_InsertColumn(hwndInputList, 0, &column); + + LoadStringW(hApplet, IDS_LAYOUT, szBuffer, ARRAYSIZE(szBuffer)); + column.fmt = LVCFMT_RIGHT; + column.cx = 155; + column.iSubItem = 1; + column.pszText = szBuffer; + ListView_InsertColumn(hwndInputList, 1, &column); + + hLayoutImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + ILC_COLOR8 | ILC_MASK, 0, 0); + if (hLayoutImageList != NULL) + { + ListView_SetImageList(hwndInputList, hLayoutImageList, LVSIL_SMALL); + } + + for (pCurrentInputNode = InputList_Get(); + pCurrentInputNode != NULL; + pCurrentInputNode = pCurrentInputNode->pNext) + { + AddToInputListView(hwndInputList, pCurrentInputNode); + } } } @@ -199,6 +208,7 @@ LayoutList_Destroy(); LocaleList_Destroy(); + InputList_Destroy(); hImageList = ListView_GetImageList(GetDlgItem(hwndDlg, IDC_KEYLAYOUT_LIST), LVSIL_SMALL); @@ -209,6 +219,61 @@ } +VOID +OnCommandSettingsPage(HWND hwndDlg, WPARAM wParam) +{ + switch (LOWORD(wParam)) + { + case IDC_ADD_BUTTON: + { + if (DialogBoxW(hApplet, + MAKEINTRESOURCEW(IDD_ADD), + hwndDlg, + AddDialogProc) == IDOK) + { + UpdateInputListView(GetDlgItem(hwndDlg, IDC_KEYLAYOUT_LIST)); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + } + break; + + case IDC_REMOVE_BUTTON: + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_PROP_BUTTON: + { + + } + break; + + case IDC_SET_DEFAULT: + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + + case IDC_KEY_SET_BTN: + { + + } + break; + } +} + + +static VOID +OnNotifySettingsPage(HWND hwndDlg, LPARAM lParam) +{ + if (((LPPSHNOTIFY)lParam)->hdr.code == PSN_APPLY) + { + InputList_Process(); + } +} + + INT_PTR CALLBACK SettingsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -223,10 +288,12 @@ break; case WM_COMMAND: - { - - } - break; + OnCommandSettingsPage(hwndDlg, wParam); + break; + + case WM_NOTIFY: + OnNotifySettingsPage(hwndDlg, lParam); + break; } return FALSE;

1 0

[zhu] 72159: Massively simplified the mutex guarding each TCP_CONTEXT struct. Before, manually handled recursion. Now uses KMUTEX to handle recursion. Corrected the way debug printouts get the curr...
by zhu＠svn.reactos.org 08 Aug '16

08 Aug '16

Author: zhu Date: Mon Aug 8 16:49:04 2016 New Revision: 72159 URL: http://svn.reactos.org/svn/reactos?rev=72159&view=rev Log: Massively simplified the mutex guarding each TCP_CONTEXT struct. Before, manually handled recursion. Now uses KMUTEX to handle recursion. Corrected the way debug printouts get the current thread context. Added code to walk Request linked lists for pending TDI_SEND and TDI_RECEIVE requests upon completion of a TDI_SEND and TDI_RECEIVE request, respectively. Without this check, backed-up request were left hanging forever. Split off the lwIP tcp_write() call into a helper function to aid this. Various deadlock fixes. Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/tcp.h Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c [iso-8859-1] Mon Aug 8 16:49:04 2016 @@ -3,7 +3,7 @@ #include <winsock2.h> #define LENGTH 255 -#define NUM_CLIENTS 32 +#define NUM_CLIENTS 16 DWORD WINAPI ClientThreadMain(LPVOID lpParam) { SOCKET Sock; Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Mon Aug 8 16:49:04 2016 @@ -219,6 +219,7 @@ /* Forward-declare helper function */ VOID CloseAddress(PADDRESS_FILE AddressFile); NTSTATUS DisassociateAddress(PTCP_CONTEXT Context); +NTSTATUS DoSend(PIRP Irp, PTCP_CONTEXT Context); #define AddrIsUnspecified(Address) ((Address->in_addr == 0) || (Address->in_addr == 0xFFFFFFFF)) @@ -233,27 +234,14 @@ Context->TcpState &= ~State /** - * Recursive mutex guarding a TCP_CONTEXT using a KSPIN_LOCK residing in the Context's associated - * ADDRESS_FILE. This mutex guards against concurrent access from multiple execution contexts if and - * only if the Context is associated with an Address File. If TcpIpAssociateAddress has been called - * on a TCP_CONTEXT struct, this mutex should be held when reading from or writing to any and all - * fields in the struct until TcpIpDisassociateAddress is called on the same struct. - * - * Mutex acquisition returns TRUE if the mutex has been acquired. Returns FALSE if the mutex could - * not be acquired due to the Context having no association to any Address File. - * - * A disassociated context should be inherently safe from concurrent access because the only - * remaining reference to it should reside in an lwIP Protocol Control Block as the callback - * argument. Thus, lwIP callback functions can safely ignore the return value while all other - * functions should treat a return value of FALSE as a non-recoverable error. + * TODO: distributed mutex discription **/ VOID InitializeContextMutex( PTCP_CONTEXT Context ) { - Context->MutexOwner = NULL; - Context->MutexDepth = 0; + KeInitializeMutex(&Context->Mutex, 0); } BOOLEAN @@ -261,50 +249,30 @@ PTCP_CONTEXT Context ) { - HANDLE Thread; - KIRQL OldIrql; - PADDRESS_FILE AddressFile; - PKSPIN_LOCK Lock; - -#ifndef NDEBUG - Thread = PsGetCurrentThreadId(); + +#ifndef NDEBUG + PKTHREAD Thread; + Thread = KeGetCurrentThread(); DPRINT("Thread %p acquiring lock on Context %p\n", Thread, Context); #endif + KeWaitForMutexObject(&Context->Mutex, Executive, KernelMode, FALSE, NULL); AddressFile = Context->AddressFile; if (AddressFile == NULL) { - /* Context has been disassociated. There is no lock to acquire. */ - InterlockedIncrement(&Context->MutexDepth); + /* Context has been disassociated. Do not continue. */ return FALSE; } - Lock = &AddressFile->AssociatedContextsLock; - - Thread = PsGetCurrentThreadId(); - -AGAIN: - /* Start mutex acquisition */ - KeAcquireSpinLock(Lock, &OldIrql); if (Context->AddressFile == NULL) { /* Context was disassociated while we tried to acquire lock. IRP processing should stop. */ - KeReleaseSpinLock(Lock, OldIrql); - InterlockedIncrement(&Context->MutexDepth); return FALSE; } - if (Context->MutexOwner != NULL && Context->MutexOwner != Thread) - { - /* Context was acquired by another thread, try again */ - KeReleaseSpinLock(Lock, OldIrql); - goto AGAIN; - } - - /* We passed all tests, we have exclusive access to this Context. */ - Context->MutexOwner = Thread; - KeReleaseSpinLock(Lock, OldIrql); - InterlockedIncrement(&Context->MutexDepth); - + +#ifndef NDEBUG + DPRINT("Thread %p acquired lock on Context %p\n", Thread, Context); +#endif return TRUE; } @@ -313,23 +281,17 @@ PTCP_CONTEXT Context ) { - HANDLE Thread; +#ifndef NDEBUG + PKTHREAD Thread; + Thread = KeGetCurrentThread(); + DPRINT("Thread %p releasing lock on Context %p\n", Thread, Context); +#endif + + KeReleaseMutex(&Context->Mutex, FALSE); - Thread = PsGetCurrentThreadId(); - DPRINT("Thread %p releasing lock on Context %p\n", Thread, Context); - - /* If the releasing call came from the mutex owner, do release. Otherwise, do nothing. */ - if (Context->MutexOwner == Thread) - { - if (InterlockedDecrement(&Context->MutexDepth) == 0) - { - Context->MutexOwner = NULL; - } - } - else - { - DPRINT1("Release mutex from non-owner\n"); - } +#ifndef NDEBUG + DPRINT("Thread %p released lock on Context %p\n", Thread, Context); +#endif } /* Get exclusive access to the corresponding TCP Context before calling */ @@ -375,7 +337,7 @@ NTSTATUS Status; /* Check that the IRP was not already canceled */ - if (Irp->Cancel) + if (Irp->Cancel == TRUE) { DPRINT("IRP already canceled\n"); Irp->IoStatus.Status = STATUS_CANCELLED; @@ -404,14 +366,18 @@ ) { #ifndef NDEBUG + INT i; KIRQL OldIrql; - INT i; PIO_STACK_LOCATION IrpSp; #endif LONG ContextCount; PIRP Irp; + PIRP PendingIrp; + PLIST_ENTRY Entry; + PLIST_ENTRY Head; PTCP_CONTEXT AcceptingContext; + PTCP_REQUEST TemporaryRequest; /* If this was just a request completion, skip lwIP PCB cleanup and go straight to IRP * completion */ @@ -496,13 +462,55 @@ goto COMPLETE_IRP; case TCP_REQUEST_CANCEL_MODE_PRESERVE : /* For requests that do not deallocate the PCB when canceled, determine and clear the - * appropriate TCP State bit */ + * appropriate TCP State bit only if there are no more Requests of that type. */ + Head = &Context->RequestListHead; + Entry = Head->Flink; switch (Request->PendingMode) { case TCP_REQUEST_PENDING_SEND : + /* If there is another Send request, execute it. */ + while (Entry != Head) + { + TemporaryRequest = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (TemporaryRequest->PendingMode == TCP_REQUEST_PENDING_SEND) + { + PendingIrp = TemporaryRequest->Payload.PendingIrp; + if (DoSend(PendingIrp, Context) == STATUS_SUCCESS) + { + /* We successfully initiated another Send with lwIP */ + goto COMPLETE_IRP; + } + else + { + /* If the send failed, cancel the pending IRP and continue + * walking the list for another Send. */ + Entry = Entry->Flink; + RemoveEntryList(&TemporaryRequest->ListEntry); + PendingIrp->Cancel = TRUE; + IoSetCancelRoutine(PendingIrp, NULL); + PendingIrp->IoStatus.Information = 0; + CleanupRequest(TemporaryRequest, STATUS_CANCELLED, Context); + continue; + } + } + Entry = Entry->Flink; + } + /* We walked the entire list without finding and successfully doing a send, so + * remote the SENDING state bit. */ TCP_RMV_STATE(TCP_STATE_SENDING, Context); break; case TCP_REQUEST_PENDING_RECEIVE : + /* If there is another Receive request, we don't need to do anything but keep + * waiting for a callback. */ + while (Entry != Head) + { + TemporaryRequest = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (TemporaryRequest->PendingMode == TCP_REQUEST_PENDING_RECEIVE) + { + goto COMPLETE_IRP; + } + Entry = Entry->Flink; + } TCP_RMV_STATE(TCP_STATE_RECEIVING, Context); break; default : @@ -524,7 +532,7 @@ REMOVE_IRP(Irp); REMOVE_IRPSP(IrpSp); #endif - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + _IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); FINISH: /* Deallocate the TCP Request */ @@ -547,20 +555,11 @@ PLIST_ENTRY Entry; PLIST_ENTRY Head; PTCP_CONTEXT Context; + PTCP_CONTEXT OldContext; PTCP_REQUEST Request; - /* Check that the IRP isn't already being canceled */ - if (Irp->Cancel == TRUE) - { - IoReleaseCancelSpinLock(Irp->CancelIrql); - return; - } - - /* Block potential repeated cancellations */ - Irp->Cancel = TRUE; - IoSetCancelRoutine(Irp, NULL); - - /* This function is always called with the Cancel lock held */ + /* This function is always called with the Cancel lock held, Irp->Cancel set to TRUE, and + * Irp->CancelRoutine set to NULL. */ IoReleaseCancelSpinLock(Irp->CancelIrql); /* The file types distinguishes between some protocols */ @@ -590,7 +589,9 @@ if (IrpSp->MinorFunction == TDI_LISTEN) { /* Disassociate the listening Context, which we grab from the AddressFile. */ + OldContext = Context; Context = Context->AddressFile->Listener; + ReleaseExclusiveContextAccess(OldContext); DisassociateAddress(Context); /* If the lwIP PCB still exists, close it. Since we are deallocating the PCB's associated @@ -613,6 +614,7 @@ #endif ExFreePoolWithTag(Context, TAG_TCP_CONTEXT); + DPRINT("Return for TDI_LISTEN cancel\n"); return; } @@ -630,6 +632,7 @@ Irp->IoStatus.Information = 0; CleanupRequest(Request, STATUS_CANCELLED, Context); ReleaseExclusiveContextAccess(Context); + DPRINT("Return after IRP completion\n"); return; } @@ -645,7 +648,8 @@ REMOVE_IRP(Irp); REMOVE_IRPSP(IrpSp); #endif - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + _IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + DPRINT("Return after skipping most things\n"); return; } @@ -745,7 +749,6 @@ /* TCP variables */ AddressFile->HasListener = FALSE; - KeInitializeSpinLock(&AddressFile->AssociatedContextsLock); /* UDP and RAW variables */ KeInitializeSpinLock(&AddressFile->RequestLock); @@ -990,27 +993,31 @@ #endif /* Sanity check */ - if (Context->AddressFile != NULL) - { + if (GetExclusiveContextAccess(Context) == TRUE) + { + ReleaseExclusiveContextAccess(Context); DPRINT1("Context retains address association\n"); return STATUS_INVALID_PARAMETER; } /* If the lwIP PCB still exists, close it. Since we are deallocating the PCB's associated * Context, we also need to clear the Context pointer in the PCB. */ + ReleaseExclusiveContextAccess(Context); + ACQUIRE_SERIAL_MUTEX(); + GetExclusiveContextAccess(Context); if (Context->lwip_tcp_pcb) { #ifndef NDEBUG REMOVE_PCB(Context->lwip_tcp_pcb); #endif - ACQUIRE_SERIAL_MUTEX(); tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_close(Context->lwip_tcp_pcb); - RELEASE_SERIAL_MUTEX(); - } + } + RELEASE_SERIAL_MUTEX(); /* Deallocate the Context. The corresponding Address File's ContextCount should have been * decremented when the Context was disassociated. */ + ReleaseExclusiveContextAccess(Context); #ifndef NDEBUG REMOVE_CONTEXT(Context); #endif @@ -1172,7 +1179,6 @@ } AddressFile = Context->AddressFile; Context->AddressFile = NULL; - ReleaseExclusiveContextAccess(Context); /* Walk the Context's Request list to finish all outstanding IRPs. */ Head = &Context->RequestListHead; @@ -1204,6 +1210,8 @@ CloseAddress(AddressFile); } } + + ReleaseExclusiveContextAccess(Context); return STATUS_SUCCESS; } @@ -1260,8 +1268,8 @@ Context = IrpSp->FileObject->FsContext; if (GetExclusiveContextAccess(Context) == FALSE) { + ReleaseExclusiveContextAccess(Context); DPRINT("Context has been disassociated\n"); - ReleaseExclusiveContextAccess(Context); return STATUS_ADDRESS_CLOSED; } if (Context->TcpState != TCP_STATE_BOUND) @@ -1280,8 +1288,8 @@ ListenContext = AddressFile->Listener; if (GetExclusiveContextAccess(ListenContext) == FALSE) { + ReleaseExclusiveContextAccess(ListenContext); DPRINT1("TDI_LISTEN on disassociated Listen Context? SNAFU.\n"); - ReleaseExclusiveContextAccess(ListenContext); ReleaseExclusiveContextAccess(Context); return STATUS_ADDRESS_CLOSED; } @@ -1351,7 +1359,7 @@ ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - /* main.c will call IoCompleteRequest() on this IRP */ + /* main.c will call _IoCompleteRequest() on this IRP */ return STATUS_SUCCESS; } @@ -1454,8 +1462,8 @@ Context = IrpSp->FileObject->FsContext; if (GetExclusiveContextAccess(Context) == FALSE) { + ReleaseExclusiveContextAccess(Context); DPRINT1("Context has been disassociated\n"); - ReleaseExclusiveContextAccess(Context); return STATUS_ADDRESS_CLOSED; } if (Context->TcpState != TCP_STATE_BOUND) @@ -1533,18 +1541,13 @@ _Inout_ PIRP Irp ) { -#ifndef NDEBUG - INT i; - KIRQL OldIrql; -#endif - PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; IrpSp = IoGetCurrentIrpStackLocation(Irp); /* Sanity checks. We do not acquire the Context mutex because TDI_DISCONNECT results from an - * IoCompleteRequest() called with the Context mutex held. */ + * _IoCompleteRequest() called with the Context mutex held. */ if (IrpSp->FileObject->FsContext2 != (PVOID)TDI_CONNECTION_FILE) { DPRINT1("Disconnection on something that is not a TCP Context\n"); @@ -1578,8 +1581,8 @@ Context = IrpSp->FileObject->FsContext; if (GetExclusiveContextAccess(Context) == FALSE) { + ReleaseExclusiveContextAccess(Context); DPRINT("Context has been disassociated\n"); - ReleaseExclusiveContextAccess(Context); return STATUS_ADDRESS_CLOSED; } if (!(Context->TcpState & TCP_STATE_CONNECTED)) @@ -1608,19 +1611,53 @@ } NTSTATUS +DoSend( + _In_ PIRP Irp, + _In_ PTCP_CONTEXT Context +) +{ + UINT SendBytes; + + PVOID Buffer; + + err_t lwip_err; + + /* Get send buffer and length */ + NdisQueryBuffer(Irp->MdlAddress, &Buffer, &SendBytes); + + /* Call into lwIP to initiate send */ + ACQUIRE_SERIAL_MUTEX(); + lwip_err = tcp_write(Context->lwip_tcp_pcb, Buffer, SendBytes, 0); + RELEASE_SERIAL_MUTEX(); + switch (lwip_err) + { + case ERR_OK: + /* If the lwIP call succeeded, set the TCP State variable */ + return STATUS_SUCCESS; + case ERR_MEM: + DPRINT1("lwIP ERR_MEM\n"); + return STATUS_NO_MEMORY; + case ERR_ARG: + DPRINT1("lwIP ERR_ARG\n"); + return STATUS_INVALID_PARAMETER; + case ERR_CONN: + DPRINT1("lwIP ERR_CONN\n"); + return STATUS_CONNECTION_ACTIVE; + default: + DPRINT1("Unknwon lwIP Error: %d\n", lwip_err); + return STATUS_NOT_IMPLEMENTED; + } +} + +NTSTATUS TcpIpSend( _Inout_ PIRP Irp ) { NTSTATUS Status; - UINT SendBytes; PIO_STACK_LOCATION IrpSp; - PTDI_REQUEST_KERNEL_SEND RequestInfo; PTCP_CONTEXT Context; - PVOID Buffer; - - err_t lwip_err; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1633,8 +1670,8 @@ Context = IrpSp->FileObject->FsContext; if (GetExclusiveContextAccess(Context) == FALSE) { + ReleaseExclusiveContextAccess(Context); DPRINT1("Context has been disassociated\n"); - ReleaseExclusiveContextAccess(Context); return STATUS_ADDRESS_CLOSED; } if (!(Context->TcpState & TCP_STATE_CONNECTED)) @@ -1644,44 +1681,23 @@ return STATUS_ONLY_IF_CONNECTED; } - /* Get send buffer and length */ - NdisQueryBuffer(Irp->MdlAddress, &Buffer, &SendBytes); - RequestInfo = (PTDI_REQUEST_KERNEL_SEND)&IrpSp->Parameters; - /* If the Context is already servicing a Send request, do not initiate another one right now */ if (Context->TcpState & TCP_STATE_SENDING) { goto WAIT_TO_SEND; } - - /* Call into lwIP to initiate send */ - ACQUIRE_SERIAL_MUTEX(); - lwip_err = tcp_write(Context->lwip_tcp_pcb, Buffer, RequestInfo->SendLength, 0); - RELEASE_SERIAL_MUTEX(); - switch (lwip_err) - { - case ERR_OK: - /* If the lwIP call succeeded, set the TCP State variable */ - TCP_ADD_STATE(TCP_STATE_SENDING, Context); - break; - case ERR_MEM: - DPRINT1("lwIP ERR_MEM\n"); - Status = STATUS_NO_MEMORY; - goto FINISH; - case ERR_ARG: - DPRINT1("lwIP ERR_ARG\n"); - Status = STATUS_INVALID_PARAMETER; - goto FINISH; - case ERR_CONN: - DPRINT1("lwIP ERR_CONN\n"); - Status = STATUS_CONNECTION_ACTIVE; - goto FINISH; - default: - DPRINT1("Unknwon lwIP Error: %d\n", lwip_err); - Status = STATUS_NOT_IMPLEMENTED; - goto FINISH; - } - + + /* Perform lwIP call */ + Status = DoSend(Irp, Context); + if (Status == STATUS_SUCCESS) + { + TCP_ADD_STATE(TCP_STATE_SENDING, Context); + } + else + { + goto FINISH; + } + WAIT_TO_SEND: Status = PrepareIrpForCancel( Irp, @@ -1824,7 +1840,7 @@ REMOVE_IRP(Irp); REMOVE_IRPSP(IrpSp); #endif - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + _IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); ExFreePoolWithTag(Request, TAG_DGRAM_REQST); } @@ -1914,7 +1930,7 @@ REMOVE_IRP(Irp); REMOVE_IRPSP(IrpSp); #endif - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + _IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); return Status; } @@ -2064,7 +2080,7 @@ REMOVE_IRP(Irp); REMOVE_IRPSP(IrpSp); #endif - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + _IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); return Status; } @@ -2125,10 +2141,9 @@ TcpState = TCP_STATE_ABORTED; break; case ERR_RST : - /* This is the only case that indicates the lwIP PCB still exists */ DPRINT1("lwIP socket reset\n"); TcpState = TCP_STATE_CLOSED; - goto RETAIN_PCB; + break; case ERR_CLSD : DPRINT1("lwIP socket closed\n"); TcpState = TCP_STATE_CLOSED; @@ -2159,7 +2174,6 @@ GetExclusiveContextAccess(Context); Context->lwip_tcp_pcb = NULL; -RETAIN_PCB: ProcessPCBError(Context, TcpState); ReleaseExclusiveContextAccess(Context); } @@ -2404,6 +2418,7 @@ err_t err ) { + BOOLEAN Acquired; INT CopiedLength; INT RemainingDestBytes; UCHAR *CurrentDestLocation; @@ -2434,9 +2449,9 @@ } /* Sanity checks */ - if (!(Context->TcpState & TCP_STATE_RECEIVING)) - { - DPRINT1("Receive callback on Context that is not currently receiving\n"); + if (!(Context->TcpState & TCP_STATE_CONNECTED)) + { + DPRINT1("Receive callback on Context that is not currently connected\n"); ReleaseExclusiveContextAccess(Context); return ERR_ARG; } Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] Mon Aug 8 16:49:04 2016 @@ -130,6 +130,10 @@ IRPSPCount--; \ KeReleaseSpinLockFromDpcLevel(&IRPSPArrayLock) #endif + +#define _IoCompleteRequest(Irp,Mode) \ + DPRINT("Complete IRP %p with IO Status %08X\n", Irp, Irp->IoStatus.Status); \ + IoCompleteRequest(Irp, Mode) struct _TCP_CONTEXT; typedef struct _TCP_CONTEXT TCP_CONTEXT, *PTCP_CONTEXT; @@ -151,7 +155,6 @@ struct udp_pcb* lwip_udp_pcb; PTCP_CONTEXT Listener; }; - KSPIN_LOCK AssociatedContextsLock; } ADDRESS_FILE, *PADDRESS_FILE; struct _TCP_CONTEXT { @@ -160,8 +163,7 @@ LIST_ENTRY RequestListHead; struct tcp_pcb* lwip_tcp_pcb; BOOLEAN ReferencedByUpperLayer; - HANDLE MutexOwner; - volatile long MutexDepth; + KMUTEX Mutex; }; typedef struct _TCP_REQUEST { Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] Mon Aug 8 16:49:04 2016 @@ -347,7 +347,7 @@ REMOVE_IRP(Irp); REMOVE_IRPSP(IrpSp); #endif - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + _IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); } return Status; @@ -418,7 +418,7 @@ REMOVE_IRP(Irp); REMOVE_IRPSP(IrpSp); #endif - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + _IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); return Status; } @@ -572,7 +572,6 @@ Status = STATUS_NOT_IMPLEMENTED; } -FINISH: Irp->IoStatus.Status = Status; if (Status == STATUS_PENDING) { @@ -584,7 +583,7 @@ REMOVE_IRP(Irp); REMOVE_IRPSP(IrpSp); #endif - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + _IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); } return Status; Modified: branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/sdk/lib/dr… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/tcp.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/sdk/lib/drivers/lwip/src/include/lwip/tcp.h [iso-8859-1] Mon Aug 8 16:49:04 2016 @@ -371,24 +371,25 @@ /** * REACT_OS Global Mutex * Serializes all kernel network activity to circumvent lwIP core's lack of thread-safety. - */ + **/ KMUTEX MTSerialMutex; +/* #define ACQUIRE_SERIAL_MUTEX() \ KeWaitForMutexObject(&MTSerialMutex, Executive, KernelMode, FALSE, NULL) #define RELEASE_SERIAL_MUTEX() \ KeReleaseMutex(&MTSerialMutex, FALSE) -/* +*/ #define ACQUIRE_SERIAL_MUTEX() \ - DPRINT("Acquiring MTSerialMutex on thread %p\n", PsGetCurrentThreadId()); \ + DPRINT("Acquiring MTSerialMutex on thread %p\n", KeGetCurrentThread()); \ KeWaitForMutexObject(&MTSerialMutex, Executive, KernelMode, FALSE, NULL); \ - DPRINT("MTSerialMutex acquired on thread %p\n", PsGetCurrentThreadId()) + DPRINT("MTSerialMutex acquired on thread %p\n", KeGetCurrentThread()) #define RELEASE_SERIAL_MUTEX() \ - DPRINT("Releasing MTSerialMutex on thread %p\n", PsGetCurrentThreadId()); \ + DPRINT("Releasing MTSerialMutex on thread %p\n", KeGetCurrentThread()); \ KeReleaseMutex(&MTSerialMutex, FALSE); \ - DPRINT("MTSerialMutex released on thread %p\n", PsGetCurrentThreadId()) -*/ + DPRINT("MTSerialMutex released on thread %p\n", KeGetCurrentThread()) + const char* tcp_debug_state_str(enum tcp_state s); #ifdef __cplusplus

1 0

[bfreisen] 72158: [MSPAINT] Handle settings from registry correctly. Patch by Carlo Bramini. CORE-11400
by bfreisen＠svn.reactos.org 08 Aug '16

08 Aug '16

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); }

1 0

[pschweitzer] 72157: [FASTFAT] Fix a FIXME: update the last writing date in case of null-length write.
by pschweitzer＠svn.reactos.org 08 Aug '16

08 Aug '16

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))) {

1 0

[pschweitzer] 72156: [FASTFAT] Opening file by ID is not possible with FAT.
by pschweitzer＠svn.reactos.org 08 Aug '16

08 Aug '16

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)

1 0

[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 07 Aug '16

07 Aug '16

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:

1 0

[dchapyshev] 72154: [INPUT] - Implement list of keyboard layouts on Settings Page
by dchapyshev＠svn.reactos.org 07 Aug '16

07 Aug '16

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

1 0

[ekohl] 72153: [LSASRV] - Partital implementation of LsarRemoveAccountRights. - Simplify LsapLookupAccountRightValue. Return ACCESS_MASK instead of NTSTATUS. - LsarAddAccountRights: Check parameter...
by ekohl＠svn.reactos.org 07 Aug '16

07 Aug '16

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 */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs