Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [DEVMGR] Polish translation update (#2554)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=458c155c2e8971372e9ce… commit 458c155c2e8971372e9ce0f319c25a16bc2279c8 Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Thu Apr 16 19:25:01 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 16 19:25:01 2020 +0200 [DEVMGR] Polish translation update (#2554) --- dll/win32/devmgr/lang/pl-PL.rc | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc index 41db4e55fb1..e9a48f437f6 100644 --- a/dll/win32/devmgr/lang/pl-PL.rc +++ b/dll/win32/devmgr/lang/pl-PL.rc @@ -6,6 +6,7 @@ * Updated by Caemyr - Olaf Siejka (Jan 2008, Jan 2010) * UTF-8 conversion by Caemyr (May, 2011) * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (November, 2011) + * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -168,29 +169,29 @@ BEGIN COMBOBOX IDC_DEVUSAGE, 7, 198, 239, 40, CBS_DROPDOWNLIST | WS_VSCROLL | WS_DISABLED END -IDD_DEVICEDRIVER DIALOGEX 0, 0, 252, 218 +IDD_DEVICEDRIVER DIALOGEX 0, 0, 303, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Sterownik" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 - LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX - LTEXT "Dostawca sterownika:", -1, 37, 39, 60, 8, SS_NOPREFIX - EDITTEXT IDC_DRVPROVIDER, 100, 39, 146, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Data sterownika:", -1, 37, 53, 60, 8, SS_NOPREFIX - EDITTEXT IDC_DRVDATE, 100, 53, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Wersja sterownika:", -1, 37, 67, 60, 8, SS_NOPREFIX - EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - LTEXT "Podpis cyfrowy:", -1, 37, 81, 60, 8, SS_NOPREFIX - EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Szczegóły sterownika...", IDC_DRIVERDETAILS, 7, 106, 90, 15 - LTEXT "Wyświetla informacje szczegółowe.", -1, 106, 110, 132, 17, SS_NOPREFIX - PUSHBUTTON "Akt&ualizuj sterownik...", IDC_UPDATEDRIVER, 7, 134, 90, 15 - LTEXT "Aktualizuje oprogramowanie sterownika.", -1, 106, 138, 132, 17, SS_NOPREFIX - PUSHBUTTON "&Przywróć sterownik", IDC_ROLLBACKDRIVER, 7, 162, 90, 15 - LTEXT "Przywraca poprzednio zainstalowany sterownik, jeśli po zaktualizowaniu sterownika urządzenie nie działa.", -1, 106, 162, 132, 25, SS_NOPREFIX - PUSHBUTTON "&Odinstaluj", IDC_UNINSTALLDRIVER, 7, 190, 90, 15 - LTEXT "Odinstalowuje sterownik (zaawansowane).", -1, 106, 194, 132, 17, SS_NOPREFIX + LTEXT "", IDC_DEVNAME, 37, 9, 252, 16, SS_NOPREFIX + LTEXT "Dostawca sterownika:", -1, 37, 39, 71, 8, SS_NOPREFIX + EDITTEXT IDC_DRVPROVIDER, 117, 39, 183, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Data sterownika:", -1, 37, 53, 55, 8, SS_NOPREFIX + EDITTEXT IDC_DRVDATE, 117, 53, 183, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Wersja sterownika:", -1, 37, 67, 61, 8, SS_NOPREFIX + EDITTEXT IDC_DRVVERSION, 117, 67, 183, 8, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + LTEXT "Podpis cyfrowy:", -1, 37, 81, 55, 8, SS_NOPREFIX + EDITTEXT IDC_DIGITALSIGNER, 117, 81, 183, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY + PUSHBUTTON "&Szczegóły sterownika...", IDC_DRIVERDETAILS, 7, 106, 86, 15 + LTEXT "Wyświetla informacje szczegółowe na temat plików sterownika.", -1, 101, 105, 189, 17, SS_NOPREFIX + PUSHBUTTON "Akt&ualizuj sterownik...", IDC_UPDATEDRIVER, 7, 134, 86, 15 + LTEXT "Aktualizuje oprogramowanie sterownika.", -1, 101, 138, 189, 17, SS_NOPREFIX + PUSHBUTTON "&Przywróć sterownik", IDC_ROLLBACKDRIVER, 7, 162, 86, 15 + LTEXT "Przywraca poprzednio zainstalowany sterownik, jeśli po zaktualizowaniu sterownika urządzenie nie działa.", -1, 101, 162, 189, 25, SS_NOPREFIX + PUSHBUTTON "&Odinstaluj", IDC_UNINSTALLDRIVER, 7, 190, 86, 15 + LTEXT "Odinstalowuje sterownik (zaawansowane).", -1, 101, 194, 189, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX 0, 0, 224, 230

4 years, 8 months

[reactos] 01/01: [attrib] pl-pl lang update

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b43dce0946b9fb94e01d… commit 9b43dce0946b9fb94e01dc98bcd7483c31fb1a1b Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Thu Apr 16 16:59:48 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 16 18:32:22 2020 +0200 [attrib] pl-pl lang update --- base/applications/cmdutils/attrib/lang/pl-PL.rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/applications/cmdutils/attrib/lang/pl-PL.rc b/base/applications/cmdutils/attrib/lang/pl-PL.rc index 3776b95160e..fe8d0974589 100644 --- a/base/applications/cmdutils/attrib/lang/pl-PL.rc +++ b/base/applications/cmdutils/attrib/lang/pl-PL.rc @@ -5,13 +5,14 @@ * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) + * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN - STRING_FILE_NOT_FOUND "File not found - '%s'\n" + STRING_FILE_NOT_FOUND "Nie można odnaleźć pliku - '%s'\n" STRING_ATTRIB_HELP "Wyświetla lub zmienia atrybuty plików.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] nazwa_pliku ...\n\ [/S [/D]]\n\n\

4 years, 8 months

[reactos] 01/01: [cmd] pl-pl update

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd5364ae8e296aced5d4b… commit cd5364ae8e296aced5d4b04c05408d2bd1ca2eef Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Thu Apr 16 17:46:15 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 16 18:32:08 2020 +0200 [cmd] pl-pl update --- base/shell/cmd/lang/pl-PL.rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/shell/cmd/lang/pl-PL.rc b/base/shell/cmd/lang/pl-PL.rc index b2792dd62f9..fc24b14e4b0 100644 --- a/base/shell/cmd/lang/pl-PL.rc +++ b/base/shell/cmd/lang/pl-PL.rc @@ -5,6 +5,7 @@ * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) + * Updated by pithwz - Piotr Hetnarowicz (piotrhwz(a)gmail.com) (April, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -532,7 +533,7 @@ title nowy tytuł okna\n" STRING_REPLACE_ERROR7 "Extended Error 32 - Błąd współdzielenia\n" STRING_CMD_INFOLINE " Wiersz polecenia ReactOS Type HELP = Help " STRING_REACTOS_VERSION "System operacyjny ReactOS [Wersja %s %s]\n" - STRING_CMD_SHELLINFO "\nInterpreter linii poleceń ReactOS\nVersion %s %s" + STRING_CMD_SHELLINFO "\nInterpreter linii poleceń ReactOS\nWersja %s %s" STRING_VERSION_RUNNING_ON "Działający na: " STRING_VERSION_RUNVER "%s [Wersja %d.%d.%d] %s" STRING_COPY_FILE " %d plik(ów) skopiowano\n"

4 years, 8 months

[reactos] 01/01: [SYSSETUP] Update authors page in second stage setup

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=173a2af48c337c1d1cbb1… commit 173a2af48c337c1d1cbb12d32fd271c8ff868d00 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Apr 16 18:46:31 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Apr 16 18:57:14 2020 +0300 [SYSSETUP] Update authors page in second stage setup Fix layout issues in different languages. CORE-16874 --- dll/win32/syssetup/lang/bg-BG.rc | 2 +- dll/win32/syssetup/lang/cs-CZ.rc | 4 ++-- dll/win32/syssetup/lang/da-DK.rc | 2 +- dll/win32/syssetup/lang/de-DE.rc | 2 +- dll/win32/syssetup/lang/el-GR.rc | 2 +- dll/win32/syssetup/lang/en-US.rc | 2 +- dll/win32/syssetup/lang/es-ES.rc | 2 +- dll/win32/syssetup/lang/et-EE.rc | 2 +- dll/win32/syssetup/lang/fi-FI.rc | 2 +- dll/win32/syssetup/lang/fr-FR.rc | 2 +- dll/win32/syssetup/lang/he-IL.rc | 2 +- dll/win32/syssetup/lang/hi-IN.rc | 2 +- dll/win32/syssetup/lang/hu-HU.rc | 2 +- dll/win32/syssetup/lang/id-ID.rc | 2 +- dll/win32/syssetup/lang/it-IT.rc | 2 +- dll/win32/syssetup/lang/ja-JP.rc | 2 +- dll/win32/syssetup/lang/lt-LT.rc | 2 +- dll/win32/syssetup/lang/nl-NL.rc | 2 +- dll/win32/syssetup/lang/no-NO.rc | 2 +- dll/win32/syssetup/lang/pl-PL.rc | 2 +- dll/win32/syssetup/lang/pt-BR.rc | 6 +++--- dll/win32/syssetup/lang/pt-PT.rc | 2 +- dll/win32/syssetup/lang/ro-RO.rc | 2 +- dll/win32/syssetup/lang/ru-RU.rc | 2 +- dll/win32/syssetup/lang/sk-SK.rc | 2 +- dll/win32/syssetup/lang/sq-AL.rc | 2 +- dll/win32/syssetup/lang/sv-SE.rc | 2 +- dll/win32/syssetup/lang/th-TH.rc | 2 +- dll/win32/syssetup/lang/tr-TR.rc | 6 +++--- dll/win32/syssetup/lang/uk-UA.rc | 6 +++--- dll/win32/syssetup/lang/zh-CN.rc | 2 +- dll/win32/syssetup/lang/zh-TW.rc | 2 +- 32 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 46ff2c057bb..acb30d85d9c 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Натиснете „Напред“ за продължаване на настройката.", IDC_STATIC, 115, 169, 200, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Настройка на РеактОС" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 066fbcf42c9..afc12c6d9bb 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -16,7 +16,7 @@ BEGIN LTEXT "Kliknutím na Další pokračujte v instalaci.", IDC_STATIC, 115, 160, 189, 31 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Instalátor" FONT 8, "MS Shell Dlg", 0, 0, 0x0 @@ -24,7 +24,7 @@ BEGIN LTEXT "Vývojáři systému ReactOS by rádi zmínili následující Open Source projekty. Tyto projekty (nebo jejich části) byly použity při vývoji systému ReactOS:", IDC_STATIC, 15, 7, 286, 19 LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL LTEXT "ReactOS je licencován pod GPL. Pokud chcete systém (nebo jeho části) použít nebo redistribuovat, musíte respektovat GPL.", IDC_STATIC, 15, 110, 227, 19 - PUSHBUTTON "&Zobrazit GPL...", IDC_VIEWGPL, 251, 110, 50, 19 + PUSHBUTTON "&Zobrazit GPL...", IDC_VIEWGPL, 246, 110, 55, 19 LTEXT "Kliknutím na Další pokračujte v instalaci.", IDC_STATIC, 15, 136, 195, 17 END diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index f6654bfdceb..98256294e0d 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -29,7 +29,7 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 19f51bb7df9..da3c8c33f03 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Klicken Sie auf Weiter, um fortzufahren.", IDC_STATIC, 115, 160, 189, 31 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS-Installation" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 201c1d24229..7ff078d51cb 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Πατήστε το κουμπί 'Επόμενο' για να συνεχίσει η εγκατάσταση.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Εγκατάσταση του ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index 64661844f88..c908775f3dc 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -29,7 +29,7 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index f26746ed163..1d9a689addb 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -19,7 +19,7 @@ BEGIN LTEXT "Pulse Siguiente para continuar con la instalación.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalación de ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index c247d7f26b6..573ffbffe78 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Vajuta Edasi paigaldamise jätkamiseks.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS'i paigaldus" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 53a595ab5b3..490d2351716 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -29,7 +29,7 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index f3110215131..dd1ab18be48 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Appuyez sur Suivant pour continuer l'installation.", IDC_STATIC, 115, 160, 189, 31 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index baf3b8b551f..43745881c40 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "לחץ על הבא כדי להמשיך עם ההתקנה", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "התקנת ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index d1312a13901..e342bc288fd 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -17,7 +17,7 @@ BEGIN LTEXT "सेटअप के साथ जारी रखने के लिए आगे क्लिक करें।", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "रिऐक्ट ओएस सेटअप" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 668a1186bb4..8c81298d715 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Kattintson a Tovább gombra a folytatáshoz.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 153 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS telepítő" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index b7184184cc2..ca3d81bd92e 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Klik Lanjut untuk melanjutkan Penyetelan.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Penyetelan ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 9f78e4fbf56..7079281a83f 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Selezionare Avanti per proseguire con la configurazione.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installazione di ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index c0ca05645a3..69d89c4f13e 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "セットアップを続行するには [次へ] をクリックして下さい。", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index cfc9dc22f2d..cd66f13dfa3 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -29,7 +29,7 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 6ad6e9d9c29..b09d3ef683e 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Klik op Volgende om voort te gaan met de installatie.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index fbe80768f0b..1db3db9aebe 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Klikk Neste for å fortsette installasjonen.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS installasjon" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index fa2652bd158..6abb05c7214 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Kliknij Dalej, by kontynuować.", IDC_STATIC, 115, 169, 160, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalator systemu ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 76b7f4a39c3..40c931d8a3e 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -10,15 +10,15 @@ BEGIN LTEXT "Clique Avançar para continuar a instalação.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Os desenvolvedores do ReactOS gostariam de agradecer aos seguintes projetos Open Source, cujo partes foram utilizadas para criar o ReactOS:", IDC_STATIC, 15, 7, 286, 19 LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS está licenciado sob a GPL, se você deseja reutilizar ou redistribuir (partes) (d)ele você deve respeitar a GPL.", IDC_STATIC, 15, 110, 227, 19 - PUSHBUTTON "&Visualizar GPL...", IDC_VIEWGPL, 251, 110, 50, 19 + LTEXT "ReactOS está licenciado sob a GPL, se você deseja reutilizar ou redistribuir (partes) (d)ele você deve respeitar a GPL.", IDC_STATIC, 15, 110, 224, 19 + PUSHBUTTON "&Visualizar GPL...", IDC_VIEWGPL, 243, 110, 58, 19 LTEXT "Clique Avançar para continuar com a instalação.", IDC_STATIC, 15, 136, 195, 17 END diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index 6d9e61c63aa..9b727816bad 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -10,7 +10,7 @@ BEGIN LTEXT "Clique Avançar para continuar a instalação.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalação do ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 8c73f48167f..614cd25351a 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -19,7 +19,7 @@ BEGIN LTEXT "Apăsați „Înainte” pentru a continua.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index b2be882c81f..46f572bc366 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -13,7 +13,7 @@ BEGIN LTEXT "Нажмите ""Далее"" для продолжения установки.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 529122fb7d1..4748c97c7f1 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -16,7 +16,7 @@ BEGIN LTEXT "Kliknutím na Ďalej pokračujte v inštalácii.", IDC_STATIC, 115, 160, 189, 31 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Inštalátor systému ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 982c56f02e0..e229246450e 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -29,7 +29,7 @@ BEGIN LTEXT "Klikoni Tjetër për të vazhduar me Ndërtimin.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ndërto ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index a277667f639..1a581684b2e 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -29,7 +29,7 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 68a6f966bdd..63d355645e4 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -29,7 +29,7 @@ BEGIN LTEXT "Click Next to continue with Setup.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index fff50ce45a9..bee503a876c 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -12,15 +12,15 @@ BEGIN LTEXT "Kur'la sürdürmek için İleri'ye tıklayınız.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kur" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "ReactOS geliştiricileri, (parçaları) ReactOS'u oluşturmak için kullanılmış aşağıdaki açık kaynak tasarılara teşekkür etmek istiyorlar:", IDC_STATIC, 15, 7, 286, 19 LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS, GPL altında ruhsatlanmıştır, bu yüzden onu (onun parçalarını) yeniden kullanmak veyâ yeniden dağıtmak isterseniz GPL'ye uymalısınız.", IDC_STATIC, 15, 110, 227, 19 - PUSHBUTTON "&GPL'yi Görüntüle...", IDC_VIEWGPL, 251, 110, 50, 19 + LTEXT "ReactOS, GPL altında ruhsatlanmıştır, bu yüzden onu (onun parçalarını) yeniden kullanmak veyâ yeniden dağıtmak isterseniz GPL'ye uymalısınız.", IDC_STATIC, 15, 110, 220, 25 + PUSHBUTTON "&GPL'yi Görüntüle...", IDC_VIEWGPL, 236, 110, 65, 19 LTEXT "Kur'la sürdürmek için İleri'ye tıklayınız.", IDC_STATIC, 15, 136, 195, 17 END diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 7ff37fc84ed..0708330b63b 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -18,15 +18,15 @@ BEGIN LTEXT "Натисніть ""Далі"", щоб продовжити встановлення.", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Розробники ReactOS хотіли б подякувати наступним Open Source проектам, що (частково) використовувалися при створенні ReactOS:", IDC_STATIC, 15, 7, 286, 19 LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS ліцензується за GPL, так що якщо Ви хочете повторно використовувати або поширювати його (частини), Ви повинні поважати GPL.", IDC_STATIC, 15, 110, 227, 24 - PUSHBUTTON "&Перегляд GPL...", IDC_VIEWGPL, 244, 110, 58, 19 + LTEXT "ReactOS ліцензується за GPL, так що якщо Ви хочете повторно використовувати або поширювати його (частини), Ви повинні поважати GPL.", IDC_STATIC, 15, 110, 224, 24 + PUSHBUTTON "&Перегляд GPL...", IDC_VIEWGPL, 242, 110, 60, 19 LTEXT "Натисніть ""Далі"", щоб продовжити встановлення.", IDC_STATIC, 15, 136, 195, 17 END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 90fc96a893d..aa85fe923d7 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -12,7 +12,7 @@ BEGIN LTEXT "若要继续，请单击“下一步”。", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 安装程序 " FONT 9, "宋体", 0, 0, 0x0 diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 4c58b3e9dd7..1167abdf7f3 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -32,7 +32,7 @@ BEGIN LTEXT "按 [下一步] 繼續安裝程式。", IDC_STATIC, 115, 169, 195, 17 END -IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 +IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS 安裝程式" FONT 9, "新細明體", 0, 0, 0x0

4 years, 8 months

[reactos] 01/01: [CMAKE] Replace custom functions to built-in ones add_target_compile_definitions -> target_compile_definitions add_target_compile_flags -> target_compile_options add_target_include_directories -> target_include_directories

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e069ccdb2eeb28b42037… commit 7e069ccdb2eeb28b420375270409d595efb86b14 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu Apr 16 15:59:38 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Thu Apr 16 15:59:38 2020 +0300 [CMAKE] Replace custom functions to built-in ones add_target_compile_definitions -> target_compile_definitions add_target_compile_flags -> target_compile_options add_target_include_directories -> target_include_directories --- base/services/nfsd/CMakeLists.txt | 2 +- base/services/rpcss/CMakeLists.txt | 2 +- base/services/wlansvc/CMakeLists.txt | 2 +- base/setup/usetup/CMakeLists.txt | 2 +- boot/freeldr/freeldr/CMakeLists.txt | 2 +- dll/3rdparty/libtiff/CMakeLists.txt | 2 +- dll/3rdparty/libtirpc/CMakeLists.txt | 4 ++-- dll/3rdparty/libxslt/CMakeLists.txt | 2 +- dll/3rdparty/mbedtls/CMakeLists.txt | 4 ++-- dll/apisets/CMakeLists.txt | 4 ++-- dll/apisets/CMakeLists.txt.in | 4 ++-- dll/directx/wine/ddraw/CMakeLists.txt | 2 +- dll/nls/idndl/CMakeLists.txt | 2 +- dll/opengl/glu32/CMakeLists.txt | 6 +++--- dll/win32/browseui/CMakeLists.txt | 2 +- dll/win32/browseui/shellbars/CMakeLists.txt | 2 +- dll/win32/browseui/shellfind/CMakeLists.txt | 2 +- dll/win32/fltlib/CMakeLists.txt | 2 +- dll/win32/mciseq/CMakeLists.txt | 2 +- dll/win32/mciwave/CMakeLists.txt | 2 +- dll/win32/winmm/CMakeLists.txt | 2 +- drivers/bluetooth/fbtusb/CMakeLists.txt | 2 +- drivers/filesystems/ext2/CMakeLists.txt | 14 +++++++------- drivers/filesystems/ffs/CMakeLists.txt | 8 ++++---- drivers/filesystems/nfs/CMakeLists.txt | 4 ++-- drivers/filesystems/reiserfs/CMakeLists.txt | 9 +++++---- drivers/filesystems/udfs/CMakeLists.txt | 12 ++++++------ drivers/filters/fltmgr/CMakeLists.txt | 2 +- drivers/storage/class/cdrom_new/CMakeLists.txt | 4 ++-- drivers/storage/class/disk_new/CMakeLists.txt | 2 +- drivers/storage/ide/uniata/CMakeLists.txt | 6 +++--- drivers/wdm/audio/backpln/portcls/CMakeLists.txt | 2 +- drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt | 2 +- hal/halx86/minihal/CMakeLists.txt | 2 +- hal/halx86/xbox.cmake | 2 +- .../applications/devutils/symdump/CMakeLists.txt | 2 +- modules/rosapps/applications/fraginator/CMakeLists.txt | 2 +- modules/rosapps/applications/net/ncftp/CMakeLists.txt | 5 ++--- .../applications/sysutils/logevent/CMakeLists.txt | 2 +- .../rosapps/applications/sysutils/pedump/CMakeLists.txt | 2 +- .../applications/sysutils/utils/rosperf/CMakeLists.txt | 2 +- modules/rosapps/applications/winfile/CMakeLists.txt | 2 +- modules/rosapps/templates/dialog/CMakeLists.txt | 2 +- modules/rostests/apitests/crt/crtdll_crt_apitest.cmake | 2 +- modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake | 4 ++-- modules/rostests/apitests/crt/ntdll_crt_apitest.cmake | 2 +- modules/rostests/kmtests/CMakeLists.txt | 8 ++++---- modules/rostests/kmtests/example/CMakeLists.txt | 2 +- .../kmtests/fltmgr/fltmgr_create/CMakeLists.txt | 2 +- .../rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt | 2 +- .../kmtests/fltmgr/fltmgr_register/CMakeLists.txt | 2 +- modules/rostests/kmtests/hidparse/CMakeLists.txt | 2 +- modules/rostests/kmtests/kernel32/CMakeLists.txt | 2 +- modules/rostests/kmtests/ntos_cc/CMakeLists.txt | 12 ++++++------ modules/rostests/kmtests/ntos_io/CMakeLists.txt | 8 ++++---- modules/rostests/kmtests/ntos_mm/CMakeLists.txt | 4 ++-- modules/rostests/kmtests/ntos_po/CMakeLists.txt | 2 +- modules/rostests/kmtests/tcpip/CMakeLists.txt | 2 +- modules/rostests/tests/pseh2/CMakeLists.txt | 4 ++-- modules/rostests/winetests/advapi32/CMakeLists.txt | 2 +- modules/rostests/winetests/comctl32/CMakeLists.txt | 2 +- modules/rostests/winetests/kernel32/CMakeLists.txt | 2 +- modules/rostests/winetests/msvcrt/CMakeLists.txt | 2 +- modules/rostests/winetests/ntdll/CMakeLists.txt | 2 +- modules/rostests/winetests/rpcrt4/CMakeLists.txt | 4 ++-- modules/rostests/winetests/winmm/CMakeLists.txt | 2 +- modules/rostests/winetests/ws2_32/CMakeLists.txt | 2 +- ntoskrnl/ntkrnlmp/CMakeLists.txt | 2 +- sdk/cmake/CMakeMacros.cmake | 4 ++-- sdk/cmake/compilerflags.cmake | 17 ----------------- sdk/cmake/gcc.cmake | 10 +++++----- sdk/lib/3rdparty/adns/CMakeLists.txt | 2 +- sdk/lib/3rdparty/cardlib/CMakeLists.txt | 2 +- sdk/lib/3rdparty/freetype/CMakeLists.txt | 2 +- sdk/lib/3rdparty/libxml2/CMakeLists.txt | 4 ++-- sdk/lib/3rdparty/stlport/CMakeLists.txt | 6 +++--- sdk/lib/3rdparty/zlib/CMakeLists.txt | 4 ++-- sdk/lib/cmlib/CMakeLists.txt | 2 +- sdk/lib/crt/CMakeLists.txt | 6 +++--- sdk/lib/crt/crt.cmake | 4 ++-- sdk/lib/crt/libcntpr.cmake | 4 ++-- sdk/lib/crt/msvcrtex.cmake | 2 +- sdk/lib/inflib/CMakeLists.txt | 2 +- sdk/lib/lsalib/CMakeLists.txt | 2 +- sdk/tools/hhpcomp/CMakeLists.txt | 4 ++-- sdk/tools/hpp/CMakeLists.txt | 2 +- sdk/tools/mkhive/CMakeLists.txt | 2 +- sdk/tools/mkisofs/CMakeLists.txt | 16 ++++++++-------- sdk/tools/unicode/CMakeLists.txt | 6 +++--- sdk/tools/widl/CMakeLists.txt | 6 +++--- sdk/tools/xml2sdb/CMakeLists.txt | 4 ++-- win32ss/printing/base/spoolsv/CMakeLists.txt | 2 +- win32ss/user/winsrv/consrv.cmake | 4 ++-- 93 files changed, 163 insertions(+), 180 deletions(-) diff --git a/base/services/nfsd/CMakeLists.txt b/base/services/nfsd/CMakeLists.txt index f0451522686..d92ff83d858 100644 --- a/base/services/nfsd/CMakeLists.txt +++ b/base/services/nfsd/CMakeLists.txt @@ -56,7 +56,7 @@ add_executable(nfsd ${SOURCE} nfsd.rc) if(MSVC AND (NOT USE_CLANG_CL)) else() # FIXME: Tons of warnings. - add_target_compile_flags(nfsd "-w") + target_compile_options(nfsd PRIVATE "-w") endif() set_module_type(nfsd win32cui) diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index 2ed8b49df35..a0dd14487df 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -17,7 +17,7 @@ include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos/wine) add_executable(rpcss ${SOURCE} rpcss.rc) if(USE_CLANG_CL) - add_target_compile_flags(rpcss "-Wno-cast-calling-convention") + target_compile_options(rpcss PRIVATE "-Wno-cast-calling-convention") endif() target_link_libraries(rpcss ${PSEH_LIB} wine) diff --git a/base/services/wlansvc/CMakeLists.txt b/base/services/wlansvc/CMakeLists.txt index f62b8eca9eb..0ac461728e5 100644 --- a/base/services/wlansvc/CMakeLists.txt +++ b/base/services/wlansvc/CMakeLists.txt @@ -11,7 +11,7 @@ list(APPEND SOURCE add_executable(wlansvc ${SOURCE} wlansvc.rc) if(USE_CLANG_CL) - add_target_compile_flags(wlansvc "-Wno-cast-calling-convention") + target_compile_options(wlansvc PRIVATE "-Wno-cast-calling-convention") endif() if(NOT MSVC) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 89891713ffd..1c6c85d1dcf 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -31,7 +31,7 @@ list(APPEND SOURCE add_executable(usetup ${SOURCE} usetup.rc) if(USE_CLANG_CL) - add_target_compile_flags(usetup "-Wno-invalid-source-encoding") + target_compile_options(usetup PRIVATE "-Wno-invalid-source-encoding") endif() add_pch(usetup usetup.h SOURCE) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 254dfa073ef..41d4ab68c86 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -222,7 +222,7 @@ add_library(freeldr_common if(USE_CLANG_CL) # We need to reduce the binary size - add_target_compile_flags(freeldr_common "/Os") + target_compile_options(freeldr_common PRIVATE "/Os") endif() if(NOT MSVC AND ARCH STREQUAL "i386" AND SARCH STREQUAL "xbox") # Prevent a warning when doing a memcmp with address 0 diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index 1c8255a9990..c8c388ba702 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -70,5 +70,5 @@ add_pch(libtiff precomp.h SOURCE) add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all) if(NOT MSVC) - add_target_compile_flags(libtiff "-Wno-unused-but-set-variable") + target_compile_options(libtiff PRIVATE "-Wno-unused-but-set-variable") endif() diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt index 128fccc7a05..207ccb87a98 100644 --- a/dll/3rdparty/libtirpc/CMakeLists.txt +++ b/dll/3rdparty/libtirpc/CMakeLists.txt @@ -103,10 +103,10 @@ add_library(libtirpc MODULE if(MSVC AND (NOT USE_CLANG_CL)) replace_compile_flags("/we4101" " ") - add_target_compile_flags(libtirpc "/wd4101 /wd4133 /wd4473 /wd4477") + target_compile_options(libtirpc PRIVATE /wd4101 /wd4133 /wd4473 /wd4477) else() # FIXME: Tons of warnings. - add_target_compile_flags(libtirpc "-w") + target_compile_options(libtirpc PRIVATE "-w") endif() set_module_type(libtirpc win32dll) diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt index 1ff2571361b..8105fdde4a9 100644 --- a/dll/3rdparty/libxslt/CMakeLists.txt +++ b/dll/3rdparty/libxslt/CMakeLists.txt @@ -51,5 +51,5 @@ add_pch(libxslt precomp.h SOURCE) add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(libxslt "-Wno-pointer-sign -Wno-unused-function") + target_compile_options(libxslt PRIVATE -Wno-pointer-sign -Wno-unused-function) endif() diff --git a/dll/3rdparty/mbedtls/CMakeLists.txt b/dll/3rdparty/mbedtls/CMakeLists.txt index dcc0a7c2b74..a67e183b003 100644 --- a/dll/3rdparty/mbedtls/CMakeLists.txt +++ b/dll/3rdparty/mbedtls/CMakeLists.txt @@ -94,7 +94,7 @@ add_definitions(-DMINGW_HAS_SECURE_API -DCRTDLL) add_cd_file(TARGET mbedtls DESTINATION reactos/system32 FOR all) if(NOT MSVC) - add_target_compile_flags(mbedtls "-Wno-pointer-sign -Wno-unused-function") + target_compile_options(mbedtls PRIVATE -Wno-pointer-sign -Wno-unused-function) elseif(USE_CLANG_CL) - add_target_compile_flags(mbedtls "-Wno-tautological-constant-compare") + target_compile_options(mbedtls PRIVATE -Wno-tautological-constant-compare) endif() diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt index 4e658584755..27b82d2a281 100644 --- a/dll/apisets/CMakeLists.txt +++ b/dll/apisets/CMakeLists.txt @@ -25,9 +25,9 @@ function (add_apiset apiset_name baseaddress) set_module_type(${apiset_name} win32dll ENTRYPOINT 0 UNICODE IMAGEBASE ${baseaddress}) if(NOT MSVC) - add_target_compile_flags(${apiset_name} "-fno-builtin") + target_compile_options(${apiset_name} PRIVATE -fno-builtin) else() - add_target_compile_flags(${apiset_name} "/wd4026 /wd4273") + target_compile_options(${apiset_name} PRIVATE /wd4026 /wd4273) endif() add_importlibs(${apiset_name} ${ARGN} ntdll) diff --git a/dll/apisets/CMakeLists.txt.in b/dll/apisets/CMakeLists.txt.in index 1a12f9e89aa..69aaa9fa38d 100644 --- a/dll/apisets/CMakeLists.txt.in +++ b/dll/apisets/CMakeLists.txt.in @@ -25,9 +25,9 @@ function (add_apiset apiset_name baseaddress) set_module_type(${apiset_name} win32dll ENTRYPOINT 0 UNICODE IMAGEBASE ${baseaddress}) if(NOT MSVC) - add_target_compile_flags(${apiset_name} "-fno-builtin") + target_compile_options(${apiset_name} PRIVATE -fno-builtin) else() - add_target_compile_flags(${apiset_name} "/wd4026 /wd4273") + target_compile_options(${apiset_name} PRIVATE /wd4026 /wd4273) endif() add_importlibs(${apiset_name} ${ARGN} ntdll) diff --git a/dll/directx/wine/ddraw/CMakeLists.txt b/dll/directx/wine/ddraw/CMakeLists.txt index cd501d5d19b..4ac3ca28690 100644 --- a/dll/directx/wine/ddraw/CMakeLists.txt +++ b/dll/directx/wine/ddraw/CMakeLists.txt @@ -26,7 +26,7 @@ list(APPEND SOURCE if(MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #add_target_compile_flags(ddraw "/FIwine/typeof.h") + #target_compile_options(ddraw PRIVATE "/FIwine/typeof.h") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h") endif() diff --git a/dll/nls/idndl/CMakeLists.txt b/dll/nls/idndl/CMakeLists.txt index efbd71ed0fd..a65540c0beb 100644 --- a/dll/nls/idndl/CMakeLists.txt +++ b/dll/nls/idndl/CMakeLists.txt @@ -11,7 +11,7 @@ add_library(idndl MODULE set_entrypoint(idndl 0) if(NOT MSVC) - add_target_compile_flags(idndl "-fno-exceptions -fno-rtti") + target_compile_options(idndl PRIVATE -fno-exceptions -fno-rtti) endif() add_importlibs(idndl kernel32) diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt index 791cf2df1ea..b0caa74fabf 100644 --- a/dll/opengl/glu32/CMakeLists.txt +++ b/dll/opengl/glu32/CMakeLists.txt @@ -120,12 +120,12 @@ add_library(glu32 MODULE set_module_type(glu32 win32dll) if(NOT MSVC) - add_target_compile_flags(glu32 "-Wno-write-strings -Wno-unused-but-set-variable") + target_compile_options(glu32 PRIVATE -Wno-write-strings -Wno-unused-but-set-variable) # Prevent a warning when comparing 'this' against 0 set_source_files_properties(src/libnurbs/internals/arc.cc PROPERTIES COMPILE_FLAGS "-Wno-nonnull-compare") elseif(USE_CLANG_CL) - add_target_compile_flags(glu32 "-Wno-self-assign -Wno-unused-function -Wno-microsoft-include") - add_target_compile_flags(glu32 "-Wno-deprecated-register -Wno-tautological-undefined-compare") + target_compile_options(glu32 PRIVATE -Wno-self-assign -Wno-unused-function -Wno-microsoft-include) + target_compile_options(glu32 PRIVATE -Wno-deprecated-register -Wno-tautological-undefined-compare) endif() add_importlibs(glu32 opengl32 gdi32 msvcrt kernel32 ntdll) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index d3787d2704e..562693288de 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -53,7 +53,7 @@ add_pch(browseui precomp.h SOURCE) add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) if(NOT MSVC) - add_target_compile_flags(browseui "-Wno-unused-but-set-variable") + target_compile_options(browseui PRIVATE "-Wno-unused-but-set-variable") # Binutils linker bug if(LTCG) add_target_link_flags(browseui "-Wl,--allow-multiple-definition") diff --git a/dll/win32/browseui/shellbars/CMakeLists.txt b/dll/win32/browseui/shellbars/CMakeLists.txt index 64cc9b55f21..12b5a84a019 100644 --- a/dll/win32/browseui/shellbars/CMakeLists.txt +++ b/dll/win32/browseui/shellbars/CMakeLists.txt @@ -19,7 +19,7 @@ list(APPEND SOURCE add_library(shellbars ${SOURCE}) if(NOT MSVC) - add_target_compile_flags(shellbars "-Wno-unused-but-set-variable") + target_compile_options(shellbars PRIVATE "-Wno-unused-but-set-variable") endif() add_pch(shellbars shellbars.h SOURCE) diff --git a/dll/win32/browseui/shellfind/CMakeLists.txt b/dll/win32/browseui/shellfind/CMakeLists.txt index 1e3acddb288..0d7fd02d398 100644 --- a/dll/win32/browseui/shellfind/CMakeLists.txt +++ b/dll/win32/browseui/shellfind/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND SOURCE add_library(shellfind ${SOURCE}) if(NOT MSVC) - add_target_compile_flags(shellfind "-Wno-unused-but-set-variable") + target_compile_options(shellfind PRIVATE "-Wno-unused-but-set-variable") endif() add_pch(shellfind shellfind.h SOURCE) diff --git a/dll/win32/fltlib/CMakeLists.txt b/dll/win32/fltlib/CMakeLists.txt index 7b4320ad692..6c65cd3ae5c 100644 --- a/dll/win32/fltlib/CMakeLists.txt +++ b/dll/win32/fltlib/CMakeLists.txt @@ -16,6 +16,6 @@ list(APPEND SOURCE add_library(fltlib MODULE ${SOURCE} rsrc.rc) set_module_type(fltlib win32dll) target_link_libraries(fltlib wine) -add_target_compile_definitions(fltlib NTDDI_VERSION=NTDDI_WS03SP1) +target_compile_definitions(fltlib PRIVATE NTDDI_VERSION=NTDDI_WS03SP1) add_importlibs(fltlib msvcrt kernel32 ntdll) add_cd_file(TARGET fltlib DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt index 62b3f54b341..8f1dd4ca5a3 100644 --- a/dll/win32/mciseq/CMakeLists.txt +++ b/dll/win32/mciseq/CMakeLists.txt @@ -14,5 +14,5 @@ add_importlibs(mciseq winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET mciseq DESTINATION reactos/system32 FOR all) if(NOT MSVC) - add_target_compile_flags(mciseq "-Wno-overflow") + target_compile_options(mciseq PRIVATE "-Wno-overflow") endif() diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt index e4b06aa0d2e..569b91f212c 100644 --- a/dll/win32/mciwave/CMakeLists.txt +++ b/dll/win32/mciwave/CMakeLists.txt @@ -17,5 +17,5 @@ add_importlibs(mciwave user32 winmm msvcrt kernel32 ntdll) add_cd_file(TARGET mciwave DESTINATION reactos/system32 FOR all) if(NOT MSVC) - add_target_compile_flags(mciwave "-Wno-overflow") + target_compile_options(mciwave PRIVATE "-Wno-overflow") endif() diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt index 8d697b4e6df..fd746a2bafb 100644 --- a/dll/win32/winmm/CMakeLists.txt +++ b/dll/win32/winmm/CMakeLists.txt @@ -33,7 +33,7 @@ add_pch(winmm winemm.h SOURCE) add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all) if(NOT MSVC) - add_target_compile_flags(winmm "-Wno-unused-but-set-variable") + target_compile_options(winmm PRIVATE "-Wno-unused-but-set-variable") endif() add_subdirectory(midimap) diff --git a/drivers/bluetooth/fbtusb/CMakeLists.txt b/drivers/bluetooth/fbtusb/CMakeLists.txt index 3ac3f8941dc..20c8d7bfd12 100644 --- a/drivers/bluetooth/fbtusb/CMakeLists.txt +++ b/drivers/bluetooth/fbtusb/CMakeLists.txt @@ -13,7 +13,7 @@ list(APPEND SOURCE add_library(fbtusb MODULE ${SOURCE} fbtusb.rc) if(NOT MSVC) - add_target_compile_flags(fbtusb "-Wno-unused-but-set-variable") + target_compile_options(fbtusb PRIVATE "-Wno-unused-but-set-variable") endif() set_module_type(fbtusb kernelmodedriver) diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index 13c6960e73b..b362a60f56d 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -96,16 +96,16 @@ if(MSVC AND (NOT USE_CLANG_CL)) # Disable warnings: "unreferenced local variable", "initialized, but not used variable", "benign include" replace_compile_flags("/we4101" " ") replace_compile_flags("/we4189" " ") - add_target_compile_flags(ext2fs "/wd4189 /wd4142 /wd4101") + target_compile_options(ext2fs PRIVATE /wd4189 /wd4142 /wd4101) else() - add_target_compile_flags(ext2fs "-Wno-pointer-sign -Wno-unused-function") - add_target_compile_flags(ext2fs "-Wno-unused-variable -Wno-missing-braces") + target_compile_options(ext2fs PRIVATE -Wno-pointer-sign -Wno-unused-function) + target_compile_options(ext2fs PRIVATE -Wno-unused-variable -Wno-missing-braces) if(USE_CLANG_CL) - add_target_compile_flags(ext2fs "-Wno-unused-value -Wno-parentheses-equality") - add_target_compile_flags(ext2fs "-Wno-incompatible-pointer-types-discards-qualifiers") - add_target_compile_flags(ext2fs "-Wno-#pragma-messages -Wno-cast-calling-convention") + target_compile_options(ext2fs PRIVATE -Wno-unused-value -Wno-parentheses-equality) + target_compile_options(ext2fs PRIVATE -Wno-incompatible-pointer-types-discards-qualifiers) + target_compile_options(ext2fs PRIVATE "-Wno-#pragma-messages;-Wno-cast-calling-convention") else() - add_target_compile_flags(ext2fs "-Wno-unused-but-set-variable") + target_compile_options(ext2fs PRIVATE -Wno-unused-but-set-variable) endif() endif() diff --git a/drivers/filesystems/ffs/CMakeLists.txt b/drivers/filesystems/ffs/CMakeLists.txt index 3f0b56d9423..b2e5135b84a 100644 --- a/drivers/filesystems/ffs/CMakeLists.txt +++ b/drivers/filesystems/ffs/CMakeLists.txt @@ -31,12 +31,12 @@ list(APPEND SOURCE add_library(ffs MODULE ${SOURCE} src/ffsdrv.rc) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(ffs "-Wno-pointer-sign -Wno-unused-function") - add_target_compile_flags(ffs "-Wno-unused-variable -Wno-missing-braces") + target_compile_options(ffs PRIVATE -Wno-pointer-sign -Wno-unused-function) + target_compile_options(ffs PRIVATE -Wno-unused-variable -Wno-missing-braces) if(USE_CLANG_CL) - add_target_compile_flags(ffs "-Wno-empty-body") + target_compile_options(ffs PRIVATE -Wno-empty-body) else() - add_target_compile_flags(ffs "-Wno-unused-but-set-variable") + target_compile_options(ffs PRIVATE -Wno-unused-but-set-variable) endif() endif() diff --git a/drivers/filesystems/nfs/CMakeLists.txt b/drivers/filesystems/nfs/CMakeLists.txt index 455d30127ec..9845ef76814 100644 --- a/drivers/filesystems/nfs/CMakeLists.txt +++ b/drivers/filesystems/nfs/CMakeLists.txt @@ -15,9 +15,9 @@ target_link_libraries(nfs41_driver ntoskrnl_vista rdbsslib rxce copysup memcmp $ add_importlibs(nfs41_driver ntoskrnl hal) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(nfs41_driver "-Wno-switch") + target_compile_options(nfs41_driver PRIVATE "-Wno-switch") if(USE_CLANG_CL) - add_target_compile_flags(nfs41_driver "-Wno-unused-value") + target_compile_options(nfs41_driver PRIVATE "-Wno-unused-value") endif() endif() diff --git a/drivers/filesystems/reiserfs/CMakeLists.txt b/drivers/filesystems/reiserfs/CMakeLists.txt index 51d1cddc462..cd939d40b85 100644 --- a/drivers/filesystems/reiserfs/CMakeLists.txt +++ b/drivers/filesystems/reiserfs/CMakeLists.txt @@ -79,16 +79,17 @@ list(APPEND SOURCE add_library(reiserfs MODULE ${SOURCE} src/rfsd.rc) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(reiserfs "-Wno-missing-braces -Wno-pointer-sign") - add_target_compile_flags(reiserfs "-Wno-unused-function -Wno-unused-variable") + target_compile_options(reiserfs PRIVATE -Wno-missing-braces -Wno-pointer-sign) + target_compile_options(reiserfs PRIVATE -Wno-unused-function -Wno-unused-variable) if(NOT USE_CLANG_CL) - add_target_compile_flags(reiserfs "-Wno-unused-but-set-variable -D__GCC__") + target_compile_options(reiserfs PRIVATE -Wno-unused-but-set-variable) + target_compile_definitions(reiserfs PRIVATE __GCC__) endif() else() #disable warnings: "unreferenced local variable", "initialized, but not used variable", "benign include" replace_compile_flags("/we4101" " ") replace_compile_flags("/we4189" " ") - add_target_compile_flags(reiserfs "/wd4189 /wd4142 /wd4101") + target_compile_options(reiserfs PRIVATE /wd4189 /wd4142 /wd4101) endif() target_link_libraries(reiserfs memcmp ${PSEH_LIB}) diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt index 66ce8d5ec4c..8c13bf7d861 100644 --- a/drivers/filesystems/udfs/CMakeLists.txt +++ b/drivers/filesystems/udfs/CMakeLists.txt @@ -45,15 +45,15 @@ add_library(udfs MODULE ${SOURCE} udffs.rc) if(MSVC) # FIXME: Make sure we marked all what needs to be marked with stdcall before removing this. - add_target_compile_flags(udfs "/Gz") + target_compile_options(udfs PRIVATE "/Gz") if(USE_CLANG_CL) - add_target_compile_flags(udfs "-Wno-extern-c-compat -Wno-unused-value") - add_target_compile_flags(udfs "-Wno-tautological-constant-out-of-range-compare") - add_target_compile_flags(udfs "-Wno-tautological-unsigned-zero-compare -Wno-self-assign") - add_target_compile_flags(udfs "-Wno-sometimes-uninitialized -Wno-parentheses-equality") + target_compile_options(udfs PRIVATE -Wno-extern-c-compat -Wno-unused-value) + target_compile_options(udfs PRIVATE -Wno-tautological-constant-out-of-range-compare) + target_compile_options(udfs PRIVATE -Wno-tautological-unsigned-zero-compare -Wno-self-assign) + target_compile_options(udfs PRIVATE -Wno-sometimes-uninitialized -Wno-parentheses-equality) endif() else() - add_target_compile_flags(udfs "-Wno-unused-but-set-variable") + target_compile_options(udfs PRIVATE "-Wno-unused-but-set-variable") endif() set_module_type(udfs kernelmodedriver) diff --git a/drivers/filters/fltmgr/CMakeLists.txt b/drivers/filters/fltmgr/CMakeLists.txt index 92f86b20608..3a07ff28215 100644 --- a/drivers/filters/fltmgr/CMakeLists.txt +++ b/drivers/filters/fltmgr/CMakeLists.txt @@ -26,6 +26,6 @@ add_library(fltmgr MODULE set_module_type(fltmgr kernelmodedriver) target_link_libraries(fltmgr ${PSEH_LIB}) add_importlibs(fltmgr ntoskrnl hal) -add_target_compile_definitions(fltmgr NTDDI_VERSION=NTDDI_WS03SP1) +target_compile_definitions(fltmgr PRIVATE NTDDI_VERSION=NTDDI_WS03SP1) add_pch(fltmgr fltmgr.h SOURCE) add_cd_file(TARGET fltmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/class/cdrom_new/CMakeLists.txt b/drivers/storage/class/cdrom_new/CMakeLists.txt index 34171764575..0d4e472eb28 100644 --- a/drivers/storage/class/cdrom_new/CMakeLists.txt +++ b/drivers/storage/class/cdrom_new/CMakeLists.txt @@ -13,9 +13,9 @@ add_library(cdrom_new MODULE ${SOURCE}) target_link_libraries(cdrom_new libcntpr wdmguid) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(cdrom_new "-Wno-format -Wno-unused-variable -Wno-pointer-sign") + target_compile_options(cdrom_new PRIVATE -Wno-format -Wno-unused-variable -Wno-pointer-sign) if(USE_CLANG_CL) - add_target_compile_flags(cdrom_new "-Wno-enum-conversion -Wno-tautological-constant-compare") + target_compile_options(cdrom_new PRIVATE -Wno-enum-conversion -Wno-tautological-constant-compare) endif() endif() diff --git a/drivers/storage/class/disk_new/CMakeLists.txt b/drivers/storage/class/disk_new/CMakeLists.txt index 82136b8f02a..252f6735ff2 100644 --- a/drivers/storage/class/disk_new/CMakeLists.txt +++ b/drivers/storage/class/disk_new/CMakeLists.txt @@ -15,7 +15,7 @@ add_library(disk_new MODULE ${SOURCE} disk.rc) target_link_libraries(disk_new libcntpr wdmguid) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(disk_new "-Wno-format -Wno-pointer-sign") + target_compile_options(disk_new PRIVATE -Wno-format -Wno-pointer-sign) endif() set_module_type(disk_new kernelmodedriver) diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt index 72e729ff506..163174825a4 100644 --- a/drivers/storage/ide/uniata/CMakeLists.txt +++ b/drivers/storage/ide/uniata/CMakeLists.txt @@ -23,11 +23,11 @@ list(APPEND SOURCE add_library(uniata MODULE ${SOURCE} idedma.rc) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(uniata "-Wno-narrowing") + target_compile_options(uniata PRIVATE "-Wno-narrowing") if(USE_CLANG_CL) - add_target_compile_flags(uniata "-Wno-unused-const-variable") + target_compile_options(uniata PRIVATE "-Wno-unused-const-variable") else() - add_target_compile_flags(uniata "-Wno-unused-but-set-variable") + target_compile_options(uniata PRIVATE "-Wno-unused-but-set-variable") endif() endif() diff --git a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt index b438197e941..60742e4626b 100644 --- a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt +++ b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt @@ -56,7 +56,7 @@ add_library(portcls MODULE ${CMAKE_CURRENT_BINARY_DIR}/portcls.def) if(USE_CLANG_CL) - add_target_compile_flags(portcls "-Wno-missing-braces") + target_compile_options(portcls PRIVATE "-Wno-missing-braces") endif() target_link_libraries(portcls libcntpr ${PSEH_LIB}) diff --git a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt index f992fa463e3..29202ba0933 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt @@ -25,7 +25,7 @@ set_module_type(cmipci wdmdriver UNICODE) add_importlibs(cmipci portcls hal ntoskrnl) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(cmipci "-Wno-write-strings -Wno-switch") + target_compile_options(cmipci PRIVATE -Wno-write-strings -Wno-switch) endif() add_pch(cmipci precomp.h SOURCE) diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 2d772d1205d..eb80a8ea0a1 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -27,6 +27,6 @@ list(APPEND MINI_HAL_SOURCE add_asm_files(mini_hal_asm ../generic/systimer.S) add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm}) -add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_) +target_compile_definitions(mini_hal PRIVATE _BLDR_ _MINIHAL_) add_dependencies(mini_hal psdk bugcodes asm) add_pch(mini_hal ../include/hal.h MINI_HAL_SOURCE) diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake index c3604e70dfe..4d16aaa4834 100644 --- a/hal/halx86/xbox.cmake +++ b/hal/halx86/xbox.cmake @@ -39,7 +39,7 @@ list(APPEND HAL_XBOX_SOURCE add_asm_files(lib_hal_xbox_asm ${HAL_XBOX_ASM_SOURCE}) add_object_library(lib_hal_xbox ${HAL_XBOX_SOURCE} ${lib_hal_xbox_asm}) if(NOT SARCH STREQUAL "xbox") - add_target_compile_definitions(lib_hal_xbox SARCH_XBOX) + target_compile_definitions(lib_hal_xbox PRIVATE SARCH_XBOX) endif() add_dependencies(lib_hal_xbox bugcodes xdk asm) #add_pch(lib_hal_xbox xbox/halxbox.h) diff --git a/modules/rosapps/applications/devutils/symdump/CMakeLists.txt b/modules/rosapps/applications/devutils/symdump/CMakeLists.txt index 14c53460d04..0e0bd3b2adf 100644 --- a/modules/rosapps/applications/devutils/symdump/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/symdump/CMakeLists.txt @@ -5,6 +5,6 @@ set_module_type(symdump win32cui) target_link_libraries(symdump wine) add_importlibs(symdump dbghelp shlwapi msvcrt kernel32 ntdll) if(NOT MSVC) - add_target_compile_flags(symdump "-Wno-unused-but-set-variable") + target_compile_options(symdump PRIVATE "-Wno-unused-but-set-variable") endif() add_cd_file(TARGET symdump DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/fraginator/CMakeLists.txt b/modules/rosapps/applications/fraginator/CMakeLists.txt index 1d66dc1671a..7526d90bd8b 100644 --- a/modules/rosapps/applications/fraginator/CMakeLists.txt +++ b/modules/rosapps/applications/fraginator/CMakeLists.txt @@ -17,7 +17,7 @@ add_importlibs(frag user32 advapi32 shell32 comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET frag DESTINATION reactos/system32 FOR all) add_executable(unfrag ${UNFRAG_SOURCE}) -add_target_compile_definitions(unfrag "_CUI_") +target_compile_definitions(unfrag PRIVATE "_CUI_") set_module_type(unfrag win32cui UNICODE) add_importlibs(unfrag advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET unfrag DESTINATION reactos/system32 FOR all) \ No newline at end of file diff --git a/modules/rosapps/applications/net/ncftp/CMakeLists.txt b/modules/rosapps/applications/net/ncftp/CMakeLists.txt index 58e794cdc94..41ad22bd30e 100644 --- a/modules/rosapps/applications/net/ncftp/CMakeLists.txt +++ b/modules/rosapps/applications/net/ncftp/CMakeLists.txt @@ -70,10 +70,9 @@ list(APPEND SOURCE add_executable(ncftp ${SOURCE} ncftp.rc) set_module_type(ncftp win32cui) +target_compile_definitions(ncftp PRIVATE HAVE_UTIME_H HAVE_UNISTD_H) if(NOT MSVC) - add_target_compile_flags(ncftp "-DHAVE_UTIME_H -DHAVE_UNISTD_H -Wno-unused-but-set-variable") -else() - add_target_compile_flags(ncftp "-DHAVE_UTIME_H -DHAVE_UNISTD_H") + target_compile_options(ncftp PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(ncftp advapi32 user32 ws2_32 msvcrt kernel32) add_cd_file(TARGET ncftp DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt b/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt index b737ad2022f..7b5aba3b6cb 100644 --- a/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(logevent logevent.c logevent.rc) set_module_type(logevent win32cui) if(NOT MSVC) - add_target_compile_flags(logevent "-Wno-unused-but-set-variable") + target_compile_options(logevent PRIVATE "-Wno-unused-but-set-variable") endif() add_importlibs(logevent advapi32 msvcrt kernel32) add_cd_file(TARGET logevent DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt b/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt index b2805cbc346..ca2eade1876 100644 --- a/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(pedump pedump.c pedump.rc) set_module_type(pedump win32cui) if(NOT MSVC) - add_target_compile_flags(pedump "-Wno-unused-but-set-variable") + target_compile_options(pedump PRIVATE "-Wno-unused-but-set-variable") endif() add_importlibs(pedump msvcrt kernel32 ntdll) add_cd_file(TARGET pedump DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt b/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt index 92d9621eadc..748d0f03544 100644 --- a/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt @@ -12,7 +12,7 @@ list(APPEND SOURCE add_executable(rosperf ${SOURCE} rosperf.rc) set_module_type(rosperf win32cui UNICODE) if(NOT MSVC) - add_target_compile_flags(rosperf "-Wno-unused-but-set-variable") + target_compile_options(rosperf PRIVATE "-Wno-unused-but-set-variable") endif() add_importlibs(rosperf version msimg32 gdi32 shell32 advapi32 user32 ntdll msvcrt kernel32) add_cd_file(TARGET rosperf DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/winfile/CMakeLists.txt b/modules/rosapps/applications/winfile/CMakeLists.txt index 8b5228201c5..863ffd2fcdc 100644 --- a/modules/rosapps/applications/winfile/CMakeLists.txt +++ b/modules/rosapps/applications/winfile/CMakeLists.txt @@ -9,5 +9,5 @@ add_cd_file(TARGET winefile DESTINATION reactos/system32 FOR all) #if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 -# add_target_compile_flags(winefile "-Wno-format") +# target_compile_options(winefile PRIVATE "-Wno-format") #endif() diff --git a/modules/rosapps/templates/dialog/CMakeLists.txt b/modules/rosapps/templates/dialog/CMakeLists.txt index 6102bb4bfb4..16aed4a4261 100644 --- a/modules/rosapps/templates/dialog/CMakeLists.txt +++ b/modules/rosapps/templates/dialog/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND SOURCE add_executable(template_dialog ${SOURCE} dialog.rc) set_module_type(template_dialog win32cui) if(NOT MSVC) - add_target_compile_flags(template_dialog "-Wno-unused-but-set-variable") + target_compile_options(template_dialog PRIVATE "-Wno-unused-but-set-variable") endif() add_importlibs(template_dialog user32 gdi32 comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET template_dialog DESTINATION reactos/system32 FOR all) diff --git a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake index 6aa52ef6773..8361b7b1105 100644 --- a/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/crtdll_crt_apitest.cmake @@ -553,7 +553,7 @@ endif() add_executable(crtdll_crt_apitest testlist.c ${SOURCE_CRTDLL}) -add_target_compile_definitions(crtdll_crt_apitest TEST_CRTDLL) +target_compile_definitions(crtdll_crt_apitest PRIVATE TEST_CRTDLL) target_link_libraries(crtdll_crt_apitest wine ${PSEH_LIB}) set_module_type(crtdll_crt_apitest win32cui) add_importlibs(crtdll_crt_apitest crtdll msvcrt kernel32 ntdll) diff --git a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake index 49c965dbac5..619fcdfa780 100644 --- a/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/msvcrt_crt_apitest.cmake @@ -1375,7 +1375,7 @@ endif() # Startup code doesn't go together well with the static CRT... too much __imp_ #add_executable(static_crt_apitest testlist.c ${SOURCE_MSVCRT}) -#add_target_compile_definitions(static_crt_apitest TEST_STATIC_CRT) +#target_compile_definitions(static_crt_apitest PRIVATE TEST_STATIC_CRT) #target_link_libraries(static_crt_apitest ${PSEH_LIB} crt wine) #set_module_type(static_crt_apitest win32cui) #add_importlibs(static_crt_apitest kernel32 ntdll) @@ -1391,7 +1391,7 @@ endif() #add_rostests_file(TARGET static_crt_dll_startup) add_executable(msvcrt_crt_apitest testlist.c ${SOURCE_MSVCRT}) -add_target_compile_definitions(msvcrt_crt_apitest TEST_MSVCRT) +target_compile_definitions(msvcrt_crt_apitest PRIVATE TEST_MSVCRT) target_link_libraries(msvcrt_crt_apitest wine ${PSEH_LIB}) set_module_type(msvcrt_crt_apitest win32cui) add_importlibs(msvcrt_crt_apitest msvcrt kernel32 ntdll) diff --git a/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake b/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake index 704288786fc..b9ffc61c5f4 100644 --- a/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake +++ b/modules/rostests/apitests/crt/ntdll_crt_apitest.cmake @@ -152,7 +152,7 @@ elseif(ARCH STREQUAL "amd64") endif() add_executable(ntdll_crt_apitest testlist.c ${SOURCE_NTDLL}) -add_target_compile_definitions(ntdll_crt_apitest TEST_NTDLL) +target_compile_definitions(ntdll_crt_apitest PRIVATE TEST_NTDLL) target_link_libraries(ntdll_crt_apitest wine ${PSEH_LIB}) set_module_type(ntdll_crt_apitest win32cui) add_importlibs(ntdll_crt_apitest ntdll msvcrt kernel32) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index 087bb31c704..4c03a27d58f 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -106,7 +106,7 @@ set_module_type(kmtest_drv kernelmodedriver) target_link_libraries(kmtest_drv kmtest_printf chkstk memcmp ntoskrnl_vista ${PSEH_LIB}) add_importlibs(kmtest_drv ntoskrnl hal) add_dependencies(kmtest_drv bugcodes xdk) -add_target_compile_definitions(kmtest_drv KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) +target_compile_definitions(kmtest_drv PRIVATE KMT_KERNEL_MODE NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(kmtest_drv include/kmt_test.h) add_rostests_file(TARGET kmtest_drv) @@ -115,8 +115,8 @@ add_library(kmtest_printf ${REACTOS_SOURCE_DIR}/sdk/lib/crt/string/strnlen.c ${REACTOS_SOURCE_DIR}/sdk/lib/crt/string/wcsnlen.c ${REACTOS_SOURCE_DIR}/sdk/lib/crt/printf/streamout.c) -add_target_compile_definitions(kmtest_printf _LIBCNT_ _USER32_WSPRINTF wctomb=KmtWcToMb) -add_target_include_directories(kmtest_printf ${REACTOS_SOURCE_DIR}/sdk/lib/crt/include) +target_compile_definitions(kmtest_printf PRIVATE _LIBCNT_ _USER32_WSPRINTF wctomb=KmtWcToMb) +target_include_directories(kmtest_printf PRIVATE ${REACTOS_SOURCE_DIR}/sdk/lib/crt/include) # # kmtest.exe loader application @@ -159,7 +159,7 @@ add_executable(kmtest ${KMTEST_SOURCE}) set_module_type(kmtest win32cui) target_link_libraries(kmtest ${PSEH_LIB}) add_importlibs(kmtest fltlib advapi32 ws2_32 msvcrt kernel32 ntdll) -add_target_compile_definitions(kmtest KMT_USER_MODE NTDDI_VERSION=NTDDI_WS03SP1) +target_compile_definitions(kmtest PRIVATE KMT_USER_MODE NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(kmtest include/kmt_test.h) set_target_properties(kmtest PROPERTIES OUTPUT_NAME "kmtest_") add_rostests_file(TARGET kmtest) diff --git a/modules/rostests/kmtests/example/CMakeLists.txt b/modules/rostests/kmtests/example/CMakeLists.txt index a1a9b51db2b..824fccb29ca 100644 --- a/modules/rostests/kmtests/example/CMakeLists.txt +++ b/modules/rostests/kmtests/example/CMakeLists.txt @@ -9,6 +9,6 @@ add_library(example_drv MODULE ${EXAMPLE_DRV_SOURCE}) set_module_type(example_drv kernelmodedriver) target_link_libraries(example_drv kmtest_printf ${PSEH_LIB}) add_importlibs(example_drv ntoskrnl hal) -add_target_compile_definitions(example_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(example_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(example_drv ../include/kmt_test.h) add_rostests_file(TARGET example_drv) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt index cc700c52465..8d244b28323 100644 --- a/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt +++ b/modules/rostests/kmtests/fltmgr/fltmgr_create/CMakeLists.txt @@ -9,6 +9,6 @@ add_library(fltmgr_create MODULE ${FLTMGR_TEST_DRV_SOURCE}) set_module_type(fltmgr_create kernelmodedriver) target_link_libraries(fltmgr_create kmtest_printf ${PSEH_LIB}) add_importlibs(fltmgr_create fltmgr ntoskrnl hal) -add_target_compile_definitions(fltmgr_create KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) +target_compile_definitions(fltmgr_create PRIVATE KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(example_drv ../include/kmt_test.h) add_rostests_file(TARGET fltmgr_create) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt index 1f41dd938c7..2095a385b4d 100644 --- a/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt +++ b/modules/rostests/kmtests/fltmgr/fltmgr_load/CMakeLists.txt @@ -9,6 +9,6 @@ add_library(FltMgrLoad_drv MODULE ${FLTMGR_TEST_DRV_SOURCE}) set_module_type(FltMgrLoad_drv kernelmodedriver) target_link_libraries(FltMgrLoad_drv kmtest_printf ${PSEH_LIB}) add_importlibs(FltMgrLoad_drv fltmgr ntoskrnl hal) -add_target_compile_definitions(FltMgrLoad_drv KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) +target_compile_definitions(FltMgrLoad_drv PRIVATE KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(example_drv ../include/kmt_test.h) add_rostests_file(TARGET FltMgrLoad_drv) diff --git a/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt b/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt index 5faa8bf7a06..3c1c4a54d57 100644 --- a/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt +++ b/modules/rostests/kmtests/fltmgr/fltmgr_register/CMakeLists.txt @@ -10,6 +10,6 @@ add_library(fltmgrreg_drv MODULE ${FLTMGR_TEST_DRV_SOURCE}) set_module_type(fltmgrreg_drv kernelmodedriver) target_link_libraries(fltmgrreg_drv kmtest_printf ${PSEH_LIB}) add_importlibs(fltmgrreg_drv fltmgr ntoskrnl hal) -add_target_compile_definitions(fltmgrreg_drv KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) +target_compile_definitions(fltmgrreg_drv PRIVATE KMT_STANDALONE_DRIVER KMT_FILTER_DRIVER NTDDI_VERSION=NTDDI_WS03SP1) #add_pch(example_drv ../include/kmt_test.h) add_rostests_file(TARGET fltmgrreg_drv) diff --git a/modules/rostests/kmtests/hidparse/CMakeLists.txt b/modules/rostests/kmtests/hidparse/CMakeLists.txt index 91064640adf..9ecd64bf340 100644 --- a/modules/rostests/kmtests/hidparse/CMakeLists.txt +++ b/modules/rostests/kmtests/hidparse/CMakeLists.txt @@ -13,6 +13,6 @@ add_library(hidp_drv MODULE ${HIDP_DRV_SOURCE}) set_module_type(hidp_drv kernelmodedriver) target_link_libraries(hidp_drv kmtest_printf ${PSEH_LIB}) add_importlibs(hidp_drv hidparse ntoskrnl hal) -add_target_compile_definitions(hidp_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(hidp_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(hidp_drv ../include/kmt_test.h) add_rostests_file(TARGET hidp_drv) diff --git a/modules/rostests/kmtests/kernel32/CMakeLists.txt b/modules/rostests/kmtests/kernel32/CMakeLists.txt index 6dd07ed60ca..529074e640c 100644 --- a/modules/rostests/kmtests/kernel32/CMakeLists.txt +++ b/modules/rostests/kmtests/kernel32/CMakeLists.txt @@ -9,6 +9,6 @@ add_library(kernel32_drv MODULE ${KERNEL32_DRV_SOURCE}) set_module_type(kernel32_drv kernelmodedriver) target_link_libraries(kernel32_drv kmtest_printf ${PSEH_LIB}) add_importlibs(kernel32_drv ntoskrnl hal) -add_target_compile_definitions(kernel32_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(kernel32_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(kernel32_drv ../include/kmt_test.h) add_rostests_file(TARGET kernel32_drv) diff --git a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt index b31a1e50588..600e0106dd5 100644 --- a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt +++ b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(cccopyread_drv MODULE ${CCCOPYREAD_DRV_SOURCE}) set_module_type(cccopyread_drv kernelmodedriver) target_link_libraries(cccopyread_drv kmtest_printf ${PSEH_LIB}) add_importlibs(cccopyread_drv ntoskrnl hal) -add_target_compile_definitions(cccopyread_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(cccopyread_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(cccopyread_drv ../include/kmt_test.h) add_rostests_file(TARGET cccopyread_drv) @@ -27,7 +27,7 @@ add_library(cccopywrite_drv MODULE ${CCCOPYWRITE_DRV_SOURCE}) set_module_type(cccopywrite_drv kernelmodedriver) target_link_libraries(cccopywrite_drv kmtest_printf ${PSEH_LIB}) add_importlibs(cccopywrite_drv ntoskrnl hal) -add_target_compile_definitions(cccopywrite_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(cccopywrite_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(cccopyread_drv ../include/kmt_test.h) add_rostests_file(TARGET cccopywrite_drv) @@ -42,7 +42,7 @@ add_library(ccmapdata_drv MODULE ${CCMAPDATA_DRV_SOURCE}) set_module_type(ccmapdata_drv kernelmodedriver) target_link_libraries(ccmapdata_drv kmtest_printf ${PSEH_LIB}) add_importlibs(ccmapdata_drv ntoskrnl hal) -add_target_compile_definitions(ccmapdata_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(ccmapdata_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(ccmapdata_drv ../include/kmt_test.h) add_rostests_file(TARGET ccmapdata_drv) @@ -57,7 +57,7 @@ add_library(ccpinmappeddata_drv MODULE ${CCPINMAPPEDDATA_DRV_SOURCE}) set_module_type(ccpinmappeddata_drv kernelmodedriver) target_link_libraries(ccpinmappeddata_drv kmtest_printf ${PSEH_LIB}) add_importlibs(ccpinmappeddata_drv ntoskrnl hal) -add_target_compile_definitions(ccpinmappeddata_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(ccpinmappeddata_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(ccpinmappeddata_drv ../include/kmt_test.h) add_rostests_file(TARGET ccpinmappeddata_drv) @@ -72,7 +72,7 @@ add_library(ccpinread_drv MODULE ${CCPINREAD_DRV_SOURCE}) set_module_type(ccpinread_drv kernelmodedriver) target_link_libraries(ccpinread_drv kmtest_printf ${PSEH_LIB}) add_importlibs(ccpinread_drv ntoskrnl hal) -add_target_compile_definitions(ccpinread_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(ccpinread_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(ccmapdata_drv ../include/kmt_test.h) add_rostests_file(TARGET ccpinread_drv) @@ -87,6 +87,6 @@ add_library(ccsetfilesizes_drv MODULE ${CCSETFILESIZES_DRV_SOURCE}) set_module_type(ccsetfilesizes_drv kernelmodedriver) target_link_libraries(ccsetfilesizes_drv kmtest_printf ${PSEH_LIB}) add_importlibs(ccsetfilesizes_drv ntoskrnl hal) -add_target_compile_definitions(ccsetfilesizes_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(ccsetfilesizes_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(ccsetfilesizes_drv ../include/kmt_test.h) add_rostests_file(TARGET ccsetfilesizes_drv) diff --git a/modules/rostests/kmtests/ntos_io/CMakeLists.txt b/modules/rostests/kmtests/ntos_io/CMakeLists.txt index f1c142efcc2..cdcbe728f68 100644 --- a/modules/rostests/kmtests/ntos_io/CMakeLists.txt +++ b/modules/rostests/kmtests/ntos_io/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(iocreatefile_drv MODULE ${IOCREATEFILE_DRV_SOURCE}) set_module_type(iocreatefile_drv kernelmodedriver) target_link_libraries(iocreatefile_drv kmtest_printf ${PSEH_LIB}) add_importlibs(iocreatefile_drv ntoskrnl hal) -add_target_compile_definitions(iocreatefile_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(iocreatefile_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(iocreatefile_drv ../include/kmt_test.h) add_rostests_file(TARGET iocreatefile_drv) @@ -27,7 +27,7 @@ add_library(iodeviceobject_drv MODULE ${IODEVICEOBJECT_DRV_SOURCE}) set_module_type(iodeviceobject_drv kernelmodedriver) target_link_libraries(iodeviceobject_drv kmtest_printf ${PSEH_LIB}) add_importlibs(iodeviceobject_drv ntoskrnl hal) -add_target_compile_definitions(iodeviceobject_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(iodeviceobject_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(iodeviceobject_drv ../include/kmt_test.h) add_rostests_file(TARGET iodeviceobject_drv) @@ -42,7 +42,7 @@ add_library(iohelper_drv MODULE ${IOHELPER_DRV_SOURCE}) set_module_type(iohelper_drv kernelmodedriver) target_link_libraries(iohelper_drv kmtest_printf ${PSEH_LIB}) add_importlibs(iohelper_drv ntoskrnl hal) -add_target_compile_definitions(iohelper_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(iohelper_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(iohelper_drv ../include/kmt_test.h) add_rostests_file(TARGET iohelper_drv) @@ -57,6 +57,6 @@ add_library(ioreadwrite_drv MODULE ${IOREADWRITE_DRV_SOURCE}) set_module_type(ioreadwrite_drv kernelmodedriver) target_link_libraries(ioreadwrite_drv kmtest_printf ${PSEH_LIB}) add_importlibs(ioreadwrite_drv ntoskrnl hal) -add_target_compile_definitions(ioreadwrite_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(ioreadwrite_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(ioreadwrite_drv ../include/kmt_test.h) add_rostests_file(TARGET ioreadwrite_drv) diff --git a/modules/rostests/kmtests/ntos_mm/CMakeLists.txt b/modules/rostests/kmtests/ntos_mm/CMakeLists.txt index 6610bba053a..9072c8c05a7 100644 --- a/modules/rostests/kmtests/ntos_mm/CMakeLists.txt +++ b/modules/rostests/kmtests/ntos_mm/CMakeLists.txt @@ -12,7 +12,7 @@ add_library(ntcreatesection_drv MODULE ${NTCREATESECTION_DRV_SOURCE}) set_module_type(ntcreatesection_drv kernelmodedriver) target_link_libraries(ntcreatesection_drv kmtest_printf ${PSEH_LIB}) add_importlibs(ntcreatesection_drv ntoskrnl hal) -add_target_compile_definitions(ntcreatesection_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(ntcreatesection_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(ntcreatesection_drv ../include/kmt_test.h) add_rostests_file(TARGET ntcreatesection_drv) @@ -27,6 +27,6 @@ add_library(mmmaplockedpagesspecifycache_drv MODULE ${MMMAPLOCKEDPAGESSPECIFYCAC set_module_type(mmmaplockedpagesspecifycache_drv kernelmodedriver) target_link_libraries(mmmaplockedpagesspecifycache_drv kmtest_printf ${PSEH_LIB}) add_importlibs(mmmaplockedpagesspecifycache_drv ntoskrnl hal) -add_target_compile_definitions(mmmaplockedpagesspecifycache_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(mmmaplockedpagesspecifycache_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(mmmaplockedpagesspecifycache_drv ../include/kmt_test.h) add_rostests_file(TARGET mmmaplockedpagesspecifycache_drv) diff --git a/modules/rostests/kmtests/ntos_po/CMakeLists.txt b/modules/rostests/kmtests/ntos_po/CMakeLists.txt index 26258ad6160..bc5510af97e 100644 --- a/modules/rostests/kmtests/ntos_po/CMakeLists.txt +++ b/modules/rostests/kmtests/ntos_po/CMakeLists.txt @@ -12,6 +12,6 @@ add_library(poirp_drv MODULE ${POIRP_DRV_SOURCE}) set_module_type(poirp_drv kernelmodedriver) target_link_libraries(poirp_drv kmtest_printf ${PSEH_LIB}) add_importlibs(poirp_drv ntoskrnl hal) -add_target_compile_definitions(poirp_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(poirp_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(poirp_drv ../include/kmt_test.h) add_rostests_file(TARGET poirp_drv) diff --git a/modules/rostests/kmtests/tcpip/CMakeLists.txt b/modules/rostests/kmtests/tcpip/CMakeLists.txt index be094fa0ebe..94691d5f38b 100644 --- a/modules/rostests/kmtests/tcpip/CMakeLists.txt +++ b/modules/rostests/kmtests/tcpip/CMakeLists.txt @@ -11,6 +11,6 @@ add_library(tcpip_drv MODULE ${TCPIP_TEST_DRV_SOURCE}) set_module_type(tcpip_drv kernelmodedriver) target_link_libraries(tcpip_drv kmtest_printf ${PSEH_LIB}) add_importlibs(tcpip_drv ntoskrnl hal) -add_target_compile_definitions(tcpip_drv KMT_STANDALONE_DRIVER) +target_compile_definitions(tcpip_drv PRIVATE KMT_STANDALONE_DRIVER) #add_pch(example_drv ../include/kmt_test.h) add_rostests_file(TARGET tcpip_drv) diff --git a/modules/rostests/tests/pseh2/CMakeLists.txt b/modules/rostests/tests/pseh2/CMakeLists.txt index e737a974a09..fe5ee66e0b0 100644 --- a/modules/rostests/tests/pseh2/CMakeLists.txt +++ b/modules/rostests/tests/pseh2/CMakeLists.txt @@ -6,7 +6,7 @@ add_importlibs(pseh2_test msvcrt kernel32 ntdll) add_rostests_file(TARGET pseh2_test) if(NOT MSVC) - add_target_compile_flags(pseh2_test "-Wno-format") + target_compile_options(pseh2_test PRIVATE "-Wno-format") endif() @@ -17,5 +17,5 @@ add_importlibs(pseh2_test_cpp msvcrt kernel32 ntdll) add_rostests_file(TARGET pseh2_test_cpp) if(NOT MSVC) - add_target_compile_flags(pseh2_test_cpp "-Wno-format") + target_compile_options(pseh2_test_cpp PRIVATE "-Wno-format") endif() diff --git a/modules/rostests/winetests/advapi32/CMakeLists.txt b/modules/rostests/winetests/advapi32/CMakeLists.txt index 5d9cb9c3bde..5df0f3bf3f1 100644 --- a/modules/rostests/winetests/advapi32/CMakeLists.txt +++ b/modules/rostests/winetests/advapi32/CMakeLists.txt @@ -18,7 +18,7 @@ list(APPEND SOURCE add_executable(advapi32_winetest ${SOURCE} testlist.c) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(advapi32_winetest "-Wno-format") + target_compile_options(advapi32_winetest PRIVATE "-Wno-format") endif() set_module_type(advapi32_winetest win32cui) diff --git a/modules/rostests/winetests/comctl32/CMakeLists.txt b/modules/rostests/winetests/comctl32/CMakeLists.txt index 9212bc0fe14..42d37d7b02c 100644 --- a/modules/rostests/winetests/comctl32/CMakeLists.txt +++ b/modules/rostests/winetests/comctl32/CMakeLists.txt @@ -41,7 +41,7 @@ add_executable(comctl32_winetest rsrc.rc) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(comctl32_winetest "-Wno-format") + target_compile_options(comctl32_winetest PRIVATE "-Wno-format") endif() set_module_type(comctl32_winetest win32cui) diff --git a/modules/rostests/winetests/kernel32/CMakeLists.txt b/modules/rostests/winetests/kernel32/CMakeLists.txt index f591e0c1ee1..1194e45989b 100644 --- a/modules/rostests/winetests/kernel32/CMakeLists.txt +++ b/modules/rostests/winetests/kernel32/CMakeLists.txt @@ -49,7 +49,7 @@ add_executable(kernel32_winetest resource.rc) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(kernel32_winetest "-Wno-format") + target_compile_options(kernel32_winetest PRIVATE "-Wno-format") endif() set_module_type(kernel32_winetest win32cui) diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index f63fa637a9b..90866735d1b 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -28,7 +28,7 @@ list(APPEND SOURCE add_executable(msvcrt_winetest ${SOURCE} testlist.c) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(msvcrt_winetest "-Wno-format") + target_compile_options(msvcrt_winetest PRIVATE "-Wno-format") endif() set_module_type(msvcrt_winetest win32cui) diff --git a/modules/rostests/winetests/ntdll/CMakeLists.txt b/modules/rostests/winetests/ntdll/CMakeLists.txt index c0e90fe99d4..2262afe975d 100644 --- a/modules/rostests/winetests/ntdll/CMakeLists.txt +++ b/modules/rostests/winetests/ntdll/CMakeLists.txt @@ -33,7 +33,7 @@ endif() add_executable(ntdll_winetest ${SOURCE} testlist.c) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(ntdll_winetest "-Wno-format") + target_compile_options(ntdll_winetest PRIVATE "-Wno-format") endif() set_module_type(ntdll_winetest win32cui) diff --git a/modules/rostests/winetests/rpcrt4/CMakeLists.txt b/modules/rostests/winetests/rpcrt4/CMakeLists.txt index e92f9bbfad0..f764a4b89c7 100644 --- a/modules/rostests/winetests/rpcrt4/CMakeLists.txt +++ b/modules/rostests/winetests/rpcrt4/CMakeLists.txt @@ -41,9 +41,9 @@ endif() add_executable(rpcrt4_winetest ${SOURCE}) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(rpcrt4_winetest "-Wno-format") + target_compile_options(rpcrt4_winetest PRIVATE "-Wno-format") if(USE_CLANG_CL) - add_target_compile_flags(rpcrt4_winetest "-Wno-cast-calling-convention") + target_compile_options(rpcrt4_winetest PRIVATE "-Wno-cast-calling-convention") endif() endif() diff --git a/modules/rostests/winetests/winmm/CMakeLists.txt b/modules/rostests/winetests/winmm/CMakeLists.txt index 58cc1eb8072..c30a6b2a565 100644 --- a/modules/rostests/winetests/winmm/CMakeLists.txt +++ b/modules/rostests/winetests/winmm/CMakeLists.txt @@ -15,7 +15,7 @@ list(APPEND SOURCE add_executable(winmm_winetest ${SOURCE}) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(winmm_winetest "-Wno-format") + target_compile_options(winmm_winetest PRIVATE "-Wno-format") endif() target_link_libraries(winmm_winetest dxguid) diff --git a/modules/rostests/winetests/ws2_32/CMakeLists.txt b/modules/rostests/winetests/ws2_32/CMakeLists.txt index 8e0946d609e..2229f5787aa 100644 --- a/modules/rostests/winetests/ws2_32/CMakeLists.txt +++ b/modules/rostests/winetests/ws2_32/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(ws2_32_winetest protocol.c sock.c testlist.c) if(USE_CLANG_CL OR (NOT MSVC)) - add_target_compile_flags(ws2_32_winetest "-Wno-format") + target_compile_options(ws2_32_winetest PRIVATE "-Wno-format") endif() set_module_type(ws2_32_winetest win32cui) diff --git a/ntoskrnl/ntkrnlmp/CMakeLists.txt b/ntoskrnl/ntkrnlmp/CMakeLists.txt index 2853f45fe75..0c6e0a8edc3 100644 --- a/ntoskrnl/ntkrnlmp/CMakeLists.txt +++ b/ntoskrnl/ntkrnlmp/CMakeLists.txt @@ -18,7 +18,7 @@ add_executable(ntkrnlmp ${CMAKE_CURRENT_BINARY_DIR}/ntkrnlmp.def) set_property(TARGET ntkrnlmp PROPERTY ENABLE_EXPORTS TRUE) -add_target_compile_definitions(ntkrnlmp CONFIG_SMP) +target_compile_definitions(ntkrnlmp PRIVATE CONFIG_SMP) if(ARCH STREQUAL "i386") set_entrypoint(ntkrnlmp KiSystemStartup 4) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 99a12b2f554..a3be90baa74 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -608,7 +608,7 @@ function(add_importlibs _module) add_dependency_node(${_module}) foreach(LIB ${ARGN}) if("${LIB}" MATCHES "msvcrt") - add_target_compile_definitions(${_module} _DLL __USE_CRTIMP) + target_compile_definitions(${_module} PRIVATE _DLL __USE_CRTIMP) target_link_libraries(${_module} msvcrtex) endif() target_link_libraries(${_module} lib${LIB}) @@ -657,7 +657,7 @@ function(set_module_type MODULE TYPE) # Set unicode definitions if(__module_UNICODE) - add_target_compile_definitions(${MODULE} UNICODE _UNICODE) + target_compile_definitions(${MODULE} PRIVATE UNICODE _UNICODE) endif() # Set entry point diff --git a/sdk/cmake/compilerflags.cmake b/sdk/cmake/compilerflags.cmake index 669a4ff1df5..b89023e3565 100644 --- a/sdk/cmake/compilerflags.cmake +++ b/sdk/cmake/compilerflags.cmake @@ -31,16 +31,7 @@ endfunction() # arguments, all of which will be added to the list # # Examples: -# add_target_compile_flags(mymodule "-pedantic -O5") # add_target_link_flags(mymodule "-s --fatal-warnings") -# add_target_compile_definitions(mymodule WIN32 _WIN32 INLINE=inline) -# add_target_include_directories(mymodule include ../include) -function(add_target_compile_flags _module _flags) - if(${ARGC} GREATER 2) - message(FATAL_ERROR "Excess arguments to add_target_compile_flags! Module ${_module}, args ${ARGN}") - endif() - add_target_property(${_module} COMPILE_FLAGS ${_flags}) -endfunction() function(add_target_link_flags _module _flags) if(${ARGC} GREATER 2) @@ -49,14 +40,6 @@ function(add_target_link_flags _module _flags) add_target_property(${_module} LINK_FLAGS ${_flags}) endfunction() -function(add_target_compile_definitions _module) - add_target_property(${_module} COMPILE_DEFINITIONS ${ARGN}) -endfunction() - -function(add_target_include_directories _module) - add_target_property(${_module} INCLUDE_DIRECTORIES ${ARGN}) -endfunction() - # replace_compiler_option # (taken from LLVM) # Replaces a compiler option or switch `_old' in `_var' by `_new'. diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index c6bfb95d41a..5f0ea13b23a 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -231,7 +231,7 @@ elseif(NO_ROSSYM) else() # Normal rsym build get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) - + set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> ${CMAKE_C_FLAGS} <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>" "${RSYM} -s ${REACTOS_SOURCE_DIR} <TARGET> <TARGET>") @@ -323,7 +323,7 @@ function(set_module_type_toolchain MODULE TYPE) #Disabled due to LD bug: ROSBE-154 #add_linker_script(${MODULE} ${REACTOS_SOURCE_DIR}/sdk/cmake/init-section.lds) endif() - + if(STACK_PROTECTOR) target_link_libraries(${MODULE} gcc_ssp) endif() @@ -366,7 +366,7 @@ endfunction() set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-lib=<TARGET>") set(CMAKE_IMPLIB_DELAYED_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-delaylib=<TARGET>") function(spec2def _dllname _spec_file) - + cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS;WITH_RELAY" "VERSION" "" ${ARGN}) # Get library basename @@ -396,7 +396,7 @@ function(spec2def _dllname _spec_file) if(__spec2def_NO_PRIVATE_WARNINGS) set(_extraflags --no-private-warnings) endif() - + generate_import_lib(lib${_file} ${_dllname} ${_spec_file} ${_extraflags}) endif() endfunction() @@ -467,7 +467,7 @@ endfunction() function(allow_warnings __module) # We don't allow warnings in trunk, this needs to be reworked. See CORE-6959. - #add_target_compile_flags(${__module} "-Wno-error") + #target_compile_options(${__module} PRIVATE "-Wno-error") endfunction() macro(add_asm_files _target) diff --git a/sdk/lib/3rdparty/adns/CMakeLists.txt b/sdk/lib/3rdparty/adns/CMakeLists.txt index ff18daf5db4..d46b9e4cdfa 100644 --- a/sdk/lib/3rdparty/adns/CMakeLists.txt +++ b/sdk/lib/3rdparty/adns/CMakeLists.txt @@ -25,7 +25,7 @@ list(APPEND SOURCE add_library(adns ${SOURCE}) if(NOT MSVC) - add_target_compile_flags(adns "-Wno-unused-but-set-variable") + target_compile_options(adns PRIVATE "-Wno-unused-but-set-variable") endif() add_dependencies(adns psdk) diff --git a/sdk/lib/3rdparty/cardlib/CMakeLists.txt b/sdk/lib/3rdparty/cardlib/CMakeLists.txt index 224d8d396c7..ae2423020eb 100644 --- a/sdk/lib/3rdparty/cardlib/CMakeLists.txt +++ b/sdk/lib/3rdparty/cardlib/CMakeLists.txt @@ -18,7 +18,7 @@ list(APPEND SOURCE add_library(cardlib ${SOURCE}) if(NOT MSVC) - add_target_compile_flags(cardlib "-Wno-unused-but-set-variable") + target_compile_options(cardlib PRIVATE "-Wno-unused-but-set-variable") endif() add_dependencies(cardlib psdk) diff --git a/sdk/lib/3rdparty/freetype/CMakeLists.txt b/sdk/lib/3rdparty/freetype/CMakeLists.txt index f7e3313c5cd..f14ed5c47f5 100644 --- a/sdk/lib/3rdparty/freetype/CMakeLists.txt +++ b/sdk/lib/3rdparty/freetype/CMakeLists.txt @@ -61,5 +61,5 @@ list(APPEND SOURCE add_library(freetype ${SOURCE}) if(USE_CLANG_CL) - add_target_compile_flags(freetype "-Wno-tautological-constant-compare") + target_compile_options(freetype PRIVATE "-Wno-tautological-constant-compare") endif() diff --git a/sdk/lib/3rdparty/libxml2/CMakeLists.txt b/sdk/lib/3rdparty/libxml2/CMakeLists.txt index cbf577fc7d6..855d45ff9cd 100644 --- a/sdk/lib/3rdparty/libxml2/CMakeLists.txt +++ b/sdk/lib/3rdparty/libxml2/CMakeLists.txt @@ -67,11 +67,11 @@ add_library(libxml2 ${SOURCE}) if(MSVC AND (NOT USE_CLANG_CL)) # Unreferenced local variable replace_compile_flags("/we4101" " ") - add_target_compile_flags(libxml2 "/wd4101") + target_compile_options(libxml2 PRIVATE "/wd4101") # Local variable initialized but not referenced replace_compile_flags("/we4189" " ") else() - add_target_compile_flags(libxml2 "-w") + target_compile_options(libxml2 PRIVATE "-w") endif() target_link_libraries(libxml2 oldnames) diff --git a/sdk/lib/3rdparty/stlport/CMakeLists.txt b/sdk/lib/3rdparty/stlport/CMakeLists.txt index 17c902fdd34..865475f8f1b 100644 --- a/sdk/lib/3rdparty/stlport/CMakeLists.txt +++ b/sdk/lib/3rdparty/stlport/CMakeLists.txt @@ -48,9 +48,9 @@ add_library(stlport src/c_locale.c) if(USE_CLANG_CL) - add_target_compile_flags(stlport "-Wno-missing-braces -Wno-unused-local-typedef") - add_target_compile_flags(stlport "-Wno-infinite-recursion -Wno-deprecated-register") - add_target_compile_flags(stlport "-Wno-tautological-unsigned-zero-compare") + target_compile_options(stlport PRIVATE -Wno-missing-braces -Wno-unused-local-typedef) + target_compile_options(stlport PRIVATE -Wno-infinite-recursion -Wno-deprecated-register) + target_compile_options(stlport PRIVATE -Wno-tautological-unsigned-zero-compare) endif() add_dependencies(stlport xdk) diff --git a/sdk/lib/3rdparty/zlib/CMakeLists.txt b/sdk/lib/3rdparty/zlib/CMakeLists.txt index c68a46ee90c..a10936ea05a 100644 --- a/sdk/lib/3rdparty/zlib/CMakeLists.txt +++ b/sdk/lib/3rdparty/zlib/CMakeLists.txt @@ -36,13 +36,13 @@ if(CMAKE_CROSSCOMPILING) add_library(zlib ${SOURCE} ${SOLO_SOURCE}) target_include_directories(zlib PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) add_library(zlib_solo ${SOLO_SOURCE}) - add_target_compile_definitions(zlib_solo Z_SOLO) + target_compile_definitions(zlib_solo PRIVATE Z_SOLO) target_include_directories(zlib_solo PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) add_library(minizip ${MINIZIP_SOURCE}) add_dependencies(minizip psdk) target_include_directories(minizip PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) else() add_library(zlibhost ${SOLO_SOURCE}) - add_target_compile_definitions(zlibhost Z_SOLO) + target_compile_definitions(zlibhost PRIVATE Z_SOLO) target_include_directories(zlibhost PUBLIC ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) endif() diff --git a/sdk/lib/cmlib/CMakeLists.txt b/sdk/lib/cmlib/CMakeLists.txt index c94674f0cf8..d69202ba12d 100644 --- a/sdk/lib/cmlib/CMakeLists.txt +++ b/sdk/lib/cmlib/CMakeLists.txt @@ -29,7 +29,7 @@ else() target_include_directories(cmlibhost INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) if(NOT MSVC) - add_target_compile_flags(cmlibhost "-fshort-wchar -Wno-multichar") + target_compile_options(cmlibhost PRIVATE -fshort-wchar -Wno-multichar) endif() target_link_libraries(cmlibhost PRIVATE host_includes) diff --git a/sdk/lib/crt/CMakeLists.txt b/sdk/lib/crt/CMakeLists.txt index 6659b0b8581..03a366ce372 100644 --- a/sdk/lib/crt/CMakeLists.txt +++ b/sdk/lib/crt/CMakeLists.txt @@ -47,13 +47,13 @@ add_library(user32_wsprintf string/wcstombs_nt.c) add_dependencies(user32_wsprintf psdk) -add_target_compile_definitions(user32_wsprintf _USER32_WSPRINTF) +target_compile_definitions(user32_wsprintf PRIVATE _USER32_WSPRINTF) add_library(memcmp mem/memcmp.c) add_dependencies(memcmp psdk) add_library(getopt misc/getopt.c) -add_target_compile_definitions(getopt _DLL __USE_CRTIMP) +target_compile_definitions(getopt PRIVATE _DLL __USE_CRTIMP) add_dependencies(getopt psdk) add_library(strtol @@ -64,7 +64,7 @@ add_library(strtol string/strtoul.c string/strtoull.c string/wctype.c) -add_target_compile_definitions(strtol _LIBCNT_) +target_compile_definitions(strtol PRIVATE _LIBCNT_) add_dependencies(strtol psdk) diff --git a/sdk/lib/crt/crt.cmake b/sdk/lib/crt/crt.cmake index 91f186013b6..b200145c0d6 100644 --- a/sdk/lib/crt/crt.cmake +++ b/sdk/lib/crt/crt.cmake @@ -604,8 +604,8 @@ endif() add_library(crt ${CRT_SOURCE} ${CRT_WINE_SOURCE} ${crt_asm}) target_link_libraries(crt chkstk) -add_target_compile_definitions(crt - __MINGW_IMPORT=extern +target_compile_definitions(crt + PRIVATE __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ diff --git a/sdk/lib/crt/libcntpr.cmake b/sdk/lib/crt/libcntpr.cmake index aa3b1d4fa67..1a49be53d75 100644 --- a/sdk/lib/crt/libcntpr.cmake +++ b/sdk/lib/crt/libcntpr.cmake @@ -241,8 +241,8 @@ set_source_files_properties(${LIBCNTPR_ASM_SOURCE} PROPERTIES COMPILE_DEFINITION add_asm_files(libcntpr_asm ${LIBCNTPR_ASM_SOURCE}) add_library(libcntpr ${LIBCNTPR_SOURCE} ${libcntpr_asm}) -add_target_compile_definitions(libcntpr - NO_RTL_INLINES +target_compile_definitions(libcntpr + PRIVATE NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 3da70e6b10b..3d68ce5189f 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -102,7 +102,7 @@ set_source_files_properties(${MSVCRTEX_ASM_SOURCE} PROPERTIES COMPILE_DEFINITION add_asm_files(msvcrtex_asm ${MSVCRTEX_ASM_SOURCE}) add_library(msvcrtex ${MSVCRTEX_SOURCE} ${msvcrtex_asm}) -add_target_compile_definitions(msvcrtex _DLL _MSVCRTEX_) +target_compile_definitions(msvcrtex PRIVATE _DLL _MSVCRTEX_) set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL) set_source_files_properties(startup/crtexe.c startup/wcrtexe.c PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE) diff --git a/sdk/lib/inflib/CMakeLists.txt b/sdk/lib/inflib/CMakeLists.txt index 1688d691b3e..df44bf18794 100644 --- a/sdk/lib/inflib/CMakeLists.txt +++ b/sdk/lib/inflib/CMakeLists.txt @@ -26,7 +26,7 @@ else() target_include_directories(inflibhost INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) if(NOT MSVC) - add_target_compile_flags(inflibhost "-fshort-wchar -Wpointer-arith -Wwrite-strings") + target_compile_options(inflibhost PRIVATE -fshort-wchar -Wpointer-arith -Wwrite-strings) endif() target_link_libraries(inflibhost PRIVATE host_includes) diff --git a/sdk/lib/lsalib/CMakeLists.txt b/sdk/lib/lsalib/CMakeLists.txt index acf1c285f10..ca3316c43ad 100644 --- a/sdk/lib/lsalib/CMakeLists.txt +++ b/sdk/lib/lsalib/CMakeLists.txt @@ -5,5 +5,5 @@ add_library(lsalib lsa.c) add_dependencies(lsalib xdk) add_library(ntlsalib lsa.c) -add_target_compile_definitions(ntlsalib _NTSYSTEM_) +target_compile_definitions(ntlsalib PRIVATE _NTSYSTEM_) add_dependencies(ntlsalib xdk) diff --git a/sdk/tools/hhpcomp/CMakeLists.txt b/sdk/tools/hhpcomp/CMakeLists.txt index fa8a7c6f00e..50fd03c94ef 100644 --- a/sdk/tools/hhpcomp/CMakeLists.txt +++ b/sdk/tools/hhpcomp/CMakeLists.txt @@ -17,8 +17,8 @@ target_link_libraries(hhpcomp) if(MSVC) # Disable warning "'x': unreferenced local variable" - add_target_compile_flags(hhpcomp "/wd4101") + target_compile_options(hhpcomp PRIVATE "/wd4101") # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" - add_target_compile_flags(hhpcomp "/wd4244") + target_compile_options(hhpcomp PRIVATE "/wd4244") endif() diff --git a/sdk/tools/hpp/CMakeLists.txt b/sdk/tools/hpp/CMakeLists.txt index 3ca527e44fd..72ff8b02414 100644 --- a/sdk/tools/hpp/CMakeLists.txt +++ b/sdk/tools/hpp/CMakeLists.txt @@ -3,5 +3,5 @@ add_host_tool(hpp hpp.c) if(MSVC) # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" - add_target_compile_flags(hpp "/wd4244") + target_compile_options(hpp PRIVATE "/wd4244") endif() diff --git a/sdk/tools/mkhive/CMakeLists.txt b/sdk/tools/mkhive/CMakeLists.txt index 7f1845d6387..eb840ba9dab 100644 --- a/sdk/tools/mkhive/CMakeLists.txt +++ b/sdk/tools/mkhive/CMakeLists.txt @@ -11,7 +11,7 @@ add_host_tool(mkhive ${SOURCE}) target_include_directories(mkhive PRIVATE ${REACTOS_SOURCE_DIR}/sdk/lib/rtl) target_compile_definitions(mkhive PRIVATE -DMKHIVE_HOST) if(NOT MSVC) - add_target_compile_flags(mkhive "-fshort-wchar") + target_compile_options(mkhive PRIVATE "-fshort-wchar") endif() target_link_libraries(mkhive PRIVATE host_includes unicode cmlibhost inflibhost) diff --git a/sdk/tools/mkisofs/CMakeLists.txt b/sdk/tools/mkisofs/CMakeLists.txt index 82704df3066..0caa8c8bc79 100644 --- a/sdk/tools/mkisofs/CMakeLists.txt +++ b/sdk/tools/mkisofs/CMakeLists.txt @@ -83,27 +83,27 @@ target_link_libraries(mkisofs libmdigest libschily libsiconv) if(MSVC) # mkisofs uses K&R-style function definitions to support very old compilers. # MSVC complains about the resulting foo() vs. foo(void) mismatches. - add_target_compile_flags(mkisofs "/wd4113") + target_compile_options(mkisofs PRIVATE "/wd4113") if (ARCH STREQUAL "amd64") # Disable warning "conversion from 'size_t' to 'int', possible loss of data" - add_target_compile_flags(mkisofs "/wd4267") + target_compile_options(mkisofs PRIVATE "/wd4267") # Disable warning "'type cast': pointer truncation from 'const char *' to 'long'" - add_target_compile_flags(libschily "/wd4311") + target_compile_options(libschily PRIVATE "/wd4311") endif() # Disable warning "'<': signed/unsigned mismatch" - add_target_compile_flags(mkisofs "/wd4018") + target_compile_options(mkisofs PRIVATE "/wd4018") # Disable warning "'nchar': unreferenced local variable" - add_target_compile_flags(mkisofs "/wd4101") + target_compile_options(mkisofs PRIVATE "/wd4101") # Disable warning "'+=': conversion from 'x' to 'y', possible loss of data" - add_target_compile_flags(libschily "/wd4244") - add_target_compile_flags(mkisofs "/wd4244") + target_compile_options(libschily PRIVATE "/wd4244") + target_compile_options(mkisofs PRIVATE "/wd4244") else() # libschily implements an own printf function with support for the %r formatter. # Silence compilers checking for invalid formatting sequences. - add_target_compile_flags(libschily "-Wno-format") + target_compile_options(libschily PRIVATE "-Wno-format") endif() diff --git a/sdk/tools/unicode/CMakeLists.txt b/sdk/tools/unicode/CMakeLists.txt index 85c668dead7..424fcd715dd 100644 --- a/sdk/tools/unicode/CMakeLists.txt +++ b/sdk/tools/unicode/CMakeLists.txt @@ -89,11 +89,11 @@ target_link_libraries(unicode PRIVATE host_includes) if(MSVC) # Disable warning "'<': signed/unsigned mismatch" - add_target_compile_flags(unicode "/wd4018") + target_compile_options(unicode PRIVATE "/wd4018") # Disable warning "unary minus operator applied to unsigned type, result still unsigned" - add_target_compile_flags(unicode "/wd4146") + target_compile_options(unicode PRIVATE "/wd4146") # Disable warning "conversion from 'const WCHAR' to 'char', possible loss of data" - add_target_compile_flags(unicode "/wd4244") + target_compile_options(unicode PRIVATE "/wd4244") endif() diff --git a/sdk/tools/widl/CMakeLists.txt b/sdk/tools/widl/CMakeLists.txt index 51e7356ee74..22fa0846602 100644 --- a/sdk/tools/widl/CMakeLists.txt +++ b/sdk/tools/widl/CMakeLists.txt @@ -38,11 +38,11 @@ target_link_libraries(widl PRIVATE host_includes wpphost) if(MSVC) # Disable warning "'>': signed/unsigned mismatch" - add_target_compile_flags(widl "/wd4018") + target_compile_options(widl PRIVATE "/wd4018") # Disable warning "unary minus operator applied to unsigned type, result still unsigned" - add_target_compile_flags(widl "/wd4146") + target_compile_options(widl PRIVATE "/wd4146") # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" - add_target_compile_flags(widl "/wd4244") + target_compile_options(widl PRIVATE "/wd4244") endif() diff --git a/sdk/tools/xml2sdb/CMakeLists.txt b/sdk/tools/xml2sdb/CMakeLists.txt index 8c302ced7dc..739e48a9b7e 100644 --- a/sdk/tools/xml2sdb/CMakeLists.txt +++ b/sdk/tools/xml2sdb/CMakeLists.txt @@ -17,7 +17,7 @@ target_link_libraries(xml2sdb PRIVATE host_includes) if(MSVC) # Disable warning "'=': conversion from 'a' to 'b', possible loss of data" - add_target_compile_flags(xml2sdb "/wd4244") + target_compile_options(xml2sdb PRIVATE "/wd4244") else() - add_target_compile_flags(xml2sdb "-fshort-wchar") + target_compile_options(xml2sdb PRIVATE "-fshort-wchar") endif() diff --git a/win32ss/printing/base/spoolsv/CMakeLists.txt b/win32ss/printing/base/spoolsv/CMakeLists.txt index da7f7b8bf5c..d2e8ed1026c 100644 --- a/win32ss/printing/base/spoolsv/CMakeLists.txt +++ b/win32ss/printing/base/spoolsv/CMakeLists.txt @@ -24,7 +24,7 @@ list(APPEND SOURCE add_executable(spoolsv ${SOURCE} spoolsv.rc) if(USE_CLANG_CL) - add_target_compile_flags(spoolsv "-Wno-cast-calling-convention") + target_compile_options(spoolsv PRIVATE "-Wno-cast-calling-convention") endif() set_module_type(spoolsv win32cui UNICODE) diff --git a/win32ss/user/winsrv/consrv.cmake b/win32ss/user/winsrv/consrv.cmake index 9f421ca8f1d..48fb96d2de2 100644 --- a/win32ss/user/winsrv/consrv.cmake +++ b/win32ss/user/winsrv/consrv.cmake @@ -45,10 +45,10 @@ list(APPEND CONSRV_SOURCE # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) ## NOTE: No need to specify it as we use MSVC :) - ##add_target_compile_flags(consrv "/Ze") + ##target_compile_options(consrv PRIVATE "/Ze") #set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_FLAGS "/Ze") else() - #add_target_compile_flags(consrv "-fms-extensions") + #target_compile_options(consrv PRIVATE "-fms-extensions") set_source_files_properties(${CONSRV_SOURCE} PROPERTIES COMPILE_FLAGS "-fms-extensions") endif()

4 years, 8 months

[reactos] 01/01: [BROWSEUI] Fix build. Addendum to ac29d29.

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=480f729f6dd46f07b7d03… commit 480f729f6dd46f07b7d033b81c87826d57e72101 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Apr 16 14:16:48 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Apr 16 14:16:48 2020 +0300 [BROWSEUI] Fix build. Addendum to ac29d29. CORE-16810 --- dll/win32/browseui/resource.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/browseui/resource.h b/dll/win32/browseui/resource.h index 8f032f2b7cd..aba9e2fb8b0 100644 --- a/dll/win32/browseui/resource.h +++ b/dll/win32/browseui/resource.h @@ -171,4 +171,5 @@ #define IDS_COL_RELEVANCE 8989 #define IDS_SEARCH_FILES_FOUND 9232 #define IDS_SEARCH_FOLDER 9234 +#define IDS_SEARCH_RESULTS 30520 #define IDS_SEARCH_OPEN_FOLDER 40960

4 years, 8 months

[reactos] 01/01: [BROWSEUI] Localize "Search Results" shell folder name

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ac29d29297e1625534c19… commit ac29d29297e1625534c19e2e2df577895c724852 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Apr 16 14:10:24 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Apr 16 14:10:24 2020 +0300 [BROWSEUI] Localize "Search Results" shell folder name Also update French and Russian translations. CORE-16810 --- dll/win32/browseui/lang/bg-BG.rc | 1 + dll/win32/browseui/lang/de-DE.rc | 1 + dll/win32/browseui/lang/en-US.rc | 1 + dll/win32/browseui/lang/es-ES.rc | 1 + dll/win32/browseui/lang/et-EE.rc | 1 + dll/win32/browseui/lang/fr-FR.rc | 3 ++- dll/win32/browseui/lang/he-IL.rc | 1 + dll/win32/browseui/lang/hi-IN.rc | 1 + dll/win32/browseui/lang/hu-HU.rc | 1 + dll/win32/browseui/lang/id-ID.rc | 1 + dll/win32/browseui/lang/it-IT.rc | 1 + dll/win32/browseui/lang/ja-JP.rc | 1 + dll/win32/browseui/lang/pl-PL.rc | 1 + dll/win32/browseui/lang/pt-BR.rc | 1 + dll/win32/browseui/lang/pt-PT.rc | 1 + dll/win32/browseui/lang/ro-RO.rc | 1 + dll/win32/browseui/lang/ru-RU.rc | 5 +++-- dll/win32/browseui/lang/sq-AL.rc | 1 + dll/win32/browseui/lang/tr-TR.rc | 1 + dll/win32/browseui/lang/uk-UA.rc | 1 + dll/win32/browseui/lang/zh-CN.rc | 1 + dll/win32/browseui/lang/zh-TW.rc | 1 + dll/win32/browseui/res/findfolder.rgs | 1 + 23 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dll/win32/browseui/lang/bg-BG.rc b/dll/win32/browseui/lang/bg-BG.rc index 1ccbc75b544..2df9859f64e 100644 --- a/dll/win32/browseui/lang/bg-BG.rc +++ b/dll/win32/browseui/lang/bg-BG.rc @@ -327,6 +327,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/de-DE.rc b/dll/win32/browseui/lang/de-DE.rc index ef7cedde3b7..554fc03d709 100644 --- a/dll/win32/browseui/lang/de-DE.rc +++ b/dll/win32/browseui/lang/de-DE.rc @@ -346,6 +346,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' ist kein gültiger Ordner." IDS_SEARCH_FOLDER "%s wird durchsucht" IDS_SEARCH_FILES_FOUND "%u Objekte gefunden" diff --git a/dll/win32/browseui/lang/en-US.rc b/dll/win32/browseui/lang/en-US.rc index e2d51923637..9ad03fcd9c5 100644 --- a/dll/win32/browseui/lang/en-US.rc +++ b/dll/win32/browseui/lang/en-US.rc @@ -345,6 +345,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/es-ES.rc b/dll/win32/browseui/lang/es-ES.rc index d839fa11c7f..cf9f4b20f37 100644 --- a/dll/win32/browseui/lang/es-ES.rc +++ b/dll/win32/browseui/lang/es-ES.rc @@ -336,6 +336,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' no es una carpeta válida." IDS_SEARCH_FOLDER "Buscando %s" IDS_SEARCH_FILES_FOUND "%u archivos encontrados" diff --git a/dll/win32/browseui/lang/et-EE.rc b/dll/win32/browseui/lang/et-EE.rc index 1c644d2e184..9de2b95a55f 100644 --- a/dll/win32/browseui/lang/et-EE.rc +++ b/dll/win32/browseui/lang/et-EE.rc @@ -334,6 +334,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/fr-FR.rc b/dll/win32/browseui/lang/fr-FR.rc index 2b0ceb3a74e..2185583ad6d 100644 --- a/dll/win32/browseui/lang/fr-FR.rc +++ b/dll/win32/browseui/lang/fr-FR.rc @@ -169,7 +169,7 @@ BEGIN PUSHBUTTON "&Arrêter", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP AUTOCHECKBOX "Inclure les dossiers et les fichiers cachés", - IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + IDC_SEARCH_HIDDEN, 4, 130, 144, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END @@ -345,6 +345,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Résultats de la recherche" IDS_SEARCHINVALID "'%1' n'est pas un dossier valide." IDS_SEARCH_FOLDER "Recherche de %s en cours" IDS_SEARCH_FILES_FOUND "%u fichiers trouvés" diff --git a/dll/win32/browseui/lang/he-IL.rc b/dll/win32/browseui/lang/he-IL.rc index c0092db7a57..03d5366197b 100644 --- a/dll/win32/browseui/lang/he-IL.rc +++ b/dll/win32/browseui/lang/he-IL.rc @@ -329,6 +329,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' אינה תיקיה תקינה." IDS_SEARCH_FOLDER "מחפש ב %s" IDS_SEARCH_FILES_FOUND "%u קבצים נמצאו" diff --git a/dll/win32/browseui/lang/hi-IN.rc b/dll/win32/browseui/lang/hi-IN.rc index f9c55ff3709..75a2008e5f3 100644 --- a/dll/win32/browseui/lang/hi-IN.rc +++ b/dll/win32/browseui/lang/hi-IN.rc @@ -327,6 +327,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/hu-HU.rc b/dll/win32/browseui/lang/hu-HU.rc index 24583c6826b..812cc58a33f 100644 --- a/dll/win32/browseui/lang/hu-HU.rc +++ b/dll/win32/browseui/lang/hu-HU.rc @@ -345,6 +345,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/id-ID.rc b/dll/win32/browseui/lang/id-ID.rc index b0576c2faa9..cf1729e3716 100644 --- a/dll/win32/browseui/lang/id-ID.rc +++ b/dll/win32/browseui/lang/id-ID.rc @@ -345,6 +345,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' bukan folder yang sah." IDS_SEARCH_FOLDER "Mencari %s" IDS_SEARCH_FILES_FOUND "%u berkas ditemukan" diff --git a/dll/win32/browseui/lang/it-IT.rc b/dll/win32/browseui/lang/it-IT.rc index bb2384481cb..1fc6d3f8451 100644 --- a/dll/win32/browseui/lang/it-IT.rc +++ b/dll/win32/browseui/lang/it-IT.rc @@ -327,6 +327,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/ja-JP.rc b/dll/win32/browseui/lang/ja-JP.rc index d3cb3046e0a..46e37f04d22 100644 --- a/dll/win32/browseui/lang/ja-JP.rc +++ b/dll/win32/browseui/lang/ja-JP.rc @@ -345,6 +345,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' は有効なフォルダではありません。" IDS_SEARCH_FOLDER "%s を検索中" IDS_SEARCH_FILES_FOUND "%u 個のファイルが見つかりました" diff --git a/dll/win32/browseui/lang/pl-PL.rc b/dll/win32/browseui/lang/pl-PL.rc index f0c033eff89..7333f5e58f7 100644 --- a/dll/win32/browseui/lang/pl-PL.rc +++ b/dll/win32/browseui/lang/pl-PL.rc @@ -335,6 +335,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "Folder '%1' jest nieprawidłowy." IDS_SEARCH_FOLDER "Trwa wyszukiwanie %s" IDS_SEARCH_FILES_FOUND "Znaleziono %u plików" diff --git a/dll/win32/browseui/lang/pt-BR.rc b/dll/win32/browseui/lang/pt-BR.rc index 55e1bebde05..819760b7ee3 100644 --- a/dll/win32/browseui/lang/pt-BR.rc +++ b/dll/win32/browseui/lang/pt-BR.rc @@ -329,6 +329,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/pt-PT.rc b/dll/win32/browseui/lang/pt-PT.rc index 66257415a8b..2c4cdfe0c28 100644 --- a/dll/win32/browseui/lang/pt-PT.rc +++ b/dll/win32/browseui/lang/pt-PT.rc @@ -329,6 +329,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/ro-RO.rc b/dll/win32/browseui/lang/ro-RO.rc index 22702a9a4b6..3be6b38605d 100644 --- a/dll/win32/browseui/lang/ro-RO.rc +++ b/dll/win32/browseui/lang/ro-RO.rc @@ -329,6 +329,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index 9baefa021d3..fd74f6d4ca3 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -159,8 +159,8 @@ BEGIN DEFPUSHBUTTON "Най&ти", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE PUSHBUTTON "Остановит&ь", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - AUTOCHECKBOX "Search Hidden Files and Folders", - IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP + AUTOCHECKBOX "Искать в &скрытых файлах и папках", + IDC_SEARCH_HIDDEN, 4, 130, 136, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 END @@ -336,6 +336,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Результаты поиска" IDS_SEARCHINVALID "'%1' не является допустимой папкой." IDS_SEARCH_FOLDER "Ищем в ""%s""" IDS_SEARCH_FILES_FOUND "Найдено файлов: %u" diff --git a/dll/win32/browseui/lang/sq-AL.rc b/dll/win32/browseui/lang/sq-AL.rc index 631ea5928bb..2632c14206f 100644 --- a/dll/win32/browseui/lang/sq-AL.rc +++ b/dll/win32/browseui/lang/sq-AL.rc @@ -346,6 +346,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/tr-TR.rc b/dll/win32/browseui/lang/tr-TR.rc index e652a5cb37b..8f127e2e7cf 100644 --- a/dll/win32/browseui/lang/tr-TR.rc +++ b/dll/win32/browseui/lang/tr-TR.rc @@ -329,6 +329,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/uk-UA.rc b/dll/win32/browseui/lang/uk-UA.rc index 9bc13c71524..8ef156403e1 100644 --- a/dll/win32/browseui/lang/uk-UA.rc +++ b/dll/win32/browseui/lang/uk-UA.rc @@ -335,6 +335,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/zh-CN.rc b/dll/win32/browseui/lang/zh-CN.rc index 2627baaf12b..732ffa3acee 100644 --- a/dll/win32/browseui/lang/zh-CN.rc +++ b/dll/win32/browseui/lang/zh-CN.rc @@ -348,6 +348,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/lang/zh-TW.rc b/dll/win32/browseui/lang/zh-TW.rc index bb526dbc3d6..00bbfec1fa1 100644 --- a/dll/win32/browseui/lang/zh-TW.rc +++ b/dll/win32/browseui/lang/zh-TW.rc @@ -348,6 +348,7 @@ END STRINGTABLE BEGIN + IDS_SEARCH_RESULTS "Search Results" IDS_SEARCHINVALID "'%1' is not a valid folder." IDS_SEARCH_FOLDER "Searching %s" IDS_SEARCH_FILES_FOUND "%u files found" diff --git a/dll/win32/browseui/res/findfolder.rgs b/dll/win32/browseui/res/findfolder.rgs index 1cc3d295969..c5e2ce22c63 100644 --- a/dll/win32/browseui/res/findfolder.rgs +++ b/dll/win32/browseui/res/findfolder.rgs @@ -4,6 +4,7 @@ HKCR { ForceRemove {E17D4FC0-5564-11D1-83F2-00A0C90DC849} = s 'Search Results Folder' { + val LocalizedString = s '@%MODULE%,-30520' DefaultIcon = e '%%SystemRoot%%\System32\shell32.dll,-134' InprocServer32 = s '%MODULE%' {

4 years, 8 months

[reactos] 01/01: [SHELL32] Update Russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=edc66fdc225b88e529a47… commit edc66fdc225b88e529a47d6c458c54fb76b05b59 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Apr 16 13:40:49 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Apr 16 13:40:49 2020 +0300 [SHELL32] Update Russian translation CORE-16873 --- dll/win32/shell32/lang/ru-RU.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 40c1a320fbc..bd144604f72 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -926,7 +926,7 @@ BEGIN IDS_EDIT_VERB "Изменить" IDS_FIND_VERB "Поиск" IDS_PRINT_VERB "Печать" - IDS_CMD_VERB "Command Prompt here" + IDS_CMD_VERB "Командная строка" IDS_FILE_FOLDER "%u файлов, %u папок" IDS_PRINTERS "Принтеры"

4 years, 8 months

[reactos] 01/01: [SHELL32] Update Polish translation (#2364)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=abd6954d6aa49e1b7d4d0… commit abd6954d6aa49e1b7d4d061e82e9634dc8677fbe Author: Piotr Hetnarowicz <piotrhwz(a)gmail.com> AuthorDate: Thu Feb 20 13:36:41 2020 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Apr 16 13:24:17 2020 +0300 [SHELL32] Update Polish translation (#2364) --- dll/win32/shell32/lang/pl-PL.rc | 57 +++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 2e6632ac505..a6cc0f519d9 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -1,6 +1,7 @@ /* * Updated by Saibamen (July, 2015) * Updated by BlackDragonDv (January, 2018) + * Updated by Piotr Hetnarowicz <piotrhwz(a)gmail.com> (February, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -169,7 +170,7 @@ CAPTION "Uruchamianie" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Wpisz nazwę programu, folderu, katalogu lub zasobu internetowego a zostanie on otwarty przez system ReactOS.", 12289, 36, 11, 185, 24 + LTEXT "Wpisz nazwę programu, folderu, dokumentu lub zasobu internetowego, a zostanie on otwarty przez system ReactOS.", 12289, 36, 11, 185, 24 LTEXT "&Otwórz:", 12305, 7, 44, 25, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 43, 184, 100 DEFPUSHBUTTON "OK", IDOK, 62, 70, 50, 14, WS_TABSTOP @@ -243,7 +244,7 @@ BEGIN LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Atrybuty:", 14020, 8, 152, 46, 10 AUTOCHECKBOX "&Tylko do odczytu", 14021, 58, 151, 70, 10 - AUTOCHECKBOX "&Ukryty", 14022, 126, 151, 70, 10 + AUTOCHECKBOX "&Ukryty", 14022, 130, 151, 70, 10 AUTOCHECKBOX "&Archiwalny", 14023, 181, 151, 70, 10 PUSHBUTTON "Zaawa&nsowane...", 14028, 158, 170, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -296,7 +297,7 @@ BEGIN LTEXT "Prawa autorskie: ", 14004, 10, 46, 66, 10 EDITTEXT 14005, 77, 46, 152, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER GROUPBOX "Pozostałe informacje o wersji: ", 14006, 6, 70, 222, 115 - LTEXT "Nazwa: ", 14007, 13, 82, 50, 10 + LTEXT "Nazwa elementu: ", 14007, 13, 82, 58, 10 LTEXT "Wartość: ", 14008, 112, 82, 45, 10 LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY @@ -343,12 +344,12 @@ BEGIN GROUPBOX "Sprawdzanie błędów", -1, 5, 5, 230, 60 ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 LTEXT "Ta opcja sprawdzi wolumin w poszukiwaniu błędów.", -1, 40, 25, 160, 20 - PUSHBUTTON "Sprawdź...", 14000, 130, 45, 100, 15, WS_TABSTOP + PUSHBUTTON "&Sprawdź...", 14000, 130, 45, 100, 15, WS_TABSTOP GROUPBOX "Defragmentacja", -1, 5, 65, 230, 60 ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 85, 21, 20 LTEXT "Ta opcja dokona defragmentacji plików woluminu.", -1, 40, 85, 160, 20 - PUSHBUTTON "Defragmentuj...", 14001, 130, 105, 100, 15, WS_TABSTOP - GROUPBOX "Kopia zapasowa", -1, 5, 130, 230, 60 + PUSHBUTTON "&Defragmentuj...", 14001, 130, 105, 100, 15, WS_TABSTOP + GROUPBOX "&Kopia zapasowa", -1, 5, 130, 230, 60 ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 LTEXT "Ta opcja wykona kopię zapasową plików tego woluminu.", -1, 40, 150, 160, 20 PUSHBUTTON "Wykonaj kopię zapasową...", 14002, 130, 170, 100, 15, WS_TABSTOP @@ -392,7 +393,7 @@ BEGIN EDITTEXT 14002, 116, 102, 50, 14, WS_TABSTOP | ES_NUMBER LTEXT "R&ozmiar maksymalny (MB):", -1, 20, 105, 90, 10 RADIOBUTTON "Nie przenoś plików do &Kosza. Usuń pliki natychmiast", 14003, 20, 117, 170, 20, BS_MULTILINE | WS_TABSTOP - AUTOCHECKBOX "&Wyświetl okno dialogowe z potwierdzeniem usuwania", 14004, 20, 155, 180, 10, WS_TABSTOP + AUTOCHECKBOX "&Wyświetl okno dialogowe potwierdzające usuwanie", 14004, 20, 155, 180, 10, WS_TABSTOP END IDD_OPEN_WITH DIALOGEX 0, 0, 264, 256 @@ -471,8 +472,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWIND CAPTION "Potwierdź zastąpienie pliku" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Tak", IDYES, 20, 122, 60, 14 - PUSHBUTTON "Tak na &Wszystkie", 12807, 85, 122, 60, 14 + DEFPUSHBUTTON "&Tak", IDYES, 16, 122, 60, 14 + PUSHBUTTON "Tak na &wszystkie", 12807, 81, 122, 64, 14 PUSHBUTTON "&Nie", IDNO, 150, 122, 60, 14 PUSHBUTTON "Anuluj", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL @@ -480,16 +481,16 @@ BEGIN LTEXT "Ten katalog zawiera już plik tylko do odczytu, o nazwie '%2'.", 12292, 41, 10, 222, 22, SS_NOPREFIX LTEXT "Ten katalog zawiera już plik systemowy o nazwie '%2'.", 12293, 41, 10, 222, 22, SS_NOPREFIX LTEXT "Czy chcesz zastąpić istniejący plik?", -1, 44, 35, 228, 10, SS_NOPREFIX - LTEXT "(data i rozmiar nieznane)", 12302, 79, 51, 198, 20, SS_NOPREFIX + LTEXT "(nieznana data i rozmiar)", 12302, 79, 51, 198, 20, SS_NOPREFIX ICON "", 12300, 50, 49, 21, 20, SS_REALSIZECONTROL LTEXT "nowym plikiem?", -1, 44, 75, 228, 10, SS_NOPREFIX - LTEXT "(data i rozmiar nieznane)", 12303, 79, 91, 198, 20, SS_NOPREFIX + LTEXT "(nieznana data i rozmiar)", 12303, 79, 91, 198, 20, SS_NOPREFIX ICON "", 12301, 50, 89, 21, 20, SS_REALSIZECONTROL END IDD_LOG_OFF DIALOGEX 0, 0, 188, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Wyloguj się z systemu ReactOS" +CAPTION "Wylogowywanie z systemu ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_LOGOFF, IDC_STATIC, 8, 6, 21, 20 @@ -606,7 +607,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBL CAPTION "Sprawdzanie dysku" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Rozpocznij", IDOK, 63, 95, 60, 14 + DEFPUSHBUTTON "&Rozpocznij", IDOK, 63, 95, 60, 14 GROUPBOX "Opcje sprawdzania dysku", -1, 7, 6, 179, 40 PUSHBUTTON "Anuluj", IDCANCEL, 128, 95, 60, 14 AUTOCHECKBOX "Automatycznie naprawiaj błędy systemu plików", 14000, 16, 18, 165, 10 @@ -650,7 +651,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Rozszerzenie pliku:", -1, 10, 10, 85, 14 EDITTEXT IDC_NEWEXT_EDIT, 105, 8, 60, 14 - PUSHBUTTON "&Zaawansowane >>", IDC_NEWEXT_ADVANCED, 185, 8, 65, 15 + PUSHBUTTON "<< &Zaawansowane", IDC_NEWEXT_ADVANCED, 180, 8, 70, 15 LTEXT "&Skojarzony typ pliku:", IDC_NEWEXT_ASSOC, 10, 34, 85, 14 COMBOBOX IDC_NEWEXT_COMBOBOX, 105, 32, 145, 120, CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 125, 55, 60, 14 @@ -773,17 +774,17 @@ BEGIN IDS_PASTE "Włóż" IDS_EJECT "Wysuń" IDS_DISCONNECT "Odłącz" - IDS_OPENFILELOCATION "Open f&ile location" - IDS_DESKLINK "Desktop (Create shortcut)" - IDS_SENDTO_MENU "Se&nd To" - - IDS_MOVEERRORTITLE "Error Moving File or Folder" - IDS_COPYERRORTITLE "Error Copying File or Folder" - IDS_MOVEERRORSAMEFOLDER "Cannot move '%s': The destination folder is the same as the source folder." - IDS_MOVEERRORSAME "Cannot move '%s': The source and destination file names are the same." - IDS_COPYERRORSAME "Cannot copy '%s': The source and destination file names are the same." - IDS_MOVEERRORSUBFOLDER "Cannot move '%s': The destination folder is a subfolder of the source folder." - IDS_COPYERRORSUBFOLDER "Cannot copy '%s': The destination folder is a subfolder of the source folder." + IDS_OPENFILELOCATION "O&twórz lokalizację pliku" + IDS_DESKLINK "Pulpit (utwórz skrót)" + IDS_SENDTO_MENU "Wyślij d&o" + + IDS_MOVEERRORTITLE "Błąd przenoszenia pliku lub folderu" + IDS_COPYERRORTITLE "Błąd kopiowania pliku lub folderu" + IDS_MOVEERRORSAMEFOLDER "Nie można przenieść '%s': Folder docelowy jest taki sam jak folder źródłowy." + IDS_MOVEERRORSAME "Nie można przenieść '%s': Nazwy plików źródłowego i docelowego są takie same." + IDS_COPYERRORSAME "Nie można skopiować '%s': Nazwy plików źródłowego i docelowego są takie same." + IDS_MOVEERRORSUBFOLDER "Nie można przenieść '%s': Folder docelowy jest podfolderem folderu źródłowego." + IDS_COPYERRORSUBFOLDER "Nie można skopiować '%s': Folder docelowy jest podfolderem folderu źródłowego." IDS_CREATEFOLDER_DENIED "Nie można utworzyć folderu '%1'" IDS_CREATEFOLDER_CAPTION "Nie można utworzyć folderu" @@ -887,7 +888,7 @@ BEGIN IDS_CANTEJECTMEDIA "Nie można wysunąć nośnika (kod błędu: %lu)." IDS_CANTSHOWPROPERTIES "Nie można pokazać właściwości (kod błędu: %lu)." IDS_CANTDISCONNECT "Nie można odłączyć (kod błędu: %lu)." - IDS_NONE "(None)" + IDS_NONE "(brak)" /* Friendly File Type Names */ IDS_DIRECTORY "Katalog" @@ -924,7 +925,7 @@ BEGIN IDS_EDIT_VERB "Edytuj" IDS_FIND_VERB "Wyszukaj" IDS_PRINT_VERB "Drukuj" - IDS_CMD_VERB "Command Prompt here" + IDS_CMD_VERB "&Wiersz poleceń tutaj" IDS_FILE_FOLDER "%u Plików, %u Katalogów" IDS_PRINTERS "Drukarki" @@ -956,7 +957,7 @@ BEGIN IDS_ADVANCED_FOLDER "Pliki i Foldery" IDS_ADVANCED_NET_CRAWLER "Automatycznie wyszukuj foldery sieciowe i drukarki" IDS_ADVANCED_FOLDER_SIZE_TIP "Wyświetl informacje o rozmiarze plików w etykietach folderów" - IDS_ADVANCED_FRIENDLY_TREE "Wyświetl listę folderów Eskploratora w prostym widoku folderów" + IDS_ADVANCED_FRIENDLY_TREE "Wyświetl listę folderów Eksploratora w prostym widoku folderów" IDS_ADVANCED_WEB_VIEW_BARRICADE "Wyświetl zawartość folderów systemowych" IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Wyświetl pełną ścieżkę na pasku adresu" IDS_ADVANCED_SHOW_FULL_PATH "Wyświetl pełną ścieżkę na pasku tytułu"

4 years, 8 months

[reactos] 01/01: [WINLOGON] Update Polish translation (#2363)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97bb1fa49a6d223b69555… commit 97bb1fa49a6d223b6955521b3c6a0525cc85bcaa Author: Piotr Hetnarowicz <piotrhwz(a)gmail.com> AuthorDate: Thu Feb 20 10:03:14 2020 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Apr 16 12:17:02 2020 +0300 [WINLOGON] Update Polish translation (#2363) --- base/system/winlogon/lang/pl-PL.rc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index edafb525136..19f0e6c1f54 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/base/system/winlogon/lang/pl-PL.rc @@ -3,18 +3,19 @@ * https://sourceforge.net/projects/reactospl * UTF-8 conversion by Caemyr (May, 2011) * Updated by Marcin Mikołajczak <me(a)m4sk.in> (September, 2017) + * Updated by Piotr Hetnarowicz <piotrhwz(a)gmail.com> (February, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 +IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 194, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Wyłączanie komputera" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Możesz teraz bezpiecznie wyłączyć komputer.", IDC_SHUTDOWNCOMPUTER, 31, 6, 132, 18 + LTEXT "Możesz teraz bezpiecznie wyłączyć komputer.", IDC_SHUTDOWNCOMPUTER, 31, 13, 156, 8 ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 - DEFPUSHBUTTON "&Uruchom ponownie", IDC_BTNSHTDOWNCOMPUTER, 48, 32, 68, 14 + DEFPUSHBUTTON "&Uruchom ponownie", IDC_BTNSHTDOWNCOMPUTER, 61, 32, 71, 14 END IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 @@ -24,20 +25,20 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nie można załadować biblioteki DLL interfejsu logowania użytkownika %s.", IDC_GINALOADFAILED, 39, 16, 156, 24 LTEXT "Skontaktuj się z administratorem systemu, aby zamienić bibliotekę DLL lub odtworzyć jej oryginalną wersję.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 - DEFPUSHBUTTON "&Uruchom ponownie", 1, 80, 91, 68, 14 + DEFPUSHBUTTON "&Uruchom ponownie", 1, 80, 91, 71, 14 END -IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 +IDD_SYSSHUTDOWN DIALOGEX 50, 50, 184, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP CAPTION "Zamykanie systemu" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "Trwa zamykanie systemu. Zapisz wszystkie rozpoczęte prace i wyloguj się. Wszystkie niezapisane zmiany zostaną utracone po zamknięciu systemu.", -1, 38, 7, 135, 40 - LTEXT "Czas do zamknięcia:", -1, 38, 50, 90, 8 + LTEXT "Trwa zamykanie systemu. Zapisz wszystkie rozpoczęte prace i wyloguj się. Wszystkie niezapisane zmiany zostaną utracone po zamknięciu systemu.", -1, 33, 7, 147, 42 + LTEXT "Czas do zamknięcia:", -1, 33, 50, 90, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 - LTEXT "Wiadomość:", -1, 38, 65, 135, 8 - EDITTEXT IDC_SYSSHUTDOWNMESSAGE, 34, 75, 139, 58, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE + LTEXT "Wiadomość:", -1, 33, 65, 135, 8 + EDITTEXT IDC_SYSSHUTDOWNMESSAGE, 30, 75, 146, 58, ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE END STRINGTABLE

4 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2020