Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [ATTRIB] Fix bFound assignment, as it was originally intended by the PR reviewer.
by Hermès Bélusca-Maïto 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0db5fce47d74655c0b689… commit 0db5fce47d74655c0b6896ce402b22e7cbf22d71 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 03:17:57 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 29 04:02:35 2021 +0100 [ATTRIB] Fix bFound assignment, as it was originally intended by the PR reviewer. See https://github.com/reactos/reactos/pull/2142#discussion_r360645296 This fixes the two warnings: warning C4552: '!=': result of expression not used --- base/applications/cmdutils/attrib/attrib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index fc53e68dfbc..ff6185a84ea 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -139,7 +139,7 @@ PrintAttribute( wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); - bFound != PrintAttribute(szFullName, pszFile, bRecurse, bDirectories); + bFound |= PrintAttribute(szFullName, pszFile, bRecurse, bDirectories); } while (FindNextFileW(hFind, &findData)); FindClose(hFind); @@ -243,7 +243,7 @@ ChangeAttribute( wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); - bFound != ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories, + bFound |= ChangeAttribute(szFullName, pszFile, bRecurse, bDirectories, dwMask, dwAttrib); } while (FindNextFileW(hFind, &findData));

1 0

[reactos] 01/02: [ATTRIB] Formatting only.
by Hermès Bélusca-Maïto 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da699be4c44d9d077355a… commit da699be4c44d9d077355a772ed00a2c822957eb8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 03:13:55 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 29 04:02:28 2021 +0100 [ATTRIB] Formatting only. --- base/applications/cmdutils/attrib/attrib.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 6eaf053b95a..fc53e68dfbc 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -120,7 +120,9 @@ PrintAttribute( Error = GetLastError(); if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION) && (Error != ERROR_FILE_NOT_FOUND)) + { ErrorMessage(Error, pszFile); + } return FALSE; } @@ -131,7 +133,9 @@ PrintAttribute( if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + { continue; + } wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); @@ -161,7 +165,9 @@ PrintAttribute( if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + { continue; + } wcscpy(pszFileName, findData.cFileName); @@ -174,7 +180,7 @@ PrintAttribute( szFullName); bFound = TRUE; } - while(FindNextFileW(hFind, &findData)); + while (FindNextFileW(hFind, &findData)); FindClose(hFind); return bFound; @@ -218,7 +224,9 @@ ChangeAttribute( Error = GetLastError(); if ((Error != ERROR_DIRECTORY) && (Error != ERROR_SHARING_VIOLATION) && (Error != ERROR_FILE_NOT_FOUND)) + { ErrorMessage(Error, pszFile); + } return FALSE; } @@ -229,7 +237,9 @@ ChangeAttribute( if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + { continue; + } wcscpy(pszFileName, findData.cFileName); wcscat(pszFileName, L"\\"); @@ -260,7 +270,9 @@ ChangeAttribute( if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) + { continue; + } if (bRecurse && bIsDir && !bDirectories) continue; @@ -272,7 +284,7 @@ ChangeAttribute( SetFileAttributes(szFullName, dwAttribute); bFound = TRUE; } - while(FindNextFileW(hFind, &findData)); + while (FindNextFileW(hFind, &findData)); FindClose(hFind); return bFound;

1 0

[reactos] 03/03: [RAPPS] Fix the download dialog not having an icon when RAPPS is started for the first time and the database is downloaded beforehand.
by Hermès Bélusca-Maïto 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a84d295974429fa590393… commit a84d295974429fa59039346c33f81455f3da87e8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 01:23:10 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 29 01:28:56 2021 +0100 [RAPPS] Fix the download dialog not having an icon when RAPPS is started for the first time and the database is downloaded beforehand. --- base/applications/rapps/loaddlg.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index d86bdda5131..fbe85205b19 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -406,16 +406,23 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w bCancelled = FALSE; - hIconBg = (HICON) GetClassLongPtrW(hMainWnd, GCLP_HICON); - hIconSm = (HICON) GetClassLongPtrW(hMainWnd, GCLP_HICONSM); + if (hMainWnd) + { + hIconBg = (HICON)GetClassLongPtrW(hMainWnd, GCLP_HICON); + hIconSm = (HICON)GetClassLongPtrW(hMainWnd, GCLP_HICONSM); + } + if (!hMainWnd || (!hIconBg || !hIconSm)) + { + /* Load the default icon */ + hIconBg = hIconSm = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + } if (hIconBg && hIconSm) { - SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM) hIconBg); - SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM) hIconSm); + SendMessageW(Dlg, WM_SETICON, ICON_BIG, (LPARAM)hIconBg); + SendMessageW(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); } - SetWindowLongPtrW(Dlg, GWLP_USERDATA, 0); HWND Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); if (Item) { @@ -448,7 +455,6 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w DownloadParam *param = new DownloadParam(Dlg, AppsDownloadList, szCaption); unsigned int ThreadId; HANDLE Thread = (HANDLE)_beginthreadex(NULL, 0, ThreadFunc, (void *) param, 0, &ThreadId); - if (!Thread) { return FALSE;

1 0

[reactos] 02/03: [RAPPS] Remove some dead code.
by Hermès Bélusca-Maïto 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5a6357d932ea6cc4e319… commit b5a6357d932ea6cc4e3198bb4ad1956b6a235f0c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 01:19:49 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 29 01:28:55 2021 +0100 [RAPPS] Remove some dead code. CAvailableApps::GetFolderPath() and friends are unnecessary, since the data they return are public members of the m_Strings global structure, that are already being used directly by other code. --- base/applications/rapps/available.cpp | 15 --------------- base/applications/rapps/include/available.h | 4 ---- 2 files changed, 19 deletions(-) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 3f8e30243df..fcc069b8d0a 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -613,19 +613,4 @@ ATL::CSimpleArray<CAvailableApplicationInfo> CAvailableApps::FindAppsByPkgNameLi } return result; } - -const ATL::CStringW& CAvailableApps::GetFolderPath() const -{ - return m_Strings.szPath; -} - -const ATL::CStringW& CAvailableApps::GetAppPath() const -{ - return m_Strings.szAppsPath; -} - -const ATL::CStringW& CAvailableApps::GetCabPath() const -{ - return m_Strings.szCabPath; -} // CAvailableApps diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index 92a846aa5e9..fa2a13a144f 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -129,8 +129,4 @@ public: CAvailableApplicationInfo* FindAppByPkgName(const ATL::CStringW& szPkgName) const; ATL::CSimpleArray<CAvailableApplicationInfo> FindAppsByPkgNameList(const ATL::CSimpleArray<ATL::CStringW> &arrAppsNames) const; //ATL::CSimpleArray<CAvailableApplicationInfo> GetSelected() const; - - const ATL::CStringW& GetFolderPath() const; - const ATL::CStringW& GetAppPath() const; - const ATL::CStringW& GetCabPath() const; };

1 0

[reactos] 01/03: [RAPPS] Minor formatting.
by Hermès Bélusca-Maïto 29 Dec '21

29 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35efa2b9c7275df4074a6… commit 35efa2b9c7275df4074a615341bac4980c0a610c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 01:16:42 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Dec 29 01:28:53 2021 +0100 [RAPPS] Minor formatting. --- base/applications/rapps/appview.cpp | 16 ++++++++-------- base/applications/rapps/available.cpp | 10 +++++----- base/applications/rapps/misc.cpp | 6 ++---- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index d548504c1cb..09bbb178a9a 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1414,7 +1414,7 @@ BOOL CAppsListView::AddInstalledApplication(CInstalledApplicationInfo *InstAppIn if (!hIcon) { - /* Load default icon */ + /* Load the default icon */ hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); } @@ -1442,17 +1442,17 @@ BOOL CAppsListView::AddAvailableApplication(CAvailableApplicationInfo *AvlbAppIn if (AvlbAppInfo->RetrieveIcon(szIconPath)) { hIcon = (HICON)LoadImageW(NULL, - szIconPath.GetString(), - IMAGE_ICON, - LISTVIEW_ICON_SIZE, - LISTVIEW_ICON_SIZE, - LR_LOADFROMFILE); + szIconPath.GetString(), + IMAGE_ICON, + LISTVIEW_ICON_SIZE, + LISTVIEW_ICON_SIZE, + LR_LOADFROMFILE); } if (!hIcon || GetLastError() != ERROR_SUCCESS) { - /* Load default icon */ - hIcon = (HICON)LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); + /* Load the default icon */ + hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); } int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index e148a2df4ba..3f8e30243df 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -15,7 +15,7 @@ #include "dialogs.h" - // CAvailableApplicationInfo +// CAvailableApplicationInfo CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam, AvailableStrings& AvlbStrings) : m_LicenseType(LICENSE_NONE), m_SizeBytes(0), m_sFileName(sFileNameParam), m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE) @@ -38,7 +38,8 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString // TODO: I temporarily use the file name (without suffix) as package name. // It should be better to put this in a field of ini file. - // consider write a converter to do this and write a github action for rapps-db to ensure package_name is unique. + // Consider writing a converter to do this and write a github action for + // rapps-db to ensure package_name is unique. m_szPkgName = m_sFileName; PathRemoveExtensionW(m_szPkgName.GetBuffer(MAX_PATH)); m_szPkgName.ReleaseBuffer(); @@ -72,7 +73,6 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString break; } - if (PathIsURLW(ScrnshotLocation.GetString())) { m_szScrnshotLocation.Add(ScrnshotLocation); @@ -416,7 +416,7 @@ BOOL CAvailableApps::UpdateAppsDB() return FALSE; } - //if there are some files in the db folder - we're good + // If there are some files in the db folder, we're good hFind = FindFirstFileW(m_Strings.szSearchPath, &FindFileData); if (hFind != INVALID_HANDLE_VALUE) { @@ -425,7 +425,7 @@ BOOL CAvailableApps::UpdateAppsDB() } DownloadApplicationsDB(SettingsInfo.bUseSource ? SettingsInfo.szSourceURL : APPLICATION_DATABASE_URL, - !SettingsInfo.bUseSource); + !SettingsInfo.bUseSource); if (!ExtractFilesFromCab(m_Strings.szCabName, m_Strings.szCabDir, diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index b5d142828ff..80bd875008a 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -6,8 +6,8 @@ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) */ -#include "rapps.h" +#include "rapps.h" #include "misc.h" static HANDLE hLog = NULL; @@ -197,7 +197,7 @@ VOID InitLogs() } dwData = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | - EVENTLOG_INFORMATION_TYPE; + EVENTLOG_INFORMATION_TYPE; if ((key.SetStringValue(L"EventMessageFile", szPath, @@ -215,7 +215,6 @@ VOID InitLogs() } } - VOID FreeLogs() { if (hLog) @@ -224,7 +223,6 @@ VOID FreeLogs() } } - BOOL WriteLogMessage(WORD wType, DWORD dwEventID, LPCWSTR lpMsg) { if (!SettingsInfo.bLogEnabled)

1 0

[reactos] 01/01: [MSPAINT] Add NUM_COLORS and enum PAL_TYPE (#4203)
by Katayama Hirofumi MZ 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d30e5eb51c25777527cf0… commit d30e5eb51c25777527cf0b63ee213410603a7483 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 28 19:01:31 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 28 19:01:31 2021 +0900 [MSPAINT] Add NUM_COLORS and enum PAL_TYPE (#4203) Reduce magic numbers and improve debuggability. CORE-17931 --- base/applications/mspaint/palettemodel.cpp | 44 +++++++++++++++++------------- base/applications/mspaint/palettemodel.h | 32 ++++++++++++++-------- base/applications/mspaint/winproc.cpp | 8 +++--- 3 files changed, 49 insertions(+), 35 deletions(-) diff --git a/base/applications/mspaint/palettemodel.cpp b/base/applications/mspaint/palettemodel.cpp index 021a9e0af7f..ffbde5706fd 100644 --- a/base/applications/mspaint/palettemodel.cpp +++ b/base/applications/mspaint/palettemodel.cpp @@ -4,6 +4,7 @@ * FILE: base/applications/mspaint/palettemodel.cpp * PURPOSE: Keep track of palette data, notify listeners * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ */ /* INCLUDES *********************************************************/ @@ -16,72 +17,77 @@ PaletteModel::PaletteModel() { m_fgColor = 0x00000000; m_bgColor = 0x00ffffff; - SelectPalette(1); + SelectPalette(PAL_MODERN); } -int PaletteModel::SelectedPalette() +PAL_TYPE PaletteModel::SelectedPalette() { return m_nSelectedPalette; } -void PaletteModel::SelectPalette(int nPalette) +void PaletteModel::SelectPalette(PAL_TYPE nPalette) { - int modernColors[28] = { + static const COLORREF modernColors[NUM_COLORS] = + { 0x000000, 0x464646, 0x787878, 0x300099, 0x241ced, 0x0078ff, 0x0ec2ff, 0x00f2ff, 0x1de6a8, 0x4cb122, 0xefb700, 0xf36d4d, 0x99362f, 0x98316f, 0xffffff, 0xdcdcdc, 0xb4b4b4, 0x3c5a9c, 0xb1a3ff, 0x7aaae5, 0x9ce4f5, 0xbdf9ff, 0xbcf9d3, 0x61bb9d, 0xead999, 0xd19a70, 0x8e6d54, 0xd5a5b5 }; - int oldColors[28] = { + static const COLORREF oldColors[NUM_COLORS] = + { 0x000000, 0x808080, 0x000080, 0x008080, 0x008000, 0x808000, 0x800000, 0x800080, 0x408080, 0x404000, 0xff8000, 0x804000, 0xff0040, 0x004080, 0xffffff, 0xc0c0c0, 0x0000ff, 0x00ffff, 0x00ff00, 0xffff00, 0xff0000, 0xff00ff, 0x80ffff, 0x80ff00, 0xffff80, 0xff8080, 0x8000ff, 0x4080ff }; - if (nPalette == 1) - CopyMemory(m_colors, modernColors, sizeof(m_colors)); - else if (nPalette == 2) - CopyMemory(m_colors, oldColors, sizeof(m_colors)); - else - return; + switch (nPalette) + { + case PAL_MODERN: + CopyMemory(m_colors, modernColors, sizeof(m_colors)); + break; + case PAL_OLDTYPE: + CopyMemory(m_colors, oldColors, sizeof(m_colors)); + break; + } m_nSelectedPalette = nPalette; NotifyPaletteChanged(); } -int PaletteModel::GetColor(int nIndex) const +COLORREF PaletteModel::GetColor(UINT nIndex) const { - if (nIndex < 28) + if (nIndex < NUM_COLORS) return m_colors[nIndex]; else return 0; } -void PaletteModel::SetColor(int nIndex, int newColor) +void PaletteModel::SetColor(UINT nIndex, COLORREF newColor) { - if (nIndex < 28) + if (nIndex < NUM_COLORS) { m_colors[nIndex] = newColor; NotifyPaletteChanged(); } } -int PaletteModel::GetFgColor() const +COLORREF PaletteModel::GetFgColor() const { return m_fgColor; } -void PaletteModel::SetFgColor(int newColor) +void PaletteModel::SetFgColor(COLORREF newColor) { m_fgColor = newColor; NotifyColorChanged(); } -int PaletteModel::GetBgColor() const +COLORREF PaletteModel::GetBgColor() const { return m_bgColor; } -void PaletteModel::SetBgColor(int newColor) +void PaletteModel::SetBgColor(COLORREF newColor) { m_bgColor = newColor; NotifyColorChanged(); diff --git a/base/applications/mspaint/palettemodel.h b/base/applications/mspaint/palettemodel.h index 2dccc2aa405..b2a8c40631d 100644 --- a/base/applications/mspaint/palettemodel.h +++ b/base/applications/mspaint/palettemodel.h @@ -8,27 +8,35 @@ #pragma once +#define NUM_COLORS 28 + +enum PAL_TYPE +{ + PAL_MODERN = 1, + PAL_OLDTYPE = 2, +}; + /* CLASSES **********************************************************/ class PaletteModel { private: - int m_colors[28]; - int m_nSelectedPalette; - int m_fgColor; - int m_bgColor; + COLORREF m_colors[NUM_COLORS]; + PAL_TYPE m_nSelectedPalette; + COLORREF m_fgColor; + COLORREF m_bgColor; void NotifyColorChanged(); void NotifyPaletteChanged(); public: PaletteModel(); - int SelectedPalette(); - void SelectPalette(int nPalette); - int GetColor(int nIndex) const; - void SetColor(int nIndex, int newColor); - int GetFgColor() const; - void SetFgColor(int newColor); - int GetBgColor() const; - void SetBgColor(int newColor); + PAL_TYPE SelectedPalette(); + void SelectPalette(PAL_TYPE nPalette); + COLORREF GetColor(UINT nIndex) const; + void SetColor(UINT nIndex, COLORREF newColor); + COLORREF GetFgColor() const; + void SetFgColor(COLORREF newColor); + COLORREF GetBgColor() const; + void SetBgColor(COLORREF newColor); }; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 026d5536def..4ccc7be0cdb 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -346,8 +346,8 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO CheckMenuItem(menu, IDM_VIEWZOOM400, CHECKED_IF(toolsModel.GetZoom() == 4000)); CheckMenuItem(menu, IDM_VIEWZOOM800, CHECKED_IF(toolsModel.GetZoom() == 8000)); - CheckMenuItem(menu, IDM_COLORSMODERNPALETTE, CHECKED_IF(paletteModel.SelectedPalette() == 1)); - CheckMenuItem(menu, IDM_COLORSOLDPALETTE, CHECKED_IF(paletteModel.SelectedPalette() == 2)); + CheckMenuItem(menu, IDM_COLORSMODERNPALETTE, CHECKED_IF(paletteModel.SelectedPalette() == PAL_MODERN)); + CheckMenuItem(menu, IDM_COLORSOLDPALETTE, CHECKED_IF(paletteModel.SelectedPalette() == PAL_OLDTYPE)); return 0; } @@ -586,10 +586,10 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH paletteModel.SetFgColor(choosecolor.rgbResult); break; case IDM_COLORSMODERNPALETTE: - paletteModel.SelectPalette(1); + paletteModel.SelectPalette(PAL_MODERN); break; case IDM_COLORSOLDPALETTE: - paletteModel.SelectPalette(2); + paletteModel.SelectPalette(PAL_OLDTYPE); break; case IDM_IMAGEINVERTCOLORS: {

1 0

[reactos] 04/04: [RAPPS] Capitalize the IDS_APP_DISPLAY_* strings ("Details"/"List"/"Tile")
by Hermès Bélusca-Maïto 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=59ceeb1da083e6f3bc4c6… commit 59ceeb1da083e6f3bc4c61ff2fc4207bb3f536c3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Dec 27 23:31:42 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 28 03:20:22 2021 +0100 [RAPPS] Capitalize the IDS_APP_DISPLAY_* strings ("Details"/"List"/"Tile") --- base/applications/rapps/lang/bg-BG.rc | 6 +++--- base/applications/rapps/lang/cs-CZ.rc | 6 +++--- base/applications/rapps/lang/en-US.rc | 6 +++--- base/applications/rapps/lang/es-ES.rc | 6 +++--- base/applications/rapps/lang/et-EE.rc | 6 +++--- base/applications/rapps/lang/fr-FR.rc | 6 +++--- base/applications/rapps/lang/he-IL.rc | 6 +++--- base/applications/rapps/lang/hu-HU.rc | 6 +++--- base/applications/rapps/lang/id-ID.rc | 6 +++--- base/applications/rapps/lang/it-IT.rc | 6 +++--- base/applications/rapps/lang/ja-JP.rc | 6 +++--- base/applications/rapps/lang/no-NO.rc | 6 +++--- base/applications/rapps/lang/pl-PL.rc | 6 +++--- base/applications/rapps/lang/pt-BR.rc | 6 +++--- base/applications/rapps/lang/pt-PT.rc | 6 +++--- base/applications/rapps/lang/ro-RO.rc | 6 +++--- base/applications/rapps/lang/ru-RU.rc | 6 +++--- base/applications/rapps/lang/sk-SK.rc | 6 +++--- base/applications/rapps/lang/sq-AL.rc | 6 +++--- base/applications/rapps/lang/sv-SE.rc | 6 +++--- base/applications/rapps/lang/tr-TR.rc | 6 +++--- base/applications/rapps/lang/uk-UA.rc | 6 +++--- 22 files changed, 66 insertions(+), 66 deletions(-) diff --git a/base/applications/rapps/lang/bg-BG.rc b/base/applications/rapps/lang/bg-BG.rc index 02cd569901c..82f7814246e 100644 --- a/base/applications/rapps/lang/bg-BG.rc +++ b/base/applications/rapps/lang/bg-BG.rc @@ -215,9 +215,9 @@ BEGIN IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/cs-CZ.rc b/base/applications/rapps/lang/cs-CZ.rc index 4d1c6d6f20b..e29d47af284 100644 --- a/base/applications/rapps/lang/cs-CZ.rc +++ b/base/applications/rapps/lang/cs-CZ.rc @@ -216,9 +216,9 @@ BEGIN IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index 876d6675dcc..3f151c10dab 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -211,9 +211,9 @@ BEGIN IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/es-ES.rc b/base/applications/rapps/lang/es-ES.rc index 634e868c375..6bbec17dd19 100644 --- a/base/applications/rapps/lang/es-ES.rc +++ b/base/applications/rapps/lang/es-ES.rc @@ -214,9 +214,9 @@ BEGIN IDS_SELECTEDFORINST "Seleccionados para instalar" IDS_MISMATCH_CERT_INFO "El certificado que usa es desconocido:\nSujeto: %s\nEmisor: %s\n¿Quiere continuar a pesar de ello?" IDS_UNABLE_PATH "Formato de ruta incorrecto." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/et-EE.rc b/base/applications/rapps/lang/et-EE.rc index e1cea69039d..659c28d953b 100644 --- a/base/applications/rapps/lang/et-EE.rc +++ b/base/applications/rapps/lang/et-EE.rc @@ -219,9 +219,9 @@ BEGIN IDS_SELECTEDFORINST "Installimiseks valitud" IDS_MISMATCH_CERT_INFO "Kasutatud sertifikaat on tundmatu:\nSubject: %s\nIssuer: %s\nKas soovid siiski jätkata?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/fr-FR.rc b/base/applications/rapps/lang/fr-FR.rc index e1f13a39b90..6ee794799b9 100644 --- a/base/applications/rapps/lang/fr-FR.rc +++ b/base/applications/rapps/lang/fr-FR.rc @@ -211,9 +211,9 @@ BEGIN IDS_SELECTEDFORINST "Sélectionnées pour installation" IDS_MISMATCH_CERT_INFO "Certificat inconnu:\nSujet: %s\nEmetteur: %s\nVoulez-vous continuer ?" IDS_UNABLE_PATH "Format de chemin invalide." - IDS_APP_DISPLAY_DETAILS "détails" - IDS_APP_DISPLAY_LIST "liste" - IDS_APP_DISPLAY_TILE "tuile" + IDS_APP_DISPLAY_DETAILS "Détails" + IDS_APP_DISPLAY_LIST "Liste" + IDS_APP_DISPLAY_TILE "Tuile" END STRINGTABLE diff --git a/base/applications/rapps/lang/he-IL.rc b/base/applications/rapps/lang/he-IL.rc index 5b4cccc9acc..306fe22928f 100644 --- a/base/applications/rapps/lang/he-IL.rc +++ b/base/applications/rapps/lang/he-IL.rc @@ -217,9 +217,9 @@ BEGIN IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/hu-HU.rc b/base/applications/rapps/lang/hu-HU.rc index db86756feef..2e1bb14b662 100644 --- a/base/applications/rapps/lang/hu-HU.rc +++ b/base/applications/rapps/lang/hu-HU.rc @@ -213,9 +213,9 @@ BEGIN IDS_SELECTEDFORINST "Telepítésre kijelölve" IDS_MISMATCH_CERT_INFO "A használt tanúsítvány ismeretlen:\nTárgy: %s\nKibocsátó: %s\nBiztosan folytatja?" IDS_UNABLE_PATH "Az elérési út formátuma érvénytelen." - IDS_APP_DISPLAY_DETAILS "részletek" - IDS_APP_DISPLAY_LIST "lista" - IDS_APP_DISPLAY_TILE "csempe" + IDS_APP_DISPLAY_DETAILS "Részletek" + IDS_APP_DISPLAY_LIST "Lista" + IDS_APP_DISPLAY_TILE "Csempe" END STRINGTABLE diff --git a/base/applications/rapps/lang/id-ID.rc b/base/applications/rapps/lang/id-ID.rc index 6da2e240587..4907c52af91 100644 --- a/base/applications/rapps/lang/id-ID.rc +++ b/base/applications/rapps/lang/id-ID.rc @@ -211,9 +211,9 @@ BEGIN IDS_SELECTEDFORINST "dipilih untuk pemasangan" IDS_MISMATCH_CERT_INFO "Sertifikat yang dipakai tidak dikenal:\nSubyek: %s\nIssuer: %s\nYakin ingin lanjut?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/it-IT.rc b/base/applications/rapps/lang/it-IT.rc index b8567c41293..ebe78af30e9 100644 --- a/base/applications/rapps/lang/it-IT.rc +++ b/base/applications/rapps/lang/it-IT.rc @@ -211,9 +211,9 @@ BEGIN IDS_SELECTEDFORINST "Selezionate per l'installazione" IDS_MISMATCH_CERT_INFO "Il certificato in uso è sconosciuto:\nSoggetto: %s\nEmittente: %s\nVuoi continuare comunque?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/ja-JP.rc b/base/applications/rapps/lang/ja-JP.rc index 056c3f83086..7c26a55f3e7 100644 --- a/base/applications/rapps/lang/ja-JP.rc +++ b/base/applications/rapps/lang/ja-JP.rc @@ -211,9 +211,9 @@ BEGIN IDS_SELECTEDFORINST "インストールを選択済み" IDS_MISMATCH_CERT_INFO "証明書は未知のものです:\nSubject: %s\nIssuer: %s\nそれでも続けますか？" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/no-NO.rc b/base/applications/rapps/lang/no-NO.rc index 75d6cd9228d..043f551ae6c 100644 --- a/base/applications/rapps/lang/no-NO.rc +++ b/base/applications/rapps/lang/no-NO.rc @@ -211,9 +211,9 @@ BEGIN IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index a7e456cf6ef..3b82b312267 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -220,9 +220,9 @@ BEGIN IDS_SELECTEDFORINST "Wybrane do instalacji" IDS_MISMATCH_CERT_INFO "Użyty certyfikat jest nieznany:\nSubject: %s\nIssuer: %s\nCzy chcesz mimo to kontynuować?" IDS_UNABLE_PATH "Niepoprawny format ścieżki." - IDS_APP_DISPLAY_DETAILS "szczegóły" - IDS_APP_DISPLAY_LIST "lista" - IDS_APP_DISPLAY_TILE "kafelki" + IDS_APP_DISPLAY_DETAILS "Szczegóły" + IDS_APP_DISPLAY_LIST "Lista" + IDS_APP_DISPLAY_TILE "Kafelki" END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-BR.rc b/base/applications/rapps/lang/pt-BR.rc index 93bebf7c027..d507c54b8f3 100644 --- a/base/applications/rapps/lang/pt-BR.rc +++ b/base/applications/rapps/lang/pt-BR.rc @@ -213,9 +213,9 @@ BEGIN IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/pt-PT.rc b/base/applications/rapps/lang/pt-PT.rc index e41033d6904..c9cf992be2c 100644 --- a/base/applications/rapps/lang/pt-PT.rc +++ b/base/applications/rapps/lang/pt-PT.rc @@ -213,9 +213,9 @@ BEGIN IDS_SELECTEDFORINST "Seleccionados para instalação" IDS_MISMATCH_CERT_INFO "O certificado usado é desconhecido:\nAssunto: %s\nEmissor: %s\nDeseja continuar mesmo assim?" IDS_UNABLE_PATH "Formato de caminho incorrecto." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 9646a33cd35..c958987a43b 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -220,9 +220,9 @@ BEGIN IDS_SELECTEDFORINST "Selectate pentru instalare" IDS_MISMATCH_CERT_INFO "Certificatul în uz este necunoscut:\nSubiect: %s\nEmitent: %s\nVreți să continuați oricum?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/ru-RU.rc b/base/applications/rapps/lang/ru-RU.rc index 75095bb8148..0ae6e33e89b 100644 --- a/base/applications/rapps/lang/ru-RU.rc +++ b/base/applications/rapps/lang/ru-RU.rc @@ -211,9 +211,9 @@ BEGIN IDS_SELECTEDFORINST "Выбрано для установки" IDS_MISMATCH_CERT_INFO "Используемый сертификат не опознан:\nНазначение: %s\nВыдан: %s\nВы хотите продолжить в любом случае?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 9c2adf6c5d5..1b261b21feb 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -216,9 +216,9 @@ BEGIN IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/sq-AL.rc b/base/applications/rapps/lang/sq-AL.rc index 0dda1a8d984..0ee3a66f24c 100644 --- a/base/applications/rapps/lang/sq-AL.rc +++ b/base/applications/rapps/lang/sq-AL.rc @@ -215,9 +215,9 @@ BEGIN IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/sv-SE.rc b/base/applications/rapps/lang/sv-SE.rc index 5e5bfb233b3..5c3800d4200 100644 --- a/base/applications/rapps/lang/sv-SE.rc +++ b/base/applications/rapps/lang/sv-SE.rc @@ -218,9 +218,9 @@ BEGIN IDS_SELECTEDFORINST "Selected for installation" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 35c55d46798..53b348f1fb2 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -213,9 +213,9 @@ BEGIN IDS_SELECTEDFORINST "Kurulum için seçildi" IDS_MISMATCH_CERT_INFO "Kullanılan sertifika bilimmiyor:\nAçıklama: %s\nSertifikayı Veren: %s\nYine de devam etmek istiyor musunuz?" IDS_UNABLE_PATH "Geçersiz dosya yolu biçimi." - IDS_APP_DISPLAY_DETAILS "detaylar" - IDS_APP_DISPLAY_LIST "liste" - IDS_APP_DISPLAY_TILE "karo" + IDS_APP_DISPLAY_DETAILS "Detaylar" + IDS_APP_DISPLAY_LIST "Liste" + IDS_APP_DISPLAY_TILE "Karo" END STRINGTABLE diff --git a/base/applications/rapps/lang/uk-UA.rc b/base/applications/rapps/lang/uk-UA.rc index 54a7d402d51..46bfb100389 100644 --- a/base/applications/rapps/lang/uk-UA.rc +++ b/base/applications/rapps/lang/uk-UA.rc @@ -219,9 +219,9 @@ BEGIN IDS_SELECTEDFORINST "Обрані для встановлення" IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "Details" + IDS_APP_DISPLAY_LIST "List" + IDS_APP_DISPLAY_TILE "Tile" END STRINGTABLE

1 0

[reactos] 03/04: [DEVCPUX] Remove double WS_POPUP.
by Hermès Bélusca-Maïto 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45bbf5bc8abdca224523a… commit 45bbf5bc8abdca224523aee8a7773d95dbb4486e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 23 03:47:19 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 28 03:20:21 2021 +0100 [DEVCPUX] Remove double WS_POPUP. --- dll/shellext/devcpux/lang/de-DE.rc | 4 ++-- dll/shellext/devcpux/lang/en-US.rc | 4 ++-- dll/shellext/devcpux/lang/fr-FR.rc | 4 ++-- dll/shellext/devcpux/lang/hi-IN.rc | 4 ++-- dll/shellext/devcpux/lang/pl-PL.rc | 4 ++-- dll/shellext/devcpux/lang/pt-PT.rc | 2 +- dll/shellext/devcpux/lang/ro-RO.rc | 4 ++-- dll/shellext/devcpux/lang/ru-RU.rc | 2 +- dll/shellext/devcpux/lang/tr-TR.rc | 4 ++-- dll/shellext/devcpux/lang/zh-CN.rc | 2 +- dll/shellext/devcpux/lang/zh-TW.rc | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dll/shellext/devcpux/lang/de-DE.rc b/dll/shellext/devcpux/lang/de-DE.rc index 10f8afa37d8..a1c416f2bbc 100644 --- a/dll/shellext/devcpux/lang/de-DE.rc +++ b/dll/shellext/devcpux/lang/de-DE.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "CPU" FONT 8, "MS Shell Dlg" BEGIN @@ -22,7 +22,7 @@ END /* DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "CPU" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/shellext/devcpux/lang/en-US.rc b/dll/shellext/devcpux/lang/en-US.rc index 428531e5a83..49a7ed8997d 100644 --- a/dll/shellext/devcpux/lang/en-US.rc +++ b/dll/shellext/devcpux/lang/en-US.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "CPU" FONT 8, "MS Shell Dlg" BEGIN @@ -22,7 +22,7 @@ END /* DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "CPU" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/shellext/devcpux/lang/fr-FR.rc b/dll/shellext/devcpux/lang/fr-FR.rc index c2b565e694b..03044eb58a4 100644 --- a/dll/shellext/devcpux/lang/fr-FR.rc +++ b/dll/shellext/devcpux/lang/fr-FR.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Processeur" FONT 8, "MS Shell Dlg" BEGIN @@ -22,7 +22,7 @@ END /* DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "CPU" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/shellext/devcpux/lang/hi-IN.rc b/dll/shellext/devcpux/lang/hi-IN.rc index 786963f1dee..cae9772b6c0 100644 --- a/dll/shellext/devcpux/lang/hi-IN.rc +++ b/dll/shellext/devcpux/lang/hi-IN.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_HINDI, SUBLANG_HINDI_INDIA DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "सीपीयू" FONT 8, "MS Shell Dlg" BEGIN @@ -29,7 +29,7 @@ END /* DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "सीपीयू" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/shellext/devcpux/lang/pl-PL.rc b/dll/shellext/devcpux/lang/pl-PL.rc index 119007aaf5a..d933526a18c 100644 --- a/dll/shellext/devcpux/lang/pl-PL.rc +++ b/dll/shellext/devcpux/lang/pl-PL.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Procesor" FONT 8, "MS Shell Dlg" BEGIN @@ -22,7 +22,7 @@ END /* DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "CPU" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/shellext/devcpux/lang/pt-PT.rc b/dll/shellext/devcpux/lang/pt-PT.rc index 9baac37ea00..06ec71fa53e 100644 --- a/dll/shellext/devcpux/lang/pt-PT.rc +++ b/dll/shellext/devcpux/lang/pt-PT.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "CPU" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/shellext/devcpux/lang/ro-RO.rc b/dll/shellext/devcpux/lang/ro-RO.rc index 15a325734f1..a803d2e5fae 100644 --- a/dll/shellext/devcpux/lang/ro-RO.rc +++ b/dll/shellext/devcpux/lang/ro-RO.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "UCP" FONT 8, "MS Shell Dlg" BEGIN @@ -24,7 +24,7 @@ END /* DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "UCP" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/shellext/devcpux/lang/ru-RU.rc b/dll/shellext/devcpux/lang/ru-RU.rc index 6e5217b28fa..9755b4c4c32 100644 --- a/dll/shellext/devcpux/lang/ru-RU.rc +++ b/dll/shellext/devcpux/lang/ru-RU.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Процессор" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/shellext/devcpux/lang/tr-TR.rc b/dll/shellext/devcpux/lang/tr-TR.rc index b09c4e3f7a7..94a66d580e1 100644 --- a/dll/shellext/devcpux/lang/tr-TR.rc +++ b/dll/shellext/devcpux/lang/tr-TR.rc @@ -8,7 +8,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "CPU" FONT 8, "MS Shell Dlg" BEGIN @@ -29,7 +29,7 @@ END /* DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "CPU" FONT 8, "MS Shell Dlg" BEGIN diff --git a/dll/shellext/devcpux/lang/zh-CN.rc b/dll/shellext/devcpux/lang/zh-CN.rc index 193c014e472..c47dcc8e01d 100644 --- a/dll/shellext/devcpux/lang/zh-CN.rc +++ b/dll/shellext/devcpux/lang/zh-CN.rc @@ -3,7 +3,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "处理器" FONT 9, "宋体" BEGIN diff --git a/dll/shellext/devcpux/lang/zh-TW.rc b/dll/shellext/devcpux/lang/zh-TW.rc index 9a634e86e51..ad892ab8f73 100644 --- a/dll/shellext/devcpux/lang/zh-TW.rc +++ b/dll/shellext/devcpux/lang/zh-TW.rc @@ -9,7 +9,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL DLG_PROCESSORINFO DIALOGEX 0, 0, 252, 218 -STYLE DS_SHELLFONT | WS_POPUP | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "處理器" FONT 9, "新細明體" BEGIN

1 0

[reactos] 02/04: [SYSDM] Some fixes when resizing the environment variables dialogs.
by Hermès Bélusca-Maïto 28 Dec '21

28 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d19ab0b828cd3f13da67… commit 0d19ab0b828cd3f13da672b2a5018c966479fe90 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 23 19:07:42 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Dec 28 03:20:11 2021 +0100 [SYSDM] Some fixes when resizing the environment variables dialogs. - Correctly handle the return values for WM_SIZING and WM_SIZE messages. - Use NULL for hWndInsertAfter parameter of DeferWindowPos() when we don't care about the Z-order. - Specify SWP_NOMOVE for controls that don't move during resizing. - Fix the IDOK and IDCANCEL buttons when resizing the environment variables list dialog. - Fix the dialog "moving" effect that happened whenever an attempt was made to resize the dialog from either of the top/left borders, or the top-right/top-left/bottom-left corners, to a size smaller than the minimal one. - Use DWLP_USER instead of GWLP_USERDATA when storing user-specific data into the dialog, since the latter can be used internally by the Win32 dialog manager implementation. --- dll/cpl/sysdm/environment.c | 214 +++++++++++++++++++++++++++----------------- 1 file changed, 133 insertions(+), 81 deletions(-) diff --git a/dll/cpl/sysdm/environment.c b/dll/cpl/sysdm/environment.c index 49f408af182..b648b77e775 100644 --- a/dll/cpl/sysdm/environment.c +++ b/dll/cpl/sysdm/environment.c @@ -430,7 +430,7 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = BeginDeferWindowPos(5); - /* For edit control */ + /* For the edit control */ hItemWnd = GetDlgItem(hwndDlg, IDC_VARIABLE_NAME); GetWindowRect(hItemWnd, &rect); MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); @@ -439,11 +439,11 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, - rect.left, rect.top, + NULL, + 0, 0, (rect.right - rect.left) + (cx - DlgData->cxOld), rect.bottom - rect.top, - SWP_NOZORDER | SWP_NOACTIVATE); + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); } hItemWnd = GetDlgItem(hwndDlg, IDC_VARIABLE_VALUE); @@ -454,18 +454,18 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, - rect.left, rect.top, + NULL, + 0, 0, (rect.right - rect.left) + (cx - DlgData->cxOld), rect.bottom - rect.top, - SWP_NOZORDER | SWP_NOACTIVATE); + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); } } else if (DlgData->dwDlgID == IDD_EDIT_VARIABLE_FANCY) { hdwp = BeginDeferWindowPos(11); - /* For list view control */ + /* For the list view control */ hItemWnd = GetDlgItem(hwndDlg, IDC_LIST_VARIABLE_VALUE); GetWindowRect(hItemWnd, &rect); MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); @@ -474,15 +474,15 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, - rect.left, rect.top, + NULL, + 0, 0, (rect.right - rect.left) + (cx - DlgData->cxOld), (rect.bottom - rect.top) + (cy - DlgData->cyOld), - SWP_NOZORDER | SWP_NOACTIVATE); + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); ListView_SetColumnWidth(hItemWnd, 0, (rect.right - rect.left) + (cx - DlgData->cxOld)); } - /* For buttons */ + /* For the buttons */ hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_BROWSE_FOLDER); GetWindowRect(hItemWnd, &rect); MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); @@ -491,7 +491,7 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top, 0, 0, @@ -505,12 +505,12 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, if (hdwp) { hdwp = DeferWindowPos(hdwp, - hItemWnd, - 0, - rect.left + (cx - DlgData->cxOld), - rect.top, - 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + hItemWnd, + NULL, + rect.left + (cx - DlgData->cxOld), + rect.top, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); } hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_EDIT); @@ -521,7 +521,7 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top, 0, 0, @@ -536,7 +536,7 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top, 0, 0, @@ -551,26 +551,26 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); } - hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_MOVE_DOWN); - GetWindowRect(hItemWnd, &rect); - MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_MOVE_DOWN); + GetWindowRect(hItemWnd, &rect); + MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); - if (hdwp) - { - hdwp = DeferWindowPos(hdwp, - hItemWnd, - 0, - rect.left + (cx - DlgData->cxOld), - rect.top, - 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + if (hdwp) + { + hdwp = DeferWindowPos(hdwp, + hItemWnd, + NULL, + rect.left + (cx - DlgData->cxOld), + rect.top, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); } hItemWnd = GetDlgItem(hwndDlg, IDC_BUTTON_EDIT_TEXT); @@ -579,9 +579,9 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, if (hdwp) { - hdwp = DeferWindowPos(hdwp, + hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top, 0, 0, @@ -597,7 +597,7 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top + (cy - DlgData->cyOld), 0, 0, @@ -612,7 +612,7 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top + (cy - DlgData->cyOld), 0, 0, @@ -628,7 +628,7 @@ OnEnvironmentEditDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top + (cy - DlgData->cyOld), 0, 0, @@ -717,7 +717,7 @@ OnNotifyEditVariableDlg(HWND hwndDlg, PEDIT_DIALOG_DATA DlgData, NMHDR *phdr) switch (phdr->idFrom) { case IDC_LIST_VARIABLE_VALUE: - switch(phdr->code) + switch (phdr->code) { case NM_CLICK: { @@ -769,15 +769,16 @@ EditVariableDlgProc(HWND hwndDlg, PEDIT_DIALOG_DATA DlgData; HWND hwndListView; - DlgData = (PEDIT_DIALOG_DATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + DlgData = (PEDIT_DIALOG_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); hwndListView = GetDlgItem(hwndDlg, IDC_LIST_VARIABLE_VALUE); + switch (uMsg) { case WM_INITDIALOG: { RECT rect; - SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)lParam); DlgData = (PEDIT_DIALOG_DATA)lParam; GetClientRect(hwndDlg, &rect); @@ -817,26 +818,56 @@ EditVariableDlgProc(HWND hwndDlg, case WM_SIZE: { OnEnvironmentEditDlgResize(hwndDlg, DlgData, LOWORD(lParam), HIWORD(lParam)); - break; + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, 0); + return TRUE; } case WM_SIZING: { - LPRECT pRect = (LPRECT)lParam; + /* Forbid resizing the dialog smaller than its minimal size */ + PRECT pRect = (PRECT)lParam; - if (pRect->right - pRect->left < DlgData->cxMin) - pRect->right = pRect->left + DlgData->cxMin; + if ((wParam == WMSZ_LEFT) || (wParam == WMSZ_TOPLEFT) || (wParam == WMSZ_BOTTOMLEFT)) + { + if (pRect->right - pRect->left < DlgData->cxMin) + pRect->left = pRect->right - DlgData->cxMin; + } + else + if ((wParam == WMSZ_RIGHT) || (wParam == WMSZ_TOPRIGHT) || (wParam == WMSZ_BOTTOMRIGHT)) + { + if (pRect->right - pRect->left < DlgData->cxMin) + pRect->right = pRect->left + DlgData->cxMin; + } - if (pRect->bottom - pRect->top < DlgData->cyMin) - pRect->bottom = pRect->top + DlgData->cyMin; + if ((wParam == WMSZ_TOP) || (wParam == WMSZ_TOPLEFT) || (wParam == WMSZ_TOPRIGHT)) + { + if (pRect->bottom - pRect->top < DlgData->cyMin) + pRect->top = pRect->bottom - DlgData->cyMin; + } + else + if ((wParam == WMSZ_BOTTOM) || (wParam == WMSZ_BOTTOMLEFT) || (wParam == WMSZ_BOTTOMRIGHT)) + { + if (pRect->bottom - pRect->top < DlgData->cyMin) + pRect->bottom = pRect->top + DlgData->cyMin; + } - /* Make sure the normal variable edit dialog doesn't change its width */ + /* Make sure the normal variable edit dialog doesn't change its height */ if (DlgData->dwDlgID == IDD_EDIT_VARIABLE) { - if (pRect->bottom - pRect->top > DlgData->cyMin) - pRect->bottom = pRect->top + DlgData->cyMin; + if ((wParam == WMSZ_TOP) || (wParam == WMSZ_TOPLEFT) || (wParam == WMSZ_TOPRIGHT)) + { + if (pRect->bottom - pRect->top > DlgData->cyMin) + pRect->top = pRect->bottom - DlgData->cyMin; + } + else + if ((wParam == WMSZ_BOTTOM) || (wParam == WMSZ_BOTTOMLEFT) || (wParam == WMSZ_BOTTOMRIGHT)) + { + if (pRect->bottom - pRect->top > DlgData->cyMin) + pRect->bottom = pRect->top + DlgData->cyMin; + } } + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, TRUE); return TRUE; } @@ -1371,7 +1402,7 @@ OnEnvironmentDlgResize(HWND hwndDlg, else y -= (DlgData->cyOld - cy + 1) / 2; - /* For group box control */ + /* For the group box controls */ hItemWnd = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_GROUP); GetWindowRect(hItemWnd, &rect); MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); @@ -1380,11 +1411,11 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, - rect.left, rect.top, + NULL, + 0, 0, (rect.right - rect.left) + (cx - DlgData->cxOld), (rect.bottom - rect.top) + y, - SWP_NOZORDER | SWP_NOACTIVATE); + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); } hItemWnd = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_GROUP); @@ -1395,14 +1426,14 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left, rect.top + y, (rect.right - rect.left) + (cx - DlgData->cxOld), (rect.bottom - rect.top) + y, SWP_NOZORDER | SWP_NOACTIVATE); } - /* For list view control */ + /* For the list view controls */ hItemWnd = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_LIST); GetWindowRect(hItemWnd, &rect); MapWindowPoints(HWND_DESKTOP, hwndDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); @@ -1411,11 +1442,11 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, - rect.left, rect.top, + NULL, + 0, 0, (rect.right - rect.left) + (cx - DlgData->cxOld), (rect.bottom - rect.top) + y, - SWP_NOZORDER | SWP_NOACTIVATE); + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); Colx = ListView_GetColumnWidth(hItemWnd, 1); ListView_SetColumnWidth(hItemWnd, 1, Colx + (cx - DlgData->cxOld)); } @@ -1428,7 +1459,7 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left, rect.top + y, (rect.right - rect.left) + (cx - DlgData->cxOld), (rect.bottom - rect.top) + y, @@ -1446,7 +1477,7 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top + y, 0, 0, @@ -1461,7 +1492,7 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top + y, 0, 0, @@ -1476,7 +1507,7 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top + y, 0, 0, @@ -1491,7 +1522,7 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top + y * 2, 0, 0, @@ -1506,7 +1537,7 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top + y * 2, 0, 0, @@ -1521,7 +1552,7 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top + y * 2, 0, 0, @@ -1536,9 +1567,9 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), - rect.top + (cy - DlgData->cyOld * 2), + rect.top + (cy - DlgData->cyOld), 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); } @@ -1551,9 +1582,9 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), - rect.top + y * 2, + rect.top + (cy - DlgData->cyOld), 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); } @@ -1567,7 +1598,7 @@ OnEnvironmentDlgResize(HWND hwndDlg, { hdwp = DeferWindowPos(hdwp, hItemWnd, - 0, + NULL, rect.left + (cx - DlgData->cxOld), rect.top + (cy - DlgData->cyOld), 0, 0, @@ -1764,7 +1795,7 @@ SetAllVars(HWND hwndDlg, static BOOL OnNotify(HWND hwndDlg, NMHDR *phdr) { - switch(phdr->code) + switch (phdr->code) { case NM_DBLCLK: if (phdr->idFrom == IDC_USER_VARIABLE_LIST || @@ -1798,7 +1829,7 @@ EnvironmentDlgProc(HWND hwndDlg, LPARAM lParam) { PENVIRONMENT_DIALOG_DATA DlgData; - DlgData = (PENVIRONMENT_DIALOG_DATA)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + DlgData = (PENVIRONMENT_DIALOG_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { @@ -1812,7 +1843,7 @@ EnvironmentDlgProc(HWND hwndDlg, EndDialog(hwndDlg, 0); return (INT_PTR)TRUE; } - SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)DlgData); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DlgData); GetClientRect(hwndDlg, &rect); DlgData->cxOld = rect.right - rect.left; @@ -1829,19 +1860,40 @@ EnvironmentDlgProc(HWND hwndDlg, case WM_SIZE: { OnEnvironmentDlgResize(hwndDlg, DlgData, LOWORD(lParam), HIWORD(lParam)); - break; + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, 0); + return TRUE; } case WM_SIZING: { - LPRECT pRect = (LPRECT)lParam; + /* Forbid resizing the dialog smaller than its minimal size */ + PRECT pRect = (PRECT)lParam; - if (pRect->right - pRect->left < DlgData->cxMin) - pRect->right = pRect->left + DlgData->cxMin; + if ((wParam == WMSZ_LEFT) || (wParam == WMSZ_TOPLEFT) || (wParam == WMSZ_BOTTOMLEFT)) + { + if (pRect->right - pRect->left < DlgData->cxMin) + pRect->left = pRect->right - DlgData->cxMin; + } + else + if ((wParam == WMSZ_RIGHT) || (wParam == WMSZ_TOPRIGHT) || (wParam == WMSZ_BOTTOMRIGHT)) + { + if (pRect->right - pRect->left < DlgData->cxMin) + pRect->right = pRect->left + DlgData->cxMin; + } - if (pRect->bottom - pRect->top < DlgData->cyMin) - pRect->bottom = pRect->top + DlgData->cyMin; + if ((wParam == WMSZ_TOP) || (wParam == WMSZ_TOPLEFT) || (wParam == WMSZ_TOPRIGHT)) + { + if (pRect->bottom - pRect->top < DlgData->cyMin) + pRect->top = pRect->bottom - DlgData->cyMin; + } + else + if ((wParam == WMSZ_BOTTOM) || (wParam == WMSZ_BOTTOMLEFT) || (wParam == WMSZ_BOTTOMRIGHT)) + { + if (pRect->bottom - pRect->top < DlgData->cyMin) + pRect->bottom = pRect->top + DlgData->cyMin; + } + SetWindowLongPtrW(hwndDlg, DWLP_MSGRESULT, TRUE); return TRUE; }

1 0

[reactos] 01/04: [SYSDM] Don't systematically center the environment dialog. Restore the lost DS_CONTEXTHELP style.
by Hermès Bélusca-Maïto 28 Dec '21

28 Dec '21

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs