Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [UTILMAN] Add French translation
by Pierre Schweitzer 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8351727b599eb1668297… commit a8351727b599eb1668297e9bf457069f43bdb3f6 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 19 13:42:52 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 19 13:42:52 2019 +0200 [UTILMAN] Add French translation --- base/applications/utilman/lang/fr-FR.rc | 54 +++++++++++++++++++++++++++++++++ base/applications/utilman/utilman.rc | 3 ++ media/inf/shortcuts.inf | 2 ++ 3 files changed, 59 insertions(+) diff --git a/base/applications/utilman/lang/fr-FR.rc b/base/applications/utilman/lang/fr-FR.rc new file mode 100644 index 00000000000..78c95eb9315 --- /dev/null +++ b/base/applications/utilman/lang/fr-FR.rc @@ -0,0 +1,54 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: French (France) translation resource + * COPYRIGHT: Copyright 2019 Pierre Schweitzer (pierre(a)reactos.org) + */ + +IDD_MAIN_DIALOG DIALOGEX 0, 0, 284, 183 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Gestionnaire d'utilitaires d'accessibilité" +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 + CONTROL "Démarrer", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 + CONTROL "Arrêter", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 + CONTROL "Démarrer automatiquement quand je me connecte", IDC_START_LOG_IN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 101, 206, 14 + CONTROL "Démarrer automatiquement quand je suis sur le bureau", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 + CONTROL "Démarrer automatiquement quand le gestionnaire démarre", IDC_START_UTILMAN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 134, 212, 13 + CONTROL "&OK", IDC_OK, "Button", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 161, 50, 14 + CONTROL "&Annuler", IDC_CANCEL, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 221, 161, 50, 14 + CONTROL "&Aide", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 +CAPTION "A propos du gestionnaire d'utilitaires d'accessibilité" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Accessibility Utility Manager\nCopyright (C) 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Copyright (C) 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 +END + +STRINGTABLE +BEGIN + IDS_OSK "Clavier visuel" + IDS_MAGNIFIER "Loupe" +END + +STRINGTABLE +BEGIN + IDS_NOTRUNNING "%s n'est pas en cours d'exécution" + IDS_RUNNING "%s est en cours d'exécution" + IDS_GROUPBOX_OPTIONS_TITLE "Options pour %s" +END + +STRINGTABLE +BEGIN + IDM_ABOUT "A propos du gestionnaire d'utilitaires d'accessibilité..." +END diff --git a/base/applications/utilman/utilman.rc b/base/applications/utilman/utilman.rc index 50bfa4d710c..02fa4614aa7 100644 --- a/base/applications/utilman/utilman.rc +++ b/base/applications/utilman/utilman.rc @@ -28,5 +28,8 @@ IDI_ICON_UTILMAN ICON "res/utilman.ico" #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif /* EOF */ diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index cc59005e55d..d3c0eb8aa3f 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -579,6 +579,8 @@ WINMINE_TITLE=WineMine WINMINE_DESC=WineMine SPIDER_TITLE=Spider Solitaire SPIDER_DESC=Spider Solitaire +UTILMAN_TITLE=Gestionnaire d'utilitaires d'accessibilité +UTILMAN_DESC=Lance le gestionnaire d'utilitaires d'accessibilité ; Hebrew [Strings.040D]

1 0

[reactos] 01/01: [DDK][PSDK] Add missing definitions for WPA/WPA2 authentication
by Stanislav Motylkov 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f6faec2fffb153365d49… commit 5f6faec2fffb153365d49181e0fd0c840b801fda Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Aug 18 20:16:12 2019 +0300 Commit: Colin Finck <colin(a)reactos.org> CommitDate: Mon Aug 19 13:12:13 2019 +0200 [DDK][PSDK] Add missing definitions for WPA/WPA2 authentication Part of it was already added in 3da616a. CORE-11924 --- sdk/include/psdk/ntddndis.h | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/ntddndis.h b/sdk/include/psdk/ntddndis.h index 0ccdfa53096..3da29dffe57 100644 --- a/sdk/include/psdk/ntddndis.h +++ b/sdk/include/psdk/ntddndis.h @@ -45,16 +45,30 @@ typedef enum _NDIS_DEVICE_POWER_STATE { typedef enum _NDIS_802_11_WEP_STATUS { Ndis802_11WEPEnabled, + Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled, Ndis802_11WEPDisabled, + Ndis802_11EncryptionDisabled = Ndis802_11WEPDisabled, Ndis802_11WEPKeyAbsent, - Ndis802_11WEPNotSupported -} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS; + Ndis802_11Encryption1KeyAbsent = Ndis802_11WEPKeyAbsent, + Ndis802_11WEPNotSupported, + Ndis802_11EncryptionNotSupported = Ndis802_11WEPNotSupported, + Ndis802_11Encryption2Enabled, + Ndis802_11Encryption2KeyAbsent, + Ndis802_11Encryption3Enabled, + Ndis802_11Encryption3KeyAbsent +} NDIS_802_11_WEP_STATUS, *PNDIS_802_11_WEP_STATUS, + NDIS_802_11_ENCRYPTION_STATUS, *PNDIS_802_11_ENCRYPTION_STATUS; typedef enum _NDIS_802_11_AUTHENTICATION_MODE { Ndis802_11AuthModeOpen, Ndis802_11AuthModeShared, Ndis802_11AuthModeAutoSwitch, + Ndis802_11AuthModeWPA, + Ndis802_11AuthModeWPAPSK, + Ndis802_11AuthModeWPANone, + Ndis802_11AuthModeWPA2, + Ndis802_11AuthModeWPA2PSK, Ndis802_11AuthModeMax } NDIS_802_11_AUTHENTICATION_MODE, *PNDIS_802_11_AUTHENTICATION_MODE; @@ -141,6 +155,18 @@ typedef struct _NDIS_802_11_WEP UCHAR KeyMaterial[1]; } NDIS_802_11_WEP, *PNDIS_802_11_WEP; +typedef ULONGLONG NDIS_802_11_KEY_RSC; + +typedef struct _NDIS_802_11_KEY +{ + ULONG Length; + ULONG KeyIndex; + ULONG KeyLength; + NDIS_802_11_MAC_ADDRESS BSSID; + NDIS_802_11_KEY_RSC KeyRSC; + UCHAR KeyMaterial[1]; +} NDIS_802_11_KEY, *PNDIS_802_11_KEY; + typedef struct _NDIS_PM_WAKE_UP_CAPABILITIES { NDIS_DEVICE_POWER_STATE MinMagicPacketWakeUp; NDIS_DEVICE_POWER_STATE MinPatternWakeUp;

1 0

[reactos] 01/01: Implement Utility Manager software
by Bișoc George 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df88ea8d25722ca204724… commit df88ea8d25722ca204724d3a6448c5eb0e82e01d Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed Apr 24 16:06:05 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 19 13:05:28 2019 +0200 Implement Utility Manager software CORE-15974 --- base/applications/CMakeLists.txt | 1 + base/applications/utilman/CMakeLists.txt | 13 + base/applications/utilman/NOTES.txt | 11 + base/applications/utilman/about.c | 93 +++++++ base/applications/utilman/dialog.c | 438 ++++++++++++++++++++++++++++++ base/applications/utilman/lang/en-US.rc | 54 ++++ base/applications/utilman/precomp.h | 75 +++++ base/applications/utilman/process.c | 189 +++++++++++++ base/applications/utilman/res/utilman.ico | Bin 0 -> 4286 bytes base/applications/utilman/resource.h | 47 ++++ base/applications/utilman/utilman.rc | 32 +++ media/inf/shortcuts.inf | 3 + 12 files changed, 956 insertions(+) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 87cbdbf5e17..74ddde5815c 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -39,6 +39,7 @@ add_subdirectory(shutdown) add_subdirectory(sndrec32) add_subdirectory(sndvol32) add_subdirectory(taskmgr) +add_subdirectory(utilman) add_subdirectory(winhlp32) add_subdirectory(winver) add_subdirectory(wordpad) diff --git a/base/applications/utilman/CMakeLists.txt b/base/applications/utilman/CMakeLists.txt new file mode 100644 index 00000000000..90a909e9dd0 --- /dev/null +++ b/base/applications/utilman/CMakeLists.txt @@ -0,0 +1,13 @@ + +list(APPEND SOURCE + dialog.c + process.c + about.c + precomp.h) + +add_rc_deps(utilman.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/utilman.ico) +add_executable(utilman ${SOURCE} utilman.rc) +set_module_type(utilman win32gui UNICODE) +add_importlibs(utilman comdlg32 user32 gdi32 advapi32 shell32 comctl32 msvcrt kernel32 ntdll) +add_pch(utilman precomp.h SOURCE) +add_cd_file(TARGET utilman DESTINATION reactos/system32 FOR all) diff --git a/base/applications/utilman/NOTES.txt b/base/applications/utilman/NOTES.txt new file mode 100644 index 00000000000..595c089ec1a --- /dev/null +++ b/base/applications/utilman/NOTES.txt @@ -0,0 +1,11 @@ +ReactOS Accessibility Utility Manager +======================================= + +Currently the application can manage the state of the accessibility tools however there are some things which needs to be DONE in order to consider the program as fully complete. The following are: + +- The warning dialog is not implemented YET +- The program can only control the launch/stopping states of accessibility tools, the code which manages the options for each utility is not implemented YET +- Function helper which catches the Windows logo + U keys is not implemented YET +- Registry configuration saver/loader is not implemented YET (XP's Utility Manager creates a key on HKEY_CURRENT_USER\Software\Microsoft with the name "Utility Manager" although the rest of other configuration values for utility options are stored elsewhere and I don't know exactly where are those) +- XP's and Server 2003's main Utility Manager implementation is compiled in a DLL (+ an executable which loads the DLL in question) whereas our Utility Manager is compiled as a whole executable +- On Windows Vista and later, it complains for required elevation to open a process. We need to improve our process creation code and discard ShellExecuteW() \ No newline at end of file diff --git a/base/applications/utilman/about.c b/base/applications/utilman/about.c new file mode 100644 index 00000000000..805fde451f9 --- /dev/null +++ b/base/applications/utilman/about.c @@ -0,0 +1,93 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: About dialog file + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +/* GLOBALS ********************************************************************/ + +UTILMAN_GLOBALS Globals; + +/* FUNCTIONS ******************************************************************/ + +/** + * @AboutDlgProc + * + * "About" dialog procedure. + * + * @param hDlg + * The handle object of the dialog. + * + * @param Msg + * Message events (in unsigned int). + * + * @param wParam + * Message parameter (in UINT_PTR). + * + * @param lParam + * Message paramater (in LONG_PTR). + * + * @return + * Return TRUE if the dialog processed messages, + * FALSE otherwise. + * + */ +INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + switch (Msg) + { + case WM_INITDIALOG: + { + Globals.hIcon = LoadImageW(Globals.hInstance, + MAKEINTRESOURCEW(IDI_ICON_UTILMAN), + IMAGE_ICON, + 0, + 0, + LR_DEFAULTSIZE); + + /* Set the icon within the dialog's title bar */ + if (Globals.hIcon) + { + SendMessageW(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hIcon); + } + + return TRUE; + } + + case WM_COMMAND: + { + case IDOK: + case IDCANCEL: + DestroyIcon(Globals.hIcon); + EndDialog(hDlg, FALSE); + break; + } + } + + return FALSE; +} + +/** + * @ShowAboutDlg + * + * Display the "About" dialog. + * + * @param hDlgParent + * The handle object of the parent dialog. + * + * @return + * Nothing. + */ +VOID ShowAboutDlg(HWND hDlgParent) +{ + /* Display the "About" dialog when the user clicks on the "About" menu item */ + DialogBoxW(Globals.hInstance, + MAKEINTRESOURCEW(IDD_ABOUT_DIALOG), + hDlgParent, + AboutDlgProc); +} diff --git a/base/applications/utilman/dialog.c b/base/applications/utilman/dialog.c new file mode 100644 index 00000000000..4ce74bfa7a6 --- /dev/null +++ b/base/applications/utilman/dialog.c @@ -0,0 +1,438 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Main dialog code file + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + * Copyright 2019 Hermes Belusca-Maito + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +/* GLOBALS ********************************************************************/ + +UTILMAN_GLOBALS Globals; + +/* DECLARATIONS ***************************************************************/ + +UTILMAN_STATE EntriesList[] = +{ + {L"magnify.exe", IDS_MAGNIFIER, L"", FALSE}, + {L"osk.exe", IDS_OSK, L"", FALSE} +}; + +/* FUNCTIONS ******************************************************************/ + +/** + * @InitUtilsList + * + * Initializes the list of accessibility utilities. + * + * @param[in] bInitGui + * Whether we are initializing the UI list (TRUE) or the internal array (FALSE). + * + * @return + * Nothing. + */ +VOID InitUtilsList(BOOL bInitGui) +{ + UINT i; + + if (!bInitGui) + { + // TODO: Load the list dynamically from the registry key + // hklm\software\microsoft\windows nt\currentversion\accessibility + + /* Initialize the resource utility strings only once */ + for (i = 0; i < _countof(EntriesList); ++i) + { + LoadStringW(Globals.hInstance, EntriesList[i].uNameId, + EntriesList[i].szResource, _countof(EntriesList[i].szResource)); + + EntriesList[i].bState = FALSE; + } + } + else + { + INT iItem; + BOOL bIsRunning; + WCHAR szFormat[MAX_BUFFER]; + + /* Reset the listbox */ + SendMessageW(Globals.hListDlg, LB_RESETCONTENT, 0, 0); + + /* Add the utilities in the listbox */ + for (i = 0; i < _countof(EntriesList); ++i) + { + bIsRunning = IsProcessRunning(EntriesList[i].lpProgram); + EntriesList[i].bState = bIsRunning; + + /* Load the string and append the utility's name to the format */ + StringCchPrintfW(szFormat, _countof(szFormat), + (bIsRunning ? Globals.szRunning : Globals.szNotRunning), + EntriesList[i].szResource); + + /* Add the item in the listbox */ + iItem = (INT)SendMessageW(Globals.hListDlg, LB_ADDSTRING, 0, (LPARAM)szFormat); + if (iItem != LB_ERR) + SendMessageW(Globals.hListDlg, LB_SETITEMDATA, iItem, (LPARAM)&EntriesList[i]); + } + } +} + +/** + * @DlgInitHandler + * + * Function which processes several operations for WM_INITDIALOG. + * + * @param[in] hDlg + * The handle object of the dialog. + * + * @return + * TRUE to inform the system that WM_INITDIALOG has been processed and + * that it should set the keyboard focus to the control. + * + */ +BOOL DlgInitHandler(IN HWND hDlg) +{ + INT PosX, PosY; + RECT rc; + WCHAR szAboutDlg[MAX_BUFFER]; + HMENU hSysMenu; + + /* Save the dialog handle */ + Globals.hMainDlg = hDlg; + + /* Center the dialog on the screen */ + GetWindowRect(hDlg, &rc); + PosX = (GetSystemMetrics(SM_CXSCREEN) - rc.right) / 2; + PosY = (GetSystemMetrics(SM_CYSCREEN) - rc.bottom) / 2; + SetWindowPos(hDlg, 0, PosX, PosY, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + + /* Load the icon resource */ + Globals.hIcon = LoadImageW(Globals.hInstance, + MAKEINTRESOURCEW(IDI_ICON_UTILMAN), + IMAGE_ICON, + 0, + 0, + LR_DEFAULTSIZE); + + /* Set the icon within the dialog's title bar */ + if (Globals.hIcon) + { + SendMessageW(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hIcon); + } + + /* Retrieve the system menu and append the "About" menu item onto it */ + hSysMenu = GetSystemMenu(hDlg, FALSE); + if (hSysMenu != NULL) + { + if (LoadStringW(Globals.hInstance, IDM_ABOUT, szAboutDlg, _countof(szAboutDlg))) + { + AppendMenuW(hSysMenu, MF_SEPARATOR, 0, NULL); + AppendMenuW(hSysMenu, MF_STRING, IDM_ABOUT, szAboutDlg); + } + } + + /* Get the dialog items, specifically the dialog list box, the Start and Stop buttons */ + Globals.hListDlg = GetDlgItem(hDlg, IDC_LISTBOX); + Globals.hDlgCtlStart = GetDlgItem(hDlg, IDC_START); + Globals.hDlgCtlStop = GetDlgItem(hDlg, IDC_STOP); + + /* Initialize the GUI listbox */ + InitUtilsList(TRUE); + + /* Set the selection to the first item */ + Globals.iSelectedIndex = 0; + + /* Refresh the list */ + ListBoxRefreshContents(); + + /* Create a timer, we'll use it to control the state of our items in the listbox */ + Globals.iTimer = SetTimer(hDlg, 0, 400, NULL); + + return TRUE; +} + +/** + * @GroupBoxUpdateTitle + * + * Updates the title of the groupbox. + * + * @return + * Nothing. + * + */ +VOID GroupBoxUpdateTitle(VOID) +{ + WCHAR szFormat[MAX_BUFFER]; + + /* Format the string with the utility's name and set it to the listbox's title */ + StringCchPrintfW(szFormat, _countof(szFormat), Globals.szGrpBoxTitle, EntriesList[Globals.iSelectedIndex].szResource); + SetWindowTextW(GetDlgItem(Globals.hMainDlg, IDC_GROUPBOX), szFormat); +} + +/** + * @UpdateUtilityState + * + * Checks the state of the given accessibility tool. + * + * @param[in] bUtilState + * State condition (boolean TRUE: started / FALSE: stopped). + * + * @return + * Nothing. + * + */ +VOID UpdateUtilityState(IN BOOL bUtilState) +{ + Button_Enable(Globals.hDlgCtlStart, !bUtilState); + Button_Enable(Globals.hDlgCtlStop, bUtilState); + + /* Update the groupbox's title based on the selected utility item */ + GroupBoxUpdateTitle(); +} + +/** + * @ListBoxRefreshContents + * + * Handle the tasks on a periodic cycle. This function handles WM_TIMER message. + * + * @return + * Returns 0 to inform the system that WM_TIMER has been processed. + * + */ +INT ListBoxRefreshContents(VOID) +{ + UINT i; + INT iItem; + BOOL bIsRunning; + WCHAR szFormat[MAX_BUFFER]; + + /* Disable listbox redraw */ + SendMessageW(Globals.hListDlg, WM_SETREDRAW, FALSE, 0); + + for (i = 0; i < _countof(EntriesList); ++i) + { + /* Check the utility's state */ + bIsRunning = IsProcessRunning(EntriesList[i].lpProgram); + if (bIsRunning != EntriesList[i].bState) + { + /* The utility's state has changed, save it */ + EntriesList[i].bState = bIsRunning; + + /* Update the corresponding item in the listbox */ + StringCchPrintfW(szFormat, _countof(szFormat), + (bIsRunning ? Globals.szRunning : Globals.szNotRunning), + EntriesList[i].szResource); + + SendMessageW(Globals.hListDlg, LB_DELETESTRING, (LPARAM)i, 0); + iItem = SendMessageW(Globals.hListDlg, LB_INSERTSTRING, (LPARAM)i, (LPARAM)szFormat); + if (iItem != LB_ERR) + SendMessageW(Globals.hListDlg, LB_SETITEMDATA, iItem, (LPARAM)&EntriesList[i]); + } + } + + /* Re-enable listbox redraw */ + SendMessageW(Globals.hListDlg, WM_SETREDRAW, TRUE, 0); + + /* + * Check the previously selected item. This will help us determine what + * item has been selected and set its focus selection back. Furthermore, check + * the state of each accessibility tool and enable/disable the buttons. + */ + SendMessageW(Globals.hListDlg, LB_SETCURSEL, (WPARAM)Globals.iSelectedIndex, 0); + UpdateUtilityState(EntriesList[Globals.iSelectedIndex].bState); + + return 0; +} + +/** + * @DlgProc + * + * Main dialog application procedure function. + * + * @param[in] hDlg + * The handle object of the dialog. + * + * @param[in] Msg + * Message events (in unsigned int). + * + * @param[in] wParam + * Message parameter (in UINT_PTR). + * + * @param[in] lParam + * Message paramater (in LONG_PTR). + * + * @return + * Returns 0 to inform the system that the procedure has been handled. + * + */ +INT_PTR APIENTRY DlgProc( + IN HWND hDlg, + IN UINT Msg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + switch (Msg) + { + case WM_INITDIALOG: + DlgInitHandler(hDlg); + return TRUE; + + case WM_CLOSE: + KillTimer(hDlg, Globals.iTimer); + DestroyIcon(Globals.hIcon); + EndDialog(hDlg, FALSE); + break; + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDC_OK: + case IDC_CANCEL: + EndDialog(hDlg, FALSE); + break; + + case IDC_LISTBOX: + { + switch (HIWORD(wParam)) + { + case LBN_SELCHANGE: + { + /* Retrieve the index of the current selected item */ + INT iIndex = SendMessageW(Globals.hListDlg, LB_GETCURSEL, 0, 0); + if ((iIndex == LB_ERR) || (iIndex >= _countof(EntriesList))) + break; + + /* Assign the selected index and check the utility's state */ + Globals.iSelectedIndex = iIndex; + UpdateUtilityState(EntriesList[Globals.iSelectedIndex].bState); + break; + } + break; + } + break; + } + + case IDC_START: + LaunchProcess(EntriesList[Globals.iSelectedIndex].lpProgram); + break; + + case IDC_STOP: + CloseProcess(EntriesList[Globals.iSelectedIndex].lpProgram); + break; + + default: + break; + } + break; + } + + case WM_TIMER: + ListBoxRefreshContents(); + return 0; + + case WM_SYSCOMMAND: + { + switch (LOWORD(wParam)) + { + case IDM_ABOUT: + ShowAboutDlg(hDlg); + break; + } + break; + } + } + + return 0; +} + +/** + * @wWinMain + * + * Application entry point. + * + * @param[in] hInstance + * Application instance. + * + * @param[in] hPrevInstance + * The previous instance of the application (not used). + * + * @param[in] pCmdLine + * Pointer to a command line argument (in wide string -- not used). + * + * @param[in] nCmdShow + * An integer served as a flag to note how the application will be shown (not used). + * + * @return + * Returns 0 to let the function terminating before it enters in the message loop. + * + */ +INT WINAPI wWinMain( + IN HINSTANCE hInstance, + IN HINSTANCE hPrevInstance, + IN LPWSTR pCmdLine, + IN INT nCmdShow) +{ + HANDLE hMutex; + DWORD dwError; + INITCOMMONCONTROLSEX iccex; + + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(pCmdLine); + UNREFERENCED_PARAMETER(nCmdShow); + + /* Create a mutant object for the program. */ + hMutex = CreateMutexW(NULL, FALSE, L"Utilman"); + if (hMutex) + { + /* Check if there's already a mutex for the program */ + dwError = GetLastError(); + if (dwError == ERROR_ALREADY_EXISTS) + { + /* + The program's instance is already here. That means + the program is running and we should not set a new instance + and mutex object. + */ + CloseHandle(hMutex); + return 0; + } + } + + /* Load the common controls for the program */ + iccex.dwSize = sizeof(INITCOMMONCONTROLSEX); + iccex.dwICC = ICC_STANDARD_CLASSES | ICC_WIN95_CLASSES; + InitCommonControlsEx(&iccex); + + /* Initialize the globals */ + ZeroMemory(&Globals, sizeof(Globals)); + Globals.hInstance = hInstance; + + LoadStringW(Globals.hInstance, IDS_RUNNING, + Globals.szRunning, _countof(Globals.szRunning)); + LoadStringW(Globals.hInstance, IDS_NOTRUNNING, + Globals.szNotRunning, _countof(Globals.szNotRunning)); + LoadStringW(Globals.hInstance, IDS_GROUPBOX_OPTIONS_TITLE, + Globals.szGrpBoxTitle, _countof(Globals.szGrpBoxTitle)); + + /* Initialize the list of accessibility utilities */ + InitUtilsList(FALSE); + + /* Create the dialog box of the program */ + DialogBoxW(hInstance, + MAKEINTRESOURCEW(IDD_MAIN_DIALOG), + GetDesktopWindow(), + DlgProc); + + /* Delete the mutex */ + if (hMutex) + { + CloseHandle(hMutex); + } + + return 0; +} diff --git a/base/applications/utilman/lang/en-US.rc b/base/applications/utilman/lang/en-US.rc new file mode 100644 index 00000000000..582c69b57c3 --- /dev/null +++ b/base/applications/utilman/lang/en-US.rc @@ -0,0 +1,54 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: English (United States of America) translation resource + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +IDD_MAIN_DIALOG DIALOGEX 0, 0, 284, 183 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "Accessibility Utility Manager" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 + CONTROL "Start", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 + CONTROL "Stop", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 + CONTROL "Start automatically when I log in", IDC_START_LOG_IN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 101, 206, 14 + CONTROL "Start automatically when I look my desktop", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 + CONTROL "Start automatically when Utility Manager starts", IDC_START_UTILMAN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 134, 212, 13 + CONTROL "&OK", IDC_OK, "Button", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 161, 50, 14 + CONTROL "&Cancel", IDC_CANCEL, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 221, 161, 50, 14 + CONTROL "&Help", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 +CAPTION "About Accessibility Utility Manager" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "Accessibility Utility Manager\nCopyright (C) 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Copyright (C) 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 +END + +STRINGTABLE +BEGIN + IDS_OSK "On-Screen Keyboard" + IDS_MAGNIFIER "Magnifier" +END + +STRINGTABLE +BEGIN + IDS_NOTRUNNING "%s is not running" + IDS_RUNNING "%s is running" + IDS_GROUPBOX_OPTIONS_TITLE "Options for %s" +END + +STRINGTABLE +BEGIN + IDM_ABOUT "About Accessibility Utility Manager..." +END diff --git a/base/applications/utilman/precomp.h b/base/applications/utilman/precomp.h new file mode 100644 index 00000000000..db665e793c2 --- /dev/null +++ b/base/applications/utilman/precomp.h @@ -0,0 +1,75 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Pre-compiled header file + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +#ifndef _UTILMAN_H +#define _UTILMAN_H + +/* INCLUDES ******************************************************************/ + +#include <stdlib.h> +#include <windows.h> +#include <commctrl.h> +#include <tlhelp32.h> +#include <windowsx.h> +#include <debug.h> +#include <wchar.h> +#include <strsafe.h> + +#include "resource.h" + +/* DEFINES ********************************************************************/ + +#define MAX_BUFFER 256 + +/* TYPES **********************************************************************/ + +typedef struct +{ + HINSTANCE hInstance; + HICON hIcon; + UINT_PTR iTimer; + INT iSelectedIndex; + HWND hDlgCtlStart; + HWND hDlgCtlStop; + HWND hListDlg; + HWND hMainDlg; + WCHAR szRunning[MAX_BUFFER]; + WCHAR szNotRunning[MAX_BUFFER]; + WCHAR szGrpBoxTitle[MAX_BUFFER]; +} UTILMAN_GLOBALS; + +typedef struct _UTILMAN_STATE +{ + LPCWSTR lpProgram; + UINT uNameId; + WCHAR szResource[MAX_BUFFER]; + BOOL bState; +} UTILMAN_STATE, *PUTILMAN_STATE; + +/* DECLARATIONS ***************************************************************/ + +/* dialog.c */ +BOOL DlgInitHandler(HWND hDlg); +INT_PTR APIENTRY DlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); +INT ListBoxRefreshContents(VOID); +VOID CheckUtilityState(BOOL bUtilState); + +/* process.c */ +BOOL IsProcessRunning(IN LPCWSTR lpProcessName); +BOOL LaunchProcess(LPCWSTR lpProcessName); +BOOL CloseProcess(IN LPCWSTR lpProcessName); + +/* about.c */ +VOID ShowAboutDlg(HWND hDlgParent); +INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); + +/* Struct variable declaration */ +extern UTILMAN_GLOBALS Globals; + +#endif /* _UTILMAN_H */ + +/* EOF */ diff --git a/base/applications/utilman/process.c b/base/applications/utilman/process.c new file mode 100644 index 00000000000..45bae49276f --- /dev/null +++ b/base/applications/utilman/process.c @@ -0,0 +1,189 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Process handling functions + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +/* INCLUDES *******************************************************************/ + +#include "precomp.h" + +/* FUNCTIONS ******************************************************************/ + +/** + * @IsProcessRunning + * + * Checks if a process is running. + * + * @param[in] ProcName + * The name of the executable process. + * + * @return + * Returns TRUE if the given process' name is running, + * FALSE otherwise. + * + */ +BOOL IsProcessRunning(IN LPCWSTR lpProcessName) +{ + BOOL bIsRunning = FALSE; + PROCESSENTRY32W Process = {0}; + + /* Create a snapshot and check whether the given process' executable name is running */ + HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + + if (hSnapshot == INVALID_HANDLE_VALUE) + return FALSE; + + Process.dwSize = sizeof(Process); + + /* Enumerate the processes */ + if (Process32FirstW(hSnapshot, &Process)) + { + do + { + if (_wcsicmp(Process.szExeFile, lpProcessName) == 0) + { + /* The process we are searching for is running */ + bIsRunning = TRUE; + break; + } + } + while (Process32NextW(hSnapshot, &Process)); + } + + /* Free the handle and return */ + CloseHandle(hSnapshot); + return bIsRunning; +} + +/** + * @LaunchProcess + * + * Executes a process. + * + * @param[in] lpProcessName + * The name of the executable process. + * + * @return + * Returns TRUE if the process has been launched successfully, + * FALSE otherwise. + * + */ +BOOL LaunchProcess(LPCWSTR lpProcessName) +{ + STARTUPINFOW si; + PROCESS_INFORMATION pi; + HANDLE hUserToken, hProcessToken; + BOOL bSuccess; + WCHAR ExpandedCmdLine[MAX_PATH]; + + /* Expand the process path string */ + ExpandEnvironmentStringsW(lpProcessName, ExpandedCmdLine, ARRAYSIZE(ExpandedCmdLine)); + + ZeroMemory(&pi, sizeof(pi)); + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); + si.dwFlags = STARTF_USESHOWWINDOW; + si.wShowWindow = SW_SHOWNORMAL; + + /* Get the token of the parent (current) process of the application */ + bSuccess = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY | TOKEN_DUPLICATE, &hUserToken); + if (!bSuccess) + { + DPRINT("OpenProcessToken() failed with error -> %lu\n", GetLastError()); + return FALSE; + } + + /* Duplicate a new token so that we can use it to create our process */ + bSuccess = DuplicateTokenEx(hUserToken, TOKEN_ALL_ACCESS, NULL, SecurityIdentification, TokenPrimary, &hProcessToken); + if (!bSuccess) + { + DPRINT("DuplicateTokenEx() failed with error -> %lu\n", GetLastError()); + CloseHandle(hUserToken); + return FALSE; + } + + /* Finally create the process */ + bSuccess = CreateProcessAsUserW(hProcessToken, + NULL, + ExpandedCmdLine, + NULL, + NULL, + FALSE, + 0, // DETACHED_PROCESS, NORMAL_PRIORITY_CLASS + NULL, + NULL, + &si, + &pi); + + if (!bSuccess) + { + DPRINT("CreateProcessAsUserW() failed with error -> %lu\n", GetLastError()); + CloseHandle(hUserToken); + CloseHandle(hProcessToken); + return FALSE; + } + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(hUserToken); + CloseHandle(hProcessToken); + return TRUE; +} + +/** + * @CloseProcess + * + * Closes a process. + * + * @param[in] lpProcessName + * The name of the executable process. + * + * @return + * Returns TRUE if the process has been terminated successfully, + * FALSE otherwise. + * + */ +BOOL CloseProcess(IN LPCWSTR lpProcessName) +{ + BOOL bSuccess = FALSE; + PROCESSENTRY32W Process = {0}; + + /* Create a snapshot and check if the given process' executable name is running */ + HANDLE hSnapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + + if (hSnapshot == INVALID_HANDLE_VALUE) + return FALSE; + + Process.dwSize = sizeof(Process); + + /* Enumerate the processes */ + if (Process32FirstW(hSnapshot, &Process)) + { + do + { + if (_wcsicmp(Process.szExeFile, lpProcessName) == 0) + { + /* + * We have found the process. However we must make + * sure that we DO NOT kill ourselves (the process ID + * matching with the current parent process ID). + */ + HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, 0, Process.th32ProcessID); + if ((hProcess != NULL) && (Process.th32ProcessID != GetCurrentProcessId())) + { + TerminateProcess(hProcess, 0); + CloseHandle(hProcess); + } + bSuccess = TRUE; + break; + } + } + while (Process32NextW(hSnapshot, &Process)); + } + + /* Free the handle and return */ + CloseHandle(hSnapshot); + return bSuccess; +} diff --git a/base/applications/utilman/res/utilman.ico b/base/applications/utilman/res/utilman.ico new file mode 100644 index 00000000000..9f37366fb10 Binary files /dev/null and b/base/applications/utilman/res/utilman.ico differ diff --git a/base/applications/utilman/resource.h b/base/applications/utilman/resource.h new file mode 100644 index 00000000000..df93ab48ad9 --- /dev/null +++ b/base/applications/utilman/resource.h @@ -0,0 +1,47 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Resource header file + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +#pragma once + +#define IDC_STATIC -1 + +/* Icon resource */ +#define IDI_ICON_UTILMAN 50 + +/* List box resource */ +#define IDC_LISTBOX 60 + +/* Utility tools name strings */ +#define IDS_OSK 100 +#define IDS_MAGNIFIER 101 + +/* Utility state strings */ +#define IDS_NOTRUNNING 150 +#define IDS_RUNNING 151 + +/* Groupbox option title */ +#define IDC_GROUPBOX 200 +#define IDS_GROUPBOX_OPTIONS_TITLE 201 + +/* Button resources */ +#define IDC_START 300 +#define IDC_STOP 301 +#define IDC_OK 302 +#define IDC_CANCEL 303 +#define IDC_HELP_TOPICS 304 + +/* Checkbox resources */ +#define IDC_START_LOG_IN 400 +#define IDC_START_DESKTOP 401 +#define IDC_START_UTILMAN 402 + +/* System menu (About) resource */ +#define IDM_ABOUT 600 + +/* Main dialog resource */ +#define IDD_MAIN_DIALOG 1000 +#define IDD_ABOUT_DIALOG 1050 diff --git a/base/applications/utilman/utilman.rc b/base/applications/utilman/utilman.rc new file mode 100644 index 00000000000..50bfa4d710c --- /dev/null +++ b/base/applications/utilman/utilman.rc @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Main resource file + * COPYRIGHT: Copyright 2019 Bișoc George (fraizeraust99 at gmail dot com) + */ + +/* INCLUDES ******************************************************************/ + +#include <windef.h> +#include <winuser.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Accessibility Utility Manager" +#define REACTOS_STR_INTERNAL_NAME "utilman" +#define REACTOS_STR_ORIGINAL_FILENAME "utilman.exe" +#include <reactos/version.rc> + +IDI_ICON_UTILMAN ICON "res/utilman.ico" + +#include <reactos/manifest_exe.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif + +/* EOF */ diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index f6e3a4c0977..cc59005e55d 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -50,6 +50,7 @@ QuickLaunchShortcuts=26, Microsoft\Internet Explorer\Quick Launch [AccessibilityShortcuts] %SystemRoot%\system32\magnify.exe, %MAGNIFY_TITLE%, %MAGNIFY_DESC%, 0, %HOMEDRIVE%%HOMEPATH% %SystemRoot%\system32\osk.exe, %OSK_TITLE%, %OSK_DESC%, 0, %HOMEDRIVE%%HOMEPATH% +%SystemRoot%\system32\utilman.exe, %UTILMAN_TITLE%, %UTILMAN_DESC%, 0, %HOMEDRIVE%%HOMEPATH% [EntertainmentShortcuts] %SystemRoot%\system32\mplay32.exe, %MPLAY_TITLE%, %MPLAY_DESC%, 0, %HOMEDRIVE%%HOMEPATH% @@ -133,6 +134,8 @@ WINMINE_TITLE=WineMine WINMINE_DESC=WineMine SPIDER_TITLE=Spider Solitaire SPIDER_DESC=Spider Solitaire +UTILMAN_TITLE=Accessibility Utility Manager +UTILMAN_DESC=Launch Accessibility Utility Manager ; Bulgarian [Strings.0402]

1 0

[reactos] 01/01: [SHELL32][STOBJECT] Enforce ShellExecuteW(..., file, parameters, ...)
by Serge Gautherie 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb77f1701fea36e872a0b… commit cb77f1701fea36e872a0be3a3a89b324cce4748c Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Aug 15 22:21:21 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 19 13:01:08 2019 +0200 [SHELL32][STOBJECT] Enforce ShellExecuteW(..., file, parameters, ...) CORE-16299 --- dll/shellext/stobject/hotplug.cpp | 7 ++++++- dll/shellext/stobject/volume.cpp | 7 ++++++- dll/win32/shell32/folders/CDrivesFolder.cpp | 7 ++++++- dll/win32/shell32/folders/CRegFolder.cpp | 29 ++++++++++++++++++++++++----- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dll/shellext/stobject/hotplug.cpp b/dll/shellext/stobject/hotplug.cpp index 03348f92d2f..b2202c99d44 100644 --- a/dll/shellext/stobject/hotplug.cpp +++ b/dll/shellext/stobject/hotplug.cpp @@ -155,7 +155,12 @@ HRESULT STDMETHODCALLTYPE Hotplug_Shutdown(_In_ CSysTray * pSysTray) static void _RunHotplug(CSysTray * pSysTray) { - ShellExecuteW(pSysTray->GetHWnd(), L"open", L"rundll32.exe shell32.dll,Control_RunDLL hotplug.dll", NULL, NULL, SW_SHOWNORMAL); + ShellExecuteW(pSysTray->GetHWnd(), + L"open", + L"rundll32.exe", + L"shell32.dll,Control_RunDLL hotplug.dll", + NULL, + SW_SHOWNORMAL); } static void _ShowContextMenu(CSysTray * pSysTray) diff --git a/dll/shellext/stobject/volume.cpp b/dll/shellext/stobject/volume.cpp index 04723a7be26..4b63e05a6b1 100644 --- a/dll/shellext/stobject/volume.cpp +++ b/dll/shellext/stobject/volume.cpp @@ -211,7 +211,12 @@ HRESULT Volume_OnDeviceChange(_In_ CSysTray * pSysTray, WPARAM wParam, LPARAM lP static void _RunVolume(BOOL bTray) { - ShellExecuteW(NULL, NULL, bTray ? L"sndvol32.exe /t" : L"sndvol32.exe", NULL, NULL, SW_SHOWNORMAL); + ShellExecuteW(NULL, + NULL, + L"sndvol32.exe", + bTray ? L"/t" : NULL, + NULL, + SW_SHOWNORMAL); } static void _RunMMCpl() diff --git a/dll/win32/shell32/folders/CDrivesFolder.cpp b/dll/win32/shell32/folders/CDrivesFolder.cpp index 15ccef2da80..17542eeea41 100644 --- a/dll/win32/shell32/folders/CDrivesFolder.cpp +++ b/dll/win32/shell32/folders/CDrivesFolder.cpp @@ -1087,7 +1087,12 @@ HRESULT WINAPI CDrivesFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IDataO if (uMsg == DFM_INVOKECOMMAND && wParam == 1) // #1 { // "System" properties - ShellExecuteW(hwndOwner, NULL, L"rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL); + ShellExecuteW(hwndOwner, + NULL, + L"rundll32.exe", + L"shell32.dll,Control_RunDLL sysdm.cpl", + NULL, + SW_SHOWNORMAL); } else if (uMsg == DFM_MERGECONTEXTMENU) { diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index fc8eba29fe7..33539816b11 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -41,21 +41,40 @@ HRESULT CALLBACK RegFolderContextMenuCallback(IShellFolder *psf, if (_ILIsMyComputer(apidl[0])) { - if (32 >= (UINT_PTR)ShellExecuteW(hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL sysdm.cpl", NULL, NULL, SW_SHOWNORMAL)) + if (32 >= (UINT_PTR)ShellExecuteW(hwnd, + L"open", + L"rundll32.exe", + L"shell32.dll,Control_RunDLL sysdm.cpl", + NULL, + SW_SHOWNORMAL)) + { hr = E_FAIL; + } } else if (_ILIsDesktop(apidl[0])) { - if (32 >= (UINT_PTR)ShellExecuteW(hwnd, L"open", L"rundll32.exe shell32.dll,Control_RunDLL desk.cpl", NULL, NULL, SW_SHOWNORMAL)) + if (32 >= (UINT_PTR)ShellExecuteW(hwnd, + L"open", + L"rundll32.exe", + L"shell32.dll,Control_RunDLL desk.cpl", + NULL, + SW_SHOWNORMAL)) + { hr = E_FAIL; + } } else if (_ILIsNetHood(apidl[0])) { // FIXME path! - if (32 >= (UINT_PTR)ShellExecuteW(NULL, L"open", L"explorer.exe", - L"::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", - NULL, SW_SHOWDEFAULT)) + if (32 >= (UINT_PTR)ShellExecuteW(NULL, + L"open", + L"explorer.exe", + L"::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", + NULL, + SW_SHOWDEFAULT)) + { hr = E_FAIL; + } } else if (_ILIsBitBucket(apidl[0])) {

1 0

[reactos] 01/01: [LDR][APPHELP] Add a shim that disables manifest compatibility version parsing
by Mark Jansen 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=343442cc3fedd084990bc… commit 343442cc3fedd084990bc02ccb32f2b8aab78cea Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Aug 19 02:33:13 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 19 12:08:06 2019 +0200 [LDR][APPHELP] Add a shim that disables manifest compatibility version parsing --- dll/appcompat/apphelp/hsdb.c | 5 +++-- dll/ntdll/ldr/ldrinit.c | 33 +++++++++++++++++++++++---------- media/sdb/sysmain.xml | 8 ++++++-- sdk/include/reactos/compat_undoc.h | 17 ++++++----------- 4 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dll/appcompat/apphelp/hsdb.c b/dll/appcompat/apphelp/hsdb.c index f04312e034a..89eb6284e8c 100644 --- a/dll/appcompat/apphelp/hsdb.c +++ b/dll/appcompat/apphelp/hsdb.c @@ -29,7 +29,7 @@ typedef struct _ShimData } ShimData; #define SHIMDATA_MAGIC 0xAC0DEDAB - +#define REACTOS_COMPATVERSION_IGNOREMANIFEST 0xffffffff C_ASSERT(SHIMDATA_MAGIC == REACTOS_SHIMDATA_MAGIC); C_ASSERT(sizeof(ShimData) == sizeof(ReactOS_ShimData)); @@ -739,7 +739,8 @@ BOOL WINAPI SdbPackAppCompatData(HSDB hsdb, PSDBQUERYRESULT pQueryResult, PVOID* if (SdbQueryData(hsdb, pQueryResult->atrLayers[n], L"SHIMVERSIONNT", &dwType, &dwValue, &dwValueSize) == ERROR_SUCCESS && dwType == REG_DWORD && dwValueSize == sizeof(dwValue)) { - dwValue = (dwValue % 100) | ((dwValue / 100) << 8); + if (dwValue != REACTOS_COMPATVERSION_IGNOREMANIFEST) + dwValue = (dwValue % 100) | ((dwValue / 100) << 8); if (dwValue > pData->dwRosProcessCompatVersion) pData->dwRosProcessCompatVersion = dwValue; } diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 16a3361421a..c23783a77ce 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -1541,9 +1541,17 @@ VOID NTAPI LdrpInitializeProcessCompat(PVOID* pOldShimData) { - static const GUID* GuidOrder[] = { &COMPAT_GUID_WIN10, &COMPAT_GUID_WIN81, &COMPAT_GUID_WIN8, - &COMPAT_GUID_WIN7, &COMPAT_GUID_VISTA }; - static const DWORD GuidVersions[] = { WINVER_WIN10, WINVER_WIN81, WINVER_WIN8, WINVER_WIN7, WINVER_VISTA }; + static const struct + { + const GUID* Guid; + const DWORD Version; + } KnownCompatGuids[] = { + { &COMPAT_GUID_WIN10, _WIN32_WINNT_WIN10 }, + { &COMPAT_GUID_WIN81, _WIN32_WINNT_WINBLUE }, + { &COMPAT_GUID_WIN8, _WIN32_WINNT_WIN8 }, + { &COMPAT_GUID_WIN7, _WIN32_WINNT_WIN7 }, + { &COMPAT_GUID_VISTA, _WIN32_WINNT_VISTA }, + }; ULONG Buffer[(sizeof(COMPATIBILITY_CONTEXT_ELEMENT) * 10 + sizeof(ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION)) / sizeof(ULONG)]; ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION* ContextCompatInfo; @@ -1552,8 +1560,6 @@ LdrpInitializeProcessCompat(PVOID* pOldShimData) DWORD n, cur; ReactOS_ShimData* pShimData = *pOldShimData; - C_ASSERT(RTL_NUMBER_OF(GuidOrder) == RTL_NUMBER_OF(GuidVersions)); - if (pShimData) { if (pShimData->dwMagic != REACTOS_SHIMDATA_MAGIC || @@ -1564,7 +1570,14 @@ LdrpInitializeProcessCompat(PVOID* pOldShimData) } if (pShimData->dwRosProcessCompatVersion) { - DPRINT1("LdrpInitializeProcessCompat: ProcessCompatVersion already set to 0x%x\n", pShimData->dwRosProcessCompatVersion); + if (pShimData->dwRosProcessCompatVersion == REACTOS_COMPATVERSION_IGNOREMANIFEST) + { + DPRINT1("LdrpInitializeProcessCompat: ProcessCompatVersion set to ignore manifest\n"); + } + else + { + DPRINT1("LdrpInitializeProcessCompat: ProcessCompatVersion already set to 0x%x\n", pShimData->dwRosProcessCompatVersion); + } return; } } @@ -1590,12 +1603,12 @@ LdrpInitializeProcessCompat(PVOID* pOldShimData) return; /* Search for known GUID's, starting from newest to oldest. */ - for (cur = 0; cur < RTL_NUMBER_OF(GuidOrder); ++cur) + for (cur = 0; cur < RTL_NUMBER_OF(KnownCompatGuids); ++cur) { for (n = 0; n < ContextCompatInfo->ElementCount; ++n) { if (ContextCompatInfo->Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS && - RtlCompareMemory(&ContextCompatInfo->Elements[n].Id, GuidOrder[cur], sizeof(GUID)) == sizeof(GUID)) + RtlCompareMemory(&ContextCompatInfo->Elements[n].Id, KnownCompatGuids[cur].Guid, sizeof(GUID)) == sizeof(GUID)) { /* If this process did not need shim data before, allocate and store it */ if (pShimData == NULL) @@ -1619,8 +1632,8 @@ LdrpInitializeProcessCompat(PVOID* pOldShimData) } /* Store the highest found version, and bail out. */ - pShimData->dwRosProcessCompatVersion = GuidVersions[cur]; - DPRINT1("LdrpInitializeProcessCompat: Found guid for winver 0x%x\n", GuidVersions[cur]); + pShimData->dwRosProcessCompatVersion = KnownCompatGuids[cur].Version; + DPRINT1("LdrpInitializeProcessCompat: Found guid for winver 0x%x\n", KnownCompatGuids[cur].Version); return; } } diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index 7afab95388e..c41413abde0 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -233,9 +233,9 @@ <DLLFILE>aclayers.dll</DLLFILE> </SHIM> - <SHIM NAME="HideShimEnv"> +  <FLAG NAME="GetShortPathNameNT4"> <FLAG_MASK_KERNEL>1</FLAG_MASK_KERNEL> @@ -248,6 +248,10 @@  + <LAYER NAME="IgnoreManifestCompatVersion"> + <DATA NAME="SHIMVERSIONNT" DATA_DWORD="0xffffffff" />  + </LAYER> + <LAYER NAME="WIN95"> <SHIM_REF NAME="Win95VersionLie" /> <SHIM_REF NAME="ForceDXSetupSuccess" /> diff --git a/sdk/include/reactos/compat_undoc.h b/sdk/include/reactos/compat_undoc.h index fc6a04794dc..44212efb2d2 100644 --- a/sdk/include/reactos/compat_undoc.h +++ b/sdk/include/reactos/compat_undoc.h @@ -13,21 +13,16 @@ typedef struct _ReactOS_ShimData #define REACTOS_SHIMDATA_MAGIC 0xAC0DEDAB +#define REACTOS_COMPATVERSION_UNINITIALIZED 0xfffffffe +#define REACTOS_COMPATVERSION_IGNOREMANIFEST 0xffffffff -#ifndef WINVER_VISTA -#define WINVER_VISTA 0x0600 -#define WINVER_WIN7 0x0601 -#define WINVER_WIN8 0x0602 -#define WINVER_WIN81 0x0603 -#define WINVER_WIN10 0x0a00 -#endif - +// Returns values in the form of _WIN32_WINNT_VISTA, _WIN32_WINNT_WIN7 etc static inline DWORD RosGetProcessCompatVersion(VOID) { - static DWORD g_CompatVersion = 0xffffffff; - if (g_CompatVersion == 0xffffffff) + static DWORD g_CompatVersion = REACTOS_COMPATVERSION_UNINITIALIZED; + if (g_CompatVersion == REACTOS_COMPATVERSION_UNINITIALIZED) { ReactOS_ShimData* pShimData = (ReactOS_ShimData*)NtCurrentPeb()->pShimData; if (pShimData && pShimData->dwMagic == REACTOS_SHIMDATA_MAGIC && @@ -36,7 +31,7 @@ DWORD RosGetProcessCompatVersion(VOID) g_CompatVersion = pShimData->dwRosProcessCompatVersion; } } - return g_CompatVersion != 0xffffffff ? g_CompatVersion : 0; + return g_CompatVersion < REACTOS_COMPATVERSION_UNINITIALIZED ? g_CompatVersion : 0; }

1 0

[reactos] 01/01: [NTOSKRNL] Handle symlink parsing when it's bound to a specific object
by Pierre Schweitzer 19 Aug '19

19 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e12abf63c53670009f684… commit e12abf63c53670009f6843fa705ab7d392b66cf9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Aug 19 10:44:56 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Aug 19 10:45:50 2019 +0200 [NTOSKRNL] Handle symlink parsing when it's bound to a specific object --- ntoskrnl/ob/oblink.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ob/oblink.c b/ntoskrnl/ob/oblink.c index 712143e1ed7..67cb36385dd 100644 --- a/ntoskrnl/ob/oblink.c +++ b/ntoskrnl/ob/oblink.c @@ -5,6 +5,7 @@ * PURPOSE: Implements symbolic links * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)mcmail.com) +* Pierre Schweitzer */ /* INCLUDES *****************************************************************/ @@ -481,7 +482,98 @@ ObpParseSymbolicLink(IN PVOID ParsedObject, /* Check if this symlink is bound to a specific object */ if (SymlinkObject->LinkTargetObject) { - UNIMPLEMENTED; + /* No name to reparse, directly reparse the object */ + if (!SymlinkObject->LinkTargetRemaining.Length) + { + *NextObject = SymlinkObject->LinkTargetObject; + return STATUS_REPARSE_OBJECT; + } + + TempLength = SymlinkObject->LinkTargetRemaining.Length; + /* The target and remaining names aren't empty, so check for slashes */ + if (SymlinkObject->LinkTargetRemaining.Buffer[TempLength / sizeof(WCHAR) - 1] == OBJ_NAME_PATH_SEPARATOR && + RemainingName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) + { + /* Reduce the length by one to cut off the extra '\' */ + TempLength -= sizeof(OBJ_NAME_PATH_SEPARATOR); + } + + /* Calculate the new length */ + LengthUsed = TempLength + RemainingName->Length; + LengthUsed += (sizeof(WCHAR) * (RemainingName->Buffer - FullPath->Buffer)); + + /* Check if it's not too much */ + if (LengthUsed > 0xFFF0) + return STATUS_NAME_TOO_LONG; + + /* If FullPath is enough, use it */ + if (FullPath->MaximumLength > LengthUsed) + { + /* Update remaining length if appropriate */ + if (RemainingName->Length) + { + RtlMoveMemory((PVOID)((ULONG_PTR)RemainingName->Buffer + TempLength), + RemainingName->Buffer, + RemainingName->Length); + } + + /* And move the target object name */ + RtlCopyMemory(RemainingName->Buffer, + SymlinkObject->LinkTargetRemaining.Buffer, + TempLength); + + /* Finally update the full path with what we parsed */ + FullPath->Length += SymlinkObject->LinkTargetRemaining.Length; + RemainingName->Length += SymlinkObject->LinkTargetRemaining.Length; + RemainingName->MaximumLength += RemainingName->Length + sizeof(WCHAR); + FullPath->Buffer[FullPath->Length / sizeof(WCHAR)] = UNICODE_NULL; + + /* And reparse */ + *NextObject = SymlinkObject->LinkTargetObject; + return STATUS_REPARSE_OBJECT; + } + + /* FullPath is not enough, we'll have to reallocate */ + MaximumLength = LengthUsed + sizeof(WCHAR); + NewTargetPath = ExAllocatePoolWithTag(NonPagedPool, + MaximumLength, + OB_NAME_TAG); + if (!NewTargetPath) return STATUS_INSUFFICIENT_RESOURCES; + + /* Copy path begin */ + RtlCopyMemory(NewTargetPath, + FullPath->Buffer, + sizeof(WCHAR) * (RemainingName->Buffer - FullPath->Buffer)); + + /* Copy path end (if any) */ + if (RemainingName->Length) + { + RtlCopyMemory((PVOID)((ULONG_PTR)&NewTargetPath[RemainingName->Buffer - FullPath->Buffer] + TempLength), + RemainingName->Buffer, + RemainingName->Length); + } + + /* And finish path with bound object */ + RtlCopyMemory(&NewTargetPath[RemainingName->Buffer - FullPath->Buffer], + SymlinkObject->LinkTargetRemaining.Buffer, + TempLength); + + /* Free old buffer */ + ExFreePool(FullPath->Buffer); + + /* Set new buffer in FullPath */ + FullPath->Buffer = NewTargetPath; + FullPath->MaximumLength = MaximumLength; + FullPath->Length = LengthUsed; + + /* Update remaining with what we handled */ + RemainingName->Length = LengthUsed + (ULONG_PTR)NewTargetPath - (ULONG_PTR)&NewTargetPath[RemainingName->Buffer - FullPath->Buffer]; + RemainingName->Buffer = &NewTargetPath[RemainingName->Buffer - FullPath->Buffer]; + RemainingName->MaximumLength = RemainingName->Length + sizeof(WCHAR); + + /* Reparse! */ + *NextObject = SymlinkObject->LinkTargetObject; + return STATUS_REPARSE_OBJECT; } /* Set the target path and length */

1 0

[reactos] 01/01: [NOTEPAD] Encoding detection (#1852)
by Katayama Hirofumi MZ 18 Aug '19

18 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e85664a3d8dfb955b56b2… commit e85664a3d8dfb955b56b2f5d27a8ccd85db9454b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 18 22:46:56 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 18 22:46:56 2019 +0900 [NOTEPAD] Encoding detection (#1852) CORE-15548 In notepad, if there is no BOM in the input file, then judge the text encoding. --- base/applications/notepad/text.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/base/applications/notepad/text.c b/base/applications/notepad/text.c index 6e26a7ab474..d22cf4817ee 100644 --- a/base/applications/notepad/text.c +++ b/base/applications/notepad/text.c @@ -4,6 +4,7 @@ * Copyright 1998,99 Marcel Baur <mbaur(a)g26.ethz.ch> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2002 Andriy Palamarchuk + * Copyright 2019 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -47,6 +48,32 @@ static BOOL Append(LPWSTR *ppszText, DWORD *pdwTextLen, LPCWSTR pszAppendText, D return TRUE; } +ENCODING AnalyzeEncoding(const char *pBytes, DWORD dwSize) +{ + INT flags = IS_TEXT_UNICODE_STATISTICS; + + if (dwSize <= 1) + return ENCODING_ANSI; + + if (IsTextUnicode(pBytes, dwSize, &flags)) + { + return ENCODING_UTF16LE; + } + + if ((flags & IS_TEXT_UNICODE_REVERSE_MASK) && !(flags & IS_TEXT_UNICODE_ILLEGAL_CHARS)) + { + return ENCODING_UTF16BE; + } + + /* is it UTF-8? */ + if (MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, pBytes, dwSize, NULL, 0)) + { + return ENCODING_UTF8; + } + + return ENCODING_ANSI; +} + BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, int *piEoln) { @@ -98,6 +125,10 @@ ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, ENCODING *pencFile, encFile = ENCODING_UTF8; dwPos += 3; } + else + { + encFile = AnalyzeEncoding((const char *)pBytes, dwSize); + } switch(encFile) {

1 0

[reactos] 01/01: [MSV1_0] Add SpLsaModeInitialize and SpUserModeInitialize.
by Eric Kohl 18 Aug '19

18 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f052817d841c5738a8d2d… commit f052817d841c5738a8d2dc645899911c04e4296b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 18 14:54:12 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 18 14:56:27 2019 +0200 [MSV1_0] Add SpLsaModeInitialize and SpUserModeInitialize. SpLsaModeInitialize and SpUserModeInitialize will provide access to SSPI functions. LSASRV will soon access the LsaAp functions via SpLsaModeInialize. --- dll/win32/msv1_0/msv1_0.c | 103 +++++++++++++++++++++++++++++++++++++++++++ dll/win32/msv1_0/msv1_0.spec | 4 +- 2 files changed, 105 insertions(+), 2 deletions(-) diff --git a/dll/win32/msv1_0/msv1_0.c b/dll/win32/msv1_0/msv1_0.c index 90ee9d264d8..cbe5ec6f944 100644 --- a/dll/win32/msv1_0/msv1_0.c +++ b/dll/win32/msv1_0/msv1_0.c @@ -1549,4 +1549,107 @@ done: return Status; } + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +SpLsaModeInitialize( + _In_ ULONG LsaVersion, + _Out_ PULONG PackageVersion, + _Out_ PSECPKG_FUNCTION_TABLE *ppTables, + _Out_ PULONG pcTables) +{ + SECPKG_FUNCTION_TABLE Tables[1]; + + TRACE("SpLsaModeInitialize(0x%lx %p %p %p)\n", + LsaVersion, PackageVersion, ppTables, pcTables); + + if (LsaVersion != SECPKG_INTERFACE_VERSION) + return STATUS_INVALID_PARAMETER; + + *PackageVersion = SECPKG_INTERFACE_VERSION; + + RtlZeroMemory(&Tables, sizeof(Tables)); + + Tables[0].InitializePackage = LsaApInitializePackage; +// Tables[0].LogonUser = NULL; + Tables[0].CallPackage = (PLSA_AP_CALL_PACKAGE)LsaApCallPackage; + Tables[0].LogonTerminated = LsaApLogonTerminated; + Tables[0].CallPackageUntrusted = LsaApCallPackageUntrusted; + Tables[0].CallPackagePassthrough = (PLSA_AP_CALL_PACKAGE_PASSTHROUGH)LsaApCallPackagePassthrough; +// Tables[0].LogonUserEx = NULL; + Tables[0].LogonUserEx2 = LsaApLogonUserEx2; +// Tables[0].Initialize = SpInitialize; +// Tables[0].Shutdown = NULL; +// Tables[0].GetInfo = NULL; +// Tables[0].AcceptCredentials = NULL; +// Tables[0].SpAcquireCredentialsHandle = NULL; +// Tables[0].SpQueryCredentialsAttributes = NULL; +// Tables[0].FreeCredentialsHandle = NULL; +// Tables[0].SaveCredentials = NULL; +// Tables[0].GetCredentials = NULL; +// Tables[0].DeleteCredentials = NULL; +// Tables[0].InitLsaModeContext = NULL; +// Tables[0].AcceptLsaModeContext = NULL; +// Tables[0].DeleteContext = NULL; +// Tables[0].ApplyControlToken = NULL; +// Tables[0].GetUserInfo = NULL; +// Tables[0].GetExtendedInformation = NULL; +// Tables[0].SpQueryContextAttributes = NULL; +// Tables[0].SpAddCredentials = NULL; +// Tables[0].SetExtendedInformation = NULL; + + *ppTables = Tables; + *pcTables = 1; + + return STATUS_SUCCESS; +} + + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +SpUserModeInitialize( + _In_ ULONG LsaVersion, + _Out_ PULONG PackageVersion, + _Out_ PSECPKG_USER_FUNCTION_TABLE *ppTables, + _Out_ PULONG pcTables) +{ + SECPKG_USER_FUNCTION_TABLE Tables[1]; + + TRACE("SpUserModeInitialize(0x%lx %p %p %p)\n", + LsaVersion, PackageVersion, ppTables, pcTables); + + if (LsaVersion != SECPKG_INTERFACE_VERSION) + return STATUS_INVALID_PARAMETER; + + *PackageVersion = SECPKG_INTERFACE_VERSION; + + RtlZeroMemory(&Tables, sizeof(Tables)); + +// Tables[0].InstanceInit = SpInstanceInit; +// Tables[0].InitUserModeContext = NULL; +// Tables[0].MakeSignature = NULL; +// Tables[0].VerifySignature = NULL; +// Tables[0].SealMessage = NULL; +// Tables[0].UnsealMessage = NULL; +// Tables[0].GetContextToken = NULL; +// Tables[0].SpQueryContextAttributes = NULL; +// Tables[0].CompleteAuthToken = NULL; +// Tables[0].DeleteUserModeContext = NULL; +// Tables[0].FormatCredentials = NULL; +// Tables[0].MarshallSupplementalCreds = NULL; +// Tables[0].ExportContext = NULL; +// Tables[0].ImportContext = NULL; + + *ppTables = Tables; + *pcTables = 1; + + return STATUS_SUCCESS; +} + /* EOF */ diff --git a/dll/win32/msv1_0/msv1_0.spec b/dll/win32/msv1_0/msv1_0.spec index 34fe25e6ca9..f1c98077b2a 100644 --- a/dll/win32/msv1_0/msv1_0.spec +++ b/dll/win32/msv1_0/msv1_0.spec @@ -12,5 +12,5 @@ @ stub MsvValidateTarget @ stub SpInitialize @ stub SpInstanceInit -@ stub SpLsaModeInitialize -@ stub SpUserModeInitialize +@ stdcall SpLsaModeInitialize(long ptr ptr ptr) +@ stdcall SpUserModeInitialize(long ptr ptr ptr)

1 0

[reactos] 02/02: [FREELDR] Demote the ArcOpen() trace in WinLdrLoadImage() to a warning only.
by Hermès Bélusca-Maïto 18 Aug '19

18 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dca43193c87f17ac778d3… commit dca43193c87f17ac778d3973102dea4b3fd7f537 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 18 15:23:23 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 18 15:26:25 2019 +0200 [FREELDR] Demote the ArcOpen() trace in WinLdrLoadImage() to a warning only. --- boot/freeldr/freeldr/lib/peloader.c | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index bd4e66573d9..0d4cb3cafba 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -75,8 +75,8 @@ WinLdrCheckForLoadedDll(IN OUT PLIST_ENTRY ModuleListHead, InLoadOrderLinks); TRACE("WinLdrCheckForLoadedDll: DTE %p, EP %p, base %p name '%.*ws'\n", - DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, - DataTableEntry->BaseDllName.Length / 2, VaToPa(DataTableEntry->BaseDllName.Buffer)); + DataTableEntry, DataTableEntry->EntryPoint, DataTableEntry->DllBase, + DataTableEntry->BaseDllName.Length / 2, VaToPa(DataTableEntry->BaseDllName.Buffer)); /* Compare names */ if (WinLdrpCompareDllName(DllName, &DataTableEntry->BaseDllName)) @@ -119,7 +119,7 @@ WinLdrScanImportDescriptorTable(IN OUT PLIST_ENTRY ModuleListHead, BaseName.MaximumLength = ScanDTE->BaseDllName.MaximumLength; BaseName.Length = ScanDTE->BaseDllName.Length; TRACE("WinLdrScanImportDescriptorTable(): %wZ ImportTable = 0x%X\n", - &BaseName, ImportTable); + &BaseName, ImportTable); } #endif @@ -182,8 +182,9 @@ WinLdrAllocateDataTableEntry(IN OUT PLIST_ENTRY ModuleListHead, PLDR_DATA_TABLE_ENTRY DataTableEntry; PIMAGE_NT_HEADERS NtHeaders; USHORT Length; + TRACE("WinLdrAllocateDataTableEntry(, '%s', '%s', %p)\n", - BaseDllName, FullDllName, BasePA); + BaseDllName, FullDllName, BasePA); /* Allocate memory for a data table entry, zero-initialize it */ DataTableEntry = (PLDR_DATA_TABLE_ENTRY)FrLdrHeapAlloc(sizeof(LDR_DATA_TABLE_ENTRY), @@ -281,13 +282,14 @@ WinLdrLoadImage(IN PCHAR FileName, ARC_STATUS Status; LARGE_INTEGER Position; ULONG i, BytesRead; + TRACE("WinLdrLoadImage(%s, %ld, *)\n", FileName, MemoryType); /* Open the image file */ Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { - ERR("ArcOpen(FileName: \"%s\", OpenReadOnly: %u) failed. Status %u\n", FileName, OpenReadOnly, Status); + WARN("ArcOpen(FileName: '%s') failed. Status: %u\n", FileName, Status); return FALSE; } @@ -472,7 +474,7 @@ WinLdrpCompareDllName(IN PCH DllName, UnicodeNamePA.MaximumLength = UnicodeName->MaximumLength; UnicodeNamePA.Buffer = VaToPa(UnicodeName->Buffer); TRACE("WinLdrpCompareDllName: %s and %wZ, Length = %d " - "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); + "UN->Length %d\n", DllName, &UnicodeNamePA, Length, UnicodeName->Length); } #endif @@ -525,7 +527,7 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, BOOLEAN Success; //TRACE("WinLdrpBindImportName(): DllBase 0x%X, ImageBase 0x%X, ThunkData 0x%X, ExportDirectory 0x%X, ExportSize %d, ProcessForwards 0x%X\n", - // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); + // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); /* Check passed DllBase param */ if(DllBase == NULL) @@ -564,7 +566,7 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, OrdinalTable = VaToPa(RVA(DllBase, ExportDirectory->AddressOfNameOrdinals)); //TRACE("NameTable 0x%X, OrdinalTable 0x%X, ED->AddressOfNames 0x%X, ED->AOFO 0x%X\n", - // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); + // NameTable, OrdinalTable, ExportDirectory->AddressOfNames, ExportDirectory->AddressOfNameOrdinals); /* Get the hint, convert it to a physical pointer */ Hint = ((PIMAGE_IMPORT_BY_NAME)VaToPa((PVOID)ThunkData->u1.AddressOfData))->Hint; @@ -604,14 +606,13 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, /* Compare the names */ Result = strcmp(ExportName, (PCHAR)ImportData->Name); - /*TRACE("Binary search: comparing Import '__', Export '%s'\n",*/ - /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ - /*(PCHAR)VaToPa(RVA(DllBase, NameTable[Middle])));*/ - - /*TRACE("TE->u1.AOD %p, fulladdr %p\n", - ThunkData->u1.AddressOfData, - ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name );*/ + // TRACE("Binary search: comparing Import '__', Export '%s'\n", + // VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]), + // (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))); + // TRACE("TE->u1.AOD %p, fulladdr %p\n", + // ThunkData->u1.AddressOfData, + // ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name ); /* Depending on result of strcmp, perform different actions */ if (Result > 0) @@ -634,7 +635,6 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, /* If high boundary is less than low boundary, then no result found */ if (High < Low) { - //Print(L"Error in binary search\n"); ERR("Did not find export '%s'!\n", (PCHAR)ImportData->Name); return FALSE; } @@ -668,6 +668,7 @@ WinLdrpBindImportName(IN OUT PLIST_ENTRY ModuleListHead, CHAR ForwardDllName[255]; PIMAGE_EXPORT_DIRECTORY RefExportDirectory; ULONG RefExportSize; + TRACE("WinLdrpBindImportName(): ForwarderName %s\n", ForwarderName); /* Save the name of the forward dll */ @@ -770,7 +771,6 @@ WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, strcat(FullDllName, ImportName); TRACE("Loading referenced DLL: %s\n", FullDllName); - //Print(L"Loading referenced DLL: %s\n", FullDllName); /* Load the image */ Success = WinLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA); @@ -794,7 +794,7 @@ WinLdrpLoadAndScanReferencedDll(PLIST_ENTRY ModuleListHead, /* Scan its dependencies too */ TRACE("WinLdrScanImportDescriptorTable() calling ourselves for %S\n", - VaToPa((*DataTableEntry)->BaseDllName.Buffer)); + VaToPa((*DataTableEntry)->BaseDllName.Buffer)); Success = WinLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); if (!Success) { @@ -817,7 +817,7 @@ WinLdrpScanImportAddressTable(IN OUT PLIST_ENTRY ModuleListHead, ULONG ExportSize; TRACE("WinLdrpScanImportAddressTable(): DllBase 0x%X, " - "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData); + "ImageBase 0x%X, ThunkData 0x%X\n", DllBase, ImageBase, ThunkData); /* Obtain the export table from the DLL's base */ if (DllBase == NULL)

1 0

[reactos] 01/02: [FFS] Silence some only-informative KdPrints.
by Hermès Bélusca-Maïto 18 Aug '19

18 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40162252693a3a59b6d28… commit 40162252693a3a59b6d28d6f8d19a52c92a7cb22 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Aug 16 18:14:19 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 18 15:26:23 2019 +0200 [FFS] Silence some only-informative KdPrints. --- drivers/filesystems/ffs/src/fsctl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/ffs/src/fsctl.c b/drivers/filesystems/ffs/src/fsctl.c index 175b3258202..1542c63df5e 100644 --- a/drivers/filesystems/ffs/src/fsctl.c +++ b/drivers/filesystems/ffs/src/fsctl.c @@ -159,13 +159,13 @@ FFSLoadDiskLabel( if (Disklabel->d_magic == DISKMAGIC) { - KdPrint(("FFSLoadDiskLabel() Disklabel magic ok\n")); + FFSPrint((DBG_INFO, "FFSLoadDiskLabel() Disklabel magic ok\n")); Status = STATUS_SUCCESS; } else { - KdPrint(("FFSLoadDiskLabel() No BSD disklabel found, trying to find BSD file system on \"normal\" partition.\n")); + FFSPrint((DBG_INFO, "FFSLoadDiskLabel() No BSD disklabel found, trying to find BSD file system on \"normal\" partition.\n")); if ((FFSSb = FFSLoadSuper(Vcb, FALSE, FSOffset + SBLOCK_UFS1)) && (FFSSb->fs_magic == FS_UFS1_MAGIC)) @@ -213,7 +213,7 @@ FFSLoadDiskLabel( } else { - KdPrint(("FFSLoadDiskLabel() No BSD file system was found on the \"normal\" partition.\n")); + FFSPrint((DBG_INFO, "FFSLoadDiskLabel() No BSD file system was found on the \"normal\" partition.\n")); #ifdef __REACTOS__ ExFreePoolWithTag(Disklabel, FFS_POOL_TAG); #endif @@ -225,7 +225,7 @@ FFSLoadDiskLabel( Status = FFSGetPartition(DeviceObject, &StartOffset); if (!NT_SUCCESS(Status)) { - KdPrint(("FFSLoadDiskLabel() Slice info failed, Status %u\n", Status)); + FFSPrint((DBG_ERROR, "FFSLoadDiskLabel() Slice info failed, Status %u\n", Status)); #ifdef __REACTOS__ ExFreePoolWithTag(Disklabel, FFS_POOL_TAG); #endif @@ -234,7 +234,7 @@ FFSLoadDiskLabel( Vcb->PartitionNumber = FFSGlobal->PartitionNumber; - KdPrint(("FFSLoadDiskLabel() Selected BSD Label : %d, StartOffset : %x\n", Vcb->PartitionNumber, StartOffset)); + FFSPrint((DBG_INFO, "FFSLoadDiskLabel() Selected BSD Label : %d, StartOffset : %x\n", Vcb->PartitionNumber, StartOffset)); for (i = 0; i < MAXPARTITIONS; i++) { @@ -247,7 +247,7 @@ FFSLoadDiskLabel( Vcb->FSOffset[i] = FSOffset; /* Important */ - KdPrint(("FFSLoadDiskLabel() Label %d, FS_BSDFFS, %x\n", i, Vcb->FSOffset[i])); + FFSPrint((DBG_INFO, "FFSLoadDiskLabel() Label %d, FS_BSDFFS, %x\n", i, Vcb->FSOffset[i])); if ((FFSSb = FFSLoadSuper(Vcb, FALSE, FSOffset + SBLOCK_UFS1)) && (FFSSb->fs_magic == FS_UFS1_MAGIC))

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