Ros-diffs December 2021

ros-diffs@reactos.org

33 participants
155 discussions

[reactos] 01/01: [MSPAINT] Add NUM_COLORS and enum PAL_TYPE (#4203)

by Katayama Hirofumi MZ

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

2 years, 12 months

[reactos] 04/04: [RAPPS] Capitalize the IDS_APP_DISPLAY_* strings ("Details"/"List"/"Tile")

by Hermès Bélusca-Maïto

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

2 years, 12 months

[reactos] 03/04: [DEVCPUX] Remove double WS_POPUP.

by Hermès Bélusca-Maïto

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

2 years, 12 months

[reactos] 02/04: [SYSDM] Some fixes when resizing the environment variables dialogs.

by Hermès Bélusca-Maïto

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

2 years, 12 months

[reactos] 01/04: [SYSDM] Don't systematically center the environment dialog. Restore the lost DS_CONTEXTHELP style.

by Hermès Bélusca-Maïto

2 years, 12 months

[reactos] 01/01: [MSPAINT] Refactoring (_countof and resource.h) (#4202)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ca3ff5bc63c52c219b1c… commit 2ca3ff5bc63c52c219b1ccfadc4a383673b06c5a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 28 10:44:56 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Dec 28 10:44:56 2021 +0900 [MSPAINT] Refactoring (_countof and resource.h) (#4202) - Use Microsoft standard _countof macro instead of SIZEOF. - Rename definitions.h as resource.h. - Move some macro definitions to its proper place. CORE-17931 --- base/applications/mspaint/common.h | 22 ++++++++++++---- base/applications/mspaint/dialogs.cpp | 16 ++++++------ base/applications/mspaint/dib.cpp | 4 +-- base/applications/mspaint/history.h | 3 +++ base/applications/mspaint/main.cpp | 14 +++++----- base/applications/mspaint/precomp.h | 11 +++++++- .../mspaint/{definitions.h => resource.h} | 30 ++-------------------- base/applications/mspaint/rsrc.rc | 2 +- base/applications/mspaint/winproc.cpp | 12 ++++----- 9 files changed, 56 insertions(+), 58 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index 7cdbb22c9bf..288bba64be4 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -2,7 +2,7 @@ * PROJECT: PAINT for ReactOS * LICENSE: LGPL * FILE: base/applications/mspaint/common.h - * PURPOSE: Commonly used functions + * PURPOSE: Commonly used functions and definitions * PROGRAMMERS: Benedikt Freisen * Stanislav Motylkov * Katayama Hirofumi MZ @@ -10,6 +10,22 @@ #pragma once +#define GRIP_SIZE 3 +#define MIN_ZOOM 125 +#define MAX_ZOOM 8000 + +/* width of the rectangle defined by a RECT structure */ +#define RECT_WIDTH(a) ((a).right - (a).left) + +/* height of the rectangle defined by a RECT structure */ +#define RECT_HEIGHT(a) ((a).bottom - (a).top) + +/* this simplifies checking and unchecking menu items */ +#define CHECKED_IF(a) ((a) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)) + +/* this simplifies enabling or graying menu items */ +#define ENABLED_IF(a) ((a) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND)) + /* FUNCTIONS ********************************************************/ BOOL zoomTo(int newZoom, int mouseX, int mouseY); @@ -24,7 +40,3 @@ static inline int UnZoomed(int xy) { return xy * 1000 / toolsModel.GetZoom(); } - -#define GRIP_SIZE 3 -#define MIN_ZOOM 125 -#define MAX_ZOOM 8000 diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index 144b5ed7350..09a3e5cebfb 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -88,8 +88,8 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, { TCHAR date[100]; TCHAR temp[100]; - GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, SIZEOF(date)); - GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, SIZEOF(temp)); + GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, _countof(date)); + GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, _countof(temp)); _tcscat(date, _T(" ")); _tcscat(date, temp); CString strSize; @@ -166,17 +166,17 @@ LRESULT CAttributesDialog::OnEdit1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOO TCHAR tempS[100]; if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, _countof(tempS)); newWidth = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM * 0.0254)); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, _countof(tempS)); newWidth = max(1, (int) (_tcstod(tempS, NULL) * fileHPPM / 100)); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, _countof(tempS)); newWidth = max(1, _tstoi(tempS)); } Edit_SetModify(hWndCtl, FALSE); @@ -191,17 +191,17 @@ LRESULT CAttributesDialog::OnEdit2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOO TCHAR tempS[100]; if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, _countof(tempS)); newHeight = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM * 0.0254)); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, _countof(tempS)); newHeight = max(1, (int) (_tcstod(tempS, NULL) * fileVPPM / 100)); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3)) { - GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, SIZEOF(tempS)); + GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, _countof(tempS)); newHeight = max(1, _tstoi(tempS)); } Edit_SetModify(hWndCtl, FALSE); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index ecdbf22e339..53a12f71602 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -137,9 +137,9 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL i // update filepathname if (name && name[0]) - GetFullPathName(name, SIZEOF(filepathname), filepathname, NULL); + GetFullPathName(name, _countof(filepathname), filepathname, NULL); else - LoadString(hProgInstance, IDS_DEFAULTFILENAME, filepathname, SIZEOF(filepathname)); + LoadString(hProgInstance, IDS_DEFAULTFILENAME, filepathname, _countof(filepathname)); // set title CString strTitle; diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 587d9c2e7a7..697b65bf128 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -8,6 +8,9 @@ #pragma once +/* HISTORYSIZE = number of possible undo-steps + 1 */ +#define HISTORYSIZE 11 + class ImageModel { private: diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index fe77e8ae097..b7e774a23f4 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -120,7 +120,7 @@ OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { hParent = GetParent(hwnd); TCHAR Path[MAX_PATH]; - SendMessage(hParent, CDM_GETFILEPATH, SIZEOF(Path), (LPARAM)Path); + SendMessage(hParent, CDM_GETFILEPATH, _countof(Path), (LPARAM)Path); LPTSTR pchTitle = _tcsrchr(Path, _T('\\')); if (pchTitle == NULL) pchTitle = _tcsrchr(Path, _T('/')); @@ -173,12 +173,12 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* initialize common controls library */ InitCommonControls(); - LoadString(hThisInstance, IDS_DEFAULTFILENAME, filepathname, SIZEOF(filepathname)); + LoadString(hThisInstance, IDS_DEFAULTFILENAME, filepathname, _countof(filepathname)); CPath pathFileName(filepathname); pathFileName.StripPath(); CString strTitle; strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)pathFileName); - LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle, SIZEOF(miniaturetitle)); + LoadString(hThisInstance, IDS_MINIATURETITLE, miniaturetitle, _countof(miniaturetitle)); /* load settings from registry */ registrySettings.Load(); @@ -279,9 +279,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument ofn.hInstance = hThisInstance; ofn.lpstrFilter = strImporters; ofn.lpstrFile = ofnFilename; - ofn.nMaxFile = SIZEOF(ofnFilename); + ofn.nMaxFile = _countof(ofnFilename); ofn.lpstrFileTitle = ofnFiletitle; - ofn.nMaxFileTitle = SIZEOF(ofnFiletitle); + ofn.nMaxFileTitle = _countof(ofnFiletitle); ofn.Flags = OFN_EXPLORER | OFN_HIDEREADONLY; ofn.lpstrDefExt = L"png"; @@ -295,9 +295,9 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument sfn.hInstance = hThisInstance; sfn.lpstrFilter = strExporters; sfn.lpstrFile = sfnFilename; - sfn.nMaxFile = SIZEOF(sfnFilename); + sfn.nMaxFile = _countof(sfnFilename); sfn.lpstrFileTitle = sfnFiletitle; - sfn.nMaxFileTitle = SIZEOF(sfnFiletitle); + sfn.nMaxFileTitle = _countof(sfnFiletitle); sfn.Flags = OFN_EXPLORER | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLEHOOK; sfn.lpfnHook = OFNHookProc; sfn.lpstrDefExt = L"png"; diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 6bdbafceb30..d51eafa85e6 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -21,7 +21,16 @@ #include <shellapi.h> #include <htmlhelp.h> -#include "definitions.h" +#define WM_TOOLSMODELTOOLCHANGED (WM_APP + 0) +#define WM_TOOLSMODELSETTINGSCHANGED (WM_APP + 1) +#define WM_TOOLSMODELZOOMCHANGED (WM_APP + 2) +#define WM_PALETTEMODELCOLORCHANGED (WM_APP + 3) +#define WM_PALETTEMODELPALETTECHANGED (WM_APP + 4) +#define WM_IMAGEMODELDIMENSIONSCHANGED (WM_APP + 5) +#define WM_IMAGEMODELIMAGECHANGED (WM_APP + 6) +#define WM_SELECTIONMODELREFRESHNEEDED (WM_APP + 7) + +#include "resource.h" #include "drawing.h" #include "dib.h" #include "fullscreen.h" diff --git a/base/applications/mspaint/definitions.h b/base/applications/mspaint/resource.h similarity index 82% rename from base/applications/mspaint/definitions.h rename to base/applications/mspaint/resource.h index 26ea4f19549..fd3330a776b 100644 --- a/base/applications/mspaint/definitions.h +++ b/base/applications/mspaint/resource.h @@ -1,8 +1,8 @@ /* * PROJECT: PAINT for ReactOS * LICENSE: LGPL - * FILE: base/applications/mspaint/definitions.h - * PURPOSE: Defines the resource ids and other stuff + * FILE: base/applications/mspaint/resource.h + * PURPOSE: Defines the resource IDs * PROGRAMMERS: Benedikt Freisen */ @@ -10,23 +10,6 @@ /* DEFINES **********************************************************/ -#define HISTORYSIZE 11 -/* HISTORYSIZE = number of possible undo-steps + 1 */ - -#define SIZEOF(a) (sizeof(a) / sizeof((a)[0])) -/* sizeof for string constants; equals max. number of characters */ - -#define RECT_WIDTH(a) ((a).right - (a).left) -/* width of the rectangle defined by a RECT structure */ - -#define RECT_HEIGHT(a) ((a).bottom - (a).top) -/* height of the rectangle defined by a RECT structure */ - -#define CHECKED_IF(a) ((a) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)) -/* simplifies checking and unchecking menu items */ -#define ENABLED_IF(a) ((a) ? (MF_ENABLED | MF_BYCOMMAND) : (MF_GRAYED | MF_BYCOMMAND)) -/* simplifies enabling or graying menu items */ - #define IDI_APPICON 500 #define IDB_TOOLBARICONS 510 @@ -219,12 +202,3 @@ #define IDS_LOADERRORTEXT 933 #define IDS_ENLARGEPROMPTTEXT 934 - -#define WM_TOOLSMODELTOOLCHANGED WM_APP -#define WM_TOOLSMODELSETTINGSCHANGED (WM_APP + 1) -#define WM_TOOLSMODELZOOMCHANGED (WM_APP + 2) -#define WM_PALETTEMODELCOLORCHANGED (WM_APP + 3) -#define WM_PALETTEMODELPALETTECHANGED (WM_APP + 4) -#define WM_IMAGEMODELDIMENSIONSCHANGED (WM_APP + 5) -#define WM_IMAGEMODELIMAGECHANGED (WM_APP + 6) -#define WM_SELECTIONMODELREFRESHNEEDED (WM_APP + 7) diff --git a/base/applications/mspaint/rsrc.rc b/base/applications/mspaint/rsrc.rc index 99c6941e91d..ccfc605fbd9 100644 --- a/base/applications/mspaint/rsrc.rc +++ b/base/applications/mspaint/rsrc.rc @@ -11,7 +11,7 @@ #include <windef.h> #include <winuser.h> -#include "definitions.h" +#include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Paint" #define REACTOS_STR_INTERNAL_NAME "mspaint" diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 1f251449669..026d5536def 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -94,7 +94,7 @@ void CMainWindow::saveImage(BOOL overwrite) else if (GetSaveFileName(&sfn) != 0) { imageModel.SaveImage(sfn.lpstrFile); - _tcsncpy(filepathname, sfn.lpstrFile, SIZEOF(filepathname)); + _tcsncpy(filepathname, sfn.lpstrFile, _countof(filepathname)); CString strTitle; strTitle.Format(IDS_WINDOWTITLE, (LPCTSTR)sfn.lpstrFileTitle); SetWindowText(strTitle); @@ -118,8 +118,8 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) TCHAR programname[20]; TCHAR shouldEnlargePromptText[100]; - LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); - LoadString(hProgInstance, IDS_ENLARGEPROMPTTEXT, shouldEnlargePromptText, SIZEOF(shouldEnlargePromptText)); + LoadString(hProgInstance, IDS_PROGRAMNAME, programname, _countof(programname)); + LoadString(hProgInstance, IDS_ENLARGEPROMPTTEXT, shouldEnlargePromptText, _countof(shouldEnlargePromptText)); switch (MessageBox(shouldEnlargePromptText, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) { @@ -212,7 +212,7 @@ LRESULT CMainWindow::OnDropFiles(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& TCHAR droppedfile[MAX_PATH]; HDROP hDrop = (HDROP)wParam; - DragQueryFile(hDrop, 0, droppedfile, SIZEOF(droppedfile)); + DragQueryFile(hDrop, 0, droppedfile, _countof(droppedfile)); DragFinish(hDrop); ConfirmSave() && DoLoadImageFile(m_hWnd, droppedfile, TRUE); @@ -430,8 +430,8 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH HICON paintIcon = LoadIcon(hProgInstance, MAKEINTRESOURCE(IDI_APPICON)); TCHAR infotitle[100]; TCHAR infotext[200]; - LoadString(hProgInstance, IDS_INFOTITLE, infotitle, SIZEOF(infotitle)); - LoadString(hProgInstance, IDS_INFOTEXT, infotext, SIZEOF(infotext)); + LoadString(hProgInstance, IDS_INFOTITLE, infotitle, _countof(infotitle)); + LoadString(hProgInstance, IDS_INFOTEXT, infotext, _countof(infotext)); ShellAbout(m_hWnd, infotitle, infotext, paintIcon); DeleteObject(paintIcon); break;

2 years, 12 months

[reactos] 03/03: [HIVESYS] Add missing device classes to avoid error messages in log

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad49da70a1615e397f07b… commit ad49da70a1615e397f07b1578a0bdb120a5d9924 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 28 04:22:16 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Dec 28 04:23:51 2021 +0300 [HIVESYS] Add missing device classes to avoid error messages in log --- boot/bootdata/hivesys.inf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 39b0175b8b7..7f34f687d29 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -379,6 +379,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE103 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","SilentInstall",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E967-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"partmgr" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E968-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Display adapters" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E968-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"Display" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E968-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-1" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E968-E325-11CE-BFC1-08002BE10318}","Installer32",0x00000000,"desk.cpl,DisplayClassInstaller" + HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Keyboard" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"Keyboard" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-3" @@ -418,6 +423,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E97D-E325-11CE-BFC1-08002BE103 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E97D-E325-11CE-BFC1-08002BE10318}","Class",0x00000000,"System" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E97D-E325-11CE-BFC1-08002BE10318}","Icon",0x00000000,"-27" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{745A17A0-74D3-11D0-B6FE-00A0C90F57DA}",,0x00000000,"Human Interface Devices" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{745A17A0-74D3-11D0-B6FE-00A0C90F57DA}","Class",0x00000000,"HIDClass" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{745A17A0-74D3-11D0-B6FE-00A0C90F57DA}","Icon",0x00000000,"-24" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{745A17A0-74D3-11D0-B6FE-00A0C90F57DA}","NoInstallClass",0x00000000,"1" + HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}",,0x00000000,"Ramdisk" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Class",0x00000000,"Ramdisk" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Icon",0x00000000,"-5"

2 years, 12 months

[reactos] 02/03: [NTOS:PNP] Remove excessive error messages

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd9436d7680cb68dce384… commit fd9436d7680cb68dce3841c7f161b82b4e1d0085 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 28 04:21:21 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Dec 28 04:23:51 2021 +0300 [NTOS:PNP] Remove excessive error messages --- ntoskrnl/io/pnpmgr/devaction.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index c97f1fdd1c5..559fc087b0c 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -251,7 +251,10 @@ IopCreateDeviceInstancePath( Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities); if (!NT_SUCCESS(Status)) { - DPRINT1("IopQueryDeviceCapabilities() failed (Status 0x%08lx)\n", Status); + if (Status != STATUS_NOT_SUPPORTED) + { + DPRINT1("IopQueryDeviceCapabilities() failed (Status 0x%08lx)\n", Status); + } RtlFreeUnicodeString(&DeviceId); return Status; }

2 years, 12 months

[reactos] 01/03: [SCSIPORT] Reduce and improve debug printing

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a6bd2704af03694fb6d8… commit 1a6bd2704af03694fb6d857b34481dd43ad39123 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Dec 28 04:20:37 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Dec 28 04:23:51 2021 +0300 [SCSIPORT] Reduce and improve debug printing --- drivers/storage/port/scsiport/fdo.c | 6 ++---- drivers/storage/port/scsiport/scsiport.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/storage/port/scsiport/fdo.c b/drivers/storage/port/scsiport/fdo.c index 8972c6f1aea..168c985c105 100644 --- a/drivers/storage/port/scsiport/fdo.c +++ b/drivers/storage/port/scsiport/fdo.c @@ -324,13 +324,11 @@ FdoScanAdapter( /* Clear the "in scan" flag */ lunExt->Flags &= ~SCSI_PORT_SCAN_IN_PROGRESS; - DPRINT("FdoScanAdapter(): Found device of type %d at bus %d tid %d lun %d\n", - InquiryData->DeviceType, pathId, targetId, lun); + DPRINT1("Found device of type %d at controller %d bus %d tid %d lun %d, PDO: %p\n", + InquiryData->DeviceType, PortExtension->PortNumber, pathId, targetId, lun, lunPDO); InsertTailList(&currentBus->LunsListHead, &lunExt->LunEntry); - DPRINT1("SCSIPORT: created lun device: %p Status: %x\n", lunPDO, status); - totalLUNs++; currentBus->LogicalUnitsCount++; targetFound = TRUE; diff --git a/drivers/storage/port/scsiport/scsiport.c b/drivers/storage/port/scsiport/scsiport.c index 8e6e3e3c198..9b7f7f9d6df 100644 --- a/drivers/storage/port/scsiport/scsiport.c +++ b/drivers/storage/port/scsiport/scsiport.c @@ -981,8 +981,6 @@ ScsiPortInitialize( break; } - DPRINT1("Created device: %wZ (%p)\n", &DeviceName, PortDeviceObject); - /* Set the buffering strategy here... */ PortDeviceObject->Flags |= DO_DIRECT_IO; PortDeviceObject->AlignmentRequirement = FILE_WORD_ALIGNMENT; /* FIXME: Is this really needed? */ @@ -2494,7 +2492,7 @@ TryNextAd: else { /* Info was not found, exit */ - DPRINT1("ZwOpenKey() failed with Status=0x%08X\n", Status); + DPRINT("ZwOpenKey() failed with Status=0x%08X\n", Status); return STATUS_DEVICE_DOES_NOT_EXIST; } }

2 years, 12 months

[reactos] 01/01: [MSPAINT] Add const to some ImageModel methods

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba117350eb3068ca7c2ed… commit ba117350eb3068ca7c2edf31a62c558530b9d86d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 28 09:49:36 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 28 09:49:36 2021 +0900 [MSPAINT] Add const to some ImageModel methods CORE-17931 --- base/applications/mspaint/history.cpp | 10 +++++----- base/applications/mspaint/history.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index b9f206cb165..221dffc52d7 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -164,17 +164,17 @@ void ImageModel::SaveImage(LPTSTR lpFileName) SaveDIBToFile(hBms[currInd], lpFileName, hDrawingDC); } -BOOL ImageModel::IsImageSaved() +BOOL ImageModel::IsImageSaved() const { return imageSaved; } -BOOL ImageModel::HasUndoSteps() +BOOL ImageModel::HasUndoSteps() const { return undoSteps > 0; } -BOOL ImageModel::HasRedoSteps() +BOOL ImageModel::HasRedoSteps() const { return redoSteps > 0; } @@ -191,12 +191,12 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk NotifyImageChanged(); } -int ImageModel::GetWidth() +int ImageModel::GetWidth() const { return GetDIBWidth(hBms[currInd]); } -int ImageModel::GetHeight() +int ImageModel::GetHeight() const { return GetDIBHeight(hBms[currInd]); } diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 1c5110f7306..587d9c2e7a7 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -30,12 +30,12 @@ public: void Insert(HBITMAP hbm); void Crop(int nWidth, int nHeight, int nOffsetX = 0, int nOffsetY = 0); void SaveImage(LPTSTR lpFileName); - BOOL IsImageSaved(); - BOOL HasUndoSteps(); - BOOL HasRedoSteps(); + BOOL IsImageSaved() const; + BOOL HasUndoSteps() const; + BOOL HasRedoSteps() const; void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX = 0, int nSkewDegY = 0); - int GetWidth(); - int GetHeight(); + int GetWidth() const; + int GetHeight() const; void InvertColors(); void Clear(COLORREF color = 0x00ffffff); HDC GetDC();

2 years, 12 months

← Newer
1
2
3
4
5
6
7
...
16
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 December 2021