Ros-diffs August 2023

ros-diffs@reactos.org

30 participants
167 discussions

[reactos] 01/01: [REACTOS] Do not free shared icon for ShellAbout() calls (#5519)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=016acd170dd75a7a24af2… commit 016acd170dd75a7a24af235339a5321e2c24bf5a Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Aug 9 11:53:13 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 9 11:53:13 2023 +0200 [REACTOS] Do not free shared icon for ShellAbout() calls (#5519) CORE-18369 --- base/applications/calc/winmain.c | 14 ++++---------- base/applications/clipbrd/clipbrd.c | 6 ++---- base/applications/mplay32/mplay32.c | 5 ++--- base/applications/mscutils/eventvwr/eventvwr.c | 6 ++---- base/applications/mscutils/servman/mainwnd.c | 6 ++---- base/applications/mspaint/winproc.cpp | 5 ++--- base/applications/osk/main.c | 11 +++-------- base/applications/rapps/gui.cpp | 6 ++---- base/applications/sndrec32/sndrec32.cpp | 6 ++---- base/applications/taskmgr/about.c | 5 ++--- dll/win32/devmgr/devmgmt/MainWindow.cpp | 7 ++----- 11 files changed, 25 insertions(+), 52 deletions(-) diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index 519bf60990e..cc26983cc52 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -1945,9 +1945,9 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL hInstance, MAKEINTRESOURCE(IDI_CALC), IMAGE_ICON, - GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), - 0); + 0, + 0, + LR_DEFAULTSIZE | LR_SHARED); calc.hSmIcon = LoadImage( hInstance, @@ -1955,7 +1955,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), - 0); + LR_SHARED); do { /* ignore hwnd: dialogs are already visible! */ @@ -1985,12 +1985,6 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL save_config(); } while (calc.action != IDC_STATIC); - if (calc.hBgIcon != NULL) - DestroyIcon(calc.hBgIcon); - - if (calc.hSmIcon != NULL) - DestroyIcon(calc.hSmIcon); - stop_rpn_engine(); Theme_Stop(); diff --git a/base/applications/clipbrd/clipbrd.c b/base/applications/clipbrd/clipbrd.c index 6f5733cae48..6aaeaca88ea 100644 --- a/base/applications/clipbrd/clipbrd.c +++ b/base/applications/clipbrd/clipbrd.c @@ -248,13 +248,11 @@ static int OnCommand(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case CMD_ABOUT: { - HICON hIcon; WCHAR szTitle[MAX_STRING_LEN]; - hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCE(CLIPBRD_ICON)); LoadStringW(Globals.hInstance, STRING_CLIPBOARD, szTitle, ARRAYSIZE(szTitle)); - ShellAboutW(Globals.hMainWnd, szTitle, NULL, hIcon); - DeleteObject(hIcon); + ShellAboutW(Globals.hMainWnd, szTitle, NULL, + LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(CLIPBRD_ICON))); break; } diff --git a/base/applications/mplay32/mplay32.c b/base/applications/mplay32/mplay32.c index 8fafeaaaba0..6d1f01dba7b 100644 --- a/base/applications/mplay32/mplay32.c +++ b/base/applications/mplay32/mplay32.c @@ -1439,9 +1439,8 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) case IDM_ABOUT: { - HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); - ShellAbout(hwnd, szAppTitle, NULL, mplayIcon); - DeleteObject(mplayIcon); + ShellAbout(hwnd, szAppTitle, NULL, + LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN))); break; } diff --git a/base/applications/mscutils/eventvwr/eventvwr.c b/base/applications/mscutils/eventvwr/eventvwr.c index 7712565e118..f707d585041 100644 --- a/base/applications/mscutils/eventvwr/eventvwr.c +++ b/base/applications/mscutils/eventvwr/eventvwr.c @@ -3640,13 +3640,11 @@ WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case IDM_ABOUT: { - HICON hIcon; WCHAR szCopyright[MAX_LOADSTRING]; - hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_EVENTVWR)); LoadStringW(hInst, IDS_COPYRIGHT, szCopyright, ARRAYSIZE(szCopyright)); - ShellAboutW(hWnd, szTitle, szCopyright, hIcon); - DeleteObject(hIcon); + ShellAboutW(hWnd, szTitle, szCopyright, + LoadIconW(hInst, MAKEINTRESOURCEW(IDI_EVENTVWR))); break; } diff --git a/base/applications/mscutils/servman/mainwnd.c b/base/applications/mscutils/servman/mainwnd.c index 1b016fb593b..526d9700199 100644 --- a/base/applications/mscutils/servman/mainwnd.c +++ b/base/applications/mscutils/servman/mainwnd.c @@ -382,7 +382,6 @@ MainWndCommand(PMAIN_WND_INFO Info, { WCHAR szAppName[256]; WCHAR szAppAuthors[256]; - HICON hIcon; UNREFERENCED_PARAMETER(hControl); @@ -597,9 +596,8 @@ MainWndCommand(PMAIN_WND_INFO Info, LoadStringW(hInstance, IDS_APPNAME, szAppName, _countof(szAppName)); LoadStringW(hInstance, IDS_APPAUTHORS, szAppAuthors, _countof(szAppAuthors)); - hIcon = LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_SM_ICON)); - ShellAboutW(Info->hMainWnd, szAppName, szAppAuthors, hIcon); - DestroyIcon(hIcon); + ShellAboutW(Info->hMainWnd, szAppName, szAppAuthors, + LoadIconW(hInstance, MAKEINTRESOURCEW(IDI_SM_ICON))); break; } diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index de22a406243..f930174d45d 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -599,13 +599,12 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { case IDM_HELPINFO: { - HICON paintIcon = LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON)); TCHAR infotitle[100]; TCHAR infotext[200]; LoadString(g_hinstExe, IDS_INFOTITLE, infotitle, _countof(infotitle)); LoadString(g_hinstExe, IDS_INFOTEXT, infotext, _countof(infotext)); - ShellAbout(m_hWnd, infotitle, infotext, paintIcon); - DeleteObject(paintIcon); + ShellAbout(m_hWnd, infotitle, infotext, + LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON))); break; } case IDM_HELPHELPTOPICS: diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index 680156639aa..d7457a7c4c9 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -138,19 +138,14 @@ DWORD WINAPI OSK_WarningDlgThread(LPVOID lpParameter) VOID OSK_About(VOID) { WCHAR szAuthors[MAX_PATH]; - HICON OSKIcon; - - /* Load the icon */ - OSKIcon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); /* Load the strings into the "About" dialog */ LoadStringW(Globals.hInstance, IDS_AUTHORS, szAuthors, _countof(szAuthors)); + /* Load the icon */ /* Finally, execute the "About" dialog by using the Shell routine */ - ShellAboutW(Globals.hMainWnd, Globals.szTitle, szAuthors, OSKIcon); - - /* Once done, destroy the icon */ - DestroyIcon(OSKIcon); + ShellAboutW(Globals.hMainWnd, Globals.szTitle, szAuthors, + LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_OSK), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED)); } /*********************************************************************** diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 9601a0c4585..0c81f789bd1 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -469,13 +469,11 @@ CMainWindow::ShowAboutDlg() { CStringW szApp; CStringW szAuthors; - HICON hIcon; szApp.LoadStringW(IDS_APPTITLE); szAuthors.LoadStringW(IDS_APP_AUTHORS); - hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); - ShellAboutW(m_hWnd, szApp, szAuthors, hIcon); - DestroyIcon(hIcon); + ShellAboutW(m_hWnd, szApp, szAuthors, + LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN))); } VOID diff --git a/base/applications/sndrec32/sndrec32.cpp b/base/applications/sndrec32/sndrec32.cpp index 0d408fc3f34..cfaf93bd25a 100644 --- a/base/applications/sndrec32/sndrec32.cpp +++ b/base/applications/sndrec32/sndrec32.cpp @@ -432,7 +432,6 @@ WndProc(HWND hWnd, HFONT oldfont; long long slid_samp = 0; WCHAR szAppName[100]; - HICON hIcon; /* Checking for global pointers to buffer and io audio devices */ if ((!AUD_IN) || (!AUD_OUT) || (!AUD_BUF)) @@ -598,9 +597,8 @@ WndProc(HWND hWnd, case ID_ABOUT: LoadStringW(hInst, IDS_APP_TITLE, szAppName, _countof(szAppName)); - hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REACTOS_SNDREC32)); - ShellAboutW(hWnd, szAppName, NULL, hIcon); - DestroyIcon(hIcon); + ShellAboutW(hWnd, szAppName, NULL, + LoadIconW(hInst, MAKEINTRESOURCEW(IDI_REACTOS_SNDREC32))); break; case ID_FILE_SAVEAS: diff --git a/base/applications/taskmgr/about.c b/base/applications/taskmgr/about.c index e0decc1ddaa..f97f6588550 100644 --- a/base/applications/taskmgr/about.c +++ b/base/applications/taskmgr/about.c @@ -10,9 +10,8 @@ void OnAbout(void) { WCHAR szTaskmgr[128]; - HICON taskmgrIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_TASKMANAGER)); LoadStringW(hInst, IDS_APP_TITLE, szTaskmgr, sizeof(szTaskmgr)/sizeof(WCHAR)); - ShellAboutW(hMainWnd, szTaskmgr, NULL, taskmgrIcon); - DeleteObject(taskmgrIcon); + ShellAboutW(hMainWnd, szTaskmgr, NULL, + LoadIconW(hInst, MAKEINTRESOURCEW(IDI_TASKMANAGER))); } diff --git a/dll/win32/devmgr/devmgmt/MainWindow.cpp b/dll/win32/devmgr/devmgmt/MainWindow.cpp index 0bf96dc3c9e..723d93e281f 100644 --- a/dll/win32/devmgr/devmgmt/MainWindow.cpp +++ b/dll/win32/devmgr/devmgmt/MainWindow.cpp @@ -653,16 +653,13 @@ CDeviceManager::OnCommand(_In_ WPARAM wParam, { CAtlStringW szAppName; CAtlStringW szAppAuthors; - HICON hIcon; if (!szAppName.LoadStringW(g_hThisInstance, IDS_APPNAME)) szAppName = L"ReactOS Device Manager"; if (!szAppAuthors.LoadStringW(g_hThisInstance, IDS_APP_AUTHORS)) szAppAuthors = L""; - hIcon = LoadIconW(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON)); - ShellAboutW(m_hMainWnd, szAppName, szAppAuthors, hIcon); - if (hIcon) - DestroyIcon(hIcon); + ShellAboutW(m_hMainWnd, szAppName, szAppAuthors, + LoadIconW(g_hThisInstance, MAKEINTRESOURCEW(IDI_MAIN_ICON))); // Set focus back to the treeview m_DeviceView->SetFocus();

1 year, 4 months

[reactos] 01/01: [REACTOS] British English spellings (#5533)

by Andrew Dent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=815d55c3782fce6f36f44… commit 815d55c3782fce6f36f445405a33974e1ff9276c Author: Andrew Dent <dent.ace(a)gmail.com> AuthorDate: Wed Aug 9 10:48:59 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 9 11:48:59 2023 +0200 [REACTOS] British English spellings (#5533) Fix spellings for en-GB: - Centre. - Colour. - Customise. - Unauthorise. --- base/applications/mspaint/lang/en-GB.rc | 4 ++-- dll/cpl/desk/lang/en-GB.rc | 6 +++--- dll/win32/shell32/lang/en-GB.rc | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base/applications/mspaint/lang/en-GB.rc b/base/applications/mspaint/lang/en-GB.rc index 69e8873cf75..ce5b06fd04f 100644 --- a/base/applications/mspaint/lang/en-GB.rc +++ b/base/applications/mspaint/lang/en-GB.rc @@ -27,7 +27,7 @@ BEGIN MENUITEM "Send...", IDM_FILESEND MENUITEM SEPARATOR MENUITEM "Set as wallpaper (Tiled)", IDM_FILEASWALLPAPERPLANE - MENUITEM "Set as wallpaper (Centered)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Set as wallpaper (Centred)", IDM_FILEASWALLPAPERCENTERED MENUITEM "Set as wallpaper (Stretched)", IDM_FILEASWALLPAPERSTRETCHED MENUITEM SEPARATOR MENUITEM "Most recently used file", IDM_FILEMOSTRECENTLYUSEDFILE, GRAYED @@ -114,7 +114,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "Rotate/&Mirror...\tCtrl+R", IDM_IMAGEROTATEMIRROR MENUITEM "&Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "&Invert colors\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "&Invert colours\tCtrl+I", IDM_IMAGEINVERTCOLORS END END diff --git a/dll/cpl/desk/lang/en-GB.rc b/dll/cpl/desk/lang/en-GB.rc index 6383c7d4875..bd8a26ccfcd 100644 --- a/dll/cpl/desk/lang/en-GB.rc +++ b/dll/cpl/desk/lang/en-GB.rc @@ -26,7 +26,7 @@ BEGIN PUSHBUTTON "&Colour...", IDC_COLOR_BUTTON, 188, 167, 55, 15 LTEXT "&Placement", IDC_STATIC, 188, 128, 55, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 139, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Customize &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 + PUSHBUTTON "Customise &Desktop...", IDC_DESKTOP_CUSTOM, 8, 194, 90, 15 END IDD_SCREENSAVER DIALOGEX 0, 0, 246, 202 @@ -246,9 +246,9 @@ END STRINGTABLE BEGIN IDS_CPLNAME "Display" - IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." + IDS_CPLDESCRIPTION "Customises the desktop display and screen saver." IDS_NONE "(None)" - IDS_CENTER "Center" + IDS_CENTER "Centre" IDS_STRETCH "Stretch" IDS_TILE "Tile" IDS_FIT "Fit" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index cec926eab93..e7415d373ae 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -207,7 +207,7 @@ BEGIN ICON IDI_SHELL_EXTENDED_PROPERTIES, IDI_SHELL_EXTENDED_PROPERTIES, 5, 5, 21, 20, SS_ICON LTEXT "Choose the advanced properties you want for this shortcut.", -1, 5, 30, 210, 10 CHECKBOX "Run with different credentials", IDC_SHORTEX_RUN_DIFFERENT, 25, 50, 150, 10 - LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorized program activity.", -1, 50, 60, 175, 40 + LTEXT "This option can allow you to run the this shortcut as another user, or continue as yourself while protecting your computer and data from unauthorised program activity.", -1, 50, 60, 175, 40 CHECKBOX "Run in seperate memory space", IDC_SHORTEX_RUN_SEPARATE, 25, 100, 150, 10, WS_DISABLED PUSHBUTTON "OK", IDOK, 63, 124, 50, 15, WS_VISIBLE PUSHBUTTON "Abort", IDCANCEL, 120, 124, 50, 15, WS_VISIBLE @@ -362,7 +362,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Which user account do you want to use to run this program?", -1, 10, 20, 220, 20 CHECKBOX "Current User %s", 14000, 10, 45, 150, 10 - LTEXT "Protect my computer and data from unauthorized program activity", -1, 25, 57, 200, 10, WS_DISABLED + LTEXT "Protect my computer and data from unauthorised program activity", -1, 25, 57, 200, 10, WS_DISABLED CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE CHECKBOX "The following user:", 14002, 10, 100, 90, 10 LTEXT "User name:", -1, 20, 118, 54, 10 @@ -702,7 +702,7 @@ BEGIN END IDD_FOLDER_CUSTOMIZE DIALOGEX 0, 0, 240, 250 -CAPTION "Customize" +CAPTION "Customise" STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN @@ -770,7 +770,7 @@ BEGIN /* special folders descriptions */ IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." - IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customise the display of files and folders and change file associations." IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." @@ -1005,7 +1005,7 @@ BEGIN IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings" IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon" IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" - IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" + IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in colour" IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" IDS_NEWEXT_ADVANCED_LEFT "<< Ad&vanced"

1 year, 4 months

[reactos] 01/01: [REACTOS] Spelling fixes (#5534)

by Andrew Dent

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72ea2d4c265355e740421… commit 72ea2d4c265355e740421d0cc67d4a2f0a974602 Author: Andrew Dent <dent.ace(a)gmail.com> AuthorDate: Wed Aug 9 10:48:07 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 9 11:48:07 2023 +0200 [REACTOS] Spelling fixes (#5534) Fix spellings / hyphenation: `unassociate` ; `read-only` ; `double-click` --- base/shell/cmd/lang/cs-CZ.rc | 2 +- base/shell/cmd/lang/en-US.rc | 2 +- base/shell/cmd/lang/sk-SK.rc | 2 +- base/shell/explorer/traywnd.cpp | 2 +- dll/cpl/main/mouse.c | 2 +- dll/win32/devmgr/devmgmt/DeviceView.cpp | 2 +- dll/win32/shell32/lang/bg-BG.rc | 2 +- dll/win32/shell32/lang/ca-ES.rc | 2 +- dll/win32/shell32/lang/cs-CZ.rc | 2 +- dll/win32/shell32/lang/da-DK.rc | 2 +- dll/win32/shell32/lang/el-GR.rc | 2 +- dll/win32/shell32/lang/en-GB.rc | 2 +- dll/win32/shell32/lang/en-US.rc | 2 +- dll/win32/shell32/lang/fi-FI.rc | 2 +- dll/win32/shell32/lang/he-IL.rc | 2 +- dll/win32/shell32/lang/it-IT.rc | 2 +- dll/win32/shell32/lang/ko-KR.rc | 2 +- dll/win32/shell32/lang/nl-NL.rc | 2 +- dll/win32/shell32/lang/no-NO.rc | 2 +- dll/win32/shell32/lang/pt-BR.rc | 2 +- dll/win32/shell32/lang/sk-SK.rc | 2 +- dll/win32/shell32/lang/sl-SI.rc | 2 +- dll/win32/shell32/lang/sq-AL.rc | 2 +- dll/win32/shell32/lang/sv-SE.rc | 2 +- modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc | 4 ++-- sdk/include/reactos/mc/errcodes.mc | 12 ++++++------ sdk/include/reactos/mc/ntstatus.mc | 2 +- win32ss/user/ntuser/msgqueue.c | 8 ++++---- 28 files changed, 37 insertions(+), 37 deletions(-) diff --git a/base/shell/cmd/lang/cs-CZ.rc b/base/shell/cmd/lang/cs-CZ.rc index 25b7282795d..043cbcfca8a 100644 --- a/base/shell/cmd/lang/cs-CZ.rc +++ b/base/shell/cmd/lang/cs-CZ.rc @@ -126,7 +126,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ /S Delete file from all sub directory\n\ /A Select files to be deleted based on attributes.\n\ attributes\n\ - R Read Only files\n\ + R Read-only files\n\ S System files\n\ A Archiveable files\n\ H Hidden Files\n\ diff --git a/base/shell/cmd/lang/en-US.rc b/base/shell/cmd/lang/en-US.rc index 070e997db8c..e530cda2db9 100644 --- a/base/shell/cmd/lang/en-US.rc +++ b/base/shell/cmd/lang/en-US.rc @@ -121,7 +121,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ /S Delete file from all sub directory\n\ /A Select files to be deleted based on attributes.\n\ attributes\n\ - R Read Only files\n\ + R Read-only files\n\ S System files\n\ A Archiveable files\n\ H Hidden Files\n\ diff --git a/base/shell/cmd/lang/sk-SK.rc b/base/shell/cmd/lang/sk-SK.rc index c8da98bdfda..eccaa057f3b 100644 --- a/base/shell/cmd/lang/sk-SK.rc +++ b/base/shell/cmd/lang/sk-SK.rc @@ -127,7 +127,7 @@ ERASE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\n\ /S Delete file from all sub directory\n\ /A Select files to be deleted based on attributes.\n\ attributes\n\ - R Read Only files\n\ + R Read-only files\n\ S System files\n\ A Archiveable files\n\ H Hidden Files\n\ diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index 576630a3359..2fbcea85299 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -3138,7 +3138,7 @@ HandleTrayContextMenu: LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - /* Let the clock handle the double click */ + /* Let the clock handle the double-click */ ::SendMessageW(m_TrayNotify, uMsg, wParam, lParam); /* We "handle" this message so users can't cause a weird maximize/restore diff --git a/dll/cpl/main/mouse.c b/dll/cpl/main/mouse.c index 022515c61e9..28ca28f3590 100644 --- a/dll/cpl/main/mouse.c +++ b/dll/cpl/main/mouse.c @@ -382,7 +382,7 @@ ButtonProc(IN HWND hwndDlg, /* Reset swap mouse button setting */ SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, 0); - /* Reset double click speed setting */ + /* Reset double-click speed setting */ SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_OrigDoubleClickSpeed, NULL, 0); //SetDoubleClickTime(pButtonData->g_OrigDoubleClickSpeed); } diff --git a/dll/win32/devmgr/devmgmt/DeviceView.cpp b/dll/win32/devmgr/devmgmt/DeviceView.cpp index 8fae7fbb601..3b38bf208e2 100644 --- a/dll/win32/devmgr/devmgmt/DeviceView.cpp +++ b/dll/win32/devmgr/devmgmt/DeviceView.cpp @@ -135,7 +135,7 @@ CDeviceView::OnDoubleClick( GetCursorPos(&hitInfo.pt); ScreenToClient(m_hTreeView, &hitInfo.pt); - // Check if we are trying to double click an item + // Check if we are trying to double-click an item hItem = TreeView_HitTest(m_hTreeView, &hitInfo); if (hItem != NULL && (hitInfo.flags & (TVHT_ONITEM | TVHT_ONITEMICON))) { diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 3c188becd5e..f748b48b598 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 9825c3a1f92..8fe2ea35f20 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 98e83f573d4..779d6ee557a 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -1018,7 +1018,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 5dc3bb704fa..b3bb48b457d 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -1018,7 +1018,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index d467a135b78..5ae43f646e1 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 6f9b532360d..cec926eab93 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index c0277a97623..80920dbd914 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index bb908ec07ef..983d4fb5fab 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index c23d965bb08..6faa9abaab2 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -1014,7 +1014,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "&מתקדם >>" IDS_NEWEXT_NEW "<חדש>" IDS_NEWEXT_SPECIFY_EXT "עליך לציין סיומת." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "סיומת בשימוש" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index c4de6949f82..6414dd62d2e 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 12306e561a4..4e883d0bcf6 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -1019,7 +1019,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 0d5d266a650..51ba62cf5a1 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 08b1a255184..08d51f68005 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 8740ac707bf..94b594c7465 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index dbff4ad2cc6..d3ea7e6974c 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index fe1b69ba5b6..3d5ff4af009 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 733369f50e9..25a95b57dfe 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -1016,7 +1016,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index d51b1824c74..46ed208c020 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -1012,7 +1012,7 @@ BEGIN IDS_NEWEXT_ADVANCED_RIGHT "Ad&vanced >>" IDS_NEWEXT_NEW "<New>" IDS_NEWEXT_SPECIFY_EXT "You must specify an extension." - IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to un-associate %s with %s and create a new File Type for it?" + IDS_NEWEXT_ALREADY_ASSOC "Extension %s is already associated with File Type %s. Do you want to unassociate %s with %s and create a new File Type for it?" IDS_NEWEXT_EXT_IN_USE "Extension is in use" IDS_REMOVE_EXT "If you remove a registered file name extension, you will not be able to open files with this extension by double-clicking their icons.\n\nAre you sure you want to remove this extension?" diff --git a/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc b/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc index 222c04d7610..33ee9145c2c 100644 --- a/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc +++ b/modules/rosapps/applications/cmdutils/vfdcmd/vfdmsg.mc @@ -1226,7 +1226,7 @@ If the target drive does not have a drive letter, this command also assigns a local drive letter (see '%1!s!HELP LINK') using the first available letter. -Read only files, NTFS encrypted/compressed files and ZIP compressed +Read-only files, NTFS encrypted/compressed files and ZIP compressed image files (such as WinImage IMZ file) cannot be mounted directly and must be opened in RAM mode. @@ -1374,7 +1374,7 @@ OPTIONS: The trailing ':' is optional. The drive 0 is used if not specified. - /ON Enables the drive write protect - the drive becomes read only. + /ON Enables the drive write protect - the drive becomes read-only. /OFF Disables the drive write protect - the drive becomes writable. diff --git a/sdk/include/reactos/mc/errcodes.mc b/sdk/include/reactos/mc/errcodes.mc index a243c8f3a38..96408a3d4d3 100644 --- a/sdk/include/reactos/mc/errcodes.mc +++ b/sdk/include/reactos/mc/errcodes.mc @@ -18781,16 +18781,16 @@ Severity=Success Facility=System SymbolicName=ERROR_WMI_READ_ONLY Language=English -The WMI data item or data block is read only. +The WMI data item or data block is read-only. . Language=Russian -The WMI data item or data block is read only. +The WMI data item or data block is read-only. . Language=Polish Element danych WMI lub blok danych są tylko do odczytu. . Language=Romanian -The WMI data item or data block is read only. +The WMI data item or data block is read-only. . MessageId=4214 @@ -21620,16 +21620,16 @@ Severity=Success Facility=System SymbolicName=ERROR_FILE_READ_ONLY Language=English -The specified file is read only. +The specified file is read-only. . Language=Russian -The specified file is read only. +The specified file is read-only. . Language=Polish Podany plik jest tylko do odczytu. . Language=Romanian -The specified file is read only. +The specified file is read-only. . MessageId=6010 diff --git a/sdk/include/reactos/mc/ntstatus.mc b/sdk/include/reactos/mc/ntstatus.mc index 57b29436033..86c69332ae0 100644 --- a/sdk/include/reactos/mc/ntstatus.mc +++ b/sdk/include/reactos/mc/ntstatus.mc @@ -4100,7 +4100,7 @@ Severity=Error Facility=System SymbolicName=STATUS_WMI_READ_ONLY Language=English -The WMI data item or data block is read only. +The WMI data item or data block is read-only. . MessageId=0x2c7 diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index d35eb38cf9d..8c24de79853 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -1564,7 +1564,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L } msg->lParam = MAKELONG( pt.x, pt.y ); - /* translate double clicks */ + /* translate double-clicks */ if ((msg->message == WM_LBUTTONDOWN) || (msg->message == WM_RBUTTONDOWN) || @@ -1573,7 +1573,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L { BOOL update = *RemoveMessages; - /* translate double clicks - + /* translate double-clicks - * note that ...MOUSEMOVEs can slip in between * ...BUTTONDOWN and ...BUTTONDBLCLK messages */ @@ -1592,7 +1592,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L message += (WM_LBUTTONDBLCLK - WM_LBUTTONDOWN); if (update) { - MessageQueue->msgDblClk.message = 0; /* clear the double click conditions */ + MessageQueue->msgDblClk.message = 0; /* clear the double-click conditions */ update = FALSE; } } @@ -1604,7 +1604,7 @@ BOOL co_IntProcessMouseMessage(MSG* msg, BOOL* RemoveMessages, BOOL* NotForUs, L return FALSE; } - /* update static double click conditions */ + /* update static double-click conditions */ if (update) MessageQueue->msgDblClk = *msg; } else

1 year, 4 months

[reactos] 03/03: [DOC] 3rd Party Files.txt: Add second path where more rdesktop code is.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a928bc4e213a8ec56c91… commit 5a928bc4e213a8ec56c91656eaf192f2da87b682 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 9 11:34:56 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 9 11:34:56 2023 +0200 [DOC] 3rd Party Files.txt: Add second path where more rdesktop code is. --- media/doc/3rd Party Files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index d3217e7427d..f1633295bfa 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -8,6 +8,7 @@ Please update this file when you port/sync an external project. Title: rdesktop Path: base/applications/mstsc +Path: modules/rosapps/applications/net/tsclient Used Version: 1.8.3 License: GPL-3.0-or-later (https://spdx.org/licenses/GPL-3.0-or-later.html) URL: https://github.com/rdesktop/rdesktop

1 year, 4 months

[reactos] 02/03: [DOC] 3rd Party Files.txt: Update PCI-IDs information. Addendum to commit 18815558

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=489834166fc6d203790bc… commit 489834166fc6d203790bcf5631b0fc80146388bb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 6 20:01:07 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 9 11:32:34 2023 +0200 [DOC] 3rd Party Files.txt: Update PCI-IDs information. Addendum to commit 18815558 --- media/doc/3rd Party Files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 9bb7f058dfc..d3217e7427d 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -166,7 +166,7 @@ URL: https://code.google.com/archive/p/cmediadrivers/ Title: PCI hardware IDs database Path: hal/halx86/legacy/bus/pci_classes.ids Path: hal/halx86/legacy/bus/pci_vendors.ids -Used Version: 2020.11.14 +Used Version: 2023.06.19 License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) URL: https://pci-ids.ucw.cz/ URL: https://github.com/pciutils/pciids

1 year, 4 months

[reactos] 01/03: [DOC] 3rd Party Files.txt: Add Microsoft WDF to the list.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64de4661af3c678f68466… commit 64de4661af3c678f684664fcb12824c1c565c3b3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 6 19:58:09 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 9 11:32:21 2023 +0200 [DOC] 3rd Party Files.txt: Add Microsoft WDF to the list. --- media/doc/3rd Party Files.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index b8a70210207..9bb7f058dfc 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -219,6 +219,12 @@ Used Version: 4.1 License: GPL-3.0-or-later (https://spdx.org/licenses/GPL-3.0-or-later.html) URL: https://github.com/dosfstools/dosfstools +Title: Microsoft Windows Driver Frameworks (WDF) +Path: sdk/lib/drivers/wdf +Used Version: git commit d9c6040 +License: MIT (https://spdx.org/licenses/MIT.html) +URL: https://github.com/microsoft/Windows-Driver-Frameworks + Title: libmpg123 (used by winemp3.acm) Path: sdk/lib/3rdparty/libmpg123 Used Version: 1.26.1

1 year, 4 months

[reactos] 01/01: [SHLWAPI][SHLWAPI_APITEST][SDK] SHGetIniStringW/SHSetIniStringW (#5547)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a83fedcbfa981f17ab1fb… commit a83fedcbfa981f17ab1fbd99045f2bdc7d71812e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 9 08:23:33 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 9 08:23:33 2023 +0900 [SHLWAPI][SHLWAPI_APITEST][SDK] SHGetIniStringW/SHSetIniStringW (#5547) Follow-up to #5531. These two functions are necessary for INI file property bag support. - Implement SHGetIniStringW and SHSetIniStringW. - Strengthen SHPropertyBag testcase of shlwapi_apitest. CORE-9283 --- dll/win32/shlwapi/ordinal.c | 104 +++++++++++++++++++++ .../rostests/apitests/shlwapi/SHPropertyBag.cpp | 50 ++++++++++ sdk/include/reactos/shlwapi_undoc.h | 6 ++ 3 files changed, 160 insertions(+) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index f43408d9479..a151d4dce00 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -47,6 +47,9 @@ #include "commdlg.h" #include "mlang.h" #include "mshtmhst.h" +#ifdef __REACTOS__ + #include <shlwapi_undoc.h> +#endif #include "wine/unicode.h" #include "wine/debug.h" @@ -3288,6 +3291,37 @@ BOOL WINAPI PlaySoundWrapW(LPCWSTR pszSound, HMODULE hmod, DWORD fdwSound) DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, DWORD outLen, LPCWSTR filename) { +#ifdef __REACTOS__ + WCHAR szSection[MAX_PATH + 2]; + WCHAR szWideBuff[MAX_PATH]; + CHAR szUtf7Buff[MAX_PATH]; + + TRACE("(%s,%s,%p,%08x,%s)\n", debugstr_w(appName), debugstr_w(keyName), + out, outLen, debugstr_w(filename)); + + if (outLen == 0) + return 0; + + /* Try ".W"-appended section name. See also SHSetIniStringW. */ + lstrcpynW(szSection, appName, _countof(szSection) - 2); + lstrcatW(szSection, L".W"); + GetPrivateProfileStringW(szSection, keyName, NULL, szWideBuff, _countof(szWideBuff), filename); + if (szWideBuff[0] == UNICODE_NULL) /* It's empty or not found */ + { + /* Try the normal section name */ + return GetPrivateProfileStringW(appName, keyName, NULL, out, outLen, filename); + } + + /* Okay, now ".W" version is valid. Its value is a UTF-7 string in UTF-16 */ + + /* szWideBuff --> szUtf7Buff */ + SHUnicodeToAnsiCP(CP_ACP, szWideBuff, szUtf7Buff, _countof(szUtf7Buff)); + szUtf7Buff[_countof(szUtf7Buff) - 1] = ANSI_NULL; + + /* szUtf7Buff --> out */ + SHAnsiToUnicodeCP(CP_UTF7, szUtf7Buff, out, outLen); + out[outLen - 1] = UNICODE_NULL; +#else INT ret; WCHAR *buf; @@ -3310,10 +3344,27 @@ DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, *out = 0; HeapFree(GetProcessHeap(), 0, buf); +#endif return strlenW(out); } +#ifdef __REACTOS__ +static BOOL Is7BitClean(LPCWSTR psz) +{ + if (!psz) + return TRUE; + + while (*psz) + { + if (*psz > 0x7F) + return FALSE; + ++psz; + } + return TRUE; +} +#endif + /************************************************************************* * @ [SHLWAPI.295] * @@ -3333,10 +3384,63 @@ DWORD WINAPI SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, BOOL WINAPI SHSetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPCWSTR str, LPCWSTR filename) { +#ifdef __REACTOS__ + WCHAR szSection[MAX_PATH + 2]; + WCHAR szWideBuff[MAX_PATH]; + CHAR szUtf7Buff[MAX_PATH]; + + TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), + debugstr_w(filename)); + + /* Write a normal profile string. If str was NULL, then key will be deleted */ + if (!WritePrivateProfileStringW(appName, keyName, str, filename)) + return FALSE; + + if (Is7BitClean(str)) + { + /* Delete ".A" version */ + lstrcpynW(szSection, appName, _countof(szSection) - 2); + lstrcatW(szSection, L".A"); + WritePrivateProfileStringW(szSection, keyName, NULL, filename); + + /* Delete ".W" version */ + lstrcpynW(szSection, appName, _countof(szSection) - 2); + lstrcatW(szSection, L".W"); + WritePrivateProfileStringW(szSection, keyName, NULL, filename); + + return TRUE; + } + + /* Now str is not 7-bit clean. It needs UTF-7 encoding in UTF-16. + We write ".A" and ".W"-appended sections. */ + + /* str --> szUtf7Buff */ + SHUnicodeToAnsiCP(CP_UTF7, str, szUtf7Buff, _countof(szUtf7Buff)); + szUtf7Buff[_countof(szUtf7Buff) - 1] = ANSI_NULL; + + /* szUtf7Buff --> szWideBuff */ + SHAnsiToUnicodeCP(CP_ACP, szUtf7Buff, szWideBuff, _countof(szWideBuff)); + szWideBuff[_countof(szWideBuff) - 1] = UNICODE_NULL; + + /* Write ".A" version */ + lstrcpynW(szSection, appName, _countof(szSection) - 2); + lstrcatW(szSection, L".A"); + if (!WritePrivateProfileStringW(szSection, keyName, str, filename)) + return FALSE; + + /* Write ".W" version */ + lstrcpynW(szSection, appName, _countof(szSection) - 2); + lstrcatW(szSection, L".W"); + if (!WritePrivateProfileStringW(szSection, keyName, szWideBuff, filename)) + return FALSE; + + return TRUE; +#else TRACE("(%s, %p, %s, %s)\n", debugstr_w(appName), keyName, debugstr_w(str), debugstr_w(filename)); return WritePrivateProfileStringW(appName, keyName, str, filename); +#endif } /************************************************************************* diff --git a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp index 365c4478f19..2593cf66c6d 100644 --- a/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp +++ b/modules/rostests/apitests/shlwapi/SHPropertyBag.cpp @@ -638,10 +638,60 @@ static void SHPropertyBag_OnRegKey(void) RegCloseKey(hKey); } +static void SHPropertyBag_SHSetIniStringW(void) +{ + WCHAR szIniFile[MAX_PATH]; + WCHAR szValue[MAX_PATH]; + BOOL bRet; + DWORD dwRet; + + ExpandEnvironmentStringsW(L"%TEMP%\\SHSetIniString.ini", szIniFile, _countof(szIniFile)); + + DeleteFileW(szIniFile); + + trace("%ls\n", szIniFile); + + bRet = SHSetIniStringW(L"TestSection", L"Key", L"Value", szIniFile); + ok_int(bRet, TRUE); + + WritePrivateProfileStringW(NULL, NULL, NULL, szIniFile); + + dwRet = SHGetIniStringW(L"TestSection", L"Key", szValue, _countof(szValue), szIniFile); + ok_long(dwRet, 5); + ok_wstr(szValue, L"Value"); + + bRet = SHSetIniStringW(L"TestSection", L"Key", NULL, szIniFile); + ok_int(bRet, TRUE); + + WritePrivateProfileStringW(NULL, NULL, NULL, szIniFile); + + dwRet = SHGetIniStringW(L"TestSection", L"Key", szValue, _countof(szValue), szIniFile); + ok_long(dwRet, 0); + ok_wstr(szValue, L""); + + bRet = SHSetIniStringW(L"TestSection", L"Key", L"ABC\x3042\x3044\x3046\x2665", szIniFile); + ok_int(bRet, TRUE); + + WritePrivateProfileStringW(NULL, NULL, NULL, szIniFile); + + dwRet = SHGetIniStringW(L"TestSection", L"Key", szValue, _countof(szValue), szIniFile); + ok_long(dwRet, 7); + ok_wstr(szValue, L"ABC\x3042\x3044\x3046\x2665"); + + szValue[0] = 0x3000; + szValue[1] = UNICODE_NULL; + dwRet = SHGetIniStringW(L"TestSection", L"NotExistentKey", szValue, _countof(szValue), szIniFile); + ok_long(dwRet, 0); + ok_wstr(szValue, L""); + + DeleteFileW(szIniFile); +} + START_TEST(SHPropertyBag) { SHPropertyBag_ReadTest(); SHPropertyBag_WriteTest(); SHPropertyBag_OnMemory(); SHPropertyBag_OnRegKey(); + SHPropertyBag_SHSetIniStringW(); } diff --git a/sdk/include/reactos/shlwapi_undoc.h b/sdk/include/reactos/shlwapi_undoc.h index 29aae083047..a2677a639ce 100644 --- a/sdk/include/reactos/shlwapi_undoc.h +++ b/sdk/include/reactos/shlwapi_undoc.h @@ -179,6 +179,12 @@ HRESULT WINAPI SHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD si #define SHLoadRegUIString SHLoadRegUIStringA #endif +DWORD WINAPI +SHGetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPWSTR out, DWORD outLen, LPCWSTR filename); + +BOOL WINAPI +SHSetIniStringW(LPCWSTR appName, LPCWSTR keyName, LPCWSTR str, LPCWSTR filename); + int WINAPIV ShellMessageBoxWrapW(

1 year, 4 months

[reactos] 01/01: [MSPAINT][ATL] Delete deprecated functions (#5542)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70e05170cf8a260326f9b… commit 70e05170cf8a260326f9bcbd2909fba711df2500 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Aug 9 08:17:07 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Aug 9 08:17:07 2023 +0900 [MSPAINT][ATL] Delete deprecated functions (#5542) - Rewrite CImageDx to reduce improper dependency with CImage. - Check if the filename extension is supported before saving the files. - Delete deprecated functions in CImage. CORE-19094 --- base/applications/mspaint/atlimagedx.h | 331 ++++++++++++++++++++++++++------- base/applications/mspaint/dib.cpp | 14 +- base/applications/mspaint/precomp.h | 1 - base/applications/mspaint/winproc.cpp | 10 + sdk/lib/atl/atlimage.h | 55 ------ 5 files changed, 287 insertions(+), 124 deletions(-) diff --git a/base/applications/mspaint/atlimagedx.h b/base/applications/mspaint/atlimagedx.h index 735d4716dc7..6469e9d471b 100644 --- a/base/applications/mspaint/atlimagedx.h +++ b/base/applications/mspaint/atlimagedx.h @@ -7,135 +7,340 @@ #pragma once -class CImageDx : public CImage +#include <atlimage.h> + +namespace GPDE = Gdiplus::DllExports; + +class CImageDx { +protected: + HBITMAP m_hBitmap = NULL; + public: - CImageDx() : CImage() + CImageDx() { - GetImageHorizontalResolution = NULL; - GetImageVerticalResolution = NULL; - BitmapSetResolution = NULL; + _shared()->AddRef(); } - BOOL GetResolution(Gdiplus::GpImage *pImage, float *pxDpi, float *pyDpi) + ~CImageDx() { - *pxDpi = 96; - *pyDpi = 96; + if (m_hBitmap) + ::DeleteObject(m_hBitmap); + + _shared()->Release(); + } + + void Attach(HBITMAP hbm) + { + if (m_hBitmap) + ::DeleteObject(m_hBitmap); + m_hBitmap = hbm; + } + + HBITMAP Detach() + { + HBITMAP hbmOld = m_hBitmap; + m_hBitmap = NULL; + return hbmOld; + } - if (GetImageHorizontalResolution == NULL || GetImageVerticalResolution == NULL) + BOOL GetResolution(Gdiplus::GpImage *pImage, float *pxDpi, float *pyDpi) + { + if (!get_fn(_shared()->m_GetImageHorizontalResolution, "GdipGetImageHorizontalResolution") || + !get_fn(_shared()->m_GetImageVerticalResolution, "GdipGetImageVerticalResolution")) { - GetImageHorizontalResolution = - AddrOf<GETIMAGEHORIZONTALRESOLUTION>("GdipGetImageHorizontalResolution"); - GetImageVerticalResolution = - AddrOf<GETIMAGEVERTICALRESOLUTION>("GdipGetImageVerticalResolution"); + return FALSE; } - if (GetImageHorizontalResolution == NULL || GetImageVerticalResolution == NULL) - return FALSE; + if (pxDpi) + _shared()->m_GetImageHorizontalResolution(pImage, pxDpi); + if (pyDpi) + _shared()->m_GetImageVerticalResolution(pImage, pyDpi); - GetImageHorizontalResolution(pImage, pxDpi); - GetImageVerticalResolution(pImage, pyDpi); return TRUE; } - BOOL SetResolution(Gdiplus::GpBitmap *pBitmap, float xDpi, float yDpi) const + BOOL SetResolution(Gdiplus::GpBitmap *pBitmap, float xDpi, float yDpi) { - if (BitmapSetResolution == NULL) - BitmapSetResolution = AddrOf<BITMAPSETRESOLUTION>("GdipBitmapSetResolution"); - - if (BitmapSetResolution == NULL) + if (!get_fn(_shared()->m_BitmapSetResolution, "GdipBitmapSetResolution")) return FALSE; - BitmapSetResolution(pBitmap, xDpi, yDpi); + _shared()->m_BitmapSetResolution(pBitmap, xDpi, yDpi); return TRUE; } HRESULT LoadDx(LPCTSTR pszFileName, float *pxDpi, float *pyDpi) throw() { - // convert the file name string into Unicode - CStringW pszNameW(pszFileName); + using namespace Gdiplus; + + _shared()->AddRef(); + + if (!get_fn(_shared()->m_CreateBitmapFromFile, "GdipCreateBitmapFromFile") || + !get_fn(_shared()->m_CreateHBITMAPFromBitmap, "GdipCreateHBITMAPFromBitmap") || + !get_fn(_shared()->m_DisposeImage, "GdipDisposeImage")) + { + _shared()->Release(); + return E_FAIL; + } // create a GpBitmap object from file - using namespace Gdiplus; GpBitmap *pBitmap = NULL; - if (GetCommon().CreateBitmapFromFile(pszNameW, &pBitmap) != Ok) + if (_shared()->m_CreateBitmapFromFile(pszFileName, &pBitmap) != Ok) { + _shared()->Release(); return E_FAIL; } - // get bitmap handle + // get an HBITMAP HBITMAP hbm = NULL; Color color(0xFF, 0xFF, 0xFF); - Gdiplus::Status status; - status = GetCommon().CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); + Status status = _shared()->m_CreateHBITMAPFromBitmap(pBitmap, &hbm, color.GetValue()); // get the resolution - GetResolution((Gdiplus::GpImage*)pBitmap, pxDpi, pyDpi); + if (pxDpi || pyDpi) + GetResolution((GpImage*)pBitmap, pxDpi, pyDpi); // delete GpBitmap - GetCommon().DisposeImage(pBitmap); + _shared()->m_DisposeImage(pBitmap); // attach it if (status == Ok) Attach(hbm); + + _shared()->Release(); return (status == Ok ? S_OK : E_FAIL); } HRESULT SaveDx(LPCTSTR pszFileName, REFGUID guidFileType = GUID_NULL, - float xDpi = 0, float yDpi = 0) const throw() + float xDpi = 0, float yDpi = 0) throw() { using namespace Gdiplus; - ATLASSERT(m_hbm); - - // TODO & FIXME: set parameters (m_rgbTransColor etc.) - // convert the file name string into Unicode - CStringW pszNameW(pszFileName); + _shared()->AddRef(); - // if the file type is null, get the file type from extension - const GUID *FileType = &guidFileType; - if (::IsEqualGUID(guidFileType, GUID_NULL)) + if (!get_fn(_shared()->m_CreateBitmapFromHBITMAP, "GdipCreateBitmapFromHBITMAP") || + !get_fn(_shared()->m_SaveImageToFile, "GdipSaveImageToFile") || + !get_fn(_shared()->m_DisposeImage, "GdipDisposeImage")) { - LPCWSTR pszExt = GetFileExtension(pszNameW); - FileType = FileTypeFromExtension(pszExt); - } - - // get CLSID from file type - CLSID clsid; - if (!GetClsidFromFileType(&clsid, FileType)) + _shared()->Release(); return E_FAIL; + } // create a GpBitmap from HBITMAP GpBitmap *pBitmap = NULL; - GetCommon().CreateBitmapFromHBITMAP(m_hbm, NULL, &pBitmap); + _shared()->m_CreateBitmapFromHBITMAP(m_hBitmap, NULL, &pBitmap); // set the resolution SetResolution(pBitmap, xDpi, yDpi); + // Get encoders + UINT cEncoders = 0; + ImageCodecInfo* pEncoders = GetAllEncoders(cEncoders); + + // if the file type is null, get the file type from extension + CLSID clsid; + if (::IsEqualGUID(guidFileType, GUID_NULL)) + { + CString strExt(PathFindExtension(pszFileName)); + clsid = FindCodecForExtension(strExt, pEncoders, cEncoders); + } + else + { + clsid = FindCodecForFileType(guidFileType, pEncoders, cEncoders); + } + + delete[] pEncoders; + // save to file - Status status; - status = GetCommon().SaveImageToFile(pBitmap, pszNameW, &clsid, NULL); + Status status = _shared()->m_SaveImageToFile(pBitmap, pszFileName, &clsid, NULL); // destroy GpBitmap - GetCommon().DisposeImage(pBitmap); + _shared()->m_DisposeImage(pBitmap); + + _shared()->Release(); return (status == Ok ? S_OK : E_FAIL); } + static BOOL IsExtensionSupported(PWCHAR pchDotExt) + { + _shared()->AddRef(); + + UINT cEncoders; + Gdiplus::ImageCodecInfo* pEncoders = GetAllEncoders(cEncoders); + + CLSID clsid = FindCodecForExtension(pchDotExt, pEncoders, cEncoders); + BOOL ret = !::IsEqualGUID(clsid, CLSID_NULL); + delete[] pEncoders; + + _shared()->Release(); + return ret; + } + protected: - // get procedure address of the DLL - template <typename TYPE> - TYPE AddrOf(const char *name) const + using FN_Startup = decltype(&Gdiplus::GdiplusStartup); + using FN_Shutdown = decltype(&Gdiplus::GdiplusShutdown); + using FN_GetImageHorizontalResolution = decltype(&GPDE::GdipGetImageHorizontalResolution); + using FN_GetImageVerticalResolution = decltype(&GPDE::GdipGetImageVerticalResolution); + using FN_BitmapSetResolution = decltype(&GPDE::GdipBitmapSetResolution); + using FN_CreateBitmapFromHBITMAP = decltype(&GPDE::GdipCreateBitmapFromHBITMAP); + using FN_CreateBitmapFromFile = decltype(&GPDE::GdipCreateBitmapFromFile); + using FN_CreateHBITMAPFromBitmap = decltype(&GPDE::GdipCreateHBITMAPFromBitmap); + using FN_SaveImageToFile = decltype(&GPDE::GdipSaveImageToFile); + using FN_DisposeImage = decltype(&GPDE::GdipDisposeImage); + using FN_GetImageEncodersSize = decltype(&GPDE::GdipGetImageEncodersSize); + using FN_GetImageEncoders = decltype(&GPDE::GdipGetImageEncoders); + + struct SHARED + { + HINSTANCE m_hGdiPlus = NULL; + LONG m_cRefs = 0; + ULONG_PTR m_dwToken = 0; + FN_Shutdown m_Shutdown = NULL; + FN_GetImageHorizontalResolution m_GetImageHorizontalResolution = NULL; + FN_GetImageVerticalResolution m_GetImageVerticalResolution = NULL; + FN_BitmapSetResolution m_BitmapSetResolution = NULL; + FN_CreateBitmapFromHBITMAP m_CreateBitmapFromHBITMAP = NULL; + FN_CreateBitmapFromFile m_CreateBitmapFromFile = NULL; + FN_CreateHBITMAPFromBitmap m_CreateHBITMAPFromBitmap = NULL; + FN_SaveImageToFile m_SaveImageToFile = NULL; + FN_DisposeImage m_DisposeImage = NULL; + FN_GetImageEncodersSize m_GetImageEncodersSize = NULL; + FN_GetImageEncoders m_GetImageEncoders = NULL; + + HINSTANCE Init() + { + if (m_hGdiPlus) + return m_hGdiPlus; + + m_hGdiPlus = ::LoadLibraryW(L"gdiplus.dll"); + if (!m_hGdiPlus) + return NULL; + + FN_Startup Startup = (FN_Startup)GetProcAddress(m_hGdiPlus, "GdiplusStartup"); + m_Shutdown = (FN_Shutdown)GetProcAddress(m_hGdiPlus, "GdiplusShutdown"); + if (!Startup || !m_Shutdown) + { + ::FreeLibrary(m_hGdiPlus); + m_hGdiPlus = NULL; + return NULL; + } + + Gdiplus::GdiplusStartupInput gdiplusStartupInput; + Startup(&m_dwToken, &gdiplusStartupInput, NULL); + + return m_hGdiPlus; + } + + void Free() + { + ::FreeLibrary(m_hGdiPlus); + ZeroMemory(this, sizeof(*this)); + } + + LONG AddRef() + { + return ++m_cRefs; + } + + LONG Release() + { + if (--m_cRefs == 0) + { + Free(); + return 0; + } + return m_cRefs; + } + }; + + static SHARED* _shared() + { + static SHARED s_shared; + return &s_shared; + } + + static Gdiplus::ImageCodecInfo* GetAllEncoders(UINT& cEncoders) + { + Gdiplus::ImageCodecInfo *ret = NULL; + UINT total_size; + + if (!get_fn(_shared()->m_GetImageEncodersSize, "GdipGetImageEncodersSize") || + !get_fn(_shared()->m_GetImageEncoders, "GdipGetImageEncoders")) + { + cEncoders = 0; + return NULL; + } + + _shared()->m_GetImageEncodersSize(&cEncoders, &total_size); + if (total_size == 0) + return NULL; + + ret = new Gdiplus::ImageCodecInfo[total_size / sizeof(ret[0])]; + if (ret == NULL) + { + cEncoders = 0; + return NULL; + } + + _shared()->m_GetImageEncoders(cEncoders, total_size, ret); + + return ret; // needs delete[] + } + + template <typename FN_T> + static bool get_fn(FN_T& fn, const char *name) { - FARPROC proc = ::GetProcAddress(GetCommon().hinstGdiPlus, name); - return reinterpret_cast<TYPE>(proc); + if (fn) + return true; + HINSTANCE hGdiPlus = _shared()->Init(); + fn = reinterpret_cast<FN_T>(::GetProcAddress(hGdiPlus, name)); + return fn != NULL; } - typedef St (WINGDIPAPI *GETIMAGEHORIZONTALRESOLUTION)(Im *, float*); - typedef St (WINGDIPAPI *GETIMAGEVERTICALRESOLUTION)(Im *, float*); - typedef St (WINGDIPAPI *BITMAPSETRESOLUTION)(Bm *, float, float); + // CImage::FindCodecForExtension is private. We have to duplicate it at here... + static CLSID + FindCodecForExtension(LPCTSTR dotext, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) + { + for (UINT i = 0; i < nCodecs; ++i) + { + CString strSpecs(pCodecs[i].FilenameExtension); + int ichOld = 0, ichSep; + for (;;) + { + ichSep = strSpecs.Find(TEXT(';'), ichOld); + + CString strSpec; + if (ichSep < 0) + strSpec = strSpecs.Mid(ichOld); + else + strSpec = strSpecs.Mid(ichOld, ichSep - ichOld); + + int ichDot = strSpec.ReverseFind(TEXT('.')); + if (ichDot >= 0) + strSpec = strSpec.Mid(ichDot); + + if (!dotext || strSpec.CompareNoCase(dotext) == 0) + return pCodecs[i].Clsid; + + if (ichSep < 0) + break; + + ichOld = ichSep + 1; + } + } + return CLSID_NULL; + } - GETIMAGEHORIZONTALRESOLUTION GetImageHorizontalResolution; - GETIMAGEVERTICALRESOLUTION GetImageVerticalResolution; - mutable BITMAPSETRESOLUTION BitmapSetResolution; + // CImage::FindCodecForFileType is private. We have to duplicate it at here... + static CLSID + FindCodecForFileType(REFGUID guidFileType, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) + { + for (UINT iInfo = 0; iInfo < nCodecs; ++iInfo) + { + if (::IsEqualGUID(pCodecs[iInfo].FormatID, guidFileType)) + return pCodecs[iInfo].Clsid; + } + return CLSID_NULL; + } }; diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index ea5ead7427a..a5b3f0b7896 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -262,7 +262,7 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) // load the image CImageDx img; - float xDpi, yDpi; + float xDpi = 0, yDpi = 0; HRESULT hr = img.LoadDx(name, &xDpi, &yDpi); if (FAILED(hr)) { @@ -274,12 +274,16 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) if (!fIsMainFile) return hBitmap; + if (xDpi <= 0 || yDpi <= 0) + { + HDC hDC = ::GetDC(NULL); + xDpi = ::GetDeviceCaps(hDC, LOGPIXELSX); + yDpi = ::GetDeviceCaps(hDC, LOGPIXELSY); + ::ReleaseDC(NULL, hDC); + } + g_xDpi = xDpi; g_yDpi = yDpi; - if (g_xDpi <= 0) - g_xDpi = 96; - if (g_yDpi <= 0) - g_yDpi = 96; SetBitmapAndInfo(hBitmap, name, &find, TRUE); return hBitmap; diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 368ce304461..385cc985a4f 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -13,7 +13,6 @@ #include <tchar.h> #include <atlbase.h> #include <atlcom.h> -#include <atlimage.h> #include <atlpath.h> #include <atlstr.h> #include <atlwin.h> diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index a15e6dd3d6b..de22a406243 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -141,6 +141,16 @@ void CMainWindow::saveImage(BOOL overwrite) { canvasWindow.finishDrawing(); + // Is the extension not supported? + PWCHAR pchDotExt = PathFindExtensionW(g_szFileName); + if (pchDotExt && *pchDotExt && !CImageDx::IsExtensionSupported(pchDotExt)) + { + // Remove the extension + PathRemoveExtensionW(g_szFileName); + // No overwrite + overwrite = FALSE; + } + if (g_isAFile && overwrite) { imageModel.SaveImage(g_szFileName); diff --git a/sdk/lib/atl/atlimage.h b/sdk/lib/atl/atlimage.h index bbf7dc6a115..462b63b1e92 100644 --- a/sdk/lib/atl/atlimage.h +++ b/sdk/lib/atl/atlimage.h @@ -1056,50 +1056,6 @@ protected: return CLSID_NULL; } - // Deprecated. Don't use this - static const GUID *FileTypeFromExtension(LPCTSTR dotext) - { - CImage dummy; // HACK: Initialize common - UINT cEncoders = 0; - Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); - - for (UINT i = 0; i < cEncoders; ++i) - { - CString strSpecs(pEncoders[i].FilenameExtension); - int ichOld = 0, ichSep; - for (;;) - { - ichSep = strSpecs.Find(TEXT(';'), ichOld); - - CString strSpec; - if (ichSep < 0) - strSpec = strSpecs.Mid(ichOld); - else - strSpec = strSpecs.Mid(ichOld, ichSep - ichOld); - - int ichDot = strSpec.ReverseFind(TEXT('.')); - if (ichDot >= 0) - strSpec = strSpec.Mid(ichDot); - - if (!dotext || strSpec.CompareNoCase(dotext) == 0) - { - static GUID s_guid; - s_guid = pEncoders[i].FormatID; - delete[] pEncoders; - return &s_guid; - } - - if (ichSep < 0) - break; - - ichOld = ichSep + 1; - } - } - - delete[] pEncoders; - return NULL; - } - static CLSID FindCodecForFileType(REFGUID guidFileType, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) { @@ -1111,17 +1067,6 @@ protected: return CLSID_NULL; } - // Deprecated. Don't use this - static bool GetClsidFromFileType(CLSID *clsid, const GUID *guid) - { - CImage dummy; // HACK: Initialize common - UINT cEncoders = 0; - Gdiplus::ImageCodecInfo* pEncoders = _getAllEncoders(cEncoders); - *clsid = FindCodecForFileType(*guid, pEncoders, cEncoders); - delete[] pEncoders; - return true; - } - static Gdiplus::ImageCodecInfo* _getAllEncoders(UINT& cEncoders) { UINT total_size = 0;

1 year, 4 months

[reactos] 01/01: [USRMGR] Get text correctly even if length is zero (#5543)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8532f1874a34ae41818a7… commit 8532f1874a34ae41818a770f8c8bd8a77b70e21a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 7 22:55:49 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 7 22:55:49 2023 +0900 [USRMGR] Get text correctly even if length is zero (#5543) - Add GetDlgItemTextAlloc and GetComboBoxLBTextAlloc helper functions. - Get the text data correctly even if the text length is zero. CORE-18275 --- dll/cpl/usrmgr/groupprops.c | 17 +------ dll/cpl/usrmgr/groups.c | 23 +++------ dll/cpl/usrmgr/userprops.c | 115 ++++++++------------------------------------ dll/cpl/usrmgr/users.c | 56 +++++---------------- dll/cpl/usrmgr/usrmgr.c | 20 +++++++- dll/cpl/usrmgr/usrmgr.h | 4 +- 6 files changed, 62 insertions(+), 173 deletions(-) diff --git a/dll/cpl/usrmgr/groupprops.c b/dll/cpl/usrmgr/groupprops.c index ec82e1e1d2a..0ad86be8745 100644 --- a/dll/cpl/usrmgr/groupprops.c +++ b/dll/cpl/usrmgr/groupprops.c @@ -494,23 +494,11 @@ SetGeneralGroupData(HWND hwndDlg, PGENERAL_GROUP_DATA pGroupData) { LOCALGROUP_INFO_1 groupInfo; - LPTSTR pszComment = NULL; - INT nLength; NET_API_STATUS status; DWORD dwIndex; /* Get the group description */ - nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_GROUP_GENERAL_DESCRIPTION)); - if (nLength == 0) - { - groupInfo.lgrpi1_comment = NULL; - } - else - { - pszComment = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); - GetDlgItemText(hwndDlg, IDC_GROUP_GENERAL_DESCRIPTION, pszComment, nLength + 1); - groupInfo.lgrpi1_comment = pszComment; - } + groupInfo.lgrpi1_comment = GetDlgItemTextAlloc(hwndDlg, IDC_GROUP_GENERAL_DESCRIPTION); status = NetLocalGroupSetInfo(NULL, pGroupData->szGroupName, 1, (LPBYTE)&groupInfo, &dwIndex); if (status != NERR_Success) @@ -518,8 +506,7 @@ SetGeneralGroupData(HWND hwndDlg, ERR("NetLocalGroupSetInfo failed. Status: %lu Index: %lu", status, dwIndex); } - if (pszComment) - HeapFree(GetProcessHeap(), 0, pszComment); + HeapFree(GetProcessHeap(), 0, groupInfo.lgrpi1_comment); return TRUE; } diff --git a/dll/cpl/usrmgr/groups.c b/dll/cpl/usrmgr/groups.c index 44423038b84..cf03624731b 100644 --- a/dll/cpl/usrmgr/groups.c +++ b/dll/cpl/usrmgr/groups.c @@ -155,19 +155,11 @@ NewGroupDlgProc(HWND hwndDlg, break; } - nLength = SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - groupInfo->lgrpi1_name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_GROUP_NEW_NAME, groupInfo->lgrpi1_name, nLength + 1); - } + /* Get Name */ + groupInfo->lgrpi1_name = GetDlgItemTextAlloc(hwndDlg, IDC_GROUP_NEW_NAME); - nLength = SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_DESCRIPTION, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - groupInfo->lgrpi1_comment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_GROUP_NEW_DESCRIPTION, groupInfo->lgrpi1_comment, nLength + 1); - } + /* Get Description */ + groupInfo->lgrpi1_comment = GetDlgItemTextAlloc(hwndDlg, IDC_GROUP_NEW_DESCRIPTION); EndDialog(hwndDlg, IDOK); break; @@ -228,11 +220,8 @@ GroupNew(HWND hwndDlg) group.lgrpi1_comment); } - if (group.lgrpi1_name) - HeapFree(GetProcessHeap(), 0, group.lgrpi1_name); - - if (group.lgrpi1_comment) - HeapFree(GetProcessHeap(), 0, group.lgrpi1_comment); + HeapFree(GetProcessHeap(), 0, group.lgrpi1_name); + HeapFree(GetProcessHeap(), 0, group.lgrpi1_comment); } diff --git a/dll/cpl/usrmgr/userprops.c b/dll/cpl/usrmgr/userprops.c index bc013522714..773b571d158 100644 --- a/dll/cpl/usrmgr/userprops.c +++ b/dll/cpl/usrmgr/userprops.c @@ -87,80 +87,38 @@ SetUserProfileData(HWND hwndDlg, PPROFILE_USER_DATA pUserData) { PUSER_INFO_3 pUserInfo = NULL; - LPTSTR pszProfilePath = NULL; - LPTSTR pszScriptPath = NULL; - LPTSTR pszHomeDir = NULL; - LPTSTR pszHomeDrive = NULL; NET_API_STATUS status; DWORD dwIndex; - INT nLength; INT nIndex; NetUserGetInfo(NULL, pUserData->szUserName, 3, (LPBYTE*)&pUserInfo); /* Get the profile path */ - nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_PROFILE_PATH)); - if (nLength == 0) - { - pUserInfo->usri3_profile = NULL; - } - else - { - pszProfilePath = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_PROFILE_PATH, pszProfilePath, nLength + 1); - pUserInfo->usri3_profile = pszProfilePath; - } + pUserInfo->usri3_profile = GetDlgItemTextAlloc(hwndDlg, IDC_USER_PROFILE_PATH); /* Get the script path */ - nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_PROFILE_SCRIPT)); - if (nLength == 0) - { - pUserInfo->usri3_script_path = NULL; - } - else - { - pszScriptPath = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_PROFILE_SCRIPT, pszScriptPath, nLength + 1); - pUserInfo->usri3_script_path = pszScriptPath; - } + pUserInfo->usri3_script_path = GetDlgItemTextAlloc(hwndDlg, IDC_USER_PROFILE_SCRIPT); if (IsDlgButtonChecked(hwndDlg, IDC_USER_PROFILE_LOCAL) == BST_CHECKED) { /* Local home directory */ - nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_PROFILE_LOCAL_PATH)); - if (nLength == 0) - { - pUserInfo->usri3_home_dir = NULL; - } - else - { - pszHomeDir = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_PROFILE_LOCAL_PATH, pszHomeDir, nLength + 1); - pUserInfo->usri3_home_dir = pszHomeDir; - } + pUserInfo->usri3_home_dir = GetDlgItemTextAlloc(hwndDlg, IDC_USER_PROFILE_LOCAL_PATH); } else { /* Remote home directory */ - nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_PROFILE_REMOTE_PATH)); - if (nLength == 0) - { - pUserInfo->usri3_home_dir = NULL; - } - else - { - pszHomeDir = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_PROFILE_REMOTE_PATH, pszHomeDir, nLength + 1); - pUserInfo->usri3_home_dir = pszHomeDir; - } + pUserInfo->usri3_home_dir = GetDlgItemTextAlloc(hwndDlg, IDC_USER_PROFILE_REMOTE_PATH); nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_USER_PROFILE_DRIVE), CB_GETCURSEL, 0, 0); if (nIndex != CB_ERR) { - nLength = SendMessage(GetDlgItem(hwndDlg, IDC_USER_PROFILE_DRIVE), CB_GETLBTEXTLEN, nIndex, 0); - pszHomeDrive = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); - SendMessage(GetDlgItem(hwndDlg, IDC_USER_PROFILE_DRIVE), CB_GETLBTEXT, nIndex, (LPARAM)pszHomeDrive); - pUserInfo->usri3_home_dir_drive = pszHomeDrive; + pUserInfo->usri3_home_dir_drive = + GetComboBoxLBTextAlloc(hwndDlg, IDC_USER_PROFILE_DRIVE, nIndex); + } + else + { + pUserInfo->usri3_home_dir_drive = + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TCHAR)); } } @@ -170,17 +128,10 @@ SetUserProfileData(HWND hwndDlg, ERR("NetUserSetInfo failed. Status: %lu Index: %lu", status, dwIndex); } - if (pszProfilePath) - HeapFree(GetProcessHeap(), 0, pszProfilePath); - - if (pszScriptPath) - HeapFree(GetProcessHeap(), 0, pszScriptPath); - - if (pszHomeDir) - HeapFree(GetProcessHeap(), 0, pszHomeDir); - - if (pszHomeDrive) - HeapFree(GetProcessHeap(), 0, pszHomeDrive); + HeapFree(GetProcessHeap(), 0, pUserInfo->usri3_profile); + HeapFree(GetProcessHeap(), 0, pUserInfo->usri3_script_path); + HeapFree(GetProcessHeap(), 0, pUserInfo->usri3_home_dir); + HeapFree(GetProcessHeap(), 0, pUserInfo->usri3_home_dir_drive); NetApiBufferFree(pUserInfo); @@ -743,11 +694,8 @@ SetUserGeneralData(HWND hwndDlg, PGENERAL_USER_DATA pUserData) { PUSER_INFO_3 pUserInfo = NULL; - LPTSTR pszFullName = NULL; - LPTSTR pszComment = NULL; NET_API_STATUS status; DWORD dwIndex; - INT nLength; NetUserGetInfo(NULL, pUserData->szUserName, 3, (LPBYTE*)&pUserInfo); @@ -757,29 +705,11 @@ SetUserGeneralData(HWND hwndDlg, pUserInfo->usri3_password_expired = pUserData->dwPasswordExpired; - nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_GENERAL_FULL_NAME)); - if (nLength == 0) - { - pUserInfo->usri3_full_name = NULL; - } - else - { - pszFullName = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_GENERAL_FULL_NAME, pszFullName, nLength + 1); - pUserInfo->usri3_full_name = pszFullName; - } + /* Get full name */ + pUserInfo->usri3_full_name = GetDlgItemTextAlloc(hwndDlg, IDC_USER_GENERAL_FULL_NAME); - nLength = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_USER_GENERAL_DESCRIPTION)); - if (nLength == 0) - { - pUserInfo->usri3_full_name = NULL; - } - else - { - pszComment = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_GENERAL_DESCRIPTION, pszComment, nLength + 1); - pUserInfo->usri3_comment = pszComment; - } + /* Get desciption */ + pUserInfo->usri3_comment = GetDlgItemTextAlloc(hwndDlg, IDC_USER_GENERAL_DESCRIPTION); status = NetUserSetInfo(NULL, pUserData->szUserName, 3, (LPBYTE)pUserInfo, &dwIndex); if (status != NERR_Success) @@ -787,11 +717,8 @@ SetUserGeneralData(HWND hwndDlg, ERR("NetUserSetInfo failed. Status: %lu Index: %lu", status, dwIndex); } - if (pszFullName) - HeapFree(GetProcessHeap(), 0, pszFullName); - - if (pszComment) - HeapFree(GetProcessHeap(), 0, pszComment); + HeapFree(GetProcessHeap(), 0, pUserInfo->usri3_full_name); + HeapFree(GetProcessHeap(), 0, pUserInfo->usri3_comment); NetApiBufferFree(pUserInfo); diff --git a/dll/cpl/usrmgr/users.c b/dll/cpl/usrmgr/users.c index 084743e72f8..5c785b6e48d 100644 --- a/dll/cpl/usrmgr/users.c +++ b/dll/cpl/usrmgr/users.c @@ -60,7 +60,6 @@ ChangePasswordDlgProc(HWND hwndDlg, LPARAM lParam) { PUSER_INFO_1003 userInfo; - INT nLength; UNREFERENCED_PARAMETER(wParam); @@ -79,14 +78,9 @@ ChangePasswordDlgProc(HWND hwndDlg, case IDOK: if (CheckPasswords(hwndDlg, IDC_EDIT_PASSWORD1, IDC_EDIT_PASSWORD2)) { - /* Store the password */ - nLength = SendDlgItemMessage(hwndDlg, IDC_EDIT_PASSWORD1, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - userInfo->usri1003_password = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_EDIT_PASSWORD1, userInfo->usri1003_password, nLength + 1); - } + userInfo->usri1003_password = + GetDlgItemTextAlloc(hwndDlg, IDC_EDIT_PASSWORD1); EndDialog(hwndDlg, IDOK); } @@ -147,8 +141,7 @@ UserChangePassword(HWND hwndDlg) } } - if (user.usri1003_password) - HeapFree(GetProcessHeap(), 0, user.usri1003_password); + HeapFree(GetProcessHeap(), 0, user.usri1003_password); } @@ -250,36 +243,16 @@ NewUserDlgProc(HWND hwndDlg, } /* Store the user name */ - nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - userInfo->usri3_name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_NEW_NAME, userInfo->usri3_name, nLength + 1); - } + userInfo->usri3_name = GetDlgItemTextAlloc(hwndDlg, IDC_USER_NEW_NAME); /* Store the full user name */ - nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_FULL_NAME, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - userInfo->usri3_full_name = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_NEW_FULL_NAME, userInfo->usri3_full_name, nLength + 1); - } + userInfo->usri3_full_name = GetDlgItemTextAlloc(hwndDlg, IDC_USER_NEW_FULL_NAME); /* Store the description */ - nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_DESCRIPTION, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - userInfo->usri3_comment = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_NEW_DESCRIPTION, userInfo->usri3_comment, nLength + 1); - } + userInfo->usri3_comment = GetDlgItemTextAlloc(hwndDlg, IDC_USER_NEW_DESCRIPTION); /* Store the password */ - nLength = SendDlgItemMessage(hwndDlg, IDC_USER_NEW_PASSWORD1, WM_GETTEXTLENGTH, 0, 0); - if (nLength > 0) - { - userInfo->usri3_password = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); - GetDlgItemText(hwndDlg, IDC_USER_NEW_PASSWORD1, userInfo->usri3_password, nLength + 1); - } + userInfo->usri3_password = GetDlgItemTextAlloc(hwndDlg, IDC_USER_NEW_PASSWORD1); EndDialog(hwndDlg, IDOK); break; @@ -351,17 +324,10 @@ UserNew(HWND hwndDlg) user.usri3_comment); } - if (user.usri3_name) - HeapFree(GetProcessHeap(), 0, user.usri3_name); - - if (user.usri3_full_name) - HeapFree(GetProcessHeap(), 0, user.usri3_full_name); - - if (user.usri3_comment) - HeapFree(GetProcessHeap(), 0, user.usri3_comment); - - if (user.usri3_password) - HeapFree(GetProcessHeap(), 0, user.usri3_password); + HeapFree(GetProcessHeap(), 0, user.usri3_name); + HeapFree(GetProcessHeap(), 0, user.usri3_full_name); + HeapFree(GetProcessHeap(), 0, user.usri3_comment); + HeapFree(GetProcessHeap(), 0, user.usri3_password); } diff --git a/dll/cpl/usrmgr/usrmgr.c b/dll/cpl/usrmgr/usrmgr.c index 6c00abd666e..cd77052eeb7 100644 --- a/dll/cpl/usrmgr/usrmgr.c +++ b/dll/cpl/usrmgr/usrmgr.c @@ -5,6 +5,7 @@ * PURPOSE: Main functions * * PROGRAMMERS: Eric Kohl + * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "usrmgr.h" @@ -15,6 +16,24 @@ static LONG APIENTRY UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lP HINSTANCE hApplet = 0; +LPTSTR GetDlgItemTextAlloc(HWND hwndDlg, INT nDlgItem) +{ + INT nLength = GetWindowTextLength(GetDlgItem(hwndDlg, nDlgItem)); + LPTSTR psz = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); + if (psz) + GetDlgItemText(hwndDlg, nDlgItem, psz, nLength + 1); + return psz; +} + +LPTSTR GetComboBoxLBTextAlloc(HWND hwndDlg, INT nDlgItem, INT nIndex) +{ + INT nLength = (INT)SendDlgItemMessage(hwndDlg, nDlgItem, CB_GETLBTEXTLEN, nIndex, 0); + LPTSTR psz = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(TCHAR)); + if (psz) + SendDlgItemMessage(hwndDlg, nDlgItem, CB_GETLBTEXT, nIndex, (LPARAM)psz); + return psz; +} + /* Applets */ APPLET Applets[NUM_APPLETS] = { @@ -26,7 +45,6 @@ APPLET Applets[NUM_APPLETS] = } }; - static VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { diff --git a/dll/cpl/usrmgr/usrmgr.h b/dll/cpl/usrmgr/usrmgr.h index 5f9c12ea191..c53e47cce8a 100644 --- a/dll/cpl/usrmgr/usrmgr.h +++ b/dll/cpl/usrmgr/usrmgr.h @@ -35,11 +35,13 @@ typedef struct _APPLET extern HINSTANCE hApplet; - INT_PTR CALLBACK UsersPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK GroupsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ExtraPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +LPTSTR GetDlgItemTextAlloc(HWND hwndDlg, INT nDlgItem); +LPTSTR GetComboBoxLBTextAlloc(HWND hwndDlg, INT nDlgItem, INT nIndex); + /* groupprops.c */ BOOL GroupProperties(HWND hwndDlg);

1 year, 4 months

[reactos] 01/01: [MUP] Mute DPRINT1's that slow down shared folder accesses (#5545)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b12ab486d83905275b906… commit b12ab486d83905275b906a800f3f8d5394df23be Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 7 22:08:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 7 22:08:05 2023 +0900 [MUP] Mute DPRINT1's that slow down shared folder accesses (#5545) Logging was too heavy. Made some DPRINT1's DPRINT's. We could make it 3 times faster. CORE-19105 --- drivers/filesystems/mup/mup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/filesystems/mup/mup.c b/drivers/filesystems/mup/mup.c index 601d0f33896..fd63b9229ad 100644 --- a/drivers/filesystems/mup/mup.c +++ b/drivers/filesystems/mup/mup.c @@ -1306,7 +1306,7 @@ MupRerouteOpen(PFILE_OBJECT FileObject, PWSTR FullPath; ULONG TotalLength; - DPRINT1("Rerouting %wZ with %wZ\n", &FileObject->FileName, &UncProvider->DeviceName); + DPRINT("Rerouting %wZ with %wZ\n", &FileObject->FileName, &UncProvider->DeviceName); /* Get the full path name (device name first, and requested file name appended) */ TotalLength = UncProvider->DeviceName.Length + FileObject->FileName.Length; @@ -1778,7 +1778,7 @@ QueryPathCompletionRoutine(PDEVICE_OBJECT DeviceObject, Prefix->ExternalAlloc = TRUE; /* Insert the accepted prefix in the table of known prefixes */ - DPRINT1("%wZ accepted %wZ\n", &Prefix->UncProvider->DeviceName, &Prefix->AcceptedPrefix); + DPRINT("%wZ accepted %wZ\n", &Prefix->UncProvider->DeviceName, &Prefix->AcceptedPrefix); ExAcquireResourceExclusiveLite(&MupPrefixTableLock, TRUE); if (RtlInsertUnicodePrefix(&MupPrefixTable, &Prefix->AcceptedPrefix, &Prefix->PrefixTableEntry)) { @@ -1897,7 +1897,7 @@ CreateRedirectedFile(PIRP Irp, return STATUS_INVALID_DEVICE_REQUEST; } - DPRINT1("Request for opening: %wZ\n", &FileObject->FileName); + DPRINT("Request for opening: %wZ\n", &FileObject->FileName); Referenced = FALSE; BreakOnFirst = TRUE; @@ -2104,7 +2104,7 @@ CreateRedirectedFile(PIRP Irp, ExReleaseResourceLite(&MasterQueryContext->QueryPathListLock); /* Query the provider !*/ - DPRINT1("Requesting UNC provider: %wZ\n", &UncProvider->DeviceName); + DPRINT("Requesting UNC provider: %wZ\n", &UncProvider->DeviceName); DPRINT("Calling: %wZ\n", &UncProvider->DeviceObject->DriverObject->DriverName); Status = IoCallDriver(UncProvider->DeviceObject, QueryIrp); }

1 year, 4 months

← Newer
1
...
10
11
12
13
14
15
16
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2023