Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-27 08:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[UTILMAN] Move most of the code in a library (#2530)

Browse source 
Windows XP and Server 2003 Utility Manager has a dedicated library for the resources and other stuff. Utility Manager is just a simple process that loads it. Hence create a library for the program, UManDlg.dll, and move the resources and other stuff there.

In addition to that, use ExtractIconW to get the icon resource from the program (the DLL doesn't share icons by default) and remove the icon resource from the "About" dialog window. Also change the encoding type of other translation files to UTF-8 (which were previously set with UTF-8 with BOM).
This commit is contained in:
Bișoc George 2020-04-17 12:42:47 +02:00 committed by GitHub
parent 963d39bf66
commit 975d417b34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 466 additions and 290 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
base/applications/utilman/CMakeLists.txt
View file

@ -1,14 +1,12 @@
list(APPEND SOURCE
dialog.c
process.c
about.c
registry.c
utilman.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_importlibs(utilman user32 msvcrt kernel32 ntdll)
add_pch(utilman precomp.h SOURCE)
add_cd_file(TARGET utilman DESTINATION reactos/system32 FOR all)
add_subdirectory(umandlg)

1
base/applications/utilman/NOTES.txt
View file

@ -7,5 +7,4 @@ Currently the application can manage the state of the accessibility tools howeve
- 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()

49
base/applications/utilman/lang/en-US.rc
View file

@ -1,55 +1,14 @@
/*
/*
* 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)
* COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com)
*/
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
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"
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 lock 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 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36
LTEXT "Copyright 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..."
IDS_FAIL_INIT "Failed to initialize the Utility Manager library! The error code is %lu."
IDS_FAIL_INIT_TITLE "Initialization failure"
END

94
base/applications/utilman/precomp.h
View file

@ -10,13 +10,7 @@
/* 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"
@ -27,93 +21,7 @@
/* 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;
typedef struct _REGISTRY_SETTINGS
{
/* Accessibility Registry settings */
LPCWSTR wszAppPath;
DWORD dwAppType;
DWORD dwClientControlCode;
LPCWSTR wszAppName;
LPCWSTR wszErrorOnLaunch;
BOOL bHideClient;
BOOL bStartWithUtilman;
BOOL bStartWithROS;
LPCWSTR wszHungRespondAction;
DWORD dwHungTimeOut;
/* Utility Manager Registry settings */
BOOL bShowWarning;
} REGISTRY_SETTINGS, *PREGISTRY_SETTINGS;
typedef struct _REGISTRY_DATA
{
/* On-Screen Keyboard Registry data */
LPCWSTR lpwsOskPath;
LPCWSTR lpwszOskDisplayName;
/* Magnify Registry data */
LPCWSTR lpwszMagnifyPath;
LPCWSTR lpwszMagnifyDisplayName;
} REGISTRY_DATA, *PREGISTRY_DATA;
/* ENUMERATIONS ***************************************************************/
typedef enum _WRITE_REGISTRY
{
REGISTRY_ACCESSIBILITY,
REGISTRY_UTILMAN
} WRITE_REGISTRY, *PWRITE_REGISTRY;
/* 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 */
DWORD GetProcessID(IN LPCWSTR lpProcessName);
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);
/* registry.c */
BOOL InitAppRegKey(IN HKEY hPredefinedKey, IN LPCWSTR lpwszSubKey, OUT PHKEY phKey, OUT LPDWORD lpdwDisposition);
BOOL QueryAppSettings(IN HKEY hKey, IN LPCWSTR lpwszSubKey, IN LPCWSTR lpwszRegValue, OUT PVOID ReturnedData, IN OUT LPDWORD lpdwSizeData);
BOOL SaveAppSettings(IN HKEY hKey, IN LPCWSTR lpwszRegValue, IN DWORD dwRegType, IN PVOID Data, IN DWORD cbSize);
/* Struct variable declaration */
extern UTILMAN_GLOBALS Globals;
extern REGISTRY_SETTINGS Settings;
extern REGISTRY_DATA RegData;
typedef BOOL (WINAPI *EXECDLGROUTINE)(VOID);
#endif /* _UTILMAN_H */

40
base/applications/utilman/resource.h
View file

@ -2,7 +2,7 @@
* 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)
* COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com)
*/
#pragma once
@ -10,38 +10,8 @@
#define IDC_STATIC -1
/* Icon resource */
#define IDI_ICON_UTILMAN 50
#define IDI_ICON_UTILMAN 30
/* 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
/* Strings */
#define IDS_FAIL_INIT 40
#define IDS_FAIL_INIT_TITLE 41

15
base/applications/utilman/umandlg/CMakeLists.txt Normal file
View file

@ -0,0 +1,15 @@
spec2def(umandlg.dll umandlg.spec)
add_library(umandlg MODULE
about.c
process.c
registry.c
umandlg.c
umandlg.h
umandlg.rc
${CMAKE_CURRENT_BINARY_DIR}/umandlg.def)
set_module_type(umandlg win32dll UNICODE)
add_importlibs(umandlg comdlg32 user32 gdi32 advapi32 shell32 comctl32 msvcrt kernel32 ntdll)
add_cd_file(TARGET umandlg DESTINATION reactos/system32 FOR all)

17
base/applications/utilman/about.c → base/applications/utilman/umandlg/about.c
View file

@ -1,13 +1,13 @@
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll)
* 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)
* COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com)
*/
/* INCLUDES *******************************************************************/
#include "precomp.h"
#include "umandlg.h"
/* GLOBALS ********************************************************************/
@ -43,12 +43,11 @@ INT_PTR CALLBACK AboutDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
{
case WM_INITDIALOG:
{
Globals.hIcon = LoadImageW(Globals.hInstance,
MAKEINTRESOURCEW(IDI_ICON_UTILMAN),
IMAGE_ICON,
0,
0,
LR_DEFAULTSIZE);
WCHAR wszAppPath[MAX_BUFFER];
/* Extract the icon resource from the executable process */
GetModuleFileNameW(NULL, wszAppPath, _countof(wszAppPath));
Globals.hIcon = ExtractIconW(Globals.hInstance, wszAppPath, 0);
/* Set the icon within the dialog's title bar */
if (Globals.hIcon)

54
base/applications/utilman/umandlg/lang/en-US.rc Normal file
View file

@ -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-2020 Bișoc George (fraizeraust99 at gmail dot com)
*/
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
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"
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 lock 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
LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 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

7
base/applications/utilman/lang/es-ES.rc → base/applications/utilman/umandlg/lang/es-ES.rc
View file

@ -1,4 +1,4 @@
/*
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Spanish (Neutral) translation resource
@ -31,9 +31,8 @@ CAPTION "Acerca de las Herramientas de Accesibilidad"
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 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36
LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36
PUSHBUTTON "Cerrar", IDOK, 75, 47, 44, 15
END

7
base/applications/utilman/lang/fr-FR.rc → base/applications/utilman/umandlg/lang/fr-FR.rc
View file

@ -1,4 +1,4 @@
/*
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: French (France) translation resource
@ -30,9 +30,8 @@ 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 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36
LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36
PUSHBUTTON "Close", IDOK, 75, 47, 44, 15
END

7
base/applications/utilman/lang/he-IL.rc → base/applications/utilman/umandlg/lang/he-IL.rc
View file

@ -1,4 +1,4 @@
/*
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Hebrew (Israel) translation resource
@ -30,9 +30,8 @@ CAPTION "אודות מנהל כלי הנגישות"
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 "מנהל כלי הנגישות\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36
LTEXT "מנהל כלי הנגישות\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36
PUSHBUTTON "סגור", IDOK, 75, 47, 44, 15
END

5
base/applications/utilman/lang/it-IT.rc → base/applications/utilman/umandlg/lang/it-IT.rc
View file

@ -30,9 +30,8 @@ CAPTION "Informazioni su Accessibilità 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 "Accessibilità Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36
LTEXT "Accessibilità Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36
PUSHBUTTON "Chiudi", IDOK, 75, 47, 44, 15
END

5
base/applications/utilman/lang/pl-PL.rc → base/applications/utilman/umandlg/lang/pl-PL.rc
View file

@ -29,9 +29,8 @@ CAPTION "Menedżer narzędzi ułatwienia dostępu - informacje"
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 "Menedżer narzędzi ułatwienia dostępu\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36
LTEXT "Menedżer narzędzi ułatwienia dostępu\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36
LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36
PUSHBUTTON "Close", IDOK, 75, 47, 44, 15
END

7
base/applications/utilman/lang/ro-RO.rc → base/applications/utilman/umandlg/lang/ro-RO.rc
View file

@ -1,4 +1,4 @@
/*
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Romanian (Romania) translation resource
@ -30,9 +30,8 @@ CAPTION "Despre Managerul utilitare"
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 "Manager utilitare\nDrept de autor 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36
LTEXT "Drept de autor 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36
LTEXT "Manager utilitare\nDrept de autor 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36
LTEXT "Drept de autor 2019 Hermes Belusca-Maito", IDC_STATIC, 10, 33, 150, 36
PUSHBUTTON "Închide", IDOK, 75, 47, 44, 15
END

7
base/applications/utilman/lang/ru-RU.rc → base/applications/utilman/umandlg/lang/ru-RU.rc
View file

@ -1,4 +1,4 @@
/*
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Russian (Russia) translation resource
@ -30,9 +30,8 @@ CAPTION "О программе"
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 "Диспетчер служебных программ\n© 2019 Джордж Бисок (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36
LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 48, 33, 150, 36
LTEXT "Диспетчер служебных программ\n© 2019 Джордж Бисок (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36
LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 10, 33, 150, 36
PUSHBUTTON "OK", IDOK, 75, 47, 44, 15
END

7
base/applications/utilman/lang/uk-UA.rc → base/applications/utilman/umandlg/lang/uk-UA.rc
View file

@ -1,4 +1,4 @@
/*
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Ukrainian (Ukraine) translation resource
@ -30,9 +30,8 @@ CAPTION "Про программу"
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 "Диспетчер службових програм\n© 2019 Джордж Бісок (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36
LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 48, 33, 150, 36
LTEXT "Диспетчер службових програм\n© 2019 Джордж Бісок (fraizeraust99 at gmail dot com)", IDC_STATIC, 10, 7, 150, 36
LTEXT "© 2019 Гермес Белуска-Майто", IDC_STATIC, 10, 33, 150, 36
PUSHBUTTON "OK", IDOK, 75, 47, 44, 15
END

6
base/applications/utilman/process.c → base/applications/utilman/umandlg/process.c
View file

@ -1,13 +1,13 @@
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll)
* 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)
* COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com)
*/
/* INCLUDES *******************************************************************/
#include "precomp.h"
#include "umandlg.h"
/* FUNCTIONS ******************************************************************/

4
base/applications/utilman/registry.c → base/applications/utilman/umandlg/registry.c
View file

@ -1,5 +1,5 @@
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Registry functions for Utility Manager settings management
* COPYRIGHT: Copyright 2020 Bișoc George (fraizeraust99 at gmail dot com)
@ -7,7 +7,7 @@
/* INCLUDES *******************************************************************/
#include "precomp.h"
#include "umandlg.h"
/* GLOBALS ********************************************************************/

44
base/applications/utilman/umandlg/resource.h Normal file
View file

@ -0,0 +1,44 @@
/*
* PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Resource header file
* COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com)
*/
#pragma once
#define IDC_STATIC -1
/* 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

102
base/applications/utilman/dialog.c → base/applications/utilman/umandlg/umandlg.c
View file

@ -1,14 +1,14 @@
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll)
* 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)
* PURPOSE: Main DLL code file
* COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com)
* Copyright 2019 Hermes Belusca-Maito
*/
/* INCLUDES *******************************************************************/
#include "precomp.h"
#include "umandlg.h"
/* GLOBALS ********************************************************************/
@ -99,6 +99,7 @@ BOOL DlgInitHandler(IN HWND hDlg)
INT PosX, PosY;
RECT rc;
WCHAR szAboutDlg[MAX_BUFFER];
WCHAR wszAppPath[MAX_BUFFER];
HMENU hSysMenu;
/* Save the dialog handle */
@ -110,13 +111,9 @@ BOOL DlgInitHandler(IN HWND hDlg)
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);
/* Extract the icon resource from the executable process */
GetModuleFileNameW(NULL, wszAppPath, _countof(wszAppPath));
Globals.hIcon = ExtractIconW(Globals.hInstance, wszAppPath, 0);
/* Set the icon within the dialog's title bar */
if (Globals.hIcon)
@ -351,40 +348,21 @@ INT_PTR APIENTRY DlgProc(
}
/**
* @wWinMain
* @UManStartDlg
*
* 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).
* Executes the dialog initialization mechanism and starts Utility Manager.
* The function is exported for use by the main process.
*
* @return
* Returns 0 to let the function terminating before it enters in the message loop.
* Returns TRUE when the operation has succeeded, FALSE otherwise.
*
*/
INT WINAPI wWinMain(
IN HINSTANCE hInstance,
IN HINSTANCE hPrevInstance,
IN LPWSTR pCmdLine,
IN INT nCmdShow)
BOOL WINAPI UManStartDlg(VOID)
{
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)
@ -399,7 +377,7 @@ INT WINAPI wWinMain(
and mutex object.
*/
CloseHandle(hMutex);
return 0;
return FALSE;
}
}
@ -408,10 +386,6 @@ INT WINAPI wWinMain(
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,
@ -423,7 +397,7 @@ INT WINAPI wWinMain(
InitUtilsList(FALSE);
/* Create the dialog box of the program */
DialogBoxW(hInstance,
DialogBoxW(Globals.hInstance,
MAKEINTRESOURCEW(IDD_MAIN_DIALOG),
GetDesktopWindow(),
DlgProc);
@ -434,5 +408,49 @@ INT WINAPI wWinMain(
CloseHandle(hMutex);
}
return 0;
return TRUE;
}
/**
* @DllMain
*
* Core routine of the Utility Manager's library.
*
* @param[in] hDllInstance
* The entry point instance of the library.
*
* @param[in] fdwReason
* The reason argument to indicate the motive DllMain
* is being called.
*
* @param[in] lpvReserved
* Reserved.
*
* @return
* Returns TRUE when main call initialization has succeeded, FALSE
* otherwise.
*
*/
BOOL WINAPI DllMain(IN HINSTANCE hDllInstance,
IN DWORD fdwReason,
IN LPVOID lpvReserved)
{
switch (fdwReason)
{
case DLL_PROCESS_ATTACH:
{
/* We don't care for DLL_THREAD_ATTACH and DLL_THREAD_DETACH notifications */
DisableThreadLibraryCalls(hDllInstance);
/* Initialize the globals */
ZeroMemory(&Globals, sizeof(Globals));
Globals.hInstance = hDllInstance;
break;
}
case DLL_PROCESS_DETACH:
break;
}
return TRUE;
}

121
base/applications/utilman/umandlg/umandlg.h Normal file
View file

@ -0,0 +1,121 @@
/*
* PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: DLL header file
* COPYRIGHT: Copyright 2020 Bișoc George (fraizeraust99 at gmail dot com)
*/
#ifndef _UMANDLG_H
#define _UMANDLG_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;
typedef struct _REGISTRY_SETTINGS
{
/* Accessibility Registry settings */
LPCWSTR wszAppPath;
DWORD dwAppType;
DWORD dwClientControlCode;
LPCWSTR wszAppName;
LPCWSTR wszErrorOnLaunch;
BOOL bHideClient;
BOOL bStartWithUtilman;
BOOL bStartWithROS;
LPCWSTR wszHungRespondAction;
DWORD dwHungTimeOut;
/* Utility Manager Registry settings */
BOOL bShowWarning;
} REGISTRY_SETTINGS, *PREGISTRY_SETTINGS;
typedef struct _REGISTRY_DATA
{
/* On-Screen Keyboard Registry data */
LPCWSTR lpwsOskPath;
LPCWSTR lpwszOskDisplayName;
/* Magnify Registry data */
LPCWSTR lpwszMagnifyPath;
LPCWSTR lpwszMagnifyDisplayName;
} REGISTRY_DATA, *PREGISTRY_DATA;
/* ENUMERATIONS ***************************************************************/
typedef enum _WRITE_REGISTRY
{
REGISTRY_ACCESSIBILITY,
REGISTRY_UTILMAN
} WRITE_REGISTRY, *PWRITE_REGISTRY;
/* DECLARATIONS ***************************************************************/
/* umandlg.c */
BOOL DlgInitHandler(HWND hDlg);
INT_PTR APIENTRY DlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
INT ListBoxRefreshContents(VOID);
VOID CheckUtilityState(BOOL bUtilState);
BOOL WINAPI UManStartDlg(VOID);
/* process.c */
DWORD GetProcessID(IN LPCWSTR lpProcessName);
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);
/* registry.c */
BOOL InitAppRegKey(IN HKEY hPredefinedKey, IN LPCWSTR lpwszSubKey, OUT PHKEY phKey, OUT LPDWORD lpdwDisposition);
BOOL QueryAppSettings(IN HKEY hKey, IN LPCWSTR lpwszSubKey, IN LPCWSTR lpwszRegValue, OUT PVOID ReturnedData, IN OUT LPDWORD lpdwSizeData);
BOOL SaveAppSettings(IN HKEY hKey, IN LPCWSTR lpwszRegValue, IN DWORD dwRegType, IN PVOID Data, IN DWORD cbSize);
/* Struct variable declaration */
extern UTILMAN_GLOBALS Globals;
extern REGISTRY_SETTINGS Settings;
extern REGISTRY_DATA RegData;
#endif /* UMANDLG_H_ */
/* EOF */

54
base/applications/utilman/umandlg/umandlg.rc Normal file
View file

@ -0,0 +1,54 @@
/*
* PROJECT: ReactOS Utility Manager Resources DLL (UManDlg.dll)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Main DLL resource file
* COPYRIGHT: Copyright 2019-2020 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 Resources DLL"
#define REACTOS_STR_INTERNAL_NAME "UManDlg"
#define REACTOS_STR_ORIGINAL_FILENAME "UManDlg.dll"
#include <reactos/version.rc>
#include <reactos/manifest_exe.rc>
/* UTF-8 */
#pragma code_page(65001)
#ifdef LANGUAGE_EN_US
#include "lang/en-US.rc"
#endif
#ifdef LANGUAGE_ES_ES
#include "lang/es-ES.rc"
#endif
#ifdef LANGUAGE_FR_FR
#include "lang/fr-FR.rc"
#endif
#ifdef LANGUAGE_HE_IL
#include "lang/he-IL.rc"
#endif
#ifdef LANGUAGE_IT_IT
#include "lang/it-IT.rc"
#endif
#ifdef LANGUAGE_PL_PL
#include "lang/pl-PL.rc"
#endif
#ifdef LANGUAGE_RO_RO
#include "lang/ro-RO.rc"
#endif
#ifdef LANGUAGE_RU_RU
#include "lang/ru-RU.rc"
#endif
#ifdef LANGUAGE_UK_UA
#include "lang/uk-UA.rc"
#endif
/* EOF */

1
base/applications/utilman/umandlg/umandlg.spec Normal file
View file

@ -0,0 +1 @@
1 stdcall UManStartDlg()

68
base/applications/utilman/utilman.c Normal file
View file

@ -0,0 +1,68 @@
/*
* PROJECT: ReactOS Utility Manager (Accessibility)
* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+)
* PURPOSE: Main dialog code file
* COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com)
*/
/* INCLUDES *******************************************************************/
#include "precomp.h"
/* FUNCTIONS ******************************************************************/
/**
* @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)
{
HMODULE hModule;
WCHAR wszFormat[MAX_BUFFER];
WCHAR wszFailLoad[MAX_BUFFER];
WCHAR wszTitle[MAX_BUFFER];
EXECDLGROUTINE UManStartDlg;
UNREFERENCED_PARAMETER(hPrevInstance);
UNREFERENCED_PARAMETER(pCmdLine);
UNREFERENCED_PARAMETER(nCmdShow);
/* Load the main resources module of Utility Manager */
hModule = LoadLibraryW(L"UManDlg.dll");
if (!hModule)
{
LoadStringW(hInstance, IDS_FAIL_INIT, wszFormat, _countof(wszFormat));
LoadStringW(hInstance, IDS_FAIL_INIT_TITLE, wszTitle, _countof(wszTitle));
StringCchPrintfW(wszFailLoad, _countof(wszFailLoad), wszFormat, GetLastError());
MessageBoxW(GetDesktopWindow(), wszFailLoad, wszTitle, MB_ICONERROR | MB_OK);
return -1;
}
/* Get the function address and launch Utility Manager */
UManStartDlg = (EXECDLGROUTINE)GetProcAddress(hModule, "UManStartDlg");
UManStartDlg();
FreeLibrary(hModule);
return 0;
}

26
base/applications/utilman/utilman.rc
View file

@ -2,7 +2,7 @@
* 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)
* COPYRIGHT: Copyright 2019-2020 Bișoc George (fraizeraust99 at gmail dot com)
*/
/* INCLUDES ******************************************************************/
@ -28,29 +28,5 @@ IDI_ICON_UTILMAN ICON "res/utilman.ico"
#ifdef LANGUAGE_EN_US
#include "lang/en-US.rc"
#endif
#ifdef LANGUAGE_ES_ES
#include "lang/es-ES.rc"
#endif
#ifdef LANGUAGE_FR_FR
#include "lang/fr-FR.rc"
#endif
#ifdef LANGUAGE_HE_IL
#include "lang/he-IL.rc"
#endif
#ifdef LANGUAGE_IT_IT
#include "lang/it-IT.rc"
#endif
#ifdef LANGUAGE_PL_PL
#include "lang/pl-PL.rc"
#endif
#ifdef LANGUAGE_RO_RO
#include "lang/ro-RO.rc"
#endif
#ifdef LANGUAGE_RU_RU
#include "lang/ru-RU.rc"
#endif
#ifdef LANGUAGE_UK_UA
#include "lang/uk-UA.rc"
#endif
/* EOF */