Ros-diffs February 2021

ros-diffs@reactos.org

30 participants
434 discussions

[reactos] 01/01: [SOLITAIRE] Add undo feature & fix occasionally invisible cards (#3422)

by Tibor Lajos Füzi

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9dff498b21da9e6b60bd1… commit 9dff498b21da9e6b60bd12d1d14de5f411382ff4 Author: Tibor Lajos Füzi <tibor.fuzi(a)gmail.com> AuthorDate: Sun Feb 28 22:31:19 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 28 22:31:19 2021 +0100 [SOLITAIRE] Add undo feature & fix occasionally invisible cards (#3422) Two issues are addressed: CORE-2189: missing undo feature Works the same way as solitaire in windows xp: - only 1 action can be undone; - the player gets -2 points in standard score mode; - the undo action resets when the player clicks on a row stack to turn the top card. CORE-11148: invisible cards This happens in 3-card mode, when only 1 card left in the deck. The fix for this is to modify the pile stack to contain all the face-up cards. It was actually already in the code somewhere else, so I turned it into a separate function. --- base/applications/games/solitaire/CMakeLists.txt | 1 + base/applications/games/solitaire/lang/bg-BG.rc | 1 + base/applications/games/solitaire/lang/ca-ES.rc | 1 + base/applications/games/solitaire/lang/cs-CZ.rc | 1 + base/applications/games/solitaire/lang/de-DE.rc | 1 + base/applications/games/solitaire/lang/el-GR.rc | 1 + base/applications/games/solitaire/lang/en-US.rc | 1 + base/applications/games/solitaire/lang/es-ES.rc | 1 + base/applications/games/solitaire/lang/eu-ES.rc | 1 + base/applications/games/solitaire/lang/fr-FR.rc | 1 + base/applications/games/solitaire/lang/he-IL.rc | 1 + base/applications/games/solitaire/lang/hu-HU.rc | 1 + base/applications/games/solitaire/lang/id-ID.rc | 1 + base/applications/games/solitaire/lang/it-IT.rc | 1 + base/applications/games/solitaire/lang/ja-JP.rc | 1 + base/applications/games/solitaire/lang/ko-KR.rc | 1 + base/applications/games/solitaire/lang/lt-LT.rc | 1 + base/applications/games/solitaire/lang/nl-NL.rc | 1 + base/applications/games/solitaire/lang/no-NO.rc | 1 + base/applications/games/solitaire/lang/pl-PL.rc | 1 + base/applications/games/solitaire/lang/pt-BR.rc | 1 + base/applications/games/solitaire/lang/ro-RO.rc | 1 + base/applications/games/solitaire/lang/ru-RU.rc | 1 + base/applications/games/solitaire/lang/sk-SK.rc | 1 + base/applications/games/solitaire/lang/sq-AL.rc | 1 + base/applications/games/solitaire/lang/sv-SE.rc | 1 + base/applications/games/solitaire/lang/th-TH.rc | 1 + base/applications/games/solitaire/lang/tr-TR.rc | 1 + base/applications/games/solitaire/lang/uk-UA.rc | 1 + base/applications/games/solitaire/lang/zh-CN.rc | 1 + base/applications/games/solitaire/lang/zh-TW.rc | 1 + base/applications/games/solitaire/resource.h | 11 +- base/applications/games/solitaire/solcreate.cpp | 2 - base/applications/games/solitaire/solgame.cpp | 50 +++++-- base/applications/games/solitaire/solitaire.cpp | 20 ++- base/applications/games/solitaire/solitaire.h | 7 + base/applications/games/solitaire/solundo.cpp | 171 +++++++++++++++++++++++ 37 files changed, 276 insertions(+), 16 deletions(-) diff --git a/base/applications/games/solitaire/CMakeLists.txt b/base/applications/games/solitaire/CMakeLists.txt index a0f083774ad..a229418320a 100644 --- a/base/applications/games/solitaire/CMakeLists.txt +++ b/base/applications/games/solitaire/CMakeLists.txt @@ -2,6 +2,7 @@ list(APPEND SOURCE solcreate.cpp solgame.cpp + solundo.cpp solitaire.cpp solitaire.h) diff --git a/base/applications/games/solitaire/lang/bg-BG.rc b/base/applications/games/solitaire/lang/bg-BG.rc index a19f9edf2cf..2b8a79bf8b5 100644 --- a/base/applications/games/solitaire/lang/bg-BG.rc +++ b/base/applications/games/solitaire/lang/bg-BG.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Раздаване\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Тесте...", IDM_GAME_DECK MENUITEM "&Настройки...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/ca-ES.rc b/base/applications/games/solitaire/lang/ca-ES.rc index 1a8a0d1f68f..231eb5589b3 100644 --- a/base/applications/games/solitaire/lang/ca-ES.rc +++ b/base/applications/games/solitaire/lang/ca-ES.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "R&eparteix\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Barallar...", IDM_GAME_DECK MENUITEM "&Opcions...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/cs-CZ.rc b/base/applications/games/solitaire/lang/cs-CZ.rc index 58060af83ad..bb61acd6295 100644 --- a/base/applications/games/solitaire/lang/cs-CZ.rc +++ b/base/applications/games/solitaire/lang/cs-CZ.rc @@ -69,6 +69,7 @@ BEGIN BEGIN MENUITEM "&Rozdat\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "Rub& karet...", IDM_GAME_DECK MENUITEM "&Možnosti...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/de-DE.rc b/base/applications/games/solitaire/lang/de-DE.rc index 331096f604a..3211c65648b 100644 --- a/base/applications/games/solitaire/lang/de-DE.rc +++ b/base/applications/games/solitaire/lang/de-DE.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Karten geben\t F2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Deckblatt...", IDM_GAME_DECK MENUITEM "&Optionen...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/el-GR.rc b/base/applications/games/solitaire/lang/el-GR.rc index 7dbaa6e8450..08707ffce52 100644 --- a/base/applications/games/solitaire/lang/el-GR.rc +++ b/base/applications/games/solitaire/lang/el-GR.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Deal\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "De&ck...", IDM_GAME_DECK MENUITEM "&Επιλογές...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/en-US.rc b/base/applications/games/solitaire/lang/en-US.rc index 46abfe30d90..b8111ee7e2b 100644 --- a/base/applications/games/solitaire/lang/en-US.rc +++ b/base/applications/games/solitaire/lang/en-US.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Deal\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "De&ck...", IDM_GAME_DECK MENUITEM "&Options...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/es-ES.rc b/base/applications/games/solitaire/lang/es-ES.rc index 3a3222a558f..16d1944faa8 100644 --- a/base/applications/games/solitaire/lang/es-ES.rc +++ b/base/applications/games/solitaire/lang/es-ES.rc @@ -73,6 +73,7 @@ BEGIN BEGIN MENUITEM "&Repartir\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Barajas...", IDM_GAME_DECK MENUITEM "&Opciones...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/eu-ES.rc b/base/applications/games/solitaire/lang/eu-ES.rc index 8a3c97956b4..064f283d75e 100644 --- a/base/applications/games/solitaire/lang/eu-ES.rc +++ b/base/applications/games/solitaire/lang/eu-ES.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Banatu\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Barajak...", IDM_GAME_DECK MENUITEM "&Aukerak...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/fr-FR.rc b/base/applications/games/solitaire/lang/fr-FR.rc index f1f874719cd..2f81611d373 100644 --- a/base/applications/games/solitaire/lang/fr-FR.rc +++ b/base/applications/games/solitaire/lang/fr-FR.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Donne\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Jeux...", IDM_GAME_DECK MENUITEM "&Options...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/he-IL.rc b/base/applications/games/solitaire/lang/he-IL.rc index 49129736df4..dda42542783 100644 --- a/base/applications/games/solitaire/lang/he-IL.rc +++ b/base/applications/games/solitaire/lang/he-IL.rc @@ -73,6 +73,7 @@ BEGIN BEGIN MENUITEM "&חלק\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "ח&פיסה...", IDM_GAME_DECK MENUITEM "&אפשרויות", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/hu-HU.rc b/base/applications/games/solitaire/lang/hu-HU.rc index 2dad6759ef1..13633305d71 100644 --- a/base/applications/games/solitaire/lang/hu-HU.rc +++ b/base/applications/games/solitaire/lang/hu-HU.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Osztás\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Visszavonás", IDM_GAME_UNDO, GRAYED MENUITEM "&Hátlap...", IDM_GAME_DECK MENUITEM "&Beállítások...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/id-ID.rc b/base/applications/games/solitaire/lang/id-ID.rc index a2af672ed89..b877e5ae7a1 100644 --- a/base/applications/games/solitaire/lang/id-ID.rc +++ b/base/applications/games/solitaire/lang/id-ID.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Main Baru\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Dek...", IDM_GAME_DECK MENUITEM "&Pilihan...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/it-IT.rc b/base/applications/games/solitaire/lang/it-IT.rc index c767ebff5ea..845f574e154 100644 --- a/base/applications/games/solitaire/lang/it-IT.rc +++ b/base/applications/games/solitaire/lang/it-IT.rc @@ -72,6 +72,7 @@ BEGIN BEGIN MENUITEM "&Dai carte\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "Maz&zo...", IDM_GAME_DECK MENUITEM "O&pzioni...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/ja-JP.rc b/base/applications/games/solitaire/lang/ja-JP.rc index cba2e976ac1..fc8bd2fa945 100644 --- a/base/applications/games/solitaire/lang/ja-JP.rc +++ b/base/applications/games/solitaire/lang/ja-JP.rc @@ -70,6 +70,7 @@ BEGIN BEGIN MENUITEM "カードを配る(&D)\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "カードの装飾(&C)...", IDM_GAME_DECK MENUITEM "オプション(&O)...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/ko-KR.rc b/base/applications/games/solitaire/lang/ko-KR.rc index b59f7841038..5c16be49a6b 100644 --- a/base/applications/games/solitaire/lang/ko-KR.rc +++ b/base/applications/games/solitaire/lang/ko-KR.rc @@ -65,6 +65,7 @@ BEGIN BEGIN MENUITEM "새 게임(&D)\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "덱(&C)...", IDM_GAME_DECK /* FIXME: is 덱 correct? */ MENUITEM "옵션(&O)...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/lt-LT.rc b/base/applications/games/solitaire/lang/lt-LT.rc index 38b9219d929..dbb674c3857 100644 --- a/base/applications/games/solitaire/lang/lt-LT.rc +++ b/base/applications/games/solitaire/lang/lt-LT.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Dalinti\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Malka...", IDM_GAME_DECK MENUITEM "&Nuostatos...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/nl-NL.rc b/base/applications/games/solitaire/lang/nl-NL.rc index d8bed184acd..6e71cd9fc59 100644 --- a/base/applications/games/solitaire/lang/nl-NL.rc +++ b/base/applications/games/solitaire/lang/nl-NL.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Delen\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Kaarten...", IDM_GAME_DECK MENUITEM "&Opties...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/no-NO.rc b/base/applications/games/solitaire/lang/no-NO.rc index c9c9e259436..79600a528cb 100644 --- a/base/applications/games/solitaire/lang/no-NO.rc +++ b/base/applications/games/solitaire/lang/no-NO.rc @@ -63,6 +63,7 @@ BEGIN BEGIN MENUITEM "&Del ut\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "Kort&stokk...", IDM_GAME_DECK MENUITEM "&Valg...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/pl-PL.rc b/base/applications/games/solitaire/lang/pl-PL.rc index bb046fb80e4..af7615ff881 100644 --- a/base/applications/games/solitaire/lang/pl-PL.rc +++ b/base/applications/games/solitaire/lang/pl-PL.rc @@ -73,6 +73,7 @@ BEGIN BEGIN MENUITEM "&Rozdaj\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Talia...", IDM_GAME_DECK MENUITEM "&Opcje...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/pt-BR.rc b/base/applications/games/solitaire/lang/pt-BR.rc index b51054578cb..6f8563bc8a2 100644 --- a/base/applications/games/solitaire/lang/pt-BR.rc +++ b/base/applications/games/solitaire/lang/pt-BR.rc @@ -65,6 +65,7 @@ BEGIN BEGIN MENUITEM "&Novo Jogo\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "Baralho...", IDM_GAME_DECK MENUITEM "&Opções...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/ro-RO.rc b/base/applications/games/solitaire/lang/ro-RO.rc index fdffea90cae..4e14430b7a2 100644 --- a/base/applications/games/solitaire/lang/ro-RO.rc +++ b/base/applications/games/solitaire/lang/ro-RO.rc @@ -73,6 +73,7 @@ BEGIN BEGIN MENUITEM "Rundă &nouă\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "Culoare &dorsală…", IDM_GAME_DECK MENUITEM "&Opțiuni…", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/ru-RU.rc b/base/applications/games/solitaire/lang/ru-RU.rc index 3e97b0c859e..047ce7487f8 100644 --- a/base/applications/games/solitaire/lang/ru-RU.rc +++ b/base/applications/games/solitaire/lang/ru-RU.rc @@ -65,6 +65,7 @@ BEGIN BEGIN MENUITEM "Н&овая игра\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Обложки...", IDM_GAME_DECK MENUITEM "&Настройки...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/sk-SK.rc b/base/applications/games/solitaire/lang/sk-SK.rc index 69f57b46f90..11a33849c43 100644 --- a/base/applications/games/solitaire/lang/sk-SK.rc +++ b/base/applications/games/solitaire/lang/sk-SK.rc @@ -72,6 +72,7 @@ BEGIN BEGIN MENUITEM "&Rozdať\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Balíček...", IDM_GAME_DECK MENUITEM "&Možnosti...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/sq-AL.rc b/base/applications/games/solitaire/lang/sq-AL.rc index 1e2f3b00af7..02400e87f51 100644 --- a/base/applications/games/solitaire/lang/sq-AL.rc +++ b/base/applications/games/solitaire/lang/sq-AL.rc @@ -72,6 +72,7 @@ BEGIN BEGIN MENUITEM "&Ndaj Letrat\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "Pa&ko...", IDM_GAME_DECK MENUITEM "&Opsione...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/sv-SE.rc b/base/applications/games/solitaire/lang/sv-SE.rc index c1d15301f1d..d548ee8670f 100644 --- a/base/applications/games/solitaire/lang/sv-SE.rc +++ b/base/applications/games/solitaire/lang/sv-SE.rc @@ -63,6 +63,7 @@ BEGIN BEGIN MENUITEM "&Ge\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Kortlek...", IDM_GAME_DECK MENUITEM "&Alternativ...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/th-TH.rc b/base/applications/games/solitaire/lang/th-TH.rc index ebabeab9946..c5e8486224e 100644 --- a/base/applications/games/solitaire/lang/th-TH.rc +++ b/base/applications/games/solitaire/lang/th-TH.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "แ&จกไพ่\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "แ&ต่งไพ่...", IDM_GAME_DECK MENUITEM "&ตัวเลือก...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/tr-TR.rc b/base/applications/games/solitaire/lang/tr-TR.rc index e53de0d0f4f..57ce217bffd 100644 --- a/base/applications/games/solitaire/lang/tr-TR.rc +++ b/base/applications/games/solitaire/lang/tr-TR.rc @@ -72,6 +72,7 @@ BEGIN BEGIN MENUITEM "&Dağıt\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "D&esteler...", IDM_GAME_DECK MENUITEM "&Seçenekler...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/uk-UA.rc b/base/applications/games/solitaire/lang/uk-UA.rc index 299492e8022..c65482340e7 100644 --- a/base/applications/games/solitaire/lang/uk-UA.rc +++ b/base/applications/games/solitaire/lang/uk-UA.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "&Роздати карти\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "&Колода...", IDM_GAME_DECK MENUITEM "Па&раметри...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/zh-CN.rc b/base/applications/games/solitaire/lang/zh-CN.rc index 5487ba8b1ca..18e8a067444 100644 --- a/base/applications/games/solitaire/lang/zh-CN.rc +++ b/base/applications/games/solitaire/lang/zh-CN.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "发牌(&D)\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "背面图案(&C)...", IDM_GAME_DECK MENUITEM "选项(&O)...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/lang/zh-TW.rc b/base/applications/games/solitaire/lang/zh-TW.rc index ff8c2410ed8..8cc1aa8225b 100644 --- a/base/applications/games/solitaire/lang/zh-TW.rc +++ b/base/applications/games/solitaire/lang/zh-TW.rc @@ -71,6 +71,7 @@ BEGIN BEGIN MENUITEM "發牌(&D)\tF2", IDM_GAME_NEW MENUITEM SEPARATOR + MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED MENUITEM "背面圖案(&C)...", IDM_GAME_DECK MENUITEM "選項(&O)...", IDM_GAME_OPTIONS MENUITEM SEPARATOR diff --git a/base/applications/games/solitaire/resource.h b/base/applications/games/solitaire/resource.h index 0b221bc4f9c..680ec9fbb51 100644 --- a/base/applications/games/solitaire/resource.h +++ b/base/applications/games/solitaire/resource.h @@ -8,11 +8,12 @@ /* Menu */ #define IDM_GAME_NEW 1001 -#define IDM_GAME_DECK 1002 -#define IDM_GAME_OPTIONS 1003 -#define IDM_GAME_EXIT 1004 -#define IDM_HELP_CONTENTS 1005 -#define IDM_HELP_ABOUT 1006 +#define IDM_GAME_UNDO 1002 +#define IDM_GAME_DECK 1003 +#define IDM_GAME_OPTIONS 1004 +#define IDM_GAME_EXIT 1005 +#define IDM_HELP_CONTENTS 1006 +#define IDM_HELP_ABOUT 1007 /* Dialogs */ #define IDD_OPTIONS 1200 diff --git a/base/applications/games/solitaire/solcreate.cpp b/base/applications/games/solitaire/solcreate.cpp index 00d29d856d6..64af9b11ba6 100644 --- a/base/applications/games/solitaire/solcreate.cpp +++ b/base/applications/games/solitaire/solcreate.cpp @@ -5,8 +5,6 @@ CardRegion *pPile; CardRegion *pSuitStack[4]; CardRegion *pRowStack[NUM_ROW_STACKS]; -extern CardStack activepile; - HBITMAP hbmBitmap; HDC hdcBitmap; int yRowStackCardOffset; diff --git a/base/applications/games/solitaire/solgame.cpp b/base/applications/games/solitaire/solgame.cpp index f1322647dba..19219b8f9f4 100644 --- a/base/applications/games/solitaire/solgame.cpp +++ b/base/applications/games/solitaire/solgame.cpp @@ -10,6 +10,7 @@ extern TCHAR MsgWin[128]; extern TCHAR MsgDeal[128]; CardStack activepile; +int VisiblePileCards; int LastId; bool fGameStarted = false; bool bAutoroute = false; @@ -53,6 +54,7 @@ void NewGame(void) deck.NewDeck(); deck.Shuffle(); activepile.Clear(); + VisiblePileCards = 0; //deal to each row stack.. for(i = 0; i < NUM_ROW_STACKS; i++) @@ -85,6 +87,7 @@ void NewGame(void) dwPrevMode = GetScoreMode(); UpdateStatusBar(); + ClearUndo(); TRACE("EXIT NewGame()\n"); @@ -160,6 +163,8 @@ bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj, CardStack &dragcards) fGameStarted = true; + SetUndo(LastId, stackobj.Id(), dragcards.NumCards(), lScore, VisiblePileCards); + if (LastId == PILE_ID) { if (GetScoreMode() == SCORE_STD) @@ -245,6 +250,8 @@ bool CARDLIBPROC SuitStackDropProc(CardRegion &stackobj, CardStack &dragcards) if (b) { + SetUndo(LastId, stackobj.Id(), 1, lScore, VisiblePileCards); + if ((LastId == PILE_ID) || (LastId >= ROW_ID)) { if (GetScoreMode() == SCORE_VEGAS) @@ -300,6 +307,7 @@ void CARDLIBPROC RowStackClickProc(CardRegion &stackobj, int iNumClicked) lScore = lScore + 5; UpdateStatusBar(); } + ClearUndo(); } LastId = stackobj.Id(); @@ -363,6 +371,7 @@ void CARDLIBPROC SuitStackAddProc(CardRegion &stackobj, const CardStack &added) } UpdateStatusBar(); + ClearUndo(); MessageBox(SolWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION); @@ -450,6 +459,22 @@ void CARDLIBPROC PileDblClickProc(CardRegion &stackobj, int iNumClicked) TRACE("EXIT PileDblClickProc()\n"); } +// +// Fix for the 3-card play when only 1 card left on the pile. +// +void FixIfOneCardLeft(void) +{ + // If there is just 1 card left, then modify the + // stack to contain ALL the face-up cards. The effect + // will be, the next time a card is dragged, all the + // previous card-triplets will be available underneath. + if ((dwOptions & OPTION_THREE_CARDS) && pPile->NumCards() == 1) + { + pPile->SetOffsets(0, 0); + pPile->SetCardStack(activepile); + } +} + // // What happens when a card is removed from face-up pile? // @@ -462,16 +487,13 @@ void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iItems) //modify our "virtual" pile by removing the same card //that was removed from the physical card stack activepile.Pop(iItems); - - //if there is just 1 card left, then modify the - //stack to contain ALL the face-up cards..the effect - //will be, the next time a card is dragged, all the - //previous card-triplets will be available underneath - if(stackobj.NumCards() == 1) + if ((dwOptions & OPTION_THREE_CARDS) && (VisiblePileCards > 1)) { - stackobj.SetOffsets(0,0); - stackobj.SetCardStack(activepile); + --VisiblePileCards; } + + FixIfOneCardLeft(); + TRACE("EXIT PileRemoveProc()\n"); } @@ -506,10 +528,13 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked) activepile.Reverse(); cardstack.Push(activepile); activepile.Clear(); + SetUndo(PILE_ID, DECK_ID, cardstack.NumCards(), lScore, VisiblePileCards); + VisiblePileCards = 0; } } else if (GetScoreMode() == SCORE_STD) { + SetUndo(PILE_ID, DECK_ID, activepile.NumCards(), lScore, VisiblePileCards); if ((dwWasteCount >= dwWasteTreshold) && (activepile.NumCards() != 0)) { if (dwOptions & OPTION_THREE_CARDS) @@ -523,6 +548,7 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked) activepile.Reverse(); cardstack.Push(activepile); activepile.Clear(); + VisiblePileCards = 0; UpdateStatusBar(); } @@ -533,6 +559,8 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked) activepile.Reverse(); cardstack.Push(activepile); activepile.Clear(); + SetUndo(PILE_ID, DECK_ID, cardstack.NumCards(), lScore, VisiblePileCards); + VisiblePileCards = 0; } dwWasteCount++; @@ -541,6 +569,8 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked) { int numcards = min((dwOptions & OPTION_THREE_CARDS) ? 3 : 1, cardstack.NumCards()); + SetUndo(DECK_ID, PILE_ID, numcards, lScore, VisiblePileCards); + //make a "visible" copy of these cards CardStack temp; temp = cardstack.Pop(numcards); @@ -553,6 +583,8 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked) //remove the top 3 from deck activepile.Push(temp); + + VisiblePileCards = numcards; } activepile.Print(); @@ -560,6 +592,8 @@ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int iNumClicked) pDeck->SetCardStack(cardstack); pPile->SetCardStack(pile); + FixIfOneCardLeft(); + SolWnd.Redraw(); TRACE("EXIT DeckClickProc()\n"); } diff --git a/base/applications/games/solitaire/solitaire.cpp b/base/applications/games/solitaire/solitaire.cpp index 84895cb5701..529f6ba56e9 100644 --- a/base/applications/games/solitaire/solitaire.cpp +++ b/base/applications/games/solitaire/solitaire.cpp @@ -12,6 +12,7 @@ DWORD dwAppStartTime; HWND hwndMain; HWND hwndStatus; HINSTANCE hInstance; +HMENU hGameMenu; TCHAR szAppName[128]; TCHAR szScore[64]; @@ -178,6 +179,18 @@ void SetPlayTimer(void) } } +void SetUndoMenuState(bool enable) +{ + if (enable) + { + EnableMenuItem(hGameMenu, IDM_GAME_UNDO, MF_BYCOMMAND | MF_ENABLED); + } + else + { + EnableMenuItem(hGameMenu, IDM_GAME_UNDO, MF_BYCOMMAND | MF_GRAYED); + } +} + // // Main entry point // @@ -248,6 +261,8 @@ int WINAPI _tWinMain(HINSTANCE hInst, HINSTANCE hPrev, LPTSTR szCmdLine, int iCm hwndMain = hwnd; + hGameMenu = GetSubMenu(GetMenu(hwndMain), 0); + UpdateStatusBar(); ShowWindow(hwnd, iCmdShow); @@ -706,6 +721,10 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) NewGame(); return 0; + case IDM_GAME_UNDO: + Undo(); + return 0; + case IDM_GAME_DECK: ShowDeckOptionsDlg(hwnd); return 0; @@ -753,4 +772,3 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) } - diff --git a/base/applications/games/solitaire/solitaire.h b/base/applications/games/solitaire/solitaire.h index 9905ec51a9a..2254b7abb58 100644 --- a/base/applications/games/solitaire/solitaire.h +++ b/base/applications/games/solitaire/solitaire.h @@ -54,15 +54,18 @@ void NewGame(void); #define Y_BORDERWITHFRAME 20 #define Y_ROWSTACK_BORDER 32 extern int yRowStackCardOffset; +extern int VisiblePileCards; extern CardRegion *pDeck; extern CardRegion *pPile; extern CardRegion *pSuitStack[]; extern CardRegion *pRowStack[]; +extern CardStack activepile; extern void UpdateStatusBar(void); extern void SetPlayTimer(void); extern int GetScoreMode(void); +extern void SetUndoMenuState(bool enable); bool CARDLIBPROC RowStackDragProc(CardRegion &stackobj, int iNumCards); bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj, CardStack &dragcards); @@ -80,5 +83,9 @@ void CARDLIBPROC PileClickProc(CardRegion &stackobj, int iNumClicked); void CARDLIBPROC PileRemoveProc(CardRegion &stackobj, int iRemoved); +void SetUndo(int set_source_id, int set_destination_id, int set_number_of_cards, int set_prev_score, int set_prev_visible_pile_cards); +void ClearUndo(void); +void Undo(void); + #endif /* _SOL_PCH_ */ diff --git a/base/applications/games/solitaire/solundo.cpp b/base/applications/games/solitaire/solundo.cpp new file mode 100644 index 00000000000..ef509255889 --- /dev/null +++ b/base/applications/games/solitaire/solundo.cpp @@ -0,0 +1,171 @@ +/* + * PROJECT: Solitaire + * LICENSE: See COPYING in top level directory + * FILE: base/applications/games/solitaire/solundo.cpp + * PURPOSE: Undo module for Solitaire + * PROGRAMMER: Tibor Lajos Füzi + */ + +#include "solitaire.h" + +// source_id and destination_id store the source and destination of the cards +// that were moved. These ids are defined in solitaire.h and can be DECK_ID, PILE_ID, +// [SUIT_ID..SUIT_ID + 3], [ROW_ID..ROW_ID + NUM_ROW_STACKS - 1]. +// -1 means that there is no action stored in the undo module. +static int source_id = -1; +static int destination_id = -1; + +// Number of cards that were moved. +static int number_of_cards = 0; + +// The score before the action was taken. +static int prev_score = 0; + +// The number of visible pile cards before the action was taken. +static int prev_visible_pile_cards = 0; + +void SetUndo( + int set_source_id, + int set_destination_id, + int set_number_of_cards, + int set_prev_score, + int set_prev_visible_pile_cards) +{ + if ((set_source_id == set_destination_id) || (set_number_of_cards == 0)) + return; + + source_id = set_source_id; + destination_id = set_destination_id; + number_of_cards = set_number_of_cards; + prev_score = set_prev_score; + prev_visible_pile_cards = set_prev_visible_pile_cards; + SetUndoMenuState(true); +} + +void ClearUndo(void) +{ + source_id = -1; + destination_id = -1; + number_of_cards = 0; + SetUndoMenuState(false); +} + +void Undo(void) +{ + CardRegion *source = NULL; + CardRegion *destination = NULL; + + if ((source_id < 1) || + (source_id > (ROW_ID + NUM_ROW_STACKS - 1)) || + (destination_id < 1) || + (destination_id > (ROW_ID + NUM_ROW_STACKS - 1)) || + (number_of_cards < 1)) + { + ClearUndo(); + return; + } + + if (source_id >= ROW_ID) + source = pRowStack[source_id - ROW_ID]; + else if ((source_id >= SUIT_ID) && (source_id < SUIT_ID + 4)) + source = pSuitStack[source_id - SUIT_ID]; + else if (source_id == PILE_ID) + source = pPile; + else if (source_id == DECK_ID) + source = pDeck; + + if (destination_id >= ROW_ID) + destination = pRowStack[destination_id - ROW_ID]; + else if ((destination_id >= SUIT_ID) && (destination_id < SUIT_ID + 4)) + destination = pSuitStack[destination_id - SUIT_ID]; + else if (destination_id == PILE_ID) + destination = pPile; + else if (destination_id == DECK_ID) + destination = pDeck; + + if (destination == NULL || source == NULL) + { + ClearUndo(); + return; + } + + // If the player clicked on the deck. + if (destination == pPile && source == pDeck) + { + // Put back the cards on the deck in reversed order. + CardStack tmp = activepile.Pop(number_of_cards); + tmp.Reverse(); + source->Push(tmp); + // Restore the pile to be the top cards in the active pile. + destination->Clear(); + if (prev_visible_pile_cards <= 1) + { + destination->SetOffsets(0,0); + destination->SetCardStack(activepile); + } + else + { + tmp = activepile.Top(prev_visible_pile_cards); + destination->SetOffsets(CS_DEFXOFF, 1); + destination->Push(tmp); + } + VisiblePileCards = prev_visible_pile_cards; + } + + // If the player clicked on the empty deck. + else if (source == pPile && destination == pDeck) + { + // Put back all the cards from the deck to the active pile in reversed order. + destination->Reverse(); + activepile.Push(destination->GetCardStack()); + destination->Clear(); + if (prev_visible_pile_cards <= 1) + { + source->SetOffsets(0,0); + source->SetCardStack(activepile); + } + else + { + CardStack tmp = activepile.Top(prev_visible_pile_cards); + source->SetOffsets(CS_DEFXOFF, 1); + source->Push(tmp); + } + VisiblePileCards = prev_visible_pile_cards; + } + + // If the player moved one card from the pile. + else if (source == pPile) + { + CardStack tmp = destination->Pop(1); + activepile.Push(tmp); + if (prev_visible_pile_cards <= 1) + { + source->Push(tmp); + } + else + { + source->Clear(); + tmp = activepile.Top(prev_visible_pile_cards); + source->Push(tmp); + source->SetOffsets(CS_DEFXOFF, 1); + } + VisiblePileCards = prev_visible_pile_cards; + } + + // If the player moved cards between row stacks / suit stacks. + else + { + destination->MoveCard(source, number_of_cards, false); + } + + lScore = prev_score; + + // -2 points for the undo in standard score mode. + if (GetScoreMode() == SCORE_STD) + lScore = lScore >= 2 ? lScore - 2 : 0; + + UpdateStatusBar(); + + SolWnd.Redraw(); + ClearUndo(); +}

3 years, 6 months

[reactos] 01/01: [MSGINA][SHELL32] Rework friendly UI shutdown dialog box and implement friendly UI log off dialog box (#3399)

by Arnav Bhatt

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd39a292af70a5854f4e6… commit fd39a292af70a5854f4e63f3a017f6ff3df5dacb Author: Arnav Bhatt <arnavbhatt288(a)gmail.com> AuthorDate: Sun Feb 28 11:03:35 2021 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 28 20:03:35 2021 +0900 [MSGINA][SHELL32] Rework friendly UI shutdown dialog box and implement friendly UI log off dialog box (#3399) Implement the re-worked shut down dialog box as well as implementing fancy log off dialog box. - Fancy shut down dialog box has been redesigned to be more comparable to of XP. - Implement features that were missing earlier. - Implement the fancy log off dialog which is more comparable to of XP. --- dll/win32/msgina/lang/bg-BG.rc | 40 +- dll/win32/msgina/lang/cs-CZ.rc | 40 +- dll/win32/msgina/lang/de-DE.rc | 40 +- dll/win32/msgina/lang/en-US.rc | 40 +- dll/win32/msgina/lang/es-ES.rc | 40 +- dll/win32/msgina/lang/fr-FR.rc | 40 +- dll/win32/msgina/lang/he-IL.rc | 40 +- dll/win32/msgina/lang/hu-HU.rc | 40 +- dll/win32/msgina/lang/id-ID.rc | 40 +- dll/win32/msgina/lang/it-IT.rc | 40 +- dll/win32/msgina/lang/ja-JP.rc | 41 +- dll/win32/msgina/lang/no-NO.rc | 40 +- dll/win32/msgina/lang/pl-PL.rc | 40 +- dll/win32/msgina/lang/pt-PT.rc | 40 +- dll/win32/msgina/lang/ro-RO.rc | 40 +- dll/win32/msgina/lang/ru-RU.rc | 40 +- dll/win32/msgina/lang/sk-SK.rc | 40 +- dll/win32/msgina/lang/sq-AL.rc | 40 +- dll/win32/msgina/lang/tr-TR.rc | 40 +- dll/win32/msgina/lang/uk-UA.rc | 40 +- dll/win32/msgina/lang/zh-CN.rc | 40 +- dll/win32/msgina/lang/zh-TW.rc | 43 +- dll/win32/msgina/msgina.rc | 3 + dll/win32/msgina/resource.h | 41 +- dll/win32/msgina/resources/README.txt | 15 + dll/win32/msgina/resources/dlg_bg.bmp | Bin 0 -> 185382 bytes dll/win32/msgina/resources/image_strip.bmp | Bin 0 -> 33054 bytes dll/win32/msgina/resources/reactos_flag.bmp | Bin 0 -> 5814 bytes dll/win32/msgina/resources/svg/background.svg | 191 +++++++ dll/win32/msgina/resources/svg/flag.svg | 123 +++++ dll/win32/msgina/resources/{ => svg}/line.svg | 0 dll/win32/msgina/resources/{ => svg}/reactos.svg | 0 dll/win32/msgina/resources/svg/reboot.svg | 392 ++++++++++++++ dll/win32/msgina/resources/svg/shut_down.svg | 331 ++++++++++++ dll/win32/msgina/resources/svg/sleep_hibernate.svg | 403 ++++++++++++++ dll/win32/msgina/shutdown.c | 580 ++++++++++++++++++++- dll/win32/shell32/bitmap_res.rc | 4 + dll/win32/shell32/dialogs/dialogs.cpp | 433 ++++++++++++++- dll/win32/shell32/lang/bg-BG.rc | 20 + dll/win32/shell32/lang/ca-ES.rc | 20 + dll/win32/shell32/lang/cs-CZ.rc | 20 + dll/win32/shell32/lang/da-DK.rc | 20 + dll/win32/shell32/lang/de-DE.rc | 20 + dll/win32/shell32/lang/el-GR.rc | 20 + dll/win32/shell32/lang/en-GB.rc | 20 + dll/win32/shell32/lang/en-US.rc | 20 + dll/win32/shell32/lang/es-ES.rc | 20 + dll/win32/shell32/lang/et-EE.rc | 20 + dll/win32/shell32/lang/fi-FI.rc | 20 + dll/win32/shell32/lang/fr-FR.rc | 20 + dll/win32/shell32/lang/he-IL.rc | 20 + dll/win32/shell32/lang/hi-IN.rc | 20 + dll/win32/shell32/lang/hu-HU.rc | 20 + dll/win32/shell32/lang/id-ID.rc | 20 + dll/win32/shell32/lang/it-IT.rc | 20 + dll/win32/shell32/lang/ja-JP.rc | 20 + dll/win32/shell32/lang/ko-KR.rc | 20 + dll/win32/shell32/lang/nl-NL.rc | 20 + dll/win32/shell32/lang/no-NO.rc | 20 + dll/win32/shell32/lang/pl-PL.rc | 20 + dll/win32/shell32/lang/pt-BR.rc | 20 + dll/win32/shell32/lang/pt-PT.rc | 20 + dll/win32/shell32/lang/ro-RO.rc | 20 + dll/win32/shell32/lang/ru-RU.rc | 20 + dll/win32/shell32/lang/sk-SK.rc | 20 + dll/win32/shell32/lang/sl-SI.rc | 20 + dll/win32/shell32/lang/sq-AL.rc | 20 + dll/win32/shell32/lang/sv-SE.rc | 20 + dll/win32/shell32/lang/tr-TR.rc | 20 + dll/win32/shell32/lang/uk-UA.rc | 20 + dll/win32/shell32/lang/zh-CN.rc | 20 + dll/win32/shell32/lang/zh-TW.rc | 20 + dll/win32/shell32/res/bitmaps/Readme.txt | 10 + dll/win32/shell32/res/bitmaps/dlg_bg.bmp | Bin 0 -> 185382 bytes dll/win32/shell32/res/bitmaps/image_strip.bmp | Bin 0 -> 23154 bytes dll/win32/shell32/res/bitmaps/reactos_flag.bmp | Bin 0 -> 5814 bytes dll/win32/shell32/res/bitmaps/svg/log_off.svg | 389 ++++++++++++++ dll/win32/shell32/res/bitmaps/svg/switch_user.svg | 394 ++++++++++++++ dll/win32/shell32/shresdef.h | 19 + 79 files changed, 4659 insertions(+), 233 deletions(-) diff --git a/dll/win32/msgina/lang/bg-BG.rc b/dll/win32/msgina/lang/bg-BG.rc index 128cb2a2d16..e9a3592e227 100644 --- a/dll/win32/msgina/lang/bg-BG.rc +++ b/dll/win32/msgina/lang/bg-BG.rc @@ -172,17 +172,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Изключване на РеактОС" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Изключване", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Отказ", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Изключване", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Отказ", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Изключване на РеактОС", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Sleep", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Изключване", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Изключване", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Отказ", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Изключване на РеактОС", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernate", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Sleep", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Изключване", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/cs-CZ.rc b/dll/win32/msgina/lang/cs-CZ.rc index 4fc75643d3b..315efc11b06 100644 --- a/dll/win32/msgina/lang/cs-CZ.rc +++ b/dll/win32/msgina/lang/cs-CZ.rc @@ -177,17 +177,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Vypnout ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Uspat", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Vypnout", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Restartovat", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Storno", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernace", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Uspat", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Vypnout", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restartovat", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Storno", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Vypnout ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Uspat", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Vypnout", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Restartovat", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernace", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Uspat", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Vypnout", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restartovat", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Storno", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Vypnout ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernace", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Uspat", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Vypnout", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Restartovat", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/de-DE.rc b/dll/win32/msgina/lang/de-DE.rc index f2e65c2eeca..9f8fe3c47f6 100644 --- a/dll/win32/msgina/lang/de-DE.rc +++ b/dll/win32/msgina/lang/de-DE.rc @@ -172,17 +172,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "ReactOS herunterfahren" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Schlafmodus", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Herunterfahren", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Neustart", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Abbrechen", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Energiesparmodus", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Schlafmodus", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Herunterfahren", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Neustart", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Abbrechen", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "ReactOS herunterfahren", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Schlafmodus", IDC_SLEEP_STATIC, 17, 70, 58, 11 + CTEXT "Herunterfahren", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Neustart", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Energiesparmodus", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Schlafmodus", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Herunterfahren", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Neustart", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Abbrechen", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "ReactOS herunterfahren", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Energiesparmodus", IDC_HIBERNATE_STATIC, 17, 70, 58, 11 + CTEXT "Schlafmodus", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Herunterfahren", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Neustart", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/en-US.rc b/dll/win32/msgina/lang/en-US.rc index e172e228406..f5525052df0 100644 --- a/dll/win32/msgina/lang/en-US.rc +++ b/dll/win32/msgina/lang/en-US.rc @@ -173,17 +173,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Shut Down ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Cancel", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Shut Down ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Sleep", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Shut Down", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Shut Down ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernate", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Sleep", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Shut Down", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/es-ES.rc b/dll/win32/msgina/lang/es-ES.rc index eed6f1b5776..43e75b7739b 100644 --- a/dll/win32/msgina/lang/es-ES.rc +++ b/dll/win32/msgina/lang/es-ES.rc @@ -181,17 +181,39 @@ BEGIN DEFPUSHBUTTON "Aceptar", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Apagar ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Suspender", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Apagar", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Reiniciar", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Cancelar", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernar", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Suspender", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Apagar", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Reiniciar", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancelar", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Apagar ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Suspender", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Apagar", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Reiniciar", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernar", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Suspender", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Apagar", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Reiniciar", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancelar", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Apagar ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernar", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Suspender", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Apagar", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Reiniciar", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/fr-FR.rc b/dll/win32/msgina/lang/fr-FR.rc index 3fbf1c3eeff..6618e61677f 100644 --- a/dll/win32/msgina/lang/fr-FR.rc +++ b/dll/win32/msgina/lang/fr-FR.rc @@ -172,17 +172,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Arrêt de ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "Mettre en &veille", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "Éteindr&e", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Redémarrer", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Annuler", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "Veille &prolongée", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "Mettre en &veille", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Éteindr&e", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Redémarrer", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Annuler", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Arrêt de ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Mettre en veille", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Éteindre", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Redémarrer", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "Veille &prolongée", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Mettre en &veille", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Éteindr&e", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Redémarrer", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Annuler", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Arrêt de ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Veille prolongée", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Mettre en veille", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Éteindre", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Redémarrer", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/he-IL.rc b/dll/win32/msgina/lang/he-IL.rc index d75af6a5362..b625be9fcce 100644 --- a/dll/win32/msgina/lang/he-IL.rc +++ b/dll/win32/msgina/lang/he-IL.rc @@ -172,17 +172,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Shut Down ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Cancel", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Shut Down ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Sleep", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Shut Down", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Shut Down ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernate", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Sleep", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Shut Down", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/hu-HU.rc b/dll/win32/msgina/lang/hu-HU.rc index 269bb6daffc..4eaa3e0f614 100644 --- a/dll/win32/msgina/lang/hu-HU.rc +++ b/dll/win32/msgina/lang/hu-HU.rc @@ -173,17 +173,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "ReactOS leállítása" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Alvás", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Leállítás", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Új&raindítás", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Mégse", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernálás", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Alvás", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Leállítás", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Új&raindítás", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Mégse", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "ReactOS leállítása", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Alvás", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Leállítás", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Újraindítás", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernálás", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Alvás", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Leállítás", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Új&raindítás", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Mégse", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "ReactOS leállítása", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernálás", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Alvás", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Leállítás", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Újraindítás", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/id-ID.rc b/dll/win32/msgina/lang/id-ID.rc index 5270a07b668..9cdbb0eecf0 100644 --- a/dll/win32/msgina/lang/id-ID.rc +++ b/dll/win32/msgina/lang/id-ID.rc @@ -172,17 +172,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Nonaktifkan ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Tidur", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Nonaktifkan", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Mulai &Ulang", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Batal", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernasi", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Tidur", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Nonaktifkan", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Mulai &Ulang", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Batal", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Nonaktifkan ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Tidur", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Nonaktifkan", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Mulai Ulang", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernasi", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Tidur", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Nonaktifkan", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Mulai &Ulang", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Batal", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Nonaktifkan ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernasi", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Tidur", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Nonaktifkan", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Mulai Ulang", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/it-IT.rc b/dll/win32/msgina/lang/it-IT.rc index 58ccf239284..205b59ef30c 100644 --- a/dll/win32/msgina/lang/it-IT.rc +++ b/dll/win32/msgina/lang/it-IT.rc @@ -181,17 +181,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Spegnimento di ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "Sos&pendi", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Spegni", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Riavvia", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Annulla", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Ibernazione", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "Sos&pendi", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Spegni", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Riavvia", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Annulla", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Spegnimento di ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Sospendi", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Spegni", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Riavvia", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Ibernazione", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Sos&pendi", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Spegni", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Riavvia", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Annulla", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Shut Down ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Ibernazione", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Sospendi", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Spegni", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Riavvia", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/ja-JP.rc b/dll/win32/msgina/lang/ja-JP.rc index 4a99eed685f..7b711b43951 100644 --- a/dll/win32/msgina/lang/ja-JP.rc +++ b/dll/win32/msgina/lang/ja-JP.rc @@ -177,17 +177,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "ReactOS のシャットダウン" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 9, "MS UI Gothic" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "スリープ(&P)", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "シャットダウン(&S)", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "再起動(&R)", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "キャンセル", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 180, 2, 32, 26 + PUSHBUTTON "休止(&H)", IDC_BUTTON_HIBERNATE, 30093, 30049, 19, 19, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "スリープ(&P)", IDC_BUTTON_SLEEP, 38, 46, 19, 19, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "シャットダウン(&S)", IDC_BUTTON_SHUTDOWN, 95, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "再起動(&R)", IDC_BUTTON_REBOOT, 152, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "キャンセル", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "ReactOS のシャットダウン", IDC_TURN_OFF_STATIC, 4, 9, 130, 20 + CTEXT "スリープ", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "シャットダウン", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "再起動", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 9, "MS UI Gothic" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 236, 2, 32, 26 + PUSHBUTTON "休止(&H)", IDC_BUTTON_HIBERNATE, 38, 46, 19, 19, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "スリープ(&P)", IDC_BUTTON_SLEEP, 95, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "关闭(&S)", IDC_BUTTON_SHUTDOWN, 152, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "シャットダウン(&R)", IDC_BUTTON_REBOOT, 209, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "キャンセル", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "ReactOS のシャットダウン", IDC_TURN_OFF_STATIC, 4, 9, 130, 20 + CTEXT "休止", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "スリープ", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "シャットダウン", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "再起動", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE @@ -234,3 +256,4 @@ BEGIN IDS_SHUTDOWN_SLEEP_DESC "システムをスリープモードにします。" IDS_SHUTDOWN_HIBERNATE_DESC "現在のセッションを保存し、コンピュータをシャットダウンします。" END + diff --git a/dll/win32/msgina/lang/no-NO.rc b/dll/win32/msgina/lang/no-NO.rc index 21dfd91e1c3..e78d6db9e91 100644 --- a/dll/win32/msgina/lang/no-NO.rc +++ b/dll/win32/msgina/lang/no-NO.rc @@ -172,17 +172,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Slå av ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Avbryt", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Avbryt", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Slå av ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Sleep", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Shut Down", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Avbryt", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Slå av ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernate", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Sleep", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Shut Down", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/pl-PL.rc b/dll/win32/msgina/lang/pl-PL.rc index 8520df64ecd..2b0e05a6849 100644 --- a/dll/win32/msgina/lang/pl-PL.rc +++ b/dll/win32/msgina/lang/pl-PL.rc @@ -183,17 +183,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Zamknij ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Uśpij", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Wyłącz", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Uruchom &ponownie", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Anuluj", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernacja", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Uśpij", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Wyłącz", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Uruchom &ponownie", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Anuluj", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Zamknij ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Uśpij", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Wyłącz", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Uruchom ponownie", IDC_RESTART_STATIC, 130, 70, 61, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernacja", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Uśpij", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Wyłącz", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Uruchom &ponownie", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Anuluj", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Zamknij ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernacja", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Uśpij", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Wyłącz", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Uruchom ponownie", IDC_RESTART_STATIC, 187, 70, 61, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/pt-PT.rc b/dll/win32/msgina/lang/pt-PT.rc index 389b3b5c1b2..52d369e2600 100644 --- a/dll/win32/msgina/lang/pt-PT.rc +++ b/dll/win32/msgina/lang/pt-PT.rc @@ -173,17 +173,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Desligar o computador" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Suspender", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Desligar", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Reiniciar", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Cancelar", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernar", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Suspender", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Desligar", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Reiniciar", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancelar", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Desligar o computador", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Suspender", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Desligar", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Reiniciar", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernar", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Suspender", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Desligar", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Reiniciar", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancelar", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Desligar o computador", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernar", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Suspender", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Desligar", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Reiniciar", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index 20b0e90c9a6..a4ae774b74e 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -181,17 +181,39 @@ BEGIN DEFPUSHBUTTON "Î&nchide", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Închidere ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Stare de veghe", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "Închi&dere", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Repornire", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "A&nulează", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernare", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Stare de veghe", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Închi&dere", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Repornire", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "A&nulează", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Închidere ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Stare de veghe", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Închidere", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Repornire", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernare", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Stare de veghe", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Închi&dere", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Repornire", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "A&nulează", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Închidere ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernate", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Stare de veghe", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Închidere", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Repornire", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index 068b508087b..951eec67d61 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -174,17 +174,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Завершение работы ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Спящий режим", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Выключить", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Перезапустить", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Отмена", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Гибернация", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Спящий режим", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Выключить", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Перезапустить", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Отмена", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Завершение работы ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 155, 19 + CTEXT "Спящий режим", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Выключить", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Перезапустить", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Гибернация", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Спящий режим", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Выключить", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Перезапустить", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Отмена", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Завершение работы ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 155, 19 + CTEXT "Гибернация", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Спящий режим", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Выключить", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Перезапустить", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/sk-SK.rc b/dll/win32/msgina/lang/sk-SK.rc index d4a28366cbe..68ff7b1f6f4 100644 --- a/dll/win32/msgina/lang/sk-SK.rc +++ b/dll/win32/msgina/lang/sk-SK.rc @@ -177,17 +177,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Vypnutie systému ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Zrušiť", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Zrušiť", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Vypnutie systému ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 155, 19 + CTEXT "Sleep", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Shut Down", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Zrušiť", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Vypnutie systému ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 155, 19 + CTEXT "Hibernate", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Sleep", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Shut Down", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/sq-AL.rc b/dll/win32/msgina/lang/sq-AL.rc index 5deec75ec1e..acad6315c7b 100644 --- a/dll/win32/msgina/lang/sq-AL.rc +++ b/dll/win32/msgina/lang/sq-AL.rc @@ -176,17 +176,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Shut Down ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Anulo", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Anulo", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Shut Down ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Sleep", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Shut Down", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Hibernate", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Slee&p", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Shut Down", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Restart", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Anulo", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Shut Down ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Hibernate", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Sleep", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Shut Down", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Restart", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/tr-TR.rc b/dll/win32/msgina/lang/tr-TR.rc index ffc374b021f..448d7219d7c 100644 --- a/dll/win32/msgina/lang/tr-TR.rc +++ b/dll/win32/msgina/lang/tr-TR.rc @@ -174,17 +174,39 @@ BEGIN DEFPUSHBUTTON "Tamam", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Bilgisayarı Kapat" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Uykuya Geçir", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "Bilgi&sayarı", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Yeniden &Başlat", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "İptal", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Anıkta Beklet", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Uykuya Geçir", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "Bilgi&sayarı", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Yeniden &Başlat", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "İptal", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Bilgisayarı Kapat", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Uykuya Geçir", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Bilgisayarı", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Yeniden Başlat", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Anıkta Beklet", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Uykuya Geçir", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Bilgi&sayarı", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Yeniden &Başlat", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "İptal", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Bilgisayarı Kapat", IDC_TURN_OFF_STATIC, 4, 7, 130, 19 + CTEXT "Anıkta Beklet", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Uykuya Geçir", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Bilgisayarı", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Yeniden Başlat", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/uk-UA.rc b/dll/win32/msgina/lang/uk-UA.rc index 3068431e425..068edc742c1 100644 --- a/dll/win32/msgina/lang/uk-UA.rc +++ b/dll/win32/msgina/lang/uk-UA.rc @@ -180,17 +180,39 @@ BEGIN DEFPUSHBUTTON "OK", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Завершення роботи ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 8, "MS Shell Dlg" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "&Сон", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "&Вимкнути", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "&Перезавантажити", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "Скасувати", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Гібернація", IDC_BUTTON_HIBERNATE, 30093, 30049, 22, 20, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "&Сон", IDC_BUTTON_SLEEP, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Вимкнути", IDC_BUTTON_SHUTDOWN, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Перезавантажити", IDC_BUTTON_REBOOT, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Скасувати", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Завершення роботи ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 155, 19 + CTEXT "Сон", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "Вимкнути", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "Перезавантажити", IDC_RESTART_STATIC, 131, 70, 61, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 232, 1, 32, 26 + PUSHBUTTON "&Гібернація", IDC_BUTTON_HIBERNATE, 36, 46, 22, 20, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "&Сон", IDC_BUTTON_SLEEP, 93, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Вимкнути", IDC_BUTTON_SHUTDOWN, 150, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "&Перезавантажити", IDC_BUTTON_REBOOT, 207, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Скасувати", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "Завершення роботи ReactOS", IDC_TURN_OFF_STATIC, 4, 7, 155, 19 + CTEXT "Гібернація", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "Сон", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "Вимкнути", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "Перезавантажити", IDC_RESTART_STATIC, 190, 70, 61, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/zh-CN.rc b/dll/win32/msgina/lang/zh-CN.rc index 85649ded9c1..dd13d590c6b 100644 --- a/dll/win32/msgina/lang/zh-CN.rc +++ b/dll/win32/msgina/lang/zh-CN.rc @@ -175,17 +175,39 @@ BEGIN DEFPUSHBUTTON "确定", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "关闭 ReactOS" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP FONT 9, "宋体" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "睡眠状态(&P)", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "关闭(&S)", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "重新启动(&R)", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "取消", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 180, 2, 32, 26 + PUSHBUTTON "休眠状态(&H)", IDC_BUTTON_HIBERNATE, 30093, 30049, 19, 19, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "睡眠状态(&P)", IDC_BUTTON_SLEEP, 38, 46, 19, 19, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "关闭(&S)", IDC_BUTTON_SHUTDOWN, 95, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "重新启动(&R)", IDC_BUTTON_REBOOT, 152, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "取消", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "关闭 ReactOS", IDC_TURN_OFF_STATIC, 4, 9, 130, 20 + CTEXT "睡眠状态", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "关闭", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "重新启动", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 9, "宋体" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 236, 2, 32, 26 + PUSHBUTTON "休眠状态(&H)", IDC_BUTTON_HIBERNATE, 38, 46, 19, 19, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "睡眠状态(&P)", IDC_BUTTON_SLEEP, 95, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "关闭(&S)", IDC_BUTTON_SHUTDOWN, 152, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "重新启动(&R)", IDC_BUTTON_REBOOT, 209, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "取消", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "关闭 ReactOS", IDC_TURN_OFF_STATIC, 4, 9, 130, 20 + CTEXT "休眠状态", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "睡眠状态", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "关闭", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "重新启动", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE diff --git a/dll/win32/msgina/lang/zh-TW.rc b/dll/win32/msgina/lang/zh-TW.rc index 46a613cbc66..6f7e92e680c 100644 --- a/dll/win32/msgina/lang/zh-TW.rc +++ b/dll/win32/msgina/lang/zh-TW.rc @@ -174,17 +174,39 @@ BEGIN DEFPUSHBUTTON "確定", IDOK, 115, 179, 50, 14 END -IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 275, 135 -STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "關閉 ReactOS" -FONT 9, "新細明體" +IDD_SHUTDOWN_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 9, "宋体" BEGIN - CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - CONTROL IDI_BAR, IDC_BAR, "Static", SS_BITMAP, 0, 44, 275, 4 - PUSHBUTTON "睡眠狀態(&P)", IDC_BUTTON_SLEEP, 37, 63, 55, 31, BS_MULTILINE | WS_GROUP - PUSHBUTTON "關閉(&S)", IDC_BUTTON_SHUTDOWN, 109, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "重新開機(&R)", IDC_BUTTON_REBOOT, 182, 63, 55, 31, BS_MULTILINE - PUSHBUTTON "取消", IDCANCEL, 205, 111, 55, 14, WS_GROUP + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 180, 2, 32, 26 + PUSHBUTTON "休眠狀態(&H)", IDC_BUTTON_HIBERNATE, 30093, 30049, 19, 19, BS_OWNERDRAW | WS_DISABLED + PUSHBUTTON "睡眠狀態(&P)", IDC_BUTTON_SLEEP, 38, 46, 19, 19, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "關閉(&S)", IDC_BUTTON_SHUTDOWN, 95, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "重新開機(&R)", IDC_BUTTON_REBOOT, 152, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "取消", IDCANCEL, 162, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "關閉 ReactOS", IDC_TURN_OFF_STATIC, 4, 9, 130, 20 + CTEXT "睡眠狀態", IDC_SLEEP_STATIC, 22, 70, 51, 11 + CTEXT "關閉", IDC_SHUTDOWN_STATIC, 79, 70, 51, 11 + CTEXT "重新開機", IDC_RESTART_STATIC, 136, 70, 51, 11 +END + +IDD_SHUTDOWN_FANCY_LONG DIALOGEX 0, 0, 264, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 9, "宋体" +BEGIN + CONTROL IDI_DLG_BG, IDC_DLG_BG, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 264, 122 + CONTROL IDI_ROSLOGO_FLAG, IDC_ROSLOGO_WHITE, "STATIC", SS_BITMAP, 236, 2, 32, 26 + PUSHBUTTON "休眠狀態(&H)", IDC_BUTTON_HIBERNATE, 38, 46, 19, 19, BS_OWNERDRAW | WS_GROUP + PUSHBUTTON "睡眠狀態(&P)", IDC_BUTTON_SLEEP, 95, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "關閉(&S)", IDC_BUTTON_SHUTDOWN, 152, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "重新開機(&R)", IDC_BUTTON_REBOOT, 209, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "取消", IDCANCEL, 218, 103, 40, 12, BS_FLAT | WS_GROUP + LTEXT "關閉 ReactOS", IDC_TURN_OFF_STATIC, 4, 9, 130, 20 + CTEXT "休眠狀態", IDC_HIBERNATE_STATIC, 22, 70, 51, 11 + CTEXT "睡眠状态", IDC_SLEEP_STATIC, 79, 70, 51, 11 + CTEXT "關閉", IDC_SHUTDOWN_STATIC, 136, 70, 51, 11 + CTEXT "重新開機", IDC_RESTART_STATIC, 193, 70, 51, 11 END STRINGTABLE @@ -231,4 +253,3 @@ BEGIN IDS_SHUTDOWN_SLEEP_DESC "使系統處於睡眠模式。" IDS_SHUTDOWN_HIBERNATE_DESC "儲存當前會話並關閉電腦。" END - diff --git a/dll/win32/msgina/msgina.rc b/dll/win32/msgina/msgina.rc index 8dba2ac6408..83654362e7e 100644 --- a/dll/win32/msgina/msgina.rc +++ b/dll/win32/msgina/msgina.rc @@ -19,7 +19,10 @@ IDI_LOCKICON ICON "resources/115.ico" /* Bitmaps */ IDI_ROSLOGO BITMAP "resources/reactos.bmp" +IDI_ROSLOGO_FLAG BITMAP "resources/reactos_flag.bmp" IDI_BAR BITMAP "resources/line.bmp" +IDI_DLG_BG BITMAP "resources/dlg_bg.bmp" +IDB_IMAGE_STRIP BITMAP "resources/image_strip.bmp" /* UTF-8 */ #pragma code_page(65001) diff --git a/dll/win32/msgina/resource.h b/dll/win32/msgina/resource.h index 52ddf7ba6ff..dcda934a875 100644 --- a/dll/win32/msgina/resource.h +++ b/dll/win32/msgina/resource.h @@ -42,6 +42,7 @@ #define IDD_SHUTDOWN 1800 #define IDD_SHUTDOWN_FANCY 1900 +#define IDD_SHUTDOWN_FANCY_LONG 1901 #define IDD_SHUTDOWN_REASON 2000 #define IDC_SHUTDOWN_ACTION 2001 @@ -51,26 +52,38 @@ #define IDC_REASON_DESCRIPTION 2005 #define IDC_REASON_COMMENT 2006 -#define IDC_BUTTON_SLEEP 1901 -#define IDC_BUTTON_SHUTDOWN 1902 -#define IDC_BUTTON_REBOOT 1903 +#define IDC_TURN_OFF_STATIC 3001 +#define IDC_HIBERNATE_STATIC 3002 +#define IDC_SLEEP_STATIC 3003 +#define IDC_SHUTDOWN_STATIC 3004 +#define IDC_RESTART_STATIC 3005 + +#define IDC_BUTTON_HIBERNATE 1901 +#define IDC_BUTTON_SLEEP 1902 +#define IDC_BUTTON_SHUTDOWN 1903 +#define IDC_BUTTON_REBOOT 1904 #define IDD_LEGALNOTICE 2100 #define IDC_LEGALNOTICE_TEXT 2101 #define IDC_ROSLOGO 1007 #define IDC_BAR 1008 - - -#define IDI_ROSLOGO 20000 -#define IDI_BAR 20001 - -#define IDI_NOT_CONNECTED 13 -#define IDI_LOGOFF 21 -#define IDI_SHUTDOWN 22 -#define IDI_KEYBOARD 109 -#define IDI_HARDWARE 110 -#define IDI_LOCKICON 115 +#define IDC_DLG_BG 1009 +#define IDC_ROSLOGO_WHITE 1010 + + +#define IDI_ROSLOGO 20000 +#define IDI_BAR 20001 +#define IDI_ROSLOGO_FLAG 20002 +#define IDI_DLG_BG 20003 +#define IDB_IMAGE_STRIP 20004 + +#define IDI_NOT_CONNECTED 13 +#define IDI_LOGOFF 21 +#define IDI_SHUTDOWN 22 +#define IDI_KEYBOARD 109 +#define IDI_HARDWARE 110 +#define IDI_LOCKICON 115 #define IDS_LOGGEDOUTSAS 40000 #define IDS_LOCKEDSAS 40001 diff --git a/dll/win32/msgina/resources/README.txt b/dll/win32/msgina/resources/README.txt new file mode 100644 index 00000000000..d211058325c --- /dev/null +++ b/dll/win32/msgina/resources/README.txt @@ -0,0 +1,15 @@ +The following bitmaps are made by Splitwirez (Splitwirez(a)gmail.com). + +dlg_bg.bmp +image_strip.bmp +reactos_flag.bmp + +Its source is available as the following files: + +svg/background.svg +svg/flag.svg +svg/shut_down.svg +svg/sleep_hibernate.svg +svg/reboot.svg + +These files are in the public domain. \ No newline at end of file diff --git a/dll/win32/msgina/resources/dlg_bg.bmp b/dll/win32/msgina/resources/dlg_bg.bmp new file mode 100644 index 00000000000..efc87c0ca46 Binary files /dev/null and b/dll/win32/msgina/resources/dlg_bg.bmp differ diff --git a/dll/win32/msgina/resources/image_strip.bmp b/dll/win32/msgina/resources/image_strip.bmp new file mode 100644 index 00000000000..531b3e8f7b4 Binary files /dev/null and b/dll/win32/msgina/resources/image_strip.bmp differ diff --git a/dll/win32/msgina/resources/reactos_flag.bmp b/dll/win32/msgina/resources/reactos_flag.bmp new file mode 100644 index 00000000000..a47b31c1ba2 Binary files /dev/null and b/dll/win32/msgina/resources/reactos_flag.bmp differ diff --git a/dll/win32/msgina/resources/svg/background.svg b/dll/win32/msgina/resources/svg/background.svg new file mode 100644 index 00000000000..d3b5a69ab4b --- /dev/null +++ b/dll/win32/msgina/resources/svg/background.svg @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="312" + height="198" + viewBox="0 0 82.549998 52.387501" + version="1.1" + id="svg919" + inkscape:version="1.0.1 (1.0.1+r74)" + sodipodi:docname="Background.svg" + inkscape:export-filename="/home/splitwirez/Documents/Art/GUI Mockups/Other Software/ReactOS-LautusTurnOffDialog/Background/v6/PNG/Background.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs913"> + <linearGradient + inkscape:collect="always" + id="linearGradient1559"> + <stop + style="stop-color:#1d1d1d;stop-opacity:1" + offset="0" + id="stop1555" /> + <stop + style="stop-color:#232323;stop-opacity:1" + offset="0.5" + id="stop1561" /> + <stop + style="stop-color:#303030;stop-opacity:1" + offset="1" + id="stop1557" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient1533"> + <stop + style="stop-color:#305067;stop-opacity:1" + offset="0" + id="stop1529" /> + <stop + style="stop-color:#9badb5;stop-opacity:1" + offset="0.25" + id="stop1551" /> + <stop + style="stop-color:#fcfcfc;stop-opacity:1" + offset="0.5" + id="stop1537" /> + <stop + style="stop-color:#9badb5;stop-opacity:1" + offset="0.75" + id="stop1553" /> + <stop + style="stop-color:#305067;stop-opacity:1" + offset="1" + id="stop1531" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1559" + id="linearGradient1523" + x1="0.13229166" + y1="0.1322915" + x2="0.13229166" + y2="11.509375" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1533" + id="linearGradient1535" + x1="-5.5511151e-17" + y1="11.641665" + x2="82.550003" + y2="11.641665" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1559" + id="linearGradient1543" + gradientUnits="userSpaceOnUse" + x1="0.13229141" + y1="11.509373" + x2="0.13229141" + y2="0.13229024" + gradientTransform="translate(2.4262432e-7,40.745833)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.4" + inkscape:cx="177.13935" + inkscape:cy="125.85454" + inkscape:document-units="px" + inkscape:current-layer="layer2" + inkscape:document-rotation="0" + showgrid="false" + units="px" + inkscape:window-width="1600" + inkscape:window-height="838" + inkscape:window-x="1280" + inkscape:window-y="0" + inkscape:window-maximized="1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> + <metadata + id="metadata916"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="Body" + sodipodi:insensitive="true"> + <rect + style="display:inline;fill:#f4f4f4;fill-opacity:1;stroke:none;stroke-width:0.264582;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + id="rect1545" + width="82.550003" + height="52.387501" + x="0" + y="3.5527137e-15" /> + </g> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Header" + style="display:inline"> + <rect + style="fill:url(#linearGradient1535);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + id="rect1527" + width="82.550003" + height="0.52916664" + x="1.3490337e-07" + y="11.641665" /> + <g + id="g1591"> + <rect + style="fill:url(#linearGradient1523);fill-opacity:1;stroke:#2a2a2a;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + id="rect1515" + width="82.285416" + height="11.377083" + x="0.13229166" + y="0.1322915" /> + <rect + style="fill:#5a5a5a;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + id="rect1525" + width="82.020836" + height="0.26458332" + x="0.26458332" + y="11.112499" /> + </g> + </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="Footer" + sodipodi:insensitive="true"> + <rect + style="display:inline;fill:url(#linearGradient1543);fill-opacity:1;stroke:#2a2a2a;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + id="rect1539" + width="82.285416" + height="11.377083" + x="0.13229097" + y="40.878124" /> + <rect + style="display:inline;fill:#5a5a5a;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + id="rect1541" + width="82.020836" + height="0.26458332" + x="0.26458424" + y="41.010414" /> + </g> +</svg> diff --git a/dll/win32/msgina/resources/svg/flag.svg b/dll/win32/msgina/resources/svg/flag.svg new file mode 100644 index 00000000000..be85fb5fc97 --- /dev/null +++ b/dll/win32/msgina/resources/svg/flag.svg @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48" + height="40" + viewBox="0 0 12.7 10.583334" + version="1.1" + id="svg919" + inkscape:version="1.0.1 (1.0.1+r74)" + sodipodi:docname="Emblem.svg" + inkscape:export-filename="/home/splitwirez/Documents/Art/GUI Mockups/Other Software/ReactOS-LautusTurnOffDialog/Background/v6/PNG/Emblem.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs913"> + <linearGradient + inkscape:collect="always" + id="linearGradient1559"> + <stop + style="stop-color:#1d1d1d;stop-opacity:1" + offset="0" + id="stop1555" /> + <stop + style="stop-color:#232323;stop-opacity:1" + offset="0.5" + id="stop1561" /> + <stop + style="stop-color:#303030;stop-opacity:1" + offset="1" + id="stop1557" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1559" + id="linearGradient1523" + x1="0.13229166" + y1="0.1322915" + x2="0.13229166" + y2="11.509375" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-69.850004,0.52916668)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="7.9195959" + inkscape:cx="11.917784" + inkscape:cy="20.654949" + inkscape:document-units="px" + inkscape:current-layer="layer6" + inkscape:document-rotation="0" + showgrid="false" + units="px" + inkscape:window-width="1600" + inkscape:window-height="838" + inkscape:window-x="1280" + inkscape:window-y="0" + inkscape:window-maximized="1" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> + <metadata + id="metadata916"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Header" + style="display:inline;opacity:1" + transform="translate(-0.26458332,-0.79375016)" + sodipodi:insensitive="true"> + <rect + style="fill:url(#linearGradient1523);fill-opacity:1;stroke:#2a2a2a;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + id="rect1515" + width="82.550003" + height="11.377083" + x="-69.717705" + y="0.66145819" /> + </g> + <g + inkscape:groupmode="layer" + id="layer6" + inkscape:label="Emblem" + style="display:inline"> + <path + id="path916" + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583;paint-order:markers fill stroke" + d="M 5.8747123,1.6960017 A 3.4348635,3.4348635 0 0 0 2.6608173,3.919103 C 3.079557,4.6605747 3.6905619,5.4649992 4.4541413,6.2285788 4.9024066,6.6768439 5.3648052,7.069623 5.8206234,7.4051201 6.2759985,7.0695997 6.7379527,6.6768926 7.1862664,6.2285788 7.9898239,5.4250211 8.6229577,4.5772361 9.0429039,3.804216 A 3.4348635,3.4348635 0 0 0 5.8747123,1.6960017 Z m 3.346392,2.6604257 C 8.7883275,5.0719442 8.2037155,5.8182687 7.4898361,6.5321484 7.0643456,6.9576384 6.627176,7.3360012 6. [...] + <path + id="path1181" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration- [...] + d="M 8.6529597,1.0586735 C 8.2440762,1.0659482 7.7855031,1.1846113 7.2940252,1.3911743 7.143637,1.4543807 6.9891614,1.5290509 6.8332203,1.6092077 a 3.6495423,3.6495423 0 0 1 0.5660479,0.2058738 c 0.020324,-0.00884 0.04148,-0.019621 0.061636,-0.028093 0.456257,-0.1917602 0.8680277,-0.2922289 1.1987636,-0.2981188 0.3307367,-0.00589 0.5693898,0.07588 0.7287346,0.2352245 0.1593448,0.1593442 0.2411146,0.3975791 0.2352247,0.7283152 -0.00592,0.3307359 -0.1051008,0.7441842 -0.2968613,1.20 [...] + <path + id="path1224" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration- [...] + d="M 9.6919728,1.4213635 9.3875643,1.7240944 C 9.5469085,1.8834388 9.6295173,2.1220928 9.6236274,2.4528289 9.6177376,2.783565 9.5176881,3.1961746 9.325928,3.6524314 8.9424077,4.5649452 8.1982083,5.6485106 7.1879438,6.6587754 6.8352016,7.0115171 6.4734883,7.3296955 6.113291,7.6135096 6.2405937,7.7004977 6.3664965,7.7823246 6.491495,7.8592164 6.8273557,7.5872728 7.1626888,7.2894919 7.4906746,6.9615063 8.5344246,5.9177558 9.3086164,4.8018467 9.7217425,3.8188915 9.9283058,3.3274138 10 [...] + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration- [...] + d="M 1.9495636,1.4215593 C 1.6897212,1.6814018 1.5809621,2.0506776 1.5882437,2.4595615 c 0.00729,0.4088839 0.1246469,0.8682261 0.3312098,1.3597038 0.4131261,0.9829553 1.1875587,2.0987819 2.2313088,3.1425321 1.0437503,1.0437502 2.1611614,1.8181825 3.1441169,2.231309 0.4914776,0.2065624 0.9492349,0.3239277 1.358119,0.3312098 0.408884,0.00731 0.7797443,-0.1014773 1.0395872,-0.3613203 L 9.3883158,8.8587268 C 9.2289714,9.0180711 8.9916581,9.1007424 8.6609218,9.0948526 8.3301856,9.08896 [...] + id="path858" /> + </g> +</svg> diff --git a/dll/win32/msgina/resources/line.svg b/dll/win32/msgina/resources/svg/line.svg similarity index 100% rename from dll/win32/msgina/resources/line.svg rename to dll/win32/msgina/resources/svg/line.svg diff --git a/dll/win32/msgina/resources/reactos.svg b/dll/win32/msgina/resources/svg/reactos.svg similarity index 100% rename from dll/win32/msgina/resources/reactos.svg rename to dll/win32/msgina/resources/svg/reactos.svg diff --git a/dll/win32/msgina/resources/svg/reboot.svg b/dll/win32/msgina/resources/svg/reboot.svg new file mode 100644 index 00000000000..06a080c1cb2 --- /dev/null +++ b/dll/win32/msgina/resources/svg/reboot.svg @@ -0,0 +1,392 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="33" + height="33" + viewBox="0 0 8.7312498 8.7312502" + version="1.1" + id="svg8" + inkscape:version="1.0.1 (1.0.1+r74)" + sodipodi:docname="Restart.svg" + inkscape:export-filename="/home/splitwirez/Documents/Art/GUI Mockups/Other Software/ReactOS-LautusTurnOffDialog/Icons/Restart.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2"> + <linearGradient + inkscape:collect="always" + id="linearGradient964"> + <stop + style="stop-color:#ffffff;stop-opacity:0.0625" + offset="0" + id="stop960" /> + <stop + style="stop-color:#ffffff;stop-opacity:0.125" + offset="1" + id="stop962" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient956"> + <stop + style="stop-color:#ffffff;stop-opacity:0.5" + offset="0" + id="stop952" /> + <stop + style="stop-color:#ffffff;stop-opacity:0.25" + offset="1" + id="stop954" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1273" + x="-0.0292032" + width="1.0584064" + y="-0.0292032" + height="1.0584064"> + <feFlood + flood-opacity="1" + flood-color="rgb(220,220,224)" + result="flood" + id="feFlood1263" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1265" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.099802953" + result="blur" + id="feGaussianBlur1267" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset1269" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite1271" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1311"> + <feFlood + flood-opacity="1" + flood-color="rgb(220,220,224)" + result="flood" + id="feFlood1301" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1303" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.2" + result="blur" + id="feGaussianBlur1305" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset1307" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="out" + result="composite2" + id="feComposite1309" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1374"> + <feFlood + flood-opacity="1" + flood-color="rgb(222,222,222)" + result="flood" + id="feFlood1364" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1366" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.2" + result="blur" + id="feGaussianBlur1368" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset1370" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="out" + result="composite2" + id="feComposite1372" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1575"> + <feFlood + flood-opacity="0.25" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1565" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1567" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.1" + result="blur" + id="feGaussianBlur1569" /> + <feOffset + dx="0" + dy="0.1" + result="offset" + id="feOffset1571" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="out" + result="composite2" + id="feComposite1573" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1669"> + <feFlood + flood-opacity="0.25" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1659" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1661" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.1" + result="blur" + id="feGaussianBlur1663" /> + <feOffset + dx="0.1" + dy="0.1" + result="offset" + id="feOffset1665" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite1667" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient956" + id="linearGradient958" + x1="0.52916664" + y1="0.52916664" + x2="0.52916664" + y2="8.2020836" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient964" + id="linearGradient966" + x1="1.9999999" + y1="1.9999999" + x2="2" + y2="20.523438" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + inkscape:label="Drop Shadow" + id="filter1669-3"> + <feFlood + flood-opacity="0.25" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1659-6" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1661-7" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.1" + result="blur" + id="feGaussianBlur1663-5" /> + <feOffset + dx="0.1" + dy="0.1" + result="offset" + id="feOffset1665-3" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite1667-5" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.313709" + inkscape:cx="8.0722202" + inkscape:cy="16.498879" + inkscape:document-units="px" + inkscape:current-layer="layer4" + inkscape:document-rotation="0" + showgrid="false" + units="px" + inkscape:window-width="1600" + inkscape:window-height="838" + inkscape:window-x="1280" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-smooth-nodes="true" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer6" + inkscape:label="Colour" + sodipodi:insensitive="true"> + <rect + style="fill:#30cf30;fill-opacity:1;stroke-width:0.264583;paint-order:markers fill stroke" + id="rect903" + width="8.7312498" + height="8.7312498" + x="0" + y="0" + rx="0.42333335" + ry="0.42333335" /> + </g> + <g + inkscape:label="Background" + inkscape:groupmode="layer" + id="layer1" + sodipodi:insensitive="true"> + <rect + style="fill:none;fill-opacity:0.5;stroke:#000000;stroke-width:0.264583;stroke-opacity:0.25;paint-order:markers fill stroke" + id="rect903-6" + width="8.4666662" + height="8.4666662" + x="0.1322915" + y="0.1322915" + rx="0.29104167" + ry="0.29104167" /> + <rect + style="fill:none;fill-opacity:0.5;stroke:#ffffff;stroke-width:0.264583;stroke-opacity:0.62;paint-order:markers fill stroke" + id="rect942" + width="7.9375" + height="7.9375" + x="0.39687482" + y="0.39687482" + rx="0.026458334" + ry="0.026458334" /> + <rect + style="fill:url(#linearGradient958);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:0.5;paint-order:markers fill stroke" + id="rect944" + width="7.6729169" + height="7.6729169" + x="0.52916664" + y="0.52916664" /> + <path + id="rect946" + style="fill:url(#linearGradient966);fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-opacity:0.5;paint-order:markers fill stroke" + d="M 2,2 V 20.523438 C 14.767912,17.358165 24.49928,15.441695 31,9.0957031 V 2 Z" + transform="scale(0.26458333)" /> + </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="Icon" + style="display:inline"> + <path + sodipodi:nodetypes="cc" + id="path1577" + d="M 4.3656249,1.3229167 V 2.9104168" + style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 4.3656249,5.8208336 V 7.4083337" + id="path902" + sodipodi:nodetypes="cc" /> + <path + style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 7.4083334,4.3656252 H 5.8208333" + id="path904" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + id="path906" + d="M 2.9104165,4.3656252 H 1.3229164" + style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 6.5171447,2.2141054 5.3946126,3.3366375" + id="path908" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + id="path910" + d="M 3.3366372,5.3946129 2.2141051,6.517145" + style="fill:none;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + id="path912" + d="M 6.5171447,6.517145 5.3946126,5.3946129" + style="fill:none;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;stroke:#ffffff;stroke-width:0.52916667;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 3.3366372,3.3366375 2.2141051,2.2141054" + id="path914" + sodipodi:nodetypes="cc" /> + </g> +</svg> diff --git a/dll/win32/msgina/resources/svg/shut_down.svg b/dll/win32/msgina/resources/svg/shut_down.svg new file mode 100644 index 00000000000..1463a434b91 --- /dev/null +++ b/dll/win32/msgina/resources/svg/shut_down.svg @@ -0,0 +1,331 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="33" + height="33" + viewBox="0 0 8.7312498 8.7312502" + version="1.1" + id="svg8" + inkscape:version="1.0.1 (1.0.1+r74)" + sodipodi:docname="TurnOff.svg" + inkscape:export-filename="/home/splitwirez/Documents/Art/GUI Mockups/Other Software/ReactOS-LautusTurnOffDialog/Icons/TurnOff.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2"> + <linearGradient + inkscape:collect="always" + id="linearGradient964"> + <stop + style="stop-color:#ffffff;stop-opacity:0.0625" + offset="0" + id="stop960" /> + <stop + style="stop-color:#ffffff;stop-opacity:0.125" + offset="1" + id="stop962" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient956"> + <stop + style="stop-color:#ffffff;stop-opacity:0.5" + offset="0" + id="stop952" /> + <stop + style="stop-color:#ffffff;stop-opacity:0.25" + offset="1" + id="stop954" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1273" + x="-0.0292032" + width="1.0584064" + y="-0.0292032" + height="1.0584064"> + <feFlood + flood-opacity="1" + flood-color="rgb(220,220,224)" + result="flood" + id="feFlood1263" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1265" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.099802953" + result="blur" + id="feGaussianBlur1267" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset1269" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite1271" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1311"> + <feFlood + flood-opacity="1" + flood-color="rgb(220,220,224)" + result="flood" + id="feFlood1301" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1303" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.2" + result="blur" + id="feGaussianBlur1305" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset1307" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="out" + result="composite2" + id="feComposite1309" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1374"> + <feFlood + flood-opacity="1" + flood-color="rgb(222,222,222)" + result="flood" + id="feFlood1364" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1366" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.2" + result="blur" + id="feGaussianBlur1368" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset1370" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="out" + result="composite2" + id="feComposite1372" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1575"> + <feFlood + flood-opacity="0.25" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1565" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1567" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.1" + result="blur" + id="feGaussianBlur1569" /> + <feOffset + dx="0" + dy="0.1" + result="offset" + id="feOffset1571" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="out" + result="composite2" + id="feComposite1573" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1669"> + <feFlood + flood-opacity="0.25" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1659" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1661" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.1" + result="blur" + id="feGaussianBlur1663" /> + <feOffset + dx="0.1" + dy="0.1" + result="offset" + id="feOffset1665" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite1667" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient956" + id="linearGradient958" + x1="0.52916664" + y1="0.52916664" + x2="0.52916664" + y2="8.2020836" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient964" + id="linearGradient966" + x1="1.9999999" + y1="1.9999999" + x2="2" + y2="20.523438" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.313709" + inkscape:cx="3.2770444" + inkscape:cy="16.521826" + inkscape:document-units="px" + inkscape:current-layer="layer4" + inkscape:document-rotation="0" + showgrid="false" + units="px" + inkscape:window-width="1600" + inkscape:window-height="838" + inkscape:window-x="1280" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-smooth-nodes="true" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer6" + inkscape:label="Colour" + sodipodi:insensitive="true"> + <rect + style="fill:#cf3030;fill-opacity:1;stroke-width:0.264583;paint-order:markers fill stroke" + id="rect903" + width="8.7312498" + height="8.7312498" + x="0" + y="0" + rx="0.42333335" + ry="0.42333335" /> + </g> + <g + inkscape:label="Background" + inkscape:groupmode="layer" + id="layer1" + sodipodi:insensitive="true"> + <rect + style="fill:none;fill-opacity:0.5;stroke:#000000;stroke-width:0.264583;stroke-opacity:0.25;paint-order:markers fill stroke" + id="rect903-6" + width="8.4666662" + height="8.4666662" + x="0.1322915" + y="0.1322915" + rx="0.29104167" + ry="0.29104167" /> + <rect + style="fill:none;fill-opacity:0.5;stroke:#ffffff;stroke-width:0.264583;stroke-opacity:0.62;paint-order:markers fill stroke" + id="rect942" + width="7.9375" + height="7.9375" + x="0.39687482" + y="0.39687482" + rx="0.026458334" + ry="0.026458334" /> + <rect + style="fill:url(#linearGradient958);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:0.5;paint-order:markers fill stroke" + id="rect944" + width="7.6729169" + height="7.6729169" + x="0.52916664" + y="0.52916664" /> + <path + id="rect946" + style="fill:url(#linearGradient966);fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-opacity:0.5;paint-order:markers fill stroke" + d="M 2,2 V 20.523438 C 14.767912,17.358165 24.49928,15.441695 31,9.0957031 V 2 Z" + transform="scale(0.26458333)" /> + </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="Icon" + style="display:inline"> + <circle + r="2.5135417" + cy="4.3656249" + cx="4.3656249" + id="path1401" + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.529167;stroke-miterlimit:11.61;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" /> + <path + sodipodi:nodetypes="cc" + id="path1577" + d="M 4.3656249,3.0427083 V 5.6885417" + style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> +</svg> diff --git a/dll/win32/msgina/resources/svg/sleep_hibernate.svg b/dll/win32/msgina/resources/svg/sleep_hibernate.svg new file mode 100644 index 00000000000..1b971082577 --- /dev/null +++ b/dll/win32/msgina/resources/svg/sleep_hibernate.svg @@ -0,0 +1,403 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="33" + height="33" + viewBox="0 0 8.7312498 8.7312502" + version="1.1" + id="svg8" + inkscape:version="1.0.1 (1.0.1+r74)" + sodipodi:docname="StandBy.svg" + inkscape:export-filename="/home/splitwirez/Documents/Art/GUI Mockups/Other Software/ReactOS-LautusTurnOffDialog/Icons/StandBy.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96"> + <defs + id="defs2"> + <linearGradient + inkscape:collect="always" + id="linearGradient964"> + <stop + style="stop-color:#ffffff;stop-opacity:0.0625" + offset="0" + id="stop960" /> + <stop + style="stop-color:#ffffff;stop-opacity:0.125" + offset="1" + id="stop962" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient956"> + <stop + style="stop-color:#ffffff;stop-opacity:0.5" + offset="0" + id="stop952" /> + <stop + style="stop-color:#ffffff;stop-opacity:0.25" + offset="1" + id="stop954" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1273" + x="-0.0292032" + width="1.0584064" + y="-0.0292032" + height="1.0584064"> + <feFlood + flood-opacity="1" + flood-color="rgb(220,220,224)" + result="flood" + id="feFlood1263" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1265" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.099802953" + result="blur" + id="feGaussianBlur1267" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset1269" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite1271" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1311"> + <feFlood + flood-opacity="1" + flood-color="rgb(220,220,224)" + result="flood" + id="feFlood1301" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1303" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.2" + result="blur" + id="feGaussianBlur1305" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset1307" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="out" + result="composite2" + id="feComposite1309" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1374"> + <feFlood + flood-opacity="1" + flood-color="rgb(222,222,222)" + result="flood" + id="feFlood1364" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1366" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.2" + result="blur" + id="feGaussianBlur1368" /> + <feOffset + dx="0" + dy="0" + result="offset" + id="feOffset1370" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="out" + result="composite2" + id="feComposite1372" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1575"> + <feFlood + flood-opacity="0.25" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1565" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1567" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.1" + result="blur" + id="feGaussianBlur1569" /> + <feOffset + dx="0" + dy="0.1" + result="offset" + id="feOffset1571" /> + <feComposite + in="offset" + in2="SourceGraphic" + operator="out" + result="composite2" + id="feComposite1573" /> + </filter> + <filter + style="color-interpolation-filters:sRGB;" + inkscape:label="Drop Shadow" + id="filter1669"> + <feFlood + flood-opacity="0.25" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1659" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1661" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.1" + result="blur" + id="feGaussianBlur1663" /> + <feOffset + dx="0.1" + dy="0.1" + result="offset" + id="feOffset1665" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite1667" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient956" + id="linearGradient958" + x1="0.52916664" + y1="0.52916664" + x2="0.52916664" + y2="8.2020836" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient964" + id="linearGradient966" + x1="1.9999999" + y1="1.9999999" + x2="2" + y2="20.523438" + gradientUnits="userSpaceOnUse" /> + <filter + style="color-interpolation-filters:sRGB" + inkscape:label="Drop Shadow" + id="filter1669-3"> + <feFlood + flood-opacity="0.25" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1659-6" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1661-7" /> + <feGaussianBlur + in="composite1" + stdDeviation="0.1" + result="blur" + id="feGaussianBlur1663-5" /> + <feOffset + dx="0.1" + dy="0.1" + result="offset" + id="feOffset1665-3" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite1667-5" /> + </filter> + <filter + id="filter1669-36" + inkscape:label="Drop Shadow" + style="color-interpolation-filters:sRGB"> + <feFlood + id="feFlood1659-7" + result="flood" + flood-color="rgb(0,0,0)" + flood-opacity="0.25" /> + <feComposite + id="feComposite1661-5" + result="composite1" + operator="in" + in2="SourceGraphic" + in="flood" /> + <feGaussianBlur + id="feGaussianBlur1663-3" + result="blur" + stdDeviation="0.1" + in="composite1" /> + <feOffset + id="feOffset1665-5" + result="offset" + dy="0.1" + dx="0.1" /> + <feComposite + id="feComposite1667-6" + result="composite2" + operator="over" + in2="offset" + in="SourceGraphic" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.313709" + inkscape:cx="13.942482" + inkscape:cy="18.388282" + inkscape:document-units="px" + inkscape:current-layer="layer4" + inkscape:document-rotation="0" + showgrid="false" + units="px" + inkscape:window-width="1600" + inkscape:window-height="838" + inkscape:window-x="1280" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-smooth-nodes="true" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer6" + inkscape:label="Colour" + sodipodi:insensitive="true"> + <rect + style="fill:#cf8030;fill-opacity:1;stroke-width:0.264583;paint-order:markers fill stroke" + id="rect903" + width="8.7312498" + height="8.7312498" + x="0" + y="0" + rx="0.42333335" + ry="0.42333335" /> + </g> + <g + inkscape:label="Background" + inkscape:groupmode="layer" + id="layer1" + sodipodi:insensitive="true"> + <rect + style="fill:none;fill-opacity:0.5;stroke:#000000;stroke-width:0.264583;stroke-opacity:0.25;paint-order:markers fill stroke" + id="rect903-6" + width="8.4666662" + height="8.4666662" + x="0.1322915" + y="0.1322915" + rx="0.29104167" + ry="0.29104167" /> + <rect + style="fill:none;fill-opacity:0.5;stroke:#ffffff;stroke-width:0.264583;stroke-opacity:0.62;paint-order:markers fill stroke" + id="rect942" + width="7.9375" + height="7.9375" + x="0.39687482" + y="0.39687482" + rx="0.026458334" + ry="0.026458334" /> + <rect + style="fill:url(#linearGradient958);fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:0.5;paint-order:markers fill stroke" + id="rect944" + width="7.6729169" + height="7.6729169" + x="0.52916664" + y="0.52916664" /> + <path + id="rect946" + style="fill:url(#linearGradient966);fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-opacity:0.5;paint-order:markers fill stroke" + d="M 2,2 V 20.523438 C 14.767912,17.358165 24.49928,15.441695 31,9.0957031 V 2 Z" + transform="scale(0.26458333)" /> + </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="Icon" + style="display:inline"> + <path + style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.529167;stroke-miterlimit:11.61;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" + id="path1401" + sodipodi:type="arc" + sodipodi:cx="-1.7339435" + sodipodi:cy="6.0420823" + sodipodi:rx="2.2489583" + sodipodi:ry="2.2489583" + sodipodi:start="0" + sodipodi:end="5.2359878" + sodipodi:arc-type="arc" + sodipodi:open="true" + transform="rotate(-60)" + d="M 0.51501489,6.0420823 A 2.2489583,2.2489583 0 0 1 -1.1518702,8.2144093 2.2489583,2.2489583 0 0 1 -3.6815985,7.1665614 2.2489583,2.2489583 0 0 1 -3.3241971,4.4518286 2.2489583,2.2489583 0 0 1 -0.6094642,4.0944273" /> + <path + style="fill:none;stroke:#ffffff;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 4.3657203,1.7198782 V 4.3657116" + id="path1577" + sodipodi:nodetypes="cc" /> + </g> +</svg> diff --git a/dll/win32/msgina/shutdown.c b/dll/win32/msgina/shutdown.c index dd8591b4a7a..8f319db0a74 100644 --- a/dll/win32/msgina/shutdown.c +++ b/dll/win32/msgina/shutdown.c @@ -5,11 +5,14 @@ * PURPOSE: Shutdown Dialog Box (GUI only) * PROGRAMMERS: Lee Schroeder (spaceseel at gmail dot com) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + * Arnav Bhatt (arnavbhatt288 at gmail dot com) */ #include "msgina.h" #include <powrprof.h> #include <wingdi.h> +#include <windowsx.h> +#include <commctrl.h> /* Shutdown state flags */ #define WLX_SHUTDOWN_STATE_LOGOFF 0x01 @@ -21,17 +24,46 @@ #define WLX_SHUTDOWN_STATE_HIBERNATE 0x40 // 0x80 +/* Macros for fancy shut down dialog */ +#define FONT_POINT_SIZE 13 + +#define DARK_GREY_COLOR RGB(244, 244, 244) +#define LIGHT_GREY_COLOR RGB(38, 38, 38) + +/* Bitmap's size for buttons */ +#define CX_BITMAP 33 +#define CY_BITMAP 33 + +#define NUMBER_OF_BUTTONS 4 + +/* After determining the button as well as its state paint the image strip bitmap using these predefined positions */ +#define BUTTON_SHUTDOWN 0 +#define BUTTON_SHUTDOWN_PRESSED (CY_BITMAP + BUTTON_SHUTDOWN) +#define BUTTON_SHUTDOWN_FOCUSED (CY_BITMAP + BUTTON_SHUTDOWN_PRESSED) +#define BUTTON_REBOOT (CY_BITMAP + BUTTON_SHUTDOWN_FOCUSED) +#define BUTTON_REBOOT_PRESSED (CY_BITMAP + BUTTON_REBOOT) +#define BUTTON_REBOOT_FOCUSED (CY_BITMAP + BUTTON_REBOOT_PRESSED) +#define BUTTON_SLEEP (CY_BITMAP + BUTTON_REBOOT_FOCUSED) +#define BUTTON_SLEEP_PRESSED (CY_BITMAP + BUTTON_SLEEP) +#define BUTTON_SLEEP_FOCUSED (CY_BITMAP + BUTTON_SLEEP_PRESSED) +#define BUTTON_SLEEP_DISABLED (CY_BITMAP + BUTTON_SLEEP_FOCUSED) + typedef struct _SHUTDOWN_DLG_CONTEXT { PGINA_CONTEXT pgContext; HBITMAP hBitmap; + HBITMAP hImageStrip; DWORD ShutdownOptions; + HBRUSH hBrush; + HFONT hfFont; BOOL bCloseDlg; + BOOL bIsSleepButtonReplaced; BOOL bReasonUI; BOOL bFriendlyUI; + BOOL bIsButtonHot[NUMBER_OF_BUTTONS]; + WNDPROC OldButtonProc; } SHUTDOWN_DLG_CONTEXT, *PSHUTDOWN_DLG_CONTEXT; - static BOOL GetShutdownReasonUI(VOID) @@ -184,6 +216,36 @@ IsNetwareActive(VOID) return FALSE; } +static +BOOL +IsShowHibernateButtonActive(VOID) +{ + INT_PTR lRet; + HKEY hKey; + DWORD dwValue, dwSize; + + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Policies\\Microsoft\\Windows\\System\\Shutdown", + 0, KEY_QUERY_VALUE, &hKey); + if (lRet == ERROR_SUCCESS) + { + dwValue = 0; + dwSize = sizeof(dwValue); + + lRet = RegQueryValueExW(hKey, + L"ShowHibernateButton", + NULL, NULL, + (LPBYTE)&dwValue, &dwSize); + RegCloseKey(hKey); + if (lRet != ERROR_SUCCESS) + { + return FALSE; + } + return (dwValue != 0); + } + return FALSE; +} + static BOOL ForceFriendlyUI(VOID) @@ -238,6 +300,120 @@ ForceFriendlyUI(VOID) return FALSE; } +static +BOOL +DrawIconOnOwnerDrawnButtons( + DRAWITEMSTRUCT* pdis, + PSHUTDOWN_DLG_CONTEXT pContext) +{ + BOOL bRet; + HDC hdcMem; + HBITMAP hbmOld; + int y; + RECT rect; + + hdcMem = CreateCompatibleDC(pdis->hDC); + hbmOld = SelectObject(hdcMem, pContext->hImageStrip); + rect = pdis->rcItem; + + /* Check the button ID for revelant bitmap to be used */ + switch (pdis->CtlID) + { + case IDC_BUTTON_SHUTDOWN: + { + switch (pdis->itemAction) + { + case ODA_DRAWENTIRE: + case ODA_FOCUS: + case ODA_SELECT: + { + y = BUTTON_SHUTDOWN; + if (pdis->itemState & ODS_SELECTED) + { + y = BUTTON_SHUTDOWN_PRESSED; + } + else if (pContext->bIsButtonHot[0] || (pdis->itemState & ODS_FOCUS)) + { + y = BUTTON_SHUTDOWN_FOCUSED; + } + break; + } + } + break; + } + + case IDC_BUTTON_REBOOT: + { + switch (pdis->itemAction) + { + case ODA_DRAWENTIRE: + case ODA_FOCUS: + case ODA_SELECT: + { + y = BUTTON_REBOOT; + if (pdis->itemState & ODS_SELECTED) + { + y = BUTTON_REBOOT_PRESSED; + } + else if (pContext->bIsButtonHot[1] || (pdis->itemState & ODS_FOCUS)) + { + y = BUTTON_REBOOT_FOCUSED; + } + break; + } + } + break; + } + + case IDC_BUTTON_HIBERNATE: + case IDC_BUTTON_SLEEP: + { + switch (pdis->itemAction) + { + case ODA_DRAWENTIRE: + case ODA_FOCUS: + case ODA_SELECT: + { + y = BUTTON_SLEEP; + if (pdis->itemState & ODS_DISABLED) + { + y = BUTTON_SLEEP_DISABLED; + } + else if (pdis->itemState & ODS_SELECTED) + { + y = BUTTON_SLEEP_PRESSED; + } + else if ((pdis->CtlID == IDC_BUTTON_SLEEP && pContext->bIsButtonHot[2]) || + (pdis->CtlID == IDC_BUTTON_HIBERNATE && pContext->bIsButtonHot[3]) || + (pdis->itemState & ODS_FOCUS)) + { + y = BUTTON_SLEEP_FOCUSED; + } + break; + } + } + break; + } + } + + /* If the owner draw button has keyboard focus make it the default button */ + if (pdis->itemState & ODS_FOCUS) + { + SendMessageW(GetParent(pdis->hwndItem), DM_SETDEFID, pdis->CtlID, 0); + } + + /* Draw it on the required button */ + bRet = BitBlt(pdis->hDC, + (rect.right - rect.left - CX_BITMAP) / 2, + (rect.bottom - rect.top - CY_BITMAP) / 2, + CX_BITMAP, CY_BITMAP, hdcMem, 0, y, SRCCOPY); + + SelectObject(hdcMem, hbmOld); + DeleteDC(hdcMem); + + return bRet; +} + BOOL WINAPI ShellIsFriendlyUIActive(VOID) @@ -324,6 +500,203 @@ LoadShutdownSelState(VOID) return dwValue; } +static INT_PTR +CALLBACK +HotButtonSubclass( + HWND hButton, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PSHUTDOWN_DLG_CONTEXT pContext; + pContext = (PSHUTDOWN_DLG_CONTEXT)GetWindowLongPtrW(hButton, GWLP_USERDATA); + + int buttonID = GetDlgCtrlID(hButton); + + switch (uMsg) + { + case WM_MOUSEMOVE: + { + HWND hwndTarget; + POINT pt = {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)}; + + if (GetCapture() != hButton) + { + SetCapture(hButton); + if (buttonID == IDC_BUTTON_SHUTDOWN) + { + pContext->bIsButtonHot[0] = TRUE; + } + else if (buttonID == IDC_BUTTON_REBOOT) + { + pContext->bIsButtonHot[1] = TRUE; + } + else if (buttonID == IDC_BUTTON_SLEEP) + { + pContext->bIsButtonHot[2] = TRUE; + } + else if (buttonID == IDC_BUTTON_HIBERNATE) + { + pContext->bIsButtonHot[3] = TRUE; + } + SetCursor(LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_HAND))); + } + + ClientToScreen(hButton, &pt); + hwndTarget = WindowFromPoint(pt); + + if (hwndTarget != hButton) + { + ReleaseCapture(); + if (buttonID == IDC_BUTTON_SHUTDOWN) + { + pContext->bIsButtonHot[0] = FALSE; + } + else if (buttonID == IDC_BUTTON_REBOOT) + { + pContext->bIsButtonHot[1] = FALSE; + } + else if (buttonID == IDC_BUTTON_SLEEP) + { + pContext->bIsButtonHot[2] = FALSE; + } + else if (buttonID == IDC_BUTTON_HIBERNATE) + { + pContext->bIsButtonHot[3] = FALSE; + } + } + InvalidateRect(hButton, NULL, FALSE); + break; + } + } + return CallWindowProcW(pContext->OldButtonProc, hButton, uMsg, wParam, lParam); +} + +VOID +AddPrefixToStaticTexts( + HWND hDlg, + BOOL bIsSleepButtonReplaced) +{ + WCHAR szBuffer[30]; + + for (int i = 0; i < NUMBER_OF_BUTTONS; i++) + { + GetDlgItemTextW(hDlg, IDC_BUTTON_HIBERNATE + i, szBuffer, _countof(szBuffer)); + SetDlgItemTextW(hDlg, IDC_HIBERNATE_STATIC + i, szBuffer); + } + + if (bIsSleepButtonReplaced) + { + GetDlgItemTextW(hDlg, IDC_BUTTON_HIBERNATE, szBuffer, _countof(szBuffer)); + SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); + } +} + +VOID +CreateToolTipForButtons( + int controlID, + int detailID, + HWND hDlg, + int titleID, + HINSTANCE hInst) +{ + HWND hwndTool, hwndTip; + WCHAR szBuffer[256]; + TTTOOLINFOW tool; + + hwndTool = GetDlgItem(hDlg, controlID); + + tool.cbSize = sizeof(tool); + tool.hwnd = hDlg; + tool.uFlags = TTF_IDISHWND | TTF_SUBCLASS; + tool.uId = (UINT_PTR)hwndTool; + + /* Create the tooltip */ + hwndTip = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, + WS_POPUP | TTS_ALWAYSTIP | TTS_BALLOON, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + hDlg, NULL, hInst, NULL); + + /* Associate the tooltip with the tool. */ + LoadStringW(hInst, detailID, szBuffer, _countof(szBuffer)); + tool.lpszText = szBuffer; + SendMessageW(hwndTip, TTM_ADDTOOLW, 0, (LPARAM)&tool); + LoadStringW(hInst, titleID, szBuffer, _countof(szBuffer)); + SendMessageW(hwndTip, TTM_SETTITLEW, TTI_NONE, (LPARAM)szBuffer); + SendMessageW(hwndTip, TTM_SETMAXTIPWIDTH, 0, 250); +} + +VOID +ReplaceRequiredButton( + HWND hDlg, + HINSTANCE hInstance, + BOOL bIsAltKeyPressed, + BOOL bIsSleepButtonReplaced) +{ + int destID = IDC_BUTTON_SLEEP; + int targetedID = IDC_BUTTON_HIBERNATE; + HWND hwndDest, hwndTarget; + RECT rect; + WCHAR szBuffer[30]; + + /* If the sleep button has been already replaced earlier, bring sleep button back to its original position */ + if (bIsSleepButtonReplaced) + { + destID = IDC_BUTTON_HIBERNATE; + targetedID = IDC_BUTTON_SLEEP; + } + + hwndDest = GetDlgItem(hDlg, destID); + hwndTarget = GetDlgItem(hDlg, targetedID); + + /* Get the position of the destination button */ + GetWindowRect(hwndDest, &rect); + + /* Get the corrected translated coordinates which is relative to the client window */ + MapWindowPoints(HWND_DESKTOP, hDlg, (LPPOINT)&rect, sizeof(RECT)/sizeof(POINT)); + + /* Set the position of targeted button and hide the destination button */ + SetWindowPos(hwndTarget, + HWND_TOP, + rect.left, rect.top, + 0, 0, + SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); + + EnableWindow(hwndDest, FALSE); + ShowWindow(hwndDest, SW_HIDE); + EnableWindow(hwndTarget, TRUE); + ShowWindow(hwndTarget, SW_SHOW); + SetFocus(hwndTarget); + + if (bIsAltKeyPressed) + { + if (!bIsSleepButtonReplaced) + { + GetDlgItemTextW(hDlg, IDC_BUTTON_HIBERNATE, szBuffer, _countof(szBuffer)); + SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); + } + else + { + GetDlgItemTextW(hDlg, IDC_BUTTON_SLEEP, szBuffer, _countof(szBuffer)); + SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); + } + } + else + { + if (!bIsSleepButtonReplaced) + { + LoadStringW(hInstance, IDS_SHUTDOWN_HIBERNATE, szBuffer, _countof(szBuffer)); + SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); + } + else + { + LoadStringW(hInstance, IDS_SHUTDOWN_SLEEP, szBuffer, _countof(szBuffer)); + SetDlgItemTextW(hDlg, IDC_SLEEP_STATIC, szBuffer); + } + } +} + VOID SaveShutdownSelState( IN DWORD ShutdownCode) @@ -463,12 +836,34 @@ ShutdownOnInit( INT idx, count, i; WCHAR szBuffer[256]; WCHAR szBuffer2[256]; + HDC hdc; + LONG lfHeight; + + /* Create font for the IDC_TURN_OFF_STATIC static control */ + hdc = GetDC(hDlg); + lfHeight = -MulDiv(FONT_POINT_SIZE, GetDeviceCaps(hdc, LOGPIXELSY), 72); + ReleaseDC(hDlg, hdc); + pContext->hfFont = CreateFontW(lfHeight, 0, 0, 0, FW_MEDIUM, FALSE, 0, 0, 0, 0, 0, 0, 0, L"MS Shell Dlg"); + SendDlgItemMessageW(hDlg, IDC_TURN_OFF_STATIC, WM_SETFONT, (WPARAM)pContext->hfFont, TRUE); + + /* Create a brush for static controls for fancy shut down dialog */ + pContext->hBrush = CreateSolidBrush(DARK_GREY_COLOR); + + pContext->hImageStrip = LoadBitmapW(pgContext->hDllInstance, MAKEINTRESOURCEW(IDB_IMAGE_STRIP)); hwndList = GetDlgItem(hDlg, IDC_SHUTDOWN_ACTION); /* Clear the content before it's used */ SendMessageW(hwndList, CB_RESETCONTENT, 0, 0); + /* Set the boolean flags to false */ + pContext->bIsSleepButtonReplaced = FALSE; + + for (int i = 0; i < NUMBER_OF_BUTTONS; i++) + { + pContext->bIsButtonHot[i] = FALSE; + } + /* Log off */ if (pContext->ShutdownOptions & WLX_SHUTDOWN_STATE_LOGOFF) { @@ -517,7 +912,7 @@ ShutdownOnInit( } else if (pContext->bFriendlyUI) { - EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SLEEP), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_SLEEP), IsPwrSuspendAllowed()); } // if (pContext->ShutdownOptions & 0x20) {} @@ -530,6 +925,10 @@ ShutdownOnInit( if (idx != CB_ERR) SendMessageW(hwndList, CB_SETITEMDATA, idx, WLX_SAS_ACTION_SHUTDOWN_HIBERNATE); } + else if (pContext->bFriendlyUI) + { + EnableWindow(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE), FALSE); + } // if (pContext->ShutdownOptions & 0x80) {} @@ -544,6 +943,34 @@ ShutdownOnInit( } } + /* Create tool tips for the buttons of fancy log off dialog */ + CreateToolTipForButtons(IDC_BUTTON_HIBERNATE, + IDS_SHUTDOWN_HIBERNATE_DESC, + hDlg, IDS_SHUTDOWN_HIBERNATE, + pContext->pgContext->hDllInstance); + CreateToolTipForButtons(IDC_BUTTON_SHUTDOWN, + IDS_SHUTDOWN_SHUTDOWN_DESC, + hDlg, IDS_SHUTDOWN_SHUTDOWN, + pContext->pgContext->hDllInstance); + CreateToolTipForButtons(IDC_BUTTON_REBOOT, + IDS_SHUTDOWN_RESTART_DESC, + hDlg, IDS_SHUTDOWN_RESTART, + pContext->pgContext->hDllInstance); + CreateToolTipForButtons(IDC_BUTTON_SLEEP, + IDS_SHUTDOWN_SLEEP_DESC, + hDlg, IDS_SHUTDOWN_SLEEP, + pContext->pgContext->hDllInstance); + + /* Gather old button func */ + pContext->OldButtonProc = (WNDPROC)GetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE), GWLP_WNDPROC); + + /* Make buttons to remember pContext and subclass the buttons */ + for (int i = 0; i < NUMBER_OF_BUTTONS; i++) + { + SetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE + i), GWLP_USERDATA, (LONG_PTR)pContext); + SetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE + i), GWLP_WNDPROC, (LONG_PTR)HotButtonSubclass); + } + /* Update the choice description based on the current selection */ UpdateShutdownDesc(hDlg, pContext); } @@ -600,6 +1027,15 @@ ShutdownDialogProc( case WM_DESTROY: DeleteObject(pContext->hBitmap); + DeleteObject(pContext->hBrush); + DeleteObject(pContext->hImageStrip); + DeleteObject(pContext->hfFont); + + /* Remove the subclass from the buttons */ + for (int i = 0; i < NUMBER_OF_BUTTONS; i++) + { + SetWindowLongPtrW(GetDlgItem(hDlg, IDC_BUTTON_HIBERNATE + i), GWLP_WNDPROC, (LONG_PTR)pContext->OldButtonProc); + } return TRUE; case WM_ACTIVATE: @@ -614,7 +1050,8 @@ ShutdownDialogProc( if (!pContext->bCloseDlg) { pContext->bCloseDlg = TRUE; - EndDialog(hDlg, 0); + DestroyWindow(hDlg); + PostQuitMessage(0); } } return FALSE; @@ -634,7 +1071,8 @@ ShutdownDialogProc( case WM_CLOSE: pContext->bCloseDlg = TRUE; - EndDialog(hDlg, IDCANCEL); + DestroyWindow(hDlg); + PostQuitMessage(IDCANCEL); break; case WM_COMMAND: @@ -659,7 +1097,8 @@ ShutdownDialogProc( case IDCANCEL: case IDHELP: pContext->bCloseDlg = TRUE; - EndDialog(hDlg, LOWORD(wParam)); + DestroyWindow(hDlg); + PostQuitMessage(LOWORD(wParam)); break; case IDC_SHUTDOWN_ACTION: @@ -668,6 +1107,45 @@ ShutdownDialogProc( } break; + case WM_CTLCOLORSTATIC: + { + /* Either make background transparent or fill it with color for required static controls */ + HDC hdcStatic = (HDC)wParam; + UINT StaticID = (UINT)GetWindowLongPtrW((HWND)lParam, GWL_ID); + + switch (StaticID) + { + case IDC_TURN_OFF_STATIC: + SetTextColor(hdcStatic, DARK_GREY_COLOR); + SetBkMode(hdcStatic, TRANSPARENT); + return (INT_PTR)GetStockObject(HOLLOW_BRUSH); + + case IDC_HIBERNATE_STATIC: + case IDC_SHUTDOWN_STATIC: + case IDC_SLEEP_STATIC: + case IDC_RESTART_STATIC: + SetTextColor(hdcStatic, LIGHT_GREY_COLOR); + SetBkMode(hdcStatic, TRANSPARENT); + return (LONG_PTR)pContext->hBrush; + } + return FALSE; + } + + case WM_DRAWITEM: + { + /* Draw bitmaps on required buttons */ + DRAWITEMSTRUCT* pdis = (DRAWITEMSTRUCT*)lParam; + switch (pdis->CtlID) + { + case IDC_BUTTON_SHUTDOWN: + case IDC_BUTTON_REBOOT: + case IDC_BUTTON_SLEEP: + case IDC_BUTTON_HIBERNATE: + return DrawIconOnOwnerDrawnButtons(pdis, pContext); + } + break; + } + default: return FALSE; } @@ -682,7 +1160,10 @@ ShutdownDialog( { INT_PTR ret; SHUTDOWN_DLG_CONTEXT Context; + BOOL bIsAltKeyPressed = FALSE; DWORD ShutdownDialogId = IDD_SHUTDOWN; + MSG Msg; + HWND hDlg; #if 0 DWORD ShutdownOptions; @@ -711,14 +1192,91 @@ ShutdownDialog( { if (Context.bFriendlyUI) { - ShutdownDialogId = IDD_SHUTDOWN_FANCY; + if (IsShowHibernateButtonActive()) + { + ShutdownDialogId = IDD_SHUTDOWN_FANCY_LONG; + } + else + { + ShutdownDialogId = IDD_SHUTDOWN_FANCY; + } } - ret = DialogBoxParamW(pgContext->hDllInstance, - MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : ShutdownDialogId), - hwndDlg, - ShutdownDialogProc, - (LPARAM)&Context); + hDlg = CreateDialogParamW(pgContext->hDllInstance, + MAKEINTRESOURCEW(Context.bReasonUI ? IDD_SHUTDOWN_REASON : ShutdownDialogId), + hwndDlg, + ShutdownDialogProc, + (LPARAM)&Context); + + ShowWindow(hDlg, SW_SHOW); + + /* Detect either Alt or Shift key have been pressed or released */ + while (GetMessageW(&Msg, NULL, 0, 0)) + { + if (!IsDialogMessageW(hDlg, &Msg)) + { + TranslateMessage(&Msg); + DispatchMessageW(&Msg); + } + + switch (Msg.message) + { + case WM_SYSKEYDOWN: + { + /* If the Alt key has been pressed once, add prefix to static controls */ + if (Msg.wParam == VK_MENU && !bIsAltKeyPressed) + { + AddPrefixToStaticTexts(hDlg, Context.bIsSleepButtonReplaced); + bIsAltKeyPressed = TRUE; + } + } + break; + + case WM_KEYDOWN: + { + /* + * If the Shift key has been pressed once, and both hibernate button and sleep button are enabled + * replace the sleep button with hibernate button + */ + if (Msg.wParam == VK_SHIFT) + { + if (ShutdownDialogId == IDD_SHUTDOWN_FANCY && !Context.bIsSleepButtonReplaced) + { + if (IsPwrHibernateAllowed() && IsPwrSuspendAllowed()) + { + ReplaceRequiredButton(hDlg, + pgContext->hDllInstance, + bIsAltKeyPressed, + Context.bIsSleepButtonReplaced); + Context.bIsSleepButtonReplaced = TRUE; + } + } + } + } + break; + + case WM_KEYUP: + { + /* If the Shift key has been released after being pressed, replace the hibernate button with sleep button again */ + if (Msg.wParam == VK_SHIFT) + { + if (ShutdownDialogId == IDD_SHUTDOWN_FANCY && Context.bIsSleepButtonReplaced) + { + if (IsPwrHibernateAllowed() && IsPwrSuspendAllowed()) + { + ReplaceRequiredButton(hDlg, + pgContext->hDllInstance, + bIsAltKeyPressed, + Context.bIsSleepButtonReplaced); + Context.bIsSleepButtonReplaced = FALSE; + } + } + } + } + break; + } + } + ret = Msg.wParam; } #if 0 diff --git a/dll/win32/shell32/bitmap_res.rc b/dll/win32/shell32/bitmap_res.rc index 80dfa6f0edc..4014180e00e 100644 --- a/dll/win32/shell32/bitmap_res.rc +++ b/dll/win32/shell32/bitmap_res.rc @@ -1,6 +1,10 @@ IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp" IDB_LINEBAR BITMAP "res/bitmaps/line.bmp" +IDB_DLG_BG BITMAP "res/bitmaps/dlg_bg.bmp" +IDB_REACTOS_FLAG BITMAP "res/bitmaps/reactos_flag.bmp" +IDB_IMAGE_STRIP BITMAP "res/bitmaps/image_strip.bmp" + IDB_SHELL_IEXPLORE_LG BITMAP "res/bitmaps/204.bmp" IDB_SHELL_IEXPLORE_LG_HOT BITMAP "res/bitmaps/205.bmp" IDB_SHELL_IEXPLORE_SM BITMAP "res/bitmaps/206.bmp" diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 1e5635cb1d1..3fbdf639aa4 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -3,6 +3,7 @@ * * Copyright 2000 Juergen Schmied * Copyright 2018 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * Copyright 2021 Arnav Bhatt <arnavbhatt288(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,16 @@ typedef struct BOOL bCoInited; } RUNFILEDLGPARAMS; +typedef struct +{ + BOOL bFriendlyUI; + BOOL bIsButtonHot[2]; + HBITMAP hImageStrip; + HBRUSH hBrush; + HFONT hfFont; + WNDPROC OldButtonProc; +} LOGOFF_DLG_CONTEXT, *PLOGOFF_DLG_CONTEXT; + typedef BOOL (WINAPI * LPFNOFN) (OPENFILENAMEW *); WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -1063,44 +1074,408 @@ int WINAPI RestartDialogEx(HWND hWndOwner, LPCWSTR lpwstrReason, DWORD uFlags, D return 0; } +/* Functions and macros used for fancy log off dialog box */ +#define IS_PRODUCT_VERSION_WORKSTATION 0x300 +#define FRIENDLY_LOGOFF_IS_NOT_ENFORCED 0x0 + +#define FONT_POINT_SIZE 13 + +#define DARK_GREY_COLOR RGB(244, 244, 244) +#define LIGHT_GREY_COLOR RGB(38, 38, 38) + +/* Bitmap's size for buttons */ +#define CX_BITMAP 33 +#define CY_BITMAP 33 + +#define NUMBER_OF_BUTTONS 2 + +/* After determining the button as well as its state paint the image strip bitmap using these predefined positions */ +#define BUTTON_SWITCH_USER 0 +#define BUTTON_SWITCH_USER_PRESSED (CY_BITMAP + BUTTON_SWITCH_USER) +#define BUTTON_SWITCH_USER_FOCUSED (CY_BITMAP + BUTTON_SWITCH_USER_PRESSED) +#define BUTTON_LOG_OFF (CY_BITMAP + BUTTON_SWITCH_USER_FOCUSED) +#define BUTTON_LOG_OFF_PRESSED (CY_BITMAP + BUTTON_LOG_OFF) +#define BUTTON_LOG_OFF_FOCUSED (CY_BITMAP + BUTTON_LOG_OFF_PRESSED) +#define BUTTON_SWITCH_USER_DISABLED (CY_BITMAP + BUTTON_LOG_OFF_FOCUSED) // Temporary + +BOOL DrawIconOnOwnerDrawnButtons(DRAWITEMSTRUCT* pdis, PLOGOFF_DLG_CONTEXT pContext) +{ + BOOL bRet = FALSE; + HDC hdcMem = NULL; + HBITMAP hbmOld = NULL; + int y = 0; + RECT rect; + + hdcMem = CreateCompatibleDC(pdis->hDC); + hbmOld = (HBITMAP)SelectObject(hdcMem, pContext->hImageStrip); + rect = pdis->rcItem; + + /* Check the button ID for revelant bitmap to be used */ + switch (pdis->CtlID) + { + case IDC_LOG_OFF_BUTTON: + { + switch (pdis->itemAction) + { + case ODA_DRAWENTIRE: + case ODA_FOCUS: + case ODA_SELECT: + { + y = BUTTON_LOG_OFF; + if (pdis->itemState & ODS_SELECTED) + { + y = BUTTON_LOG_OFF_PRESSED; + } + else if (pContext->bIsButtonHot[0] || (pdis->itemState & ODS_FOCUS)) + { + y = BUTTON_LOG_OFF_FOCUSED; + } + break; + } + } + break; + } + + case IDC_SWITCH_USER_BUTTON: + { + switch (pdis->itemAction) + { + case ODA_DRAWENTIRE: + case ODA_FOCUS: + case ODA_SELECT: + { + y = BUTTON_SWITCH_USER; + if (pdis->itemState & ODS_SELECTED) + { + y = BUTTON_SWITCH_USER_PRESSED; + } + else if (pContext->bIsButtonHot[1] || (pdis->itemState & ODS_FOCUS)) + { + y = BUTTON_SWITCH_USER_FOCUSED; + } + + /* + * Since switch user functionality isn't implemented yet therefore the button has been disabled + * temporarily hence show the disabled state + */ + else if (pdis->itemState & ODS_DISABLED) + { + y = BUTTON_SWITCH_USER_DISABLED; + } + break; + } + } + break; + } + } + + /* If the owner draw button has keyboard focus make it the default button */ + if (pdis->itemState & ODS_FOCUS) + { + SendMessageW(GetParent(pdis->hwndItem), DM_SETDEFID, pdis->CtlID, 0); + } + + /* Draw it on the required button */ + bRet = BitBlt(pdis->hDC, + (rect.right - rect.left - CX_BITMAP) / 2, + (rect.bottom - rect.top - CY_BITMAP) / 2, + CX_BITMAP, CY_BITMAP, hdcMem, 0, y, SRCCOPY); + + SelectObject(hdcMem, hbmOld); + DeleteDC(hdcMem); + + return bRet; +} + +INT_PTR CALLBACK HotButtonSubclass(HWND hButton, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + PLOGOFF_DLG_CONTEXT pContext; + pContext = (PLOGOFF_DLG_CONTEXT)GetWindowLongPtrW(hButton, GWLP_USERDATA); + + int buttonID = GetDlgCtrlID(hButton); + + switch (uMsg) + { + case WM_MOUSEMOVE: + { + HWND hwndTarget = NULL; + POINT pt = {GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)};; + + if (GetCapture() != hButton) + { + SetCapture(hButton); + if (buttonID == IDC_LOG_OFF_BUTTON) + { + pContext->bIsButtonHot[0] = TRUE; + } + else if (buttonID == IDC_SWITCH_USER_BUTTON) + { + pContext->bIsButtonHot[1] = TRUE; + } + SetCursor(LoadCursorW(NULL, MAKEINTRESOURCEW(IDC_HAND))); + } + + ClientToScreen(hButton, &pt); + hwndTarget = WindowFromPoint(pt); + + if (hwndTarget != hButton) + { + ReleaseCapture(); + if (buttonID == IDC_LOG_OFF_BUTTON) + { + pContext->bIsButtonHot[0] = FALSE; + } + else if (buttonID == IDC_SWITCH_USER_BUTTON) + { + pContext->bIsButtonHot[1] = FALSE; + } + } + InvalidateRect(hButton, NULL, FALSE); + break; + } + } + return CallWindowProcW(pContext->OldButtonProc, hButton, uMsg, wParam, lParam); +} + +VOID CreateToolTipForButtons(int controlID, int detailID, HWND hDlg, int titleID) +{ + HWND hwndTool = NULL, hwndTip = NULL; + WCHAR szBuffer[256]; + TTTOOLINFOW tool; + + hwndTool = GetDlgItem(hDlg, controlID); + + tool.cbSize = sizeof(tool); + tool.hwnd = hDlg; + tool.uFlags = TTF_IDISHWND | TTF_SUBCLASS; + tool.uId = (UINT_PTR)hwndTool; + + /* Create the tooltip */ + hwndTip = CreateWindowExW(0, TOOLTIPS_CLASSW, NULL, + WS_POPUP | TTS_ALWAYSTIP | TTS_BALLOON, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + hDlg, NULL, shell32_hInstance, NULL); + + /* Associate the tooltip with the tool. */ + LoadStringW(shell32_hInstance, detailID, szBuffer, _countof(szBuffer)); + tool.lpszText = szBuffer; + SendMessageW(hwndTip, TTM_ADDTOOLW, 0, (LPARAM)&tool); + LoadStringW(shell32_hInstance, titleID, szBuffer, _countof(szBuffer)); + SendMessageW(hwndTip, TTM_SETTITLEW, TTI_NONE, (LPARAM)szBuffer); + SendMessageW(hwndTip, TTM_SETMAXTIPWIDTH, 0, 250); +} + +static BOOL IsFriendlyUIActive(VOID) +{ + DWORD dwType = 0, dwValue = 0, dwSize = 0; + HKEY hKey = NULL; + LONG lRet = 0; + + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\Windows", + 0, + KEY_QUERY_VALUE, + &hKey); + if (lRet != ERROR_SUCCESS) + return FALSE; + + /* First check an optional ReactOS specific override, that Windows does not check. + We use this to allow users pairing 'Server'-configuration with FriendlyLogoff. + Otherwise users would have to change CSDVersion or LogonType (side-effects AppCompat) */ + dwValue = 0; + dwSize = sizeof(dwValue); + lRet = RegQueryValueExW(hKey, + L"EnforceFriendlyLogoff", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize); + + if (lRet == ERROR_SUCCESS && dwType == REG_DWORD && dwValue != FRIENDLY_LOGOFF_IS_NOT_ENFORCED) + { + RegCloseKey(hKey); + return TRUE; + } + + /* Check product version number */ + dwValue = 0; + dwSize = sizeof(dwValue); + lRet = RegQueryValueExW(hKey, + L"CSDVersion", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize); + RegCloseKey(hKey); + + if (lRet != ERROR_SUCCESS || dwType != REG_DWORD || dwValue != IS_PRODUCT_VERSION_WORKSTATION) + { + /* Allow Friendly UI only on Workstation */ + return FALSE; + } + + /* Check LogonType value */ + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", + 0, + KEY_QUERY_VALUE, + &hKey); + if (lRet != ERROR_SUCCESS) + return FALSE; + + dwValue = 0; + dwSize = sizeof(dwValue); + lRet = RegQueryValueExW(hKey, + L"LogonType", + NULL, + &dwType, + (LPBYTE)&dwValue, + &dwSize); + RegCloseKey(hKey); + + if (lRet != ERROR_SUCCESS || dwType != REG_DWORD) + return FALSE; + + return (dwValue != 0); +} + +static VOID FancyLogoffOnInit(HWND hwnd, PLOGOFF_DLG_CONTEXT pContext) +{ + HDC hdc = NULL; + LONG lfHeight = NULL; + + hdc = GetDC(NULL); + lfHeight = -MulDiv(FONT_POINT_SIZE, GetDeviceCaps(hdc, LOGPIXELSY), 72); + ReleaseDC(NULL, hdc); + pContext->hfFont = CreateFontW(lfHeight, 0, 0, 0, FW_MEDIUM, FALSE, 0, 0, 0, 0, 0, 0, 0, L"MS Shell Dlg"); + SendDlgItemMessageW(hwnd, IDC_LOG_OFF_TEXT_STATIC, WM_SETFONT, (WPARAM)pContext->hfFont, TRUE); + + pContext->hBrush = CreateSolidBrush(DARK_GREY_COLOR); + + pContext->hImageStrip = LoadBitmapW(shell32_hInstance, MAKEINTRESOURCEW(IDB_IMAGE_STRIP)); + + CreateToolTipForButtons(IDC_LOG_OFF_BUTTON, IDS_LOG_OFF_DESC, hwnd, IDS_LOG_OFF_TITLE); + CreateToolTipForButtons(IDC_SWITCH_USER_BUTTON, IDS_SWITCH_USER_DESC, hwnd, IDS_SWITCH_USER_TITLE); + + /* Gather old button func */ + pContext->OldButtonProc = (WNDPROC)GetWindowLongPtrW(GetDlgItem(hwnd, IDC_LOG_OFF_BUTTON), GWLP_WNDPROC); + + /* Make buttons to remember pContext and subclass the buttons as well as set bIsButtonHot boolean flags to false */ + for (int i = 0; i < NUMBER_OF_BUTTONS; i++) + { + pContext->bIsButtonHot[i] = FALSE; + SetWindowLongPtrW(GetDlgItem(hwnd, IDC_LOG_OFF_BUTTON + i), GWLP_USERDATA, (LONG_PTR)pContext); + SetWindowLongPtrW(GetDlgItem(hwnd, IDC_LOG_OFF_BUTTON + i), GWLP_WNDPROC, (LONG_PTR)HotButtonSubclass); + } +} + /************************************************************************* * LogOffDialogProc * * NOTES: Used to make the Log Off dialog work */ + INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + DRAWITEMSTRUCT* pdis = (DRAWITEMSTRUCT*)lParam; + PLOGOFF_DLG_CONTEXT pContext; + pContext = (PLOGOFF_DLG_CONTEXT)GetWindowLongPtrW(hwnd, GWLP_USERDATA); + switch (uMsg) { case WM_INITDIALOG: + { + pContext = (PLOGOFF_DLG_CONTEXT)lParam; + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)pContext); + + if (pContext->bFriendlyUI) + FancyLogoffOnInit(hwnd, pContext); return TRUE; + } case WM_CLOSE: - EndDialog(hwnd, IDCANCEL); + DestroyWindow(hwnd); + PostQuitMessage(IDCANCEL); break; -#if 0 + /* + * If the user deactivates the log off dialog (it loses its focus + * while the dialog is not being closed), then destroy the dialog + * box. + */ case WM_ACTIVATE: { if (LOWORD(wParam) == WA_INACTIVE) - EndDialog(hwnd, 0); + { + DestroyWindow(hwnd); + PostQuitMessage(0); + } return FALSE; } -#endif case WM_COMMAND: switch (LOWORD(wParam)) { + case IDC_LOG_OFF_BUTTON: case IDOK: ExitWindowsEx(EWX_LOGOFF, 0); break; case IDCANCEL: - EndDialog(hwnd, IDCANCEL); + DestroyWindow(hwnd); + PostQuitMessage(IDCANCEL); break; } break; + case WM_DESTROY: + DeleteObject(pContext->hBrush); + DeleteObject(pContext->hImageStrip); + DeleteObject(pContext->hfFont); + + /* Remove the subclass from the buttons */ + for (int i = 0; i < NUMBER_OF_BUTTONS; i++) + { + SetWindowLongPtrW(GetDlgItem(hwnd, IDC_LOG_OFF_BUTTON + i), GWLP_WNDPROC, (LONG_PTR)pContext->OldButtonProc); + } + return TRUE; + + case WM_CTLCOLORSTATIC: + { + /* Either make background transparent or fill it with color for required static controls */ + HDC hdcStatic = (HDC)wParam; + UINT StaticID = (UINT)GetWindowLongPtrW((HWND)lParam, GWL_ID); + + switch (StaticID) + { + case IDC_LOG_OFF_TEXT_STATIC: + SetTextColor(hdcStatic, DARK_GREY_COLOR); + SetBkMode(hdcStatic, TRANSPARENT); + return (INT_PTR)GetStockObject(HOLLOW_BRUSH); + + case IDC_LOG_OFF_STATIC: + case IDC_SWITCH_USER_STATIC: + SetTextColor(hdcStatic, LIGHT_GREY_COLOR); + SetBkMode(hdcStatic, TRANSPARENT); + return (LONG_PTR)pContext->hBrush; + } + return FALSE; + } + break; + + case WM_DRAWITEM: + { + /* Draw bitmaps on required buttons */ + switch (pdis->CtlID) + { + case IDC_LOG_OFF_BUTTON: + case IDC_SWITCH_USER_BUTTON: + return DrawIconOnOwnerDrawnButtons(pdis, pContext); + } + } + break; + default: break; } @@ -1114,12 +1489,54 @@ INT_PTR CALLBACK LogOffDialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP EXTERN_C int WINAPI LogoffWindowsDialog(HWND hWndOwner) { CComPtr<IUnknown> fadeHandler; - HWND parent; - + BOOL bIsAltKeyPressed = FALSE; + MSG Msg; + HWND parent = NULL; + HWND hWndChild = NULL; + WCHAR szBuffer[30]; + DWORD LogoffDialogID = IDD_LOG_OFF; + LOGOFF_DLG_CONTEXT Context; + if (!CallShellDimScreen(&fadeHandler, &parent)) parent = hWndOwner; - DialogBoxW(shell32_hInstance, MAKEINTRESOURCEW(IDD_LOG_OFF), parent, LogOffDialogProc); + Context.bFriendlyUI = IsFriendlyUIActive(); + + if (Context.bFriendlyUI) + { + LogoffDialogID = IDD_LOG_OFF_FANCY; + } + + hWndChild = CreateDialogParamW(shell32_hInstance, MAKEINTRESOURCEW(LogoffDialogID), parent, LogOffDialogProc, (LPARAM)&Context); + ShowWindow(hWndChild, SW_SHOWNORMAL); + + /* Detect either Alt key has been pressed */ + while (GetMessageW(&Msg, NULL, 0, 0)) + { + if(!IsDialogMessageW(hWndChild, &Msg)) + { + TranslateMessage(&Msg); + DispatchMessageW(&Msg); + } + + switch (Msg.message) + { + case WM_SYSKEYDOWN: + { + /* If the Alt key has been pressed once, add prefix to static controls */ + if (Msg.wParam == VK_MENU && !bIsAltKeyPressed && Context.bFriendlyUI) + { + for (int i = 0; i < NUMBER_OF_BUTTONS; i++) + { + GetDlgItemTextW(hWndChild, IDC_LOG_OFF_BUTTON + i, szBuffer, _countof(szBuffer)); + SetDlgItemTextW(hWndChild, IDC_LOG_OFF_STATIC + i, szBuffer); + } + bIsAltKeyPressed = TRUE; + } + } + break; + } + } return 0; } diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index ee4d85bd4d7..e5c2f3fb68b 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -494,6 +494,20 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Излизане", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Излизане от РеактОС", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Излизане", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Откачане от РеактОС" @@ -1009,4 +1023,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Излизане" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 0efaba8e9fc..3ba72022b7a 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Log Off", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Log Off ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Log Off", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Disconnect ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Log Off" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index bd35687c51d..eddcb806e50 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -510,6 +510,20 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 99, 38, 47, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Odpojit", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Storno", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Odpojit", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Odpojit", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_AUTOPLAY1 DIALOGEX 0, 0, 227, 218 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION CAPTION "Autopřehrávání" @@ -1014,4 +1028,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Odpojit" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index 6a62e89fc92..293fd440b4e 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -499,6 +499,20 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Log Off", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Log Off ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Log Off", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Disconnect ReactOS" @@ -1014,4 +1028,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Log Off" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index 0dfa9dd9700..ef277e82f7c 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 95, 39, 50, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Abmelden", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Abbrechen", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Abmelden", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Abmelden", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS trennen" @@ -1009,4 +1023,10 @@ BEGIN IDS_MOVEBUTTON "Verschieben" IDS_SYSTEMFOLDER "Systemordner" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Abmelden" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 8717da29146..ce106509d38 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Log Off", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Log Off ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Log Off", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Disconnect ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Log Off" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index f14f2006474..2bb9e8190a7 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Log Off", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Log Off ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Log Off", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Disconnect ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Log Off" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 0dbe4c0b75a..9359508d048 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Log Off", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Log Off ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Log Off", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Disconnect ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Log Off" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index bd497687819..d9bcc0252e7 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -502,6 +502,20 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 95, 39, 50, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Cerrar sesión", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancelar", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Cerrar sesión de ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 165, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Cerrar sesión", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Desconectar ReactOS" @@ -1017,4 +1031,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Cerrar sesión" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 93bb2e9d8b8..604d3b7f09d 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -500,6 +500,20 @@ BEGIN PUSHBUTTON "Loobu", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Logi välja", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Loobu", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Logi ReactOS'ist välja", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 165, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Logi välja", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Ühenda ReactOS lahti" @@ -1015,4 +1029,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Logi välja" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 007a086d95e..39ff8185b1d 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Log Off", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Log Off ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Log Off", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Disconnect ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Log Off" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 6a95cfd000e..d9c7c056248 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 95, 39, 50, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Fermer", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Annuler", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Fermer ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Fermer", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Déconnecter ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Déplacer" IDS_SYSTEMFOLDER "Dossier système" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Fermer" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 628830d04eb..49c46f5bf0e 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -495,6 +495,20 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "התנתק", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "ביטול", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "התנתקות מ-ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 135, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "התנתק", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ניתוק ReactOS" @@ -1010,4 +1024,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "התנתק" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index c13f2730c19..338c1122fe0 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "रद्द करें", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&लॉग आफ़", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "रद्द करें", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "लॉग ऑफ़ रिऐक्ट ओएस", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "लॉग आफ़", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "डिस्कनेक्ट रिऐक्ट ओएस" @@ -1003,4 +1017,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "लॉग आफ़" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 5f6c86a7e0f..c5101c5142c 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Mégse", IDCANCEL, 109, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Kijelentkezés", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Mégse", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Kijelentkezés a ReactOS-ből", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 165, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Kijelentkezés", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS leválasztása" @@ -1007,4 +1021,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Kijelentkezés" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 8d2931cf96f..a2fdca2d906 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Batal", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Keluar", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Keluar ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Keluar", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Pemutusan ReactOS" @@ -1004,4 +1018,10 @@ BEGIN IDS_MOVEBUTTON "Pindahkan" IDS_SYSTEMFOLDER "Folder Sistem" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Keluar" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index c442b3c82bf..6b3a3cd2c0a 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 95, 39, 50, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Chiudi sessione", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Annulla", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Chiudi sessione di ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 165, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Chiudi sessione", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Scollega ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Chiudi sessione" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index 8a3997f3d12..7ebf24f548d 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 95, 39, 50, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 9, "MS UI Gothic" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 180, 2, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 57, 46, 19, 19, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "ログオフ(&L)", IDC_LOG_OFF_BUTTON, 134, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "キャンセル", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "ReactOS のログオフ", IDC_LOG_OFF_TEXT_STATIC, 4, 9, 130, 20 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "ログオフ", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "ReactOS の切断" @@ -1005,4 +1019,10 @@ BEGIN IDS_MOVEBUTTON "移動" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "ログオフ" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 139a5226fe8..044323a12d2 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 9, "굴림" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 180, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 57, 46, 19, 19, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Log Off", IDC_LOG_OFF_BUTTON, 134, 46, 19, 19, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Log Off ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 9, 130, 20 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Log Off", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Disconnect ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Log Off" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index f598cfef746..a3277ed63fa 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Log Off", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancel", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Log Off ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Log Off", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Disconnect ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Log Off" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 4058056a405..7a035c25f37 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 122, 40, 60, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Logg av", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Avbryt", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Logg av ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Logg av", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Koble fra ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Logg av" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index c2c9d303f92..67eb0a140b0 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -499,6 +499,20 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 95, 39, 50, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Wyloguj", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Anuluj", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Wylogowywanie z systemu ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 170, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Wyloguj", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Odłączanie systemu ReactOS" @@ -1014,4 +1028,10 @@ BEGIN IDS_MOVEBUTTON "Przenieś" IDS_SYSTEMFOLDER "Folder systemowy" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Wyloguj" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index d128f0eda74..f2d2d3e4c07 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Log Off", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancelar", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Log Off ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Log Off", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Desconectar ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Log Off" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index b09f19dd217..43ae635f611 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -493,6 +493,20 @@ BEGIN PUSHBUTTON "&Cancelar", IDCANCEL, 99, 38, 43, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Terminar a sessão", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "Cancelar", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Terminar sessão ReactOS", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 150, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Terminar a sessão", IDC_LOG_OFF_STATIC, 116, 70, 55, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Encerrar ReactOS" @@ -1008,4 +1022,10 @@ BEGIN IDS_MOVEBUTTON "Mover" IDS_SYSTEMFOLDER "Pasta de sistema" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Terminar a sessão" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index d1fca5dd7d2..8224309a356 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -495,6 +495,20 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 95, 39, 50, 14 END +IDD_LOG_OFF_FANCY DIALOGEX 0, 0, 208, 122 +STYLE NOT WS_VISIBLE | DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_POPUP +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_DLG_BG, IDC_STATIC, "STATIC", SS_BITMAP | SS_REALSIZECONTROL, 0, 0, 208, 122 + CONTROL IDB_REACTOS_FLAG, IDC_STATIC, "STATIC", SS_BITMAP, 176, 1, 32, 26 + PUSHBUTTON "&Switch User", IDC_SWITCH_USER_BUTTON, 55, 46, 22, 20, BS_OWNERDRAW | WS_DISABLED | WS_GROUP + PUSHBUTTON "&Deautentifică", IDC_LOG_OFF_BUTTON, 132, 46, 22, 20, BS_OWNERDRAW + PUSHBUTTON "A&nulează", IDCANCEL, 162, 103, 40, 12, WS_GROUP | BS_FLAT + LTEXT "Deautentificare", IDC_LOG_OFF_TEXT_STATIC, 4, 7, 130, 19 + CTEXT "Switch User", IDC_SWITCH_USER_STATIC, 41, 70, 51, 11 + CTEXT "Deautentifică", IDC_LOG_OFF_STATIC, 118, 70, 51, 11 +END + IDD_DISCONNECT DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION CAPTION "Deconectare" @@ -1010,4 +1024,10 @@ BEGIN IDS_MOVEBUTTON "Move" IDS_SYSTEMFOLDER "System Folder" + + /* For IDD_LOG_OFF_FANCY */ + IDS_LOG_OFF_DESC "Closes your programs and ends your ReactOS session." + IDS_SWITCH_USER_DESC "Lets another user log on while your programs and files remain open.\r\n\r\n(You can also switch users by pressing the Windows logo key + L.)" + IDS_LOG_OFF_TITLE "Deautentifică" + IDS_SWITCH_USER_TITLE "Switch User" END diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc ... 1205 lines suppressed ...

3 years, 6 months

[reactos] 01/01: [LSASRV][SECUR32] Fix the naming mess

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fbb295d4ae8883edeb21… commit 1fbb295d4ae8883edeb21e969da1d9e7bb18eb8e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 28 11:03:07 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 28 11:03:33 2021 +0100 [LSASRV][SECUR32] Fix the naming mess Rename Untrusted to TrustredCaller in LSA_CONNECTION_INFO and LSAP_LOGON_CONTEXT in order to clarify the meaning of the variable. --- dll/win32/lsasrv/authpackage.c | 18 +++++++++--------- dll/win32/lsasrv/authport.c | 6 +++--- dll/win32/lsasrv/lsasrv.h | 2 +- dll/win32/secur32/lsalpc.c | 3 ++- sdk/include/reactos/subsys/lsass/lsass.h | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dll/win32/lsasrv/authpackage.c b/dll/win32/lsasrv/authpackage.c index ef8f80ae57e..8e509ed72e2 100644 --- a/dll/win32/lsasrv/authpackage.c +++ b/dll/win32/lsasrv/authpackage.c @@ -585,15 +585,7 @@ LsapCallAuthenticationPackage(PLSA_API_MSG RequestMsg, } } - if (LogonContext->Untrusted) - Status = Package->LsaApCallPackageUntrusted((PLSA_CLIENT_REQUEST)LogonContext, - LocalBuffer, - RequestMsg->CallAuthenticationPackage.Request.ProtocolSubmitBuffer, - RequestMsg->CallAuthenticationPackage.Request.SubmitBufferLength, - &RequestMsg->CallAuthenticationPackage.Reply.ProtocolReturnBuffer, - &RequestMsg->CallAuthenticationPackage.Reply.ReturnBufferLength, - &RequestMsg->CallAuthenticationPackage.Reply.ProtocolStatus); - else + if (LogonContext->TrustedCaller) Status = Package->LsaApCallPackage((PLSA_CLIENT_REQUEST)LogonContext, LocalBuffer, RequestMsg->CallAuthenticationPackage.Request.ProtocolSubmitBuffer, @@ -601,6 +593,14 @@ LsapCallAuthenticationPackage(PLSA_API_MSG RequestMsg, &RequestMsg->CallAuthenticationPackage.Reply.ProtocolReturnBuffer, &RequestMsg->CallAuthenticationPackage.Reply.ReturnBufferLength, &RequestMsg->CallAuthenticationPackage.Reply.ProtocolStatus); + else + Status = Package->LsaApCallPackageUntrusted((PLSA_CLIENT_REQUEST)LogonContext, + LocalBuffer, + RequestMsg->CallAuthenticationPackage.Request.ProtocolSubmitBuffer, + RequestMsg->CallAuthenticationPackage.Request.SubmitBufferLength, + &RequestMsg->CallAuthenticationPackage.Reply.ProtocolReturnBuffer, + &RequestMsg->CallAuthenticationPackage.Reply.ReturnBufferLength, + &RequestMsg->CallAuthenticationPackage.Reply.ProtocolStatus); if (!NT_SUCCESS(Status)) { TRACE("Package->LsaApCallPackage() failed (Status 0x%08lx)\n", Status); diff --git a/dll/win32/lsasrv/authport.c b/dll/win32/lsasrv/authport.c index aec05f287e2..e8140c0930f 100644 --- a/dll/win32/lsasrv/authport.c +++ b/dll/win32/lsasrv/authport.c @@ -135,10 +135,10 @@ LsapCheckLogonProcess(PLSA_API_MSG RequestMsg, TRACE("New LogonContext: %p\n", Context); Context->ClientProcessHandle = ProcessHandle; - Context->Untrusted = RequestMsg->ConnectInfo.Untrusted; + Context->TrustedCaller = RequestMsg->ConnectInfo.TrustedCaller; - if (Context->Untrusted == FALSE) - Context->Untrusted = !LsapIsTrustedClient(ProcessHandle); + if (Context->TrustedCaller) + Context->TrustedCaller = LsapIsTrustedClient(ProcessHandle); *LogonContext = Context; diff --git a/dll/win32/lsasrv/lsasrv.h b/dll/win32/lsasrv/lsasrv.h index 106a175722b..5e1725f81b8 100644 --- a/dll/win32/lsasrv/lsasrv.h +++ b/dll/win32/lsasrv/lsasrv.h @@ -79,7 +79,7 @@ typedef struct _LSAP_LOGON_CONTEXT LIST_ENTRY Entry; HANDLE ClientProcessHandle; HANDLE ConnectionHandle; - BOOL Untrusted; + BOOL TrustedCaller; } LSAP_LOGON_CONTEXT, *PLSAP_LOGON_CONTEXT; typedef struct _SAMPR_ULONG_ARRAY diff --git a/dll/win32/secur32/lsalpc.c b/dll/win32/secur32/lsalpc.c index 6c21f5f1b97..131538103c3 100644 --- a/dll/win32/secur32/lsalpc.c +++ b/dll/win32/secur32/lsalpc.c @@ -74,6 +74,7 @@ LsapOpenLsaPort(VOID) sizeof(ConnectInfo)); ConnectInfo.CreateContext = FALSE; + ConnectInfo.TrustedCaller = TRUE; ConnectInfoLength = sizeof(LSA_CONNECTION_INFO); Status = NtConnectPort(&LsaPortHandle, @@ -174,7 +175,7 @@ LsaConnectUntrusted( ConnectInfoLength); ConnectInfo.CreateContext = TRUE; - ConnectInfo.Untrusted = TRUE; + ConnectInfo.TrustedCaller = FALSE; Status = NtConnectPort(LsaHandle, &PortName, diff --git a/sdk/include/reactos/subsys/lsass/lsass.h b/sdk/include/reactos/subsys/lsass/lsass.h index 612c60b4ff3..5522b0ef85f 100644 --- a/sdk/include/reactos/subsys/lsass/lsass.h +++ b/sdk/include/reactos/subsys/lsass/lsass.h @@ -35,7 +35,7 @@ typedef struct _LSA_CONNECTION_INFO ULONG Length; CHAR LogonProcessNameBuffer[LSASS_MAX_LOGON_PROCESS_NAME_LENGTH + 1]; BOOL CreateContext; - BOOL Untrusted; + BOOL TrustedCaller; } LSA_CONNECTION_INFO, *PLSA_CONNECTION_INFO;

3 years, 6 months

[reactos] 01/01: [ATL_APITEST] Fixup of #3492; fix SubclassWindow testcase

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e32854998bffb8af580b… commit 9e32854998bffb8af580b570495c1a25027595db Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Feb 28 13:06:49 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Feb 28 13:13:38 2021 +0900 [ATL_APITEST] Fixup of #3492; fix SubclassWindow testcase Fix the tests at Line 359 and 403. CORE-9281 --- modules/rostests/apitests/atl/SubclassWindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/atl/SubclassWindow.cpp b/modules/rostests/apitests/atl/SubclassWindow.cpp index f372b1e7f9e..14b114ea44d 100644 --- a/modules/rostests/apitests/atl/SubclassWindow.cpp +++ b/modules/rostests/apitests/atl/SubclassWindow.cpp @@ -356,7 +356,7 @@ START_TEST(SubclassWindow) hwnd2 = Ctrl2.UnsubclassWindow(TRUE); ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); fn2 = Ctrl2.m_pfnSuperWindowProc; - ok(fn2 == fn1, "fn2 was %p\n", fn2); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); DestroyWindow(hwnd2); ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); @@ -400,7 +400,7 @@ START_TEST(SubclassWindow) hwnd2 = Ctrl2.UnsubclassWindow(TRUE); ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); fn2 = Ctrl2.m_pfnSuperWindowProc; - ok(fn2 != DefWindowProc, "fn2 was %p\n", fn2); // ntdll.dll!NtdllEditWndProc_W + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); DestroyWindow(hwnd2); ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd);

3 years, 6 months

[reactos] 01/01: [SDK][ATL] Implement UnsubclassWindow methods (#3492)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef3e7a3717e13a97a652a… commit ef3e7a3717e13a97a652a961e5217a249778f4d4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Feb 28 12:45:16 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Feb 28 12:45:16 2021 +0900 [SDK][ATL] Implement UnsubclassWindow methods (#3492) I want UnsubclassWindow methods. - Implement CWindowImpl::UnsubclassWindow method. - Implement CContainedWindowT::UnsubclassWindow method. - Add SubclassWindow testcase to atl_apitest test program. - Fix generic text mapping of <atlwin.h>. CORE-9281 --- modules/rostests/apitests/atl/CMakeLists.txt | 3 +- modules/rostests/apitests/atl/SubclassWindow.cpp | 428 +++++++++++++++++++++ modules/rostests/apitests/atl/devenv/.gitignore | 16 + modules/rostests/apitests/atl/devenv/ATLTest.sln | 10 + .../apitests/atl/devenv/SubclassWindow.vcxproj | 189 +++++++++ modules/rostests/apitests/atl/testlist.c | 2 + sdk/lib/atl/atlwin.h | 89 +++-- 7 files changed, 712 insertions(+), 25 deletions(-) diff --git a/modules/rostests/apitests/atl/CMakeLists.txt b/modules/rostests/apitests/atl/CMakeLists.txt index 555529b7e38..8f12a5071aa 100644 --- a/modules/rostests/apitests/atl/CMakeLists.txt +++ b/modules/rostests/apitests/atl/CMakeLists.txt @@ -16,7 +16,8 @@ list(APPEND SOURCE CRegKey.cpp CSimpleArray.cpp CSimpleMap.cpp - CString.cpp) + CString.cpp + SubclassWindow.cpp) list(APPEND PCH_SKIP_SOURCE testlist.c) diff --git a/modules/rostests/apitests/atl/SubclassWindow.cpp b/modules/rostests/apitests/atl/SubclassWindow.cpp new file mode 100644 index 00000000000..f372b1e7f9e --- /dev/null +++ b/modules/rostests/apitests/atl/SubclassWindow.cpp @@ -0,0 +1,428 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for SubclassWindow/UnsubclassWindow + * PROGRAMMER: Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) + */ + +#ifdef HAVE_APITEST + #include <apitest.h> + #define ATLASSUME(x) /*empty*/ + #define ATLASSERT(x) /*empty*/ +#else + #include "atltest.h" + #define ATLASSUME(x) do { \ + trace("ATLASSUME(%s) %s.\n", #x, ((x) ? "success" : "failure")); \ + } while (0) + #define ATLASSERT(x) do { \ + trace("ATLASSERT(%s) %s.\n", #x, ((x) ? "success" : "failure")); \ + } while (0) +#endif + +#include <atlbase.h> +#include <atlwin.h> + +#ifdef _WIN64 + #define INVALID_HWND ((HWND)(ULONG_PTR)0xDEADBEEFDEADBEEFULL) +#else + #define INVALID_HWND ((HWND)(ULONG_PTR)0xDEADBEEF) +#endif + +static BOOL s_flag = TRUE; + +class CMyCtrl1 : public CWindowImpl<CMyCtrl1, CWindow> +{ +public: + static LPCWSTR GetWndClassName() + { + if (s_flag) + return L"EDIT"; + else + return L"STATIC"; + } + + CMyCtrl1() + { + } + virtual ~CMyCtrl1() + { + } + + BEGIN_MSG_MAP(CMyCtrl1) + END_MSG_MAP() +}; + +class CMyCtrl2 + : public CContainedWindowT<CWindowImpl<CMyCtrl2, CWindow> > +{ +public: + static LPCWSTR GetWndClassName() + { + if (s_flag) + return L"EDIT"; + else + return L"STATIC"; + } + + CMyCtrl2() : CContainedWindowT<CWindowImpl<CMyCtrl2, CWindow> >(this) + { + } + virtual ~CMyCtrl2() + { + } + + BEGIN_MSG_MAP(CMyCtrl2) + END_MSG_MAP() +}; + +static HWND MyCreateWindow(DWORD style) +{ + return CreateWindowW(L"EDIT", NULL, style, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, GetModuleHandleW(NULL), NULL); +} + +static LRESULT CALLBACK +MyWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return 0; +} + +START_TEST(SubclassWindow) +{ + const DWORD style = WS_POPUPWINDOW | ES_MULTILINE; + HWND hwnd1, hwnd2; + WNDPROC fn1, fn2; + BOOL b; + trace("DefWindowProcA == %p\n", DefWindowProcA); + trace("DefWindowProcW == %p\n", DefWindowProcW); + trace("MyWindowProc == %p\n", MyWindowProc); + + // + // Ctrl1 + // + { + CMyCtrl1 Ctrl1; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl1.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl1.m_hWnd == hwnd1, "Ctrl1.m_hWnd was %p\n", Ctrl1.m_hWnd); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl1.UnsubclassWindow(); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + DestroyWindow(hwnd2); + ok(Ctrl1.m_hWnd == NULL, "hwnd != NULL\n"); + } + + { + CMyCtrl1 Ctrl1; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl1.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl1.m_hWnd == hwnd1, "Ctrl1.m_hWnd was %p\n", Ctrl1.m_hWnd); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl1.UnsubclassWindow(); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl1.m_pfnSuperWindowProc; + ok(fn2 == fn1, "fn2 was %p\n", fn2); + DestroyWindow(hwnd2); + ok(Ctrl1.m_hWnd == NULL, "hwnd != NULL\n"); + } + + { + CMyCtrl1 Ctrl1; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl1.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl1.m_hWnd == hwnd1, "Ctrl1.m_hWnd was %p\n", Ctrl1.m_hWnd); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl1.UnsubclassWindow(); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + DestroyWindow(hwnd2); + ok(Ctrl1.m_hWnd == NULL, "hwnd != NULL\n"); + } + + { + CMyCtrl1 Ctrl1; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl1.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl1.m_hWnd == hwnd1, "Ctrl1.m_hWnd was %p\n", Ctrl1.m_hWnd); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl1.UnsubclassWindow(); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == fn2, "fn1 != fn2\n"); + DestroyWindow(hwnd2); + ok(Ctrl1.m_hWnd == NULL, "hwnd != NULL\n"); + } + + { + CMyCtrl1 Ctrl1; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl1.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl1.m_hWnd == hwnd1, "Ctrl1.m_hWnd was %p\n", Ctrl1.m_hWnd); + Ctrl1.m_pfnSuperWindowProc = MyWindowProc; + hwnd2 = Ctrl1.UnsubclassWindow(); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl1.m_pfnSuperWindowProc; + ok(fn1 == fn2, "fn2 was %p\n", fn2); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + DestroyWindow(hwnd2); + ok(Ctrl1.m_hWnd == NULL, "hwnd != NULL\n"); + } + + // + // Ctrl2 (Not Forced) + // + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl2.UnsubclassWindow(FALSE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl2.UnsubclassWindow(FALSE); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == fn2, "fn1 == fn2\n"); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl2.UnsubclassWindow(FALSE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl2.UnsubclassWindow(FALSE); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn2 != DefWindowProc, "fn2 was %p\n", fn2); // ntdll.dll!NtdllEditWndProc_W + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + Ctrl2.m_pfnSuperWindowProc = MyWindowProc; + hwnd2 = Ctrl2.UnsubclassWindow(FALSE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "hwnd != NULL\n"); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "hwnd != NULL\n"); + } + + // + // Ctrl2 (Forced) + // + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl2.UnsubclassWindow(TRUE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl2.UnsubclassWindow(TRUE); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn2 == fn1, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + hwnd2 = Ctrl2.UnsubclassWindow(TRUE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != fn2, "fn1 == fn2\n"); + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = FALSE; // "STATIC" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 != DefWindowProc, "fn1 was %p\n", fn1); + DestroyWindow(hwnd1); // destroy now + hwnd2 = Ctrl2.UnsubclassWindow(TRUE); + ok(hwnd2 == NULL, "hwnd2 was %p\n", hwnd2); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn2 != DefWindowProc, "fn2 was %p\n", fn2); // ntdll.dll!NtdllEditWndProc_W + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + } + + { + CMyCtrl2 Ctrl2; + s_flag = TRUE; // "EDIT" + hwnd1 = MyCreateWindow(style); + ok(hwnd1 != NULL, "hwnd1 was NULL\n"); + fn1 = Ctrl2.m_pfnSuperWindowProc; + ok(fn1 == DefWindowProc, "fn1 was %p\n", fn1); + b = Ctrl2.SubclassWindow(hwnd1); + ok_int(b, TRUE); + ok(Ctrl2.m_hWnd == hwnd1, "Ctrl2.m_hWnd was %p\n", Ctrl2.m_hWnd); + Ctrl2.m_pfnSuperWindowProc = MyWindowProc; + hwnd2 = Ctrl2.UnsubclassWindow(TRUE); + ok(hwnd1 == hwnd2, "hwnd1 != hwnd2\n"); + fn2 = Ctrl2.m_pfnSuperWindowProc; + ok(fn2 == DefWindowProc, "fn2 was %p\n", fn2); + ok(Ctrl2.m_hWnd == NULL, "hwnd != NULL\n"); + DestroyWindow(hwnd2); + ok(Ctrl2.m_hWnd == NULL, "hwnd != NULL\n"); + } +} diff --git a/modules/rostests/apitests/atl/devenv/.gitignore b/modules/rostests/apitests/atl/devenv/.gitignore new file mode 100644 index 00000000000..15eeeeb1607 --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/.gitignore @@ -0,0 +1,16 @@ +*.opendb +*.db +x64/ +.vs/ +CAtlArray/ +CAtlFileMapping/ +CAtlList/ +CComHeapPtr/ +CComObject/ +CComQIPtr/ +CHeapPtrList/ +CImage/ +CSimpleArray/ +CSimpleMap/ +CString/ +SubclassWindow/ diff --git a/modules/rostests/apitests/atl/devenv/ATLTest.sln b/modules/rostests/apitests/atl/devenv/ATLTest.sln index 8fd0e07a092..9811121c7fd 100644 --- a/modules/rostests/apitests/atl/devenv/ATLTest.sln +++ b/modules/rostests/apitests/atl/devenv/ATLTest.sln @@ -25,6 +25,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CHeapPtrList", "CHeapPtrLis EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CComHeapPtr", "CComHeapPtr.vcxproj", "{F10E34E3-FB53-4650-985A-28BD1905D65C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SubclassWindow", "SubclassWindow.vcxproj", "{ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -121,6 +123,14 @@ Global {F10E34E3-FB53-4650-985A-28BD1905D65C}.Release|x64.Build.0 = Release|x64 {F10E34E3-FB53-4650-985A-28BD1905D65C}.Release|x86.ActiveCfg = Release|Win32 {F10E34E3-FB53-4650-985A-28BD1905D65C}.Release|x86.Build.0 = Release|Win32 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Debug|x64.ActiveCfg = Debug|x64 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Debug|x64.Build.0 = Debug|x64 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Debug|x86.ActiveCfg = Debug|Win32 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Debug|x86.Build.0 = Debug|Win32 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Release|x64.ActiveCfg = Release|x64 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Release|x64.Build.0 = Release|x64 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Release|x86.ActiveCfg = Release|Win32 + {ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/modules/rostests/apitests/atl/devenv/SubclassWindow.vcxproj b/modules/rostests/apitests/atl/devenv/SubclassWindow.vcxproj new file mode 100644 index 00000000000..5b1569b871c --- /dev/null +++ b/modules/rostests/apitests/atl/devenv/SubclassWindow.vcxproj @@ -0,0 +1,189 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{ABACDAE7-3936-17E1-7525-96C4A7DA4CD2}</ProjectGuid> + <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <Keyword>AtlProj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140_xp</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>true</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <IgnoreImportLibrary>true</IgnoreImportLibrary> + <LinkIncremental>false</LinkIncremental> + <IntDir>$(ProjectName)\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>NotUsing</PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <SDLCheck>true</SDLCheck> + </ClCompile> + <ResourceCompile> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ResourceCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="../SubclassWindow.cpp"> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MultiThreaded</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebug</RuntimeLibrary> + <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebug</RuntimeLibrary> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\resource.h" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\atl_apitest.rc" /> + </ItemGroup> + <ItemGroup> + <None Include="..\cstring.inl" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file diff --git a/modules/rostests/apitests/atl/testlist.c b/modules/rostests/apitests/atl/testlist.c index 028063f826e..213ce2419c4 100644 --- a/modules/rostests/apitests/atl/testlist.c +++ b/modules/rostests/apitests/atl/testlist.c @@ -16,6 +16,7 @@ extern void func_CRegKey(void); extern void func_CSimpleArray(void); extern void func_CSimpleMap(void); extern void func_CString(void); +extern void func_SubclassWindow(void); const struct test winetest_testlist[] = { @@ -34,5 +35,6 @@ const struct test winetest_testlist[] = { "CSimpleArray", func_CSimpleArray }, { "CSimpleMap", func_CSimpleMap }, { "CString", func_CString }, + { "SubclassWindow", func_SubclassWindow }, { 0, 0 } }; diff --git a/sdk/lib/atl/atlwin.h b/sdk/lib/atl/atlwin.h index 70f0413b41a..d8994988d40 100644 --- a/sdk/lib/atl/atlwin.h +++ b/sdk/lib/atl/atlwin.h @@ -1482,28 +1482,49 @@ public: BOOL SubclassWindow(HWND hWnd) { - CWindowImplBaseT<TBase, TWinTraits> *pThis; - WNDPROC newWindowProc; - WNDPROC oldWindowProc; - BOOL result; - ATLASSERT(m_hWnd == NULL); ATLASSERT(::IsWindow(hWnd)); + CWindowImplBaseT<TBase, TWinTraits> *pThis; pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits>*>(this); - result = m_thunk.Init(GetWindowProc(), this); + BOOL result = m_thunk.Init(GetWindowProc(), this); if (result == FALSE) return FALSE; - newWindowProc = m_thunk.GetWNDPROC(); - oldWindowProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtr(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(newWindowProc))); + + WNDPROC newWindowProc = m_thunk.GetWNDPROC(); + WNDPROC oldWindowProc = reinterpret_cast<WNDPROC>( + ::SetWindowLongPtr(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(newWindowProc))); if (oldWindowProc == NULL) return FALSE; - m_pfnSuperWindowProc = oldWindowProc; + + pThis->m_pfnSuperWindowProc = oldWindowProc; pThis->m_hWnd = hWnd; return TRUE; } + HWND UnsubclassWindow(BOOL bForce = FALSE) + { + ATLASSERT(m_hWnd != NULL); + ATLASSERT(::IsWindow(m_hWnd)); + + CWindowImplBaseT<TBase, TWinTraits>* pThis; + pThis = reinterpret_cast<CWindowImplBaseT<TBase, TWinTraits>*>(this); + + HWND hwndOld = pThis->m_hWnd; + WNDPROC oldWindowProc = m_thunk.GetWNDPROC(); + WNDPROC subclassedProc = reinterpret_cast<WNDPROC>( + ::GetWindowLongPtr(hwndOld, GWLP_WNDPROC)); + if (!bForce && oldWindowProc != subclassedProc) + return NULL; + + ::SetWindowLongPtr(hwndOld, GWLP_WNDPROC, + (LONG_PTR)pThis->m_pfnSuperWindowProc); + pThis->m_pfnSuperWindowProc = ::DefWindowProc; + pThis->m_hWnd = NULL; + return hwndOld; + } + virtual WNDPROC GetWindowProc() { return WindowProc; @@ -1609,7 +1630,7 @@ public: MenuOrID.m_hMenu = (HMENU)(UINT_PTR)this; if (rect.m_lpRect == NULL) rect.m_lpRect = &TBase::rcDefault; - hWnd = ::CreateWindowEx(dwExStyle, reinterpret_cast<LPCWSTR>(MAKEINTATOM(atom)), szWindowName, dwStyle, rect.m_lpRect->left, + hWnd = ::CreateWindowEx(dwExStyle, MAKEINTATOM(atom), szWindowName, dwStyle, rect.m_lpRect->left, rect.m_lpRect->top, rect.m_lpRect->right - rect.m_lpRect->left, rect.m_lpRect->bottom - rect.m_lpRect->top, hWndParent, MenuOrID.m_hMenu, _AtlBaseModule.GetModuleInstance(), lpCreateParam); @@ -1681,7 +1702,7 @@ public: m_pCurrentMsg = NULL; } - CContainedWindowT(LPTSTR lpszClassName, CMessageMap *pObject, DWORD dwMsgMapID = 0) + CContainedWindowT(LPCTSTR lpszClassName, CMessageMap *pObject, DWORD dwMsgMapID = 0) { m_lpszClassName = lpszClassName; m_pfnSuperWindowProc = ::DefWindowProc; @@ -1697,28 +1718,48 @@ public: BOOL SubclassWindow(HWND hWnd) { - CContainedWindowT<TBase> *pThis; - WNDPROC newWindowProc; - WNDPROC oldWindowProc; - BOOL result; - ATLASSERT(m_hWnd == NULL); ATLASSERT(::IsWindow(hWnd)); + CContainedWindowT<TBase> *pThis; pThis = reinterpret_cast<CContainedWindowT<TBase> *>(this); - result = m_thunk.Init(WindowProc, pThis); + BOOL result = m_thunk.Init(WindowProc, pThis); if (result == FALSE) return FALSE; - newWindowProc = m_thunk.GetWNDPROC(); - oldWindowProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtr(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(newWindowProc))); + + WNDPROC newWindowProc = m_thunk.GetWNDPROC(); + WNDPROC oldWindowProc = reinterpret_cast<WNDPROC>( + ::SetWindowLongPtr(hWnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(newWindowProc))); if (oldWindowProc == NULL) return FALSE; - m_pfnSuperWindowProc = oldWindowProc; + + pThis->m_pfnSuperWindowProc = oldWindowProc; pThis->m_hWnd = hWnd; return TRUE; } + HWND UnsubclassWindow(BOOL bForce = FALSE) + { + ATLASSERT(m_hWnd != NULL); + ATLASSERT(::IsWindow(m_hWnd)); + + CContainedWindowT<TBase>* pThis; + pThis = reinterpret_cast<CContainedWindowT<TBase>*>(this); + HWND hwndOld = pThis->m_hWnd; + + WNDPROC subclassedProc = reinterpret_cast<WNDPROC>( + ::GetWindowLongPtr(hwndOld, GWLP_WNDPROC)); + if (!bForce && m_thunk.GetWNDPROC() != subclassedProc) + return NULL; + + ::SetWindowLongPtr(hwndOld, GWLP_WNDPROC, + (LONG_PTR)pThis->m_pfnSuperWindowProc); + pThis->m_pfnSuperWindowProc = ::DefWindowProc; + pThis->m_hWnd = NULL; + return hwndOld; + } + static LRESULT CALLBACK StartWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { CContainedWindowT<TBase> *pThis; @@ -1897,13 +1938,13 @@ static ATL::CWndClassInfo& GetWndClassInfo() struct _ATL_WNDCLASSINFOW { - WNDCLASSEXW m_wc; - LPCWSTR m_lpszOrigName; + WNDCLASSEX m_wc; + LPCTSTR m_lpszOrigName; WNDPROC pWndProc; - LPCWSTR m_lpszCursorID; + LPCTSTR m_lpszCursorID; BOOL m_bSystemCursor; ATOM m_atom; - WCHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; // == 4 characters + NULL + number of hexadecimal digits describing a pointer. + TCHAR m_szAutoName[sizeof("ATL:") + sizeof(void *) * 2]; // == 4 characters + NULL + number of hexadecimal digits describing a pointer. ATOM Register(WNDPROC *p) {

3 years, 6 months

[reactos] 01/01: [LSASRV] Fix a typo in the trusted user identification

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76247390e53c0957753d5… commit 76247390e53c0957753d56c919767c4969ff0777 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 28 01:57:43 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 28 01:57:43 2021 +0100 [LSASRV] Fix a typo in the trusted user identification --- dll/win32/lsasrv/authport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/lsasrv/authport.c b/dll/win32/lsasrv/authport.c index 192c43bda5a..aec05f287e2 100644 --- a/dll/win32/lsasrv/authport.c +++ b/dll/win32/lsasrv/authport.c @@ -138,7 +138,7 @@ LsapCheckLogonProcess(PLSA_API_MSG RequestMsg, Context->Untrusted = RequestMsg->ConnectInfo.Untrusted; if (Context->Untrusted == FALSE) - Context->Untrusted = LsapIsTrustedClient(ProcessHandle); + Context->Untrusted = !LsapIsTrustedClient(ProcessHandle); *LogonContext = Context;

3 years, 6 months

[reactos] 01/01: [WKSSVC] Get version info and authentication package on startup

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95188553ba5e6212f7e91… commit 95188553ba5e6212f7e9110fac75f3c35b549cbc Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 27 19:07:47 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 27 19:07:47 2021 +0100 [WKSSVC] Get version info and authentication package on startup --- base/services/wkssvc/CMakeLists.txt | 2 +- base/services/wkssvc/precomp.h | 4 ++ base/services/wkssvc/rpcserver.c | 8 +-- base/services/wkssvc/wkssvc.c | 121 +++++++++++++++++++++++++++--------- 4 files changed, 99 insertions(+), 36 deletions(-) diff --git a/base/services/wkssvc/CMakeLists.txt b/base/services/wkssvc/CMakeLists.txt index c7bb4c8b41a..8ce12e206bb 100644 --- a/base/services/wkssvc/CMakeLists.txt +++ b/base/services/wkssvc/CMakeLists.txt @@ -13,5 +13,5 @@ add_library(wkssvc MODULE set_module_type(wkssvc win32dll UNICODE) target_link_libraries(wkssvc wine) -add_importlibs(wkssvc advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_importlibs(wkssvc secur32 advapi32 rpcrt4 msvcrt kernel32 ntdll) add_cd_file(TARGET wkssvc DESTINATION reactos/system32 FOR all) diff --git a/base/services/wkssvc/precomp.h b/base/services/wkssvc/precomp.h index be3c7982465..ac6d6e8d0c7 100644 --- a/base/services/wkssvc/precomp.h +++ b/base/services/wkssvc/precomp.h @@ -22,6 +22,10 @@ #include <wine/debug.h> +extern OSVERSIONINFOW VersionInfo; +extern HANDLE LsaHandle; +extern ULONG LsaAuthenticationPackage; + /* domain.c */ NET_API_STATUS diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index f80461c0608..d95cab57e94 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -89,7 +89,6 @@ NetrWkstaGetInfo( DWORD dwComputerNameLength; LPCWSTR pszLanRoot = L""; PWKSTA_INFO pWkstaInfo = NULL; - OSVERSIONINFOW VersionInfo; LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; PPOLICY_PRIMARY_DOMAIN_INFO DomainInfo = NULL; @@ -102,9 +101,6 @@ NetrWkstaGetInfo( GetComputerNameW(szComputerName, &dwComputerNameLength); dwComputerNameLength++; /* include NULL terminator */ - VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); - GetVersionExW(&VersionInfo); - ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes)); NtStatus = LsaOpenPolicy(NULL, &ObjectAttributes, @@ -249,6 +245,10 @@ NetrWkstaUserEnum( unsigned long *TotalEntries, unsigned long *ResumeHandle) { + ERR("NetrWkstaUserEnum(%p %p 0x%lx %p %p)\n", + ServerName, UserInfo, PreferredMaximumLength, TotalEntries, ResumeHandle); + + UNIMPLEMENTED; return 0; } diff --git a/base/services/wkssvc/wkssvc.c b/base/services/wkssvc/wkssvc.c index 9feb7bb50e2..d1e5b87840a 100644 --- a/base/services/wkssvc/wkssvc.c +++ b/base/services/wkssvc/wkssvc.c @@ -37,6 +37,10 @@ static WCHAR ServiceName[] = L"lanmanworkstation"; static SERVICE_STATUS_HANDLE ServiceStatusHandle; static SERVICE_STATUS ServiceStatus; +OSVERSIONINFOW VersionInfo; +HANDLE LsaHandle = NULL; +ULONG LsaAuthenticationPackage = 0; + /* FUNCTIONS *****************************************************************/ static VOID @@ -64,6 +68,90 @@ UpdateServiceStatus(DWORD dwState) &ServiceStatus); } + +static +DWORD +ServiceInit(VOID) +{ + LSA_STRING ProcessName, PackageName; + LSA_OPERATIONAL_MODE Mode; + HANDLE hThread; + NTSTATUS Status; + + ERR("ServiceInit()\n"); + + /* Get the OS version */ + VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); + GetVersionExW(&VersionInfo); + + ProcessName.Buffer = "Workstation"; + ProcessName.Length = strlen(ProcessName.Buffer); + ProcessName.MaximumLength = ProcessName.Length + 1; + + Status = LsaRegisterLogonProcess(&ProcessName, + &LsaHandle, + &Mode); + if (!NT_SUCCESS(Status)) + { + ERR("LsaRegisterLogonProcess() failed! (Status 0x%08lx)\n", Status); + return 1; + } + + PackageName.Buffer = MSV1_0_PACKAGE_NAME; + PackageName.Length = strlen(PackageName.Buffer); + PackageName.MaximumLength = PackageName.Length + 1; + + Status = LsaLookupAuthenticationPackage(LsaHandle, + &PackageName, + &LsaAuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + ERR("LsaLookupAuthenticationPackage() failed! (Status 0x%08lx)\n", Status); + return 1; + } + + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE)RpcThreadRoutine, + NULL, + 0, + NULL); + + if (!hThread) + { + ERR("Can't create PortThread\n"); + return GetLastError(); + } + else + CloseHandle(hThread); + + /* Report a running workstation service */ + SetServiceBits(ServiceStatusHandle, + SV_TYPE_WORKSTATION, + TRUE, + TRUE); + + return ERROR_SUCCESS; +} + + +static +VOID +ServiceShutdown(VOID) +{ + NTSTATUS Status; + + ERR("ServiceShutdown()\n"); + + Status = LsaDeregisterLogonProcess(LsaHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaDeRegisterLogonProcess() failed! (Status 0x%08lx)\n", Status); + return; + } +} + + static DWORD WINAPI ServiceControlHandler(DWORD dwControl, DWORD dwEventType, @@ -79,6 +167,7 @@ ServiceControlHandler(DWORD dwControl, UpdateServiceStatus(SERVICE_STOP_PENDING); /* Stop listening to incoming RPC messages */ RpcMgmtStopServerListening(NULL); + ServiceShutdown(); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; @@ -103,6 +192,7 @@ ServiceControlHandler(DWORD dwControl, UpdateServiceStatus(SERVICE_STOP_PENDING); /* Stop listening to incoming RPC messages */ RpcMgmtStopServerListening(NULL); + ServiceShutdown(); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; @@ -113,37 +203,6 @@ ServiceControlHandler(DWORD dwControl, } -static -DWORD -ServiceInit(VOID) -{ - HANDLE hThread; - - hThread = CreateThread(NULL, - 0, - (LPTHREAD_START_ROUTINE)RpcThreadRoutine, - NULL, - 0, - NULL); - - if (!hThread) - { - ERR("Can't create PortThread\n"); - return GetLastError(); - } - else - CloseHandle(hThread); - - /* Report a running workstation service */ - SetServiceBits(ServiceStatusHandle, - SV_TYPE_WORKSTATION, - TRUE, - TRUE); - - return ERROR_SUCCESS; -} - - VOID WINAPI ServiceMain(DWORD argc, LPTSTR *argv) {

3 years, 6 months

[reactos] 01/01: [SDK][INCLUDE] layout.h: Delete an assertion for window style

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b2e79d0672d4228366cf… commit 6b2e79d0672d4228366cf43c04a17916d2990cca Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 27 22:59:00 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Feb 27 22:59:00 2021 +0900 [SDK][INCLUDE] layout.h: Delete an assertion for window style WS_SIZEBOX or WS_THICKFRAME. CORE-9281 --- sdk/include/reactos/layout.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk/include/reactos/layout.h b/sdk/include/reactos/layout.h index 7cddf11cd11..3403ba06b3e 100644 --- a/sdk/include/reactos/layout.h +++ b/sdk/include/reactos/layout.h @@ -237,9 +237,7 @@ LayoutInit(HWND hwndParent, const LAYOUT_INFO *pLayouts, INT cLayouts) } memcpy(pData->m_pLayouts, pLayouts, cb); - /* NOTE: The parent window must have initially WS_SIZEBOX style. */ assert(IsWindow(hwndParent)); - assert(GetWindowLongPtrW(hwndParent, GWL_STYLE) & WS_SIZEBOX); pData->m_hwndParent = hwndParent;

3 years, 6 months

[reactos] 03/03: [NTOS:KD] Use Zw* syscall variants

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7caf9e9d48ca37d30f9d9… commit 7caf9e9d48ca37d30f9d9d89475b0275b4ebb638 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Feb 26 08:44:51 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Feb 26 08:46:53 2021 +0100 [NTOS:KD] Use Zw* syscall variants The log file can be (re-)initialized when previous mode is User-Mode, thus the calls fail on probing input parameters --- ntoskrnl/kd/kdio.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 288977bebbc..4ada3609a89 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -253,7 +253,7 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, NULL); /* Create the log file */ - Status = NtCreateFile(&KdpLogFileHandle, + Status = ZwCreateFile(&KdpLogFileHandle, FILE_APPEND_DATA | SYNCHRONIZE, &ObjectAttributes, &Iosb, @@ -268,7 +268,10 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, RtlFreeUnicodeString(&FileName); if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open log file: 0x%08x\n", Status); return; + } KeInitializeEvent(&KdpLoggerThreadEvent, SynchronizationEvent, TRUE); @@ -282,12 +285,12 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, NULL); if (!NT_SUCCESS(Status)) { - NtClose(KdpLogFileHandle); + ZwClose(KdpLogFileHandle); return; } Priority = 7; - NtSetInformationThread(ThreadHandle, + ZwSetInformationThread(ThreadHandle, ThreadPriority, &Priority, sizeof(Priority));

3 years, 6 months

[reactos] 02/03: [NTOS:MM] Do not chunk-read file when we are the modified-page-writer thread

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a93e065ebce692289cec4… commit a93e065ebce692289cec49af0e686122be479fbf Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 23 11:07:35 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Fri Feb 26 08:46:53 2021 +0100 [NTOS:MM] Do not chunk-read file when we are the modified-page-writer thread --- ntoskrnl/mm/section.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index ea56635b72f..b3e300a58cc 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1200,8 +1200,10 @@ MmMakeSegmentResident( if (!NT_SUCCESS(Status)) return Status; - /* If the file is not random access, read a 64K Chunk. */ - if (!FlagOn(FileObject->Flags, FO_RANDOM_ACCESS)) + /* If the file is not random access and we are not the page out thread + * read a 64K Chunk. */ + if (((ULONG_PTR)IoGetTopLevelIrp() != FSRTL_MOD_WRITE_TOP_LEVEL_IRP) + && !FlagOn(FileObject->Flags, FO_RANDOM_ACCESS)) { RangeStart = Offset - (Offset % _64K); if (RangeEnd % _64K)

3 years, 6 months

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 February 2021