Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [SYSDM] Use single string control for system version
by Stanislav Motylkov 15 Aug '18

15 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68a4cdd5ec2ae92098ada… commit 68a4cdd5ec2ae92098ada15ac61dcb0d0e12740c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Aug 11 12:56:08 2018 +0300 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Aug 15 19:30:23 2018 +0200 [SYSDM] Use single string control for system version --- dll/cpl/sysdm/general.c | 35 +++++++++++++++++++++++++++++++++++ dll/cpl/sysdm/lang/bg-BG.rc | 3 +-- dll/cpl/sysdm/lang/cs-CZ.rc | 3 +-- dll/cpl/sysdm/lang/da-DK.rc | 3 +-- dll/cpl/sysdm/lang/de-DE.rc | 3 +-- dll/cpl/sysdm/lang/el-GR.rc | 3 +-- dll/cpl/sysdm/lang/en-US.rc | 3 +-- dll/cpl/sysdm/lang/es-ES.rc | 3 +-- dll/cpl/sysdm/lang/fr-FR.rc | 3 +-- dll/cpl/sysdm/lang/he-IL.rc | 3 +-- dll/cpl/sysdm/lang/hu-HU.rc | 3 +-- dll/cpl/sysdm/lang/id-ID.rc | 3 +-- dll/cpl/sysdm/lang/it-IT.rc | 3 +-- dll/cpl/sysdm/lang/ja-JP.rc | 3 +-- dll/cpl/sysdm/lang/nl-NL.rc | 3 +-- dll/cpl/sysdm/lang/no-NO.rc | 3 +-- dll/cpl/sysdm/lang/pl-PL.rc | 3 +-- dll/cpl/sysdm/lang/ro-RO.rc | 1 - dll/cpl/sysdm/lang/ru-RU.rc | 3 +-- dll/cpl/sysdm/lang/sk-SK.rc | 3 +-- dll/cpl/sysdm/lang/sq-AL.rc | 3 +-- dll/cpl/sysdm/lang/sv-SE.rc | 3 +-- dll/cpl/sysdm/lang/tr-TR.rc | 3 +-- dll/cpl/sysdm/lang/uk-UA.rc | 3 +-- dll/cpl/sysdm/lang/zh-CN.rc | 3 +-- dll/cpl/sysdm/lang/zh-TW.rc | 3 +-- dll/cpl/sysdm/resource.h | 1 + 27 files changed, 60 insertions(+), 49 deletions(-) diff --git a/dll/cpl/sysdm/general.c b/dll/cpl/sysdm/general.c index 2d89021d31..15eb70ba6e 100644 --- a/dll/cpl/sysdm/general.c +++ b/dll/cpl/sysdm/general.c @@ -13,6 +13,8 @@ #include <winnls.h> #include <powrprof.h> +#include <buildno.h> +#include <strsafe.h> #define ANIM_STEP 2 #define ANIM_TIME 50 @@ -498,6 +500,38 @@ static VOID GetSystemInformation(HWND hwnd) } } +static VOID GetSystemVersion(HWND hwnd) +{ + HWND hRosVersion; + SIZE_T lenStr, lenVersion; + PCWSTR pwszVersion = L" " TEXT(KERNEL_VERSION_RC); + PWSTR pwszStr; + + lenVersion = wcslen(pwszVersion); + if (lenVersion == 0) + { + return; + } + + hRosVersion = GetDlgItem(hwnd, IDC_ROSVERSION); + if (!hRosVersion) + { + return; + } + lenStr = GetWindowTextLengthW(hRosVersion); + lenStr += lenVersion + 1; + pwszStr = HeapAlloc(GetProcessHeap(), 0, lenStr * sizeof(WCHAR)); + if (!pwszStr) + { + return; + } + GetWindowText(hRosVersion, pwszStr, lenStr); + + StringCchCatW(pwszStr, lenStr, pwszVersion); + SetWindowText(hRosVersion, pwszStr); + + HeapFree(GetProcessHeap(), 0, pwszStr); +} /* Property page dialog callback */ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -518,6 +552,7 @@ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM InitLogo(hwndDlg); SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_ROSIMG), GWLP_WNDPROC, (LONG_PTR)RosImageProc); GetSystemInformation(hwndDlg); + GetSystemVersion(hwndDlg); break; case WM_DESTROY: diff --git a/dll/cpl/sysdm/lang/bg-BG.rc b/dll/cpl/sysdm/lang/bg-BG.rc index c1b4a3a448..f933438d46 100644 --- a/dll/cpl/sysdm/lang/bg-BG.rc +++ b/dll/cpl/sysdm/lang/bg-BG.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Уредба:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Версия:", IDC_STATIC, 10, 153, 40, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 45, 153, 91, 9 + LTEXT "Версия:", IDC_ROSVERSION, 10, 153, 131, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Машина:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/cs-CZ.rc b/dll/cpl/sysdm/lang/cs-CZ.rc index cf6b3ff668..297583710c 100644 --- a/dll/cpl/sysdm/lang/cs-CZ.rc +++ b/dll/cpl/sysdm/lang/cs-CZ.rc @@ -13,8 +13,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Systém:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Verze ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Verze", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Počítač:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/da-DK.rc b/dll/cpl/sysdm/lang/da-DK.rc index ff5f2aa93a..a3e84ed59a 100644 --- a/dll/cpl/sysdm/lang/da-DK.rc +++ b/dll/cpl/sysdm/lang/da-DK.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Operativsystem:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index 1dae3d9001..0817e098b8 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -17,8 +17,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Computer:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/el-GR.rc b/dll/cpl/sysdm/lang/el-GR.rc index cec79e143e..ae329f4603 100644 --- a/dll/cpl/sysdm/lang/el-GR.rc +++ b/dll/cpl/sysdm/lang/el-GR.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Σύστημα:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Έκδοση ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Έκδοση", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Υπολογιστής:", IDC_STATIC, 124, 132, 44, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/en-US.rc b/dll/cpl/sysdm/lang/en-US.rc index 22307dae60..73d1f26145 100644 --- a/dll/cpl/sysdm/lang/en-US.rc +++ b/dll/cpl/sysdm/lang/en-US.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/es-ES.rc b/dll/cpl/sysdm/lang/es-ES.rc index e18788a242..8bd8ae7105 100644 --- a/dll/cpl/sysdm/lang/es-ES.rc +++ b/dll/cpl/sysdm/lang/es-ES.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Sistema operativo:", IDC_STATIC, 4, 132, 80, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versión ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versión", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Equipo:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/fr-FR.rc b/dll/cpl/sysdm/lang/fr-FR.rc index a78be4d8bf..e7aa03aff7 100644 --- a/dll/cpl/sysdm/lang/fr-FR.rc +++ b/dll/cpl/sysdm/lang/fr-FR.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Système d'exploitation :", IDC_STATIC, 4, 132, 75, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/he-IL.rc b/dll/cpl/sysdm/lang/he-IL.rc index d3291b7c41..2ddd54f91a 100644 --- a/dll/cpl/sysdm/lang/he-IL.rc +++ b/dll/cpl/sysdm/lang/he-IL.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "מערכת:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "גרסה ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "גרסה", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "מכונה:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/hu-HU.rc b/dll/cpl/sysdm/lang/hu-HU.rc index ec2de62ddc..d5c9f9c22c 100644 --- a/dll/cpl/sysdm/lang/hu-HU.rc +++ b/dll/cpl/sysdm/lang/hu-HU.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Operációs rendszer:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Verzió ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Verzió", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Számítógép:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/id-ID.rc b/dll/cpl/sysdm/lang/id-ID.rc index 5c1d338e1f..42d092e797 100644 --- a/dll/cpl/sysdm/lang/id-ID.rc +++ b/dll/cpl/sysdm/lang/id-ID.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Sistem:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versi ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versi", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Mesin:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/it-IT.rc b/dll/cpl/sysdm/lang/it-IT.rc index e0265f9a3d..ebab7b2d0b 100644 --- a/dll/cpl/sysdm/lang/it-IT.rc +++ b/dll/cpl/sysdm/lang/it-IT.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Sistema:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versione ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versione", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Macchina:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/ja-JP.rc b/dll/cpl/sysdm/lang/ja-JP.rc index fcc78f6644..7c7abd9930 100644 --- a/dll/cpl/sysdm/lang/ja-JP.rc +++ b/dll/cpl/sysdm/lang/ja-JP.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "システム:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "マシン:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/nl-NL.rc b/dll/cpl/sysdm/lang/nl-NL.rc index 56c3d3e3a1..b8198d7b0d 100644 --- a/dll/cpl/sysdm/lang/nl-NL.rc +++ b/dll/cpl/sysdm/lang/nl-NL.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Besturingssysteem:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versie ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versie", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Machine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/no-NO.rc b/dll/cpl/sysdm/lang/no-NO.rc index 6d1de0a6ce..6ae0a523cf 100644 --- a/dll/cpl/sysdm/lang/no-NO.rc +++ b/dll/cpl/sysdm/lang/no-NO.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versjon ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versjon", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Maskin:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/pl-PL.rc b/dll/cpl/sysdm/lang/pl-PL.rc index 09c72722ee..7dbbaf6e7b 100644 --- a/dll/cpl/sysdm/lang/pl-PL.rc +++ b/dll/cpl/sysdm/lang/pl-PL.rc @@ -17,8 +17,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "System:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Wersja ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Wersja", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Komputer:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index cf26027529..76f7188cbc 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -18,7 +18,6 @@ BEGIN LTEXT "Sistem:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 LTEXT "Versiune", IDC_STATIC, 10, 153, 30, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 40, 153, 91, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Calculator:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/ru-RU.rc b/dll/cpl/sysdm/lang/ru-RU.rc index 99f4b1d312..2ef6146826 100644 --- a/dll/cpl/sysdm/lang/ru-RU.rc +++ b/dll/cpl/sysdm/lang/ru-RU.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Операционная система:", IDC_STATIC, 4, 132, 87, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Версия ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Версия", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Компьютер:", IDC_STATIC, 124, 132, 40, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/sk-SK.rc b/dll/cpl/sysdm/lang/sk-SK.rc index fe3afc1e00..ee1b84fa70 100644 --- a/dll/cpl/sysdm/lang/sk-SK.rc +++ b/dll/cpl/sysdm/lang/sk-SK.rc @@ -16,8 +16,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Systém:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Verzia ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 32, 153, 91, 9 + LTEXT "Verzia", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Počítač:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/sq-AL.rc b/dll/cpl/sysdm/lang/sq-AL.rc index 3324f93128..c42292a335 100644 --- a/dll/cpl/sysdm/lang/sq-AL.rc +++ b/dll/cpl/sysdm/lang/sq-AL.rc @@ -8,8 +8,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Sistemi:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Versioni", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Versioni", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Makinë:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/sv-SE.rc b/dll/cpl/sysdm/lang/sv-SE.rc index 3adcbaa69c..1c2ce3bf57 100644 --- a/dll/cpl/sysdm/lang/sv-SE.rc +++ b/dll/cpl/sysdm/lang/sv-SE.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Operativsystem:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Version", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Dator:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/tr-TR.rc b/dll/cpl/sysdm/lang/tr-TR.rc index 52f9db671f..f4975a6258 100644 --- a/dll/cpl/sysdm/lang/tr-TR.rc +++ b/dll/cpl/sysdm/lang/tr-TR.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Dizge:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Sürüm:", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Sürüm:", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Makine:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/uk-UA.rc b/dll/cpl/sysdm/lang/uk-UA.rc index 3da2ef28e4..5a0677cfbe 100644 --- a/dll/cpl/sysdm/lang/uk-UA.rc +++ b/dll/cpl/sysdm/lang/uk-UA.rc @@ -16,8 +16,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "Операційна система:", IDC_STATIC, 4, 132, 82, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "Версія ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Версія", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "Комп'ютер:", IDC_STATIC, 124, 132, 36, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/zh-CN.rc b/dll/cpl/sysdm/lang/zh-CN.rc index bad29cec55..3afea5ad8d 100644 --- a/dll/cpl/sysdm/lang/zh-CN.rc +++ b/dll/cpl/sysdm/lang/zh-CN.rc @@ -11,8 +11,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "系统:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "版本 ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "版本", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "计算机:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/lang/zh-TW.rc b/dll/cpl/sysdm/lang/zh-TW.rc index 30e2abca4f..0b0b1c60e9 100644 --- a/dll/cpl/sysdm/lang/zh-TW.rc +++ b/dll/cpl/sysdm/lang/zh-TW.rc @@ -10,8 +10,7 @@ BEGIN CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 LTEXT "系統:", IDC_STATIC, 4, 132, 32, 9 LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 - LTEXT "版本 ", IDC_STATIC, 10, 153, 25, 9 - LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "版本", IDC_ROSVERSION, 10, 153, 116, 9 LTEXT REACTOS_STR_PRODUCT_BUILD, IDC_STATIC, 10, 162, 110, 9 LTEXT "計算機:", IDC_STATIC, 124, 132, 34, 9 LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 diff --git a/dll/cpl/sysdm/resource.h b/dll/cpl/sysdm/resource.h index 0a574c2984..f752232bda 100644 --- a/dll/cpl/sysdm/resource.h +++ b/dll/cpl/sysdm/resource.h @@ -59,6 +59,7 @@ #define IDC_LICENCE 106 #define IDC_ROSIMG 107 #define IDC_ROSHOMEPAGE_LINK 108 +#define IDC_ROSVERSION 109 /* Propsheet - hardware */ #define IDD_PROPPAGEHARDWARE 300

1 0

01/01: [SYSSETUP] Fix the button sizes of theme selection dialog (#746)
by Katayama Hirofumi MZ 15 Aug '18

15 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d9f89f8139c53c11e100… commit 6d9f89f8139c53c11e100c62bdd600be162c61d6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 16 01:32:17 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 15 18:32:17 2018 +0200 [SYSSETUP] Fix the button sizes of theme selection dialog (#746) CORE-14896 --- dll/win32/syssetup/lang/bg-BG.rc | 4 ++-- dll/win32/syssetup/lang/cs-CZ.rc | 4 ++-- dll/win32/syssetup/lang/da-DK.rc | 4 ++-- dll/win32/syssetup/lang/de-DE.rc | 4 ++-- dll/win32/syssetup/lang/el-GR.rc | 4 ++-- dll/win32/syssetup/lang/en-US.rc | 4 ++-- dll/win32/syssetup/lang/es-ES.rc | 4 ++-- dll/win32/syssetup/lang/et-EE.rc | 4 ++-- dll/win32/syssetup/lang/fi-FI.rc | 4 ++-- dll/win32/syssetup/lang/fr-FR.rc | 4 ++-- dll/win32/syssetup/lang/he-IL.rc | 4 ++-- dll/win32/syssetup/lang/hu-HU.rc | 4 ++-- dll/win32/syssetup/lang/id-ID.rc | 4 ++-- dll/win32/syssetup/lang/it-IT.rc | 4 ++-- dll/win32/syssetup/lang/ja-JP.rc | 4 ++-- dll/win32/syssetup/lang/lt-LT.rc | 4 ++-- dll/win32/syssetup/lang/nl-NL.rc | 4 ++-- dll/win32/syssetup/lang/no-NO.rc | 4 ++-- dll/win32/syssetup/lang/pl-PL.rc | 4 ++-- dll/win32/syssetup/lang/pt-BR.rc | 4 ++-- dll/win32/syssetup/lang/ro-RO.rc | 4 ++-- dll/win32/syssetup/lang/ru-RU.rc | 4 ++-- dll/win32/syssetup/lang/sk-SK.rc | 4 ++-- dll/win32/syssetup/lang/sq-AL.rc | 4 ++-- dll/win32/syssetup/lang/sv-SE.rc | 4 ++-- dll/win32/syssetup/lang/th-TH.rc | 4 ++-- dll/win32/syssetup/lang/tr-TR.rc | 4 ++-- dll/win32/syssetup/lang/uk-UA.rc | 4 ++-- dll/win32/syssetup/lang/zh-CN.rc | 4 ++-- dll/win32/syssetup/lang/zh-TW.rc | 4 ++-- 30 files changed, 60 insertions(+), 60 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 247332e9a3..0716e8b0c4 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index d5f230d3ae..5ecd4c0fc2 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -94,8 +94,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index f6c10a6898..547b30d0ca 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -107,8 +107,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index b9c32deca3..d7366c05a5 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus Theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Klassisches Theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus Theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Klassisches Theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 03f53ca214..5fc14d94d4 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index f131e0a6a4..f44d6a3dc8 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -107,8 +107,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 25081b012c..da194b5e19 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -89,8 +89,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 5f1778f477..49f5cbba45 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 76ded8ab02..1f19102619 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -107,8 +107,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 124a71fa5d..5aa51a1478 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Thème Lautus", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Thème Classique", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Thème Lautus", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Thème Classique", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 015396d16c..de2b023800 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 6a22058823..aad93e168a 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 41c8732398..2d960f130d 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index cf3a046b03..2f18ce4051 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Tema Lautus", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Tema Classico", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Tema Lautus", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Tema Classico", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index e38b38f634..4cda9d3e3c 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS セットアップ" FONT 9, "MS UI Gothic" BEGIN - PUSHBUTTON "Lautus テーマ", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "クラシックテーマ", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus テーマ", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "クラシックテーマ", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 458ce0e8eb..d19f2d5a88 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -107,8 +107,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 5b50e730d0..e7c15889b6 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 3c08e54fe3..3e86a61548 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 36ae269013..0dae847be9 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Instalator ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Klasyczny", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Klasyczny", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 00a295385b..78302db084 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -88,8 +88,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 68ce3f96b1..a42a1b73fa 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -97,8 +97,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Asistent de instalare ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Tema Lautus", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Tema clasică", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Tema Lautus", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Tema clasică", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index e4a42080cc..53dcccd398 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -90,8 +90,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Установка ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Тема ""Lautus""", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Классическая тема", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Тема ""Lautus""", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Классическая тема", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 3f550d3252..5c66a19f2c 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -94,8 +94,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 37344c3d35..aa738bb99f 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -107,8 +107,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index bece96b2cf..22921236ce 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -107,8 +107,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index de776455ed..67da58c030 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -107,8 +107,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index 5f67923ef7..ba8052219a 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -90,8 +90,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 06508a5bb9..6810e86fca 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -96,8 +96,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 15133dcd89..b488a33881 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -90,8 +90,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS 安装程序" FONT 9, "宋体" BEGIN - PUSHBUTTON "磊灿", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "经典主题", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "磊灿", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "经典主题", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index c4ca3f4d11..5ef4072634 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -90,8 +90,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "ReactOS Setup" FONT 9, "新細明體" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,7,130,130, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143

1 0

01/01: Remove unnecessary executable bits
by Mike Swanson 15 Aug '18

15 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3c7e9bb33243c59261b72… commit 3c7e9bb33243c59261b7214d3c55f1cbdd5a8558 Author: Mike Swanson <mikeonthecomputer(a)gmail.com> AuthorDate: Tue Aug 14 16:10:55 2018 -0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 15 18:29:09 2018 +0200 Remove unnecessary executable bits --- dll/shellext/shellbtrfs/devices.cpp | 0 dll/shellext/shellbtrfs/propsheet.cpp | 0 dll/shellext/shellbtrfs/shellbtrfs.manifest | 0 dll/shellext/shellbtrfs/volpropsheet.cpp | 0 dll/win32/ubtrfs/resource.h | 0 drivers/filesystems/btrfs/compress.c | 0 drivers/filesystems/btrfs/volume.c | 0 drivers/filesystems/cdfs_new/allocsup.c | 0 drivers/filesystems/cdfs_new/cachesup.c | 0 drivers/filesystems/cdfs_new/cd.h | 0 drivers/filesystems/cdfs_new/cddata.c | 0 drivers/filesystems/cdfs_new/cddata.h | 0 drivers/filesystems/cdfs_new/cdinit.c | 0 drivers/filesystems/cdfs_new/cdprocs.h | 0 drivers/filesystems/cdfs_new/cdstruc.h | 0 drivers/filesystems/cdfs_new/cleanup.c | 0 drivers/filesystems/cdfs_new/close.c | 0 drivers/filesystems/cdfs_new/create.c | 0 drivers/filesystems/cdfs_new/devctrl.c | 0 drivers/filesystems/cdfs_new/deviosup.c | 0 drivers/filesystems/cdfs_new/dirctrl.c | 0 drivers/filesystems/cdfs_new/dirsup.c | 0 drivers/filesystems/cdfs_new/fieldoff.c | 0 drivers/filesystems/cdfs_new/fileinfo.c | 0 drivers/filesystems/cdfs_new/filobsup.c | 0 drivers/filesystems/cdfs_new/fsctrl.c | 0 drivers/filesystems/cdfs_new/fspdisp.c | 0 drivers/filesystems/cdfs_new/lockctrl.c | 0 drivers/filesystems/cdfs_new/namesup.c | 0 drivers/filesystems/cdfs_new/nodetype.h | 0 drivers/filesystems/cdfs_new/pathsup.c | 0 drivers/filesystems/cdfs_new/pnp.c | 0 drivers/filesystems/cdfs_new/prefxsup.c | 0 drivers/filesystems/cdfs_new/read.c | 0 drivers/filesystems/cdfs_new/resrcsup.c | 0 drivers/filesystems/cdfs_new/strucsup.c | 0 drivers/filesystems/cdfs_new/verfysup.c | 0 drivers/filesystems/cdfs_new/volinfo.c | 0 drivers/filesystems/cdfs_new/workque.c | 0 modules/rostests/winetests/gdi32/bitmap.c | 0 modules/rostests/winetests/gdi32/brush.c | 0 modules/rostests/winetests/gdi32/gdiobj.c | 0 modules/rostests/winetests/gdi32/metafile.c | 0 modules/rostests/winetests/kernel32/atom.c | 0 modules/rostests/winetests/kernel32/change.c | 0 modules/rostests/winetests/kernel32/codepage.c | 0 modules/rostests/winetests/kernel32/comm.c | 0 modules/rostests/winetests/kernel32/console.c | 0 modules/rostests/winetests/kernel32/directory.c | 0 modules/rostests/winetests/kernel32/drive.c | 0 modules/rostests/winetests/kernel32/environ.c | 0 modules/rostests/winetests/kernel32/file.c | 0 modules/rostests/winetests/kernel32/format_msg.c | 0 modules/rostests/winetests/kernel32/heap.c | 0 modules/rostests/winetests/kernel32/locale.c | 0 modules/rostests/winetests/kernel32/mailslot.c | 0 modules/rostests/winetests/kernel32/module.c | 0 modules/rostests/winetests/kernel32/path.c | 0 modules/rostests/winetests/kernel32/pipe.c | 0 modules/rostests/winetests/kernel32/process.c | 0 modules/rostests/winetests/kernel32/profile.c | 0 modules/rostests/winetests/kernel32/sync.c | 0 modules/rostests/winetests/kernel32/testlist.c | 0 modules/rostests/winetests/kernel32/thread.c | 0 modules/rostests/winetests/kernel32/time.c | 0 modules/rostests/winetests/kernel32/timer.c | 0 modules/rostests/winetests/kernel32/virtual.c | 0 modules/rostests/winetests/ntdll/atom.c | 0 modules/rostests/winetests/ntdll/env.c | 0 modules/rostests/winetests/ntdll/error.c | 0 modules/rostests/winetests/ntdll/generated.c | 0 modules/rostests/winetests/ntdll/info.c | 0 modules/rostests/winetests/ntdll/large_int.c | 0 modules/rostests/winetests/ntdll/ntdll_test.h | 0 modules/rostests/winetests/ntdll/path.c | 0 modules/rostests/winetests/ntdll/reg.c | 0 modules/rostests/winetests/ntdll/rtl.c | 0 modules/rostests/winetests/ntdll/rtlbitmap.c | 0 modules/rostests/winetests/ntdll/rtlstr.c | 0 modules/rostests/winetests/ntdll/string.c | 0 modules/rostests/winetests/ntdll/time.c | 0 modules/rostests/winetests/shell32/generated.c | 0 modules/rostests/winetests/shell32/shell32_test.h | 0 modules/rostests/winetests/shell32/shelllink.c | 0 modules/rostests/winetests/shell32/shlexec.c | 0 modules/rostests/winetests/shell32/string.c | 0 modules/rostests/winetests/shlwapi/clist.c | 0 modules/rostests/winetests/shlwapi/clsid.c | 0 modules/rostests/winetests/shlwapi/generated.c | 0 modules/rostests/winetests/shlwapi/ordinal.c | 0 modules/rostests/winetests/shlwapi/path.c | 0 modules/rostests/winetests/shlwapi/shreg.c | 0 modules/rostests/winetests/shlwapi/string.c | 0 modules/rostests/winetests/shlwapi/testlist.c | 0 modules/rostests/winetests/user32/class.c | 0 modules/rostests/winetests/user32/clipboard.c | 0 modules/rostests/winetests/user32/dce.c | 0 modules/rostests/winetests/user32/dde.c | 0 modules/rostests/winetests/user32/dialog.c | 0 modules/rostests/winetests/user32/edit.c | 0 modules/rostests/winetests/user32/input.c | 0 modules/rostests/winetests/user32/menu.c | 0 modules/rostests/winetests/user32/msg.c | 0 modules/rostests/winetests/user32/resource.c | 0 modules/rostests/winetests/user32/resource.rc | 0 modules/rostests/winetests/user32/sysparams.c | 0 modules/rostests/winetests/user32/text.c | 0 modules/rostests/winetests/user32/winstation.c | 0 modules/rostests/winetests/user32/wsprintf.c | 0 sdk/include/ndk/gpl.txt | 0 sdk/include/ndk/lgpl.txt | 0 sdk/include/ndk/ndk.txt | 0 sdk/include/reactos/drivers/ndisuio/nuiouser.h | 0 sdk/lib/drivers/lwip/src/include/arch/bpstruct.h | 0 sdk/lib/drivers/lwip/src/include/arch/cc.h | 0 sdk/lib/drivers/lwip/src/include/arch/epstruct.h | 0 sdk/lib/drivers/lwip/src/include/arch/perf.h | 0 sdk/lib/drivers/lwip/src/include/arch/sys_arch.h | 0 sdk/lib/drivers/lwip/src/include/lwipopts.h | 0 sdk/lib/drivers/lwip/src/include/rosip.h | 0 sdk/lib/drivers/lwip/src/rosip.c | 0 sdk/lib/drivers/lwip/src/rosmem.c | 0 sdk/lib/drivers/lwip/src/rostcp.c | 0 sdk/lib/drivers/lwip/src/sys_arch.c | 0 124 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dll/shellext/shellbtrfs/devices.cpp b/dll/shellext/shellbtrfs/devices.cpp old mode 100755 new mode 100644 diff --git a/dll/shellext/shellbtrfs/propsheet.cpp b/dll/shellext/shellbtrfs/propsheet.cpp old mode 100755 new mode 100644 diff --git a/dll/shellext/shellbtrfs/shellbtrfs.manifest b/dll/shellext/shellbtrfs/shellbtrfs.manifest old mode 100755 new mode 100644 diff --git a/dll/shellext/shellbtrfs/volpropsheet.cpp b/dll/shellext/shellbtrfs/volpropsheet.cpp old mode 100755 new mode 100644 diff --git a/dll/win32/ubtrfs/resource.h b/dll/win32/ubtrfs/resource.h old mode 100755 new mode 100644 diff --git a/drivers/filesystems/btrfs/compress.c b/drivers/filesystems/btrfs/compress.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/btrfs/volume.c b/drivers/filesystems/btrfs/volume.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/allocsup.c b/drivers/filesystems/cdfs_new/allocsup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/cachesup.c b/drivers/filesystems/cdfs_new/cachesup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/cd.h b/drivers/filesystems/cdfs_new/cd.h old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/cddata.c b/drivers/filesystems/cdfs_new/cddata.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/cddata.h b/drivers/filesystems/cdfs_new/cddata.h old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/cdinit.c b/drivers/filesystems/cdfs_new/cdinit.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/cdprocs.h b/drivers/filesystems/cdfs_new/cdprocs.h old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/cdstruc.h b/drivers/filesystems/cdfs_new/cdstruc.h old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/cleanup.c b/drivers/filesystems/cdfs_new/cleanup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/close.c b/drivers/filesystems/cdfs_new/close.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/create.c b/drivers/filesystems/cdfs_new/create.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/devctrl.c b/drivers/filesystems/cdfs_new/devctrl.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/deviosup.c b/drivers/filesystems/cdfs_new/deviosup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/dirctrl.c b/drivers/filesystems/cdfs_new/dirctrl.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/dirsup.c b/drivers/filesystems/cdfs_new/dirsup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/fieldoff.c b/drivers/filesystems/cdfs_new/fieldoff.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/fileinfo.c b/drivers/filesystems/cdfs_new/fileinfo.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/filobsup.c b/drivers/filesystems/cdfs_new/filobsup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/fsctrl.c b/drivers/filesystems/cdfs_new/fsctrl.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/fspdisp.c b/drivers/filesystems/cdfs_new/fspdisp.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/lockctrl.c b/drivers/filesystems/cdfs_new/lockctrl.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/namesup.c b/drivers/filesystems/cdfs_new/namesup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/nodetype.h b/drivers/filesystems/cdfs_new/nodetype.h old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/pathsup.c b/drivers/filesystems/cdfs_new/pathsup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/pnp.c b/drivers/filesystems/cdfs_new/pnp.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/prefxsup.c b/drivers/filesystems/cdfs_new/prefxsup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/read.c b/drivers/filesystems/cdfs_new/read.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/resrcsup.c b/drivers/filesystems/cdfs_new/resrcsup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/strucsup.c b/drivers/filesystems/cdfs_new/strucsup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/verfysup.c b/drivers/filesystems/cdfs_new/verfysup.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/volinfo.c b/drivers/filesystems/cdfs_new/volinfo.c old mode 100755 new mode 100644 diff --git a/drivers/filesystems/cdfs_new/workque.c b/drivers/filesystems/cdfs_new/workque.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/gdi32/bitmap.c b/modules/rostests/winetests/gdi32/bitmap.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/gdi32/brush.c b/modules/rostests/winetests/gdi32/brush.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/gdi32/gdiobj.c b/modules/rostests/winetests/gdi32/gdiobj.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/gdi32/metafile.c b/modules/rostests/winetests/gdi32/metafile.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/atom.c b/modules/rostests/winetests/kernel32/atom.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/change.c b/modules/rostests/winetests/kernel32/change.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/codepage.c b/modules/rostests/winetests/kernel32/codepage.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/comm.c b/modules/rostests/winetests/kernel32/comm.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/console.c b/modules/rostests/winetests/kernel32/console.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/directory.c b/modules/rostests/winetests/kernel32/directory.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/drive.c b/modules/rostests/winetests/kernel32/drive.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/environ.c b/modules/rostests/winetests/kernel32/environ.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/file.c b/modules/rostests/winetests/kernel32/file.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/format_msg.c b/modules/rostests/winetests/kernel32/format_msg.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/heap.c b/modules/rostests/winetests/kernel32/heap.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/locale.c b/modules/rostests/winetests/kernel32/locale.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/mailslot.c b/modules/rostests/winetests/kernel32/mailslot.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/module.c b/modules/rostests/winetests/kernel32/module.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/path.c b/modules/rostests/winetests/kernel32/path.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/pipe.c b/modules/rostests/winetests/kernel32/pipe.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/process.c b/modules/rostests/winetests/kernel32/process.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/profile.c b/modules/rostests/winetests/kernel32/profile.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/sync.c b/modules/rostests/winetests/kernel32/sync.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/testlist.c b/modules/rostests/winetests/kernel32/testlist.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/thread.c b/modules/rostests/winetests/kernel32/thread.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/time.c b/modules/rostests/winetests/kernel32/time.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/timer.c b/modules/rostests/winetests/kernel32/timer.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/kernel32/virtual.c b/modules/rostests/winetests/kernel32/virtual.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/atom.c b/modules/rostests/winetests/ntdll/atom.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/env.c b/modules/rostests/winetests/ntdll/env.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/error.c b/modules/rostests/winetests/ntdll/error.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/generated.c b/modules/rostests/winetests/ntdll/generated.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/info.c b/modules/rostests/winetests/ntdll/info.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/large_int.c b/modules/rostests/winetests/ntdll/large_int.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/ntdll_test.h b/modules/rostests/winetests/ntdll/ntdll_test.h old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/path.c b/modules/rostests/winetests/ntdll/path.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/reg.c b/modules/rostests/winetests/ntdll/reg.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/rtl.c b/modules/rostests/winetests/ntdll/rtl.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/rtlbitmap.c b/modules/rostests/winetests/ntdll/rtlbitmap.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/rtlstr.c b/modules/rostests/winetests/ntdll/rtlstr.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/string.c b/modules/rostests/winetests/ntdll/string.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/ntdll/time.c b/modules/rostests/winetests/ntdll/time.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shell32/generated.c b/modules/rostests/winetests/shell32/generated.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shell32/shell32_test.h b/modules/rostests/winetests/shell32/shell32_test.h old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shell32/shelllink.c b/modules/rostests/winetests/shell32/shelllink.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shell32/shlexec.c b/modules/rostests/winetests/shell32/shlexec.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shell32/string.c b/modules/rostests/winetests/shell32/string.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shlwapi/clist.c b/modules/rostests/winetests/shlwapi/clist.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shlwapi/clsid.c b/modules/rostests/winetests/shlwapi/clsid.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shlwapi/generated.c b/modules/rostests/winetests/shlwapi/generated.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shlwapi/ordinal.c b/modules/rostests/winetests/shlwapi/ordinal.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shlwapi/path.c b/modules/rostests/winetests/shlwapi/path.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shlwapi/shreg.c b/modules/rostests/winetests/shlwapi/shreg.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shlwapi/string.c b/modules/rostests/winetests/shlwapi/string.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/shlwapi/testlist.c b/modules/rostests/winetests/shlwapi/testlist.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/class.c b/modules/rostests/winetests/user32/class.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/clipboard.c b/modules/rostests/winetests/user32/clipboard.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/dce.c b/modules/rostests/winetests/user32/dce.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/dde.c b/modules/rostests/winetests/user32/dde.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/dialog.c b/modules/rostests/winetests/user32/dialog.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/edit.c b/modules/rostests/winetests/user32/edit.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/input.c b/modules/rostests/winetests/user32/input.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/menu.c b/modules/rostests/winetests/user32/menu.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/msg.c b/modules/rostests/winetests/user32/msg.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/resource.c b/modules/rostests/winetests/user32/resource.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/resource.rc b/modules/rostests/winetests/user32/resource.rc old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/sysparams.c b/modules/rostests/winetests/user32/sysparams.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/text.c b/modules/rostests/winetests/user32/text.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/winstation.c b/modules/rostests/winetests/user32/winstation.c old mode 100755 new mode 100644 diff --git a/modules/rostests/winetests/user32/wsprintf.c b/modules/rostests/winetests/user32/wsprintf.c old mode 100755 new mode 100644 diff --git a/sdk/include/ndk/gpl.txt b/sdk/include/ndk/gpl.txt old mode 100755 new mode 100644 diff --git a/sdk/include/ndk/lgpl.txt b/sdk/include/ndk/lgpl.txt old mode 100755 new mode 100644 diff --git a/sdk/include/ndk/ndk.txt b/sdk/include/ndk/ndk.txt old mode 100755 new mode 100644 diff --git a/sdk/include/reactos/drivers/ndisuio/nuiouser.h b/sdk/include/reactos/drivers/ndisuio/nuiouser.h old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/include/arch/bpstruct.h b/sdk/lib/drivers/lwip/src/include/arch/bpstruct.h old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/include/arch/cc.h b/sdk/lib/drivers/lwip/src/include/arch/cc.h old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/include/arch/epstruct.h b/sdk/lib/drivers/lwip/src/include/arch/epstruct.h old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/include/arch/perf.h b/sdk/lib/drivers/lwip/src/include/arch/perf.h old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/include/arch/sys_arch.h b/sdk/lib/drivers/lwip/src/include/arch/sys_arch.h old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/include/lwipopts.h b/sdk/lib/drivers/lwip/src/include/lwipopts.h old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/include/rosip.h b/sdk/lib/drivers/lwip/src/include/rosip.h old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/rosip.c b/sdk/lib/drivers/lwip/src/rosip.c old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/rosmem.c b/sdk/lib/drivers/lwip/src/rosmem.c old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/rostcp.c b/sdk/lib/drivers/lwip/src/rostcp.c old mode 100755 new mode 100644 diff --git a/sdk/lib/drivers/lwip/src/sys_arch.c b/sdk/lib/drivers/lwip/src/sys_arch.c old mode 100755 new mode 100644

1 0

01/01: [WIN32SS][USER] fixing couple typos for WINVER >= 0x600
by Denis Malikov 15 Aug '18

15 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9e198799d48de54276674… commit 9e198799d48de54276674ce19859a029766a7cd7 Author: Denis Malikov <filedem(a)gmail.com> AuthorDate: Wed Aug 15 22:05:03 2018 +0700 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 15 18:27:31 2018 +0200 [WIN32SS][USER] fixing couple typos for WINVER >= 0x600 CORE-12596 --- win32ss/user/ntuser/sysparams.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c index c7dca11730..7eedc028de 100644 --- a/win32ss/user/ntuser/sysparams.c +++ b/win32ss/user/ntuser/sysparams.c @@ -282,7 +282,7 @@ SpiUpdatePerUserSystemParameters(VOID) gspv.bMouseClickLock = (gspv.dwUserPrefMask & UPM_CLICKLOCK) != 0; gspv.bMouseCursorShadow = (gspv.dwUserPrefMask & UPM_CURSORSHADOW) != 0; #if (_WIN32_WINNT >= 0x0600) - gspv.iWheelScrollChars = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLCHARS, 3); + gspv.uiWheelScrollChars = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLCHARS, 3); #endif /* Some hardcoded values for now */ @@ -1523,7 +1523,7 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) #if(WINVER >= 0x0600) case SPI_GETAUDIODESCRIPTION: - return SpiGet(pvParam, &gspv.audiodesription, sizeof(AUDIODESCRIPTION), fl); + return SpiGet(pvParam, &gspv.audiodescription, sizeof(AUDIODESCRIPTION), fl); case SPI_SETAUDIODESCRIPTION: ERR("SPI_SETAUDIODESCRIPTION is unimplemented\n"); @@ -1666,10 +1666,10 @@ SpiGetSet(UINT uiAction, UINT uiParam, PVOID pvParam, FLONG fl) return SpiSetBool(&gspv.bDisableOverlappedContent, uiParam, KEY_MOUSE, L"", fl); case SPI_GETCLIENTAREAANIMATION: - return SpiGetInt(pvParam, &gspv.bClientAnimation, fl); + return SpiGetInt(pvParam, &gspv.bClientAreaAnimation, fl); case SPI_SETCLIENTAREAANIMATION: - return SpiSetBool(&gspv.bClientAnimation, uiParam, KEY_MOUSE, L"", fl); + return SpiSetBool(&gspv.bClientAreaAnimation, uiParam, KEY_MOUSE, L"", fl); case SPI_GETCLEARTYPE: return SpiGetInt(pvParam, &gspv.bClearType, fl);

1 0

02/02: [BTRFS] Leak the root stream file object on mount.
by Pierre Schweitzer 15 Aug '18

15 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c13ccc92f66d9fd537ffd… commit c13ccc92f66d9fd537ffdd4c0324af5b9c2723e1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Aug 15 16:38:56 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Aug 15 16:38:56 2018 +0200 [BTRFS] Leak the root stream file object on mount. For whatever (unknown) reason yet, this stream file object seems to be deleted when still in use while installing ReactOS on BtrFS partition, leading to use after free. So, quick and dirty hack: leak it to prevent deletion. CORE-13769 --- drivers/filesystems/btrfs/btrfs.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index 27a1572db8..c4960cd421 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -4453,7 +4453,21 @@ static NTSTATUS mount_vol(_In_ PDEVICE_OBJECT DeviceObject, _In_ PIRP Irp) { goto exit; } + /* HACK: stream file object seems to get deleted at some point + * leading to use after free when installing ReactOS on + * BtrFS. + * Workaround: leak a handle to the fileobject + * XXX: Could be improved by storing it somewhere and releasing it + * on dismount. Or even by referencing again the file object. + */ +#ifndef __REACTOS__ Vcb->root_file = IoCreateStreamFileObject(NULL, DeviceToMount); +#else + { + HANDLE Dummy; + Vcb->root_file = IoCreateStreamFileObjectEx(NULL, DeviceToMount, &Dummy); + } +#endif Vcb->root_file->FsContext = root_fcb; Vcb->root_file->SectionObjectPointer = &root_fcb->nonpaged->segment_object; Vcb->root_file->Vpb = DeviceObject->Vpb;

1 0

01/02: [BTRFS] Allow driver to start at first stage when no hive is present.
by Pierre Schweitzer 15 Aug '18

15 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=80e11516b12b19530b56b… commit 80e11516b12b19530b56be7539ecc6af2039ed7b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Aug 15 16:35:05 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Aug 15 16:35:05 2018 +0200 [BTRFS] Allow driver to start at first stage when no hive is present. Contrary to upstream, we will ignore failure when opening registry and will keep going. CORE-13769 --- drivers/filesystems/btrfs/btrfs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index 236184eafa..27a1572db8 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -5563,12 +5563,19 @@ NTSTATUS DriverEntry(_In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_STRING Regi InitializeObjectAttributes(&oa, RegistryPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwCreateKey(&regh, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY, &oa, 0, NULL, REG_OPTION_NON_VOLATILE, &dispos); + /* ReactOS specific hack: allow BtrFS driver to start in 1st stage with no hive */ +#ifndef __REACTOS__ if (!NT_SUCCESS(Status)) { ERR("ZwCreateKey returned %08x\n", Status); return Status; } watch_registry(regh); +#else + if (NT_SUCCESS(Status)) { + watch_registry(regh); + } +#endif Status = IoReportDetectedDevice(drvobj, InterfaceTypeUndefined, 0xFFFFFFFF, 0xFFFFFFFF, NULL, NULL, 0, &cde->buspdo);

1 0

06/06: [APPHELP_APITEST] Fix rc dependency. As pointed out by Thomas.
by Mark Jansen 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13a3cf03d74f4233c27bc… commit 13a3cf03d74f4233c27bc5d87c2b03f5587e052f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 1 22:15:51 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 13 13:24:12 2018 +0200 [APPHELP_APITEST] Fix rc dependency. As pointed out by Thomas. --- modules/rostests/apitests/apphelp/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/rostests/apitests/apphelp/CMakeLists.txt b/modules/rostests/apitests/apphelp/CMakeLists.txt index ec218d2230..06ca2ba83a 100644 --- a/modules/rostests/apitests/apphelp/CMakeLists.txt +++ b/modules/rostests/apitests/apphelp/CMakeLists.txt @@ -17,8 +17,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/testdb.sdb COMMAND native-xml2sdb -i ${CMAKE_CURRENT_SOURCE_DIR}/testdb.xml -o ${CMAKE_CURRENT_BINARY_DIR}/testdb.sdb DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/testdb.xml native-xml2sdb) -add_custom_target(testdb DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/testdb.sdb) -add_rc_deps(testdata.rc testdb) +add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/testdb.sdb) add_executable(apphelp_apitest ${SOURCE}) set_module_type(apphelp_apitest win32cui) target_link_libraries(apphelp_apitest ${PSEH_LIB})

1 0

05/06: [RTL][KERNEL32] Add a comment indicating we need SEH in RtlImageNtHeaderEx CORE-14532 CORE-14857
by Mark Jansen 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9b6fb9f2f8f5021ab68b8… commit 9b6fb9f2f8f5021ab68b8c2495949d6cc47d7adf Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 29 19:45:13 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 13 13:24:12 2018 +0200 [RTL][KERNEL32] Add a comment indicating we need SEH in RtlImageNtHeaderEx CORE-14532 CORE-14857 --- dll/win32/kernel32/client/loader.c | 1 + modules/rostests/apitests/ntdll/load_notifications.c | 2 +- sdk/lib/rtl/image.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/loader.c b/dll/win32/kernel32/client/loader.c index a6f84ba87e..817f1019b9 100644 --- a/dll/win32/kernel32/client/loader.c +++ b/dll/win32/kernel32/client/loader.c @@ -463,6 +463,7 @@ FreeLibrary(HINSTANCE hLibModule) if (LDR_IS_DATAFILE(hLibModule)) { // FIXME: This SEH should go inside RtlImageNtHeader instead + // See https://jira.reactos.org/browse/CORE-14857 _SEH2_TRY { /* This is a LOAD_LIBRARY_AS_DATAFILE module, check if it's a valid one */ diff --git a/modules/rostests/apitests/ntdll/load_notifications.c b/modules/rostests/apitests/ntdll/load_notifications.c index 430e2fc5cb..8543f2f478 100644 --- a/modules/rostests/apitests/ntdll/load_notifications.c +++ b/modules/rostests/apitests/ntdll/load_notifications.c @@ -72,7 +72,7 @@ BOOL WINAPI notify_DllMain(IN HINSTANCE hDllHandle, IN DWORD dwReason, IN LPVOID } else { - ok_int(handlers, g_DLL_DETACH); + ok_int(handlers, g_DLL_DETACH); // For failures, see https://jira.reactos.org/browse/CORE-14857 } if (InterlockedCompareExchange(&g_DllMainExcept, 0xffffff, dwReason) == dwReason) diff --git a/sdk/lib/rtl/image.c b/sdk/lib/rtl/image.c index c7815b00e4..5629c775fd 100644 --- a/sdk/lib/rtl/image.c +++ b/sdk/lib/rtl/image.c @@ -134,6 +134,7 @@ LdrVerifyMappedImageMatchesChecksum( /* * @implemented + * @note This needs SEH (See https://jira.reactos.org/browse/CORE-14857) */ NTSTATUS NTAPI

1 0

04/06: [LDR] Guard some sections where we grab a lock. CORE-14532
by Mark Jansen 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad08c6631b4707c48b212… commit ad08c6631b4707c48b2124821b5a80b8372e2468 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 29 17:40:42 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 13 13:24:12 2018 +0200 [LDR] Guard some sections where we grab a lock. CORE-14532 --- dll/ntdll/ldr/ldrapi.c | 117 ++++++++++++------------ dll/ntdll/ldr/ldrutils.c | 229 ++++++++++++++++++++++++----------------------- 2 files changed, 180 insertions(+), 166 deletions(-) diff --git a/dll/ntdll/ldr/ldrapi.c b/dll/ntdll/ldr/ldrapi.c index 15f36bb2be..b151163dd4 100644 --- a/dll/ntdll/ldr/ldrapi.c +++ b/dll/ntdll/ldr/ldrapi.c @@ -353,73 +353,80 @@ LdrLoadDll(IN PWSTR SearchPath OPTIONAL, /* Check if there's a TLD DLL being loaded */ OldTldDll = LdrpTopLevelDllBeingLoaded; - if (OldTldDll) + _SEH2_TRY { - /* This is a recursive load, do something about it? */ - if ((ShowSnaps) || (LdrpShowRecursiveLoads) || (LdrpBreakOnRecursiveDllLoads)) + + if (OldTldDll) { - /* Print out debug messages */ - DPRINT1("[%p, %p] LDR: Recursive DLL Load\n", - Teb->RealClientId.UniqueProcess, - Teb->RealClientId.UniqueThread); - DPRINT1("[%p, %p] Previous DLL being loaded \"%wZ\"\n", - Teb->RealClientId.UniqueProcess, - Teb->RealClientId.UniqueThread, - OldTldDll); - DPRINT1("[%p, %p] DLL being requested \"%wZ\"\n", - Teb->RealClientId.UniqueProcess, - Teb->RealClientId.UniqueThread, - DllName); - - /* Was it initializing too? */ - if (!LdrpCurrentDllInitializer) + /* This is a recursive load, do something about it? */ + if ((ShowSnaps) || (LdrpShowRecursiveLoads) || (LdrpBreakOnRecursiveDllLoads)) { - DPRINT1("[%p, %p] LDR: No DLL Initializer was running\n", + /* Print out debug messages */ + DPRINT1("[%p, %p] LDR: Recursive DLL Load\n", Teb->RealClientId.UniqueProcess, Teb->RealClientId.UniqueThread); - } - else - { - DPRINT1("[%p, %p] DLL whose initializer was currently running \"%wZ\"\n", - Teb->ClientId.UniqueProcess, - Teb->ClientId.UniqueThread, - &LdrpCurrentDllInitializer->BaseDllName); + DPRINT1("[%p, %p] Previous DLL being loaded \"%wZ\"\n", + Teb->RealClientId.UniqueProcess, + Teb->RealClientId.UniqueThread, + OldTldDll); + DPRINT1("[%p, %p] DLL being requested \"%wZ\"\n", + Teb->RealClientId.UniqueProcess, + Teb->RealClientId.UniqueThread, + DllName); + + /* Was it initializing too? */ + if (!LdrpCurrentDllInitializer) + { + DPRINT1("[%p, %p] LDR: No DLL Initializer was running\n", + Teb->RealClientId.UniqueProcess, + Teb->RealClientId.UniqueThread); + } + else + { + DPRINT1("[%p, %p] DLL whose initializer was currently running \"%wZ\"\n", + Teb->ClientId.UniqueProcess, + Teb->ClientId.UniqueThread, + &LdrpCurrentDllInitializer->BaseDllName); + } } } - } - /* Set this one as the TLD DLL being loaded*/ - LdrpTopLevelDllBeingLoaded = DllName; + /* Set this one as the TLD DLL being loaded*/ + LdrpTopLevelDllBeingLoaded = DllName; - /* Load the DLL */ - Status = LdrpLoadDll(RedirectedDll, - SearchPath, - DllCharacteristics, - DllName, - BaseAddress, - TRUE); - if (NT_SUCCESS(Status)) - { - Status = STATUS_SUCCESS; + /* Load the DLL */ + Status = LdrpLoadDll(RedirectedDll, + SearchPath, + DllCharacteristics, + DllName, + BaseAddress, + TRUE); + if (NT_SUCCESS(Status)) + { + Status = STATUS_SUCCESS; + } + else if ((Status != STATUS_NO_SUCH_FILE) && + (Status != STATUS_DLL_NOT_FOUND) && + (Status != STATUS_OBJECT_NAME_NOT_FOUND) && + (Status != STATUS_DLL_INIT_FAILED)) + { + DbgPrintEx(DPFLTR_LDR_ID, + DPFLTR_WARNING_LEVEL, + "LDR: %s - failing because LdrpLoadDll(%wZ) returned status %x\n", + __FUNCTION__, + DllName, + Status); + } } - else if ((Status != STATUS_NO_SUCH_FILE) && - (Status != STATUS_DLL_NOT_FOUND) && - (Status != STATUS_OBJECT_NAME_NOT_FOUND) && - (Status != STATUS_DLL_INIT_FAILED)) + _SEH2_FINALLY { - DbgPrintEx(DPFLTR_LDR_ID, - DPFLTR_WARNING_LEVEL, - "LDR: %s - failing because LdrpLoadDll(%wZ) returned status %x\n", - __FUNCTION__, - DllName, - Status); - } - - /* Restore the old TLD DLL */ - LdrpTopLevelDllBeingLoaded = OldTldDll; + /* Restore the old TLD DLL */ + LdrpTopLevelDllBeingLoaded = OldTldDll; - /* Release the lock */ - LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + /* Release the lock */ + LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); + } + _SEH2_END; /* Do we have a redirect string? */ if (DllString2.Buffer) RtlFreeUnicodeString(&DllString2); diff --git a/dll/ntdll/ldr/ldrutils.c b/dll/ntdll/ldr/ldrutils.c index 5f55938d13..aa18d0384f 100644 --- a/dll/ntdll/ldr/ldrutils.c +++ b/dll/ntdll/ldr/ldrutils.c @@ -2488,146 +2488,153 @@ LdrpLoadDll(IN BOOLEAN Redirected, /* Check for init flag and acquire lock */ if (!InInit) RtlEnterCriticalSection(&LdrpLoaderLock); - /* Show debug message */ - if (ShowSnaps) + _SEH2_TRY { - DPRINT1("LDR: LdrLoadDll, loading %wZ from %ws\n", - &RawDllName, - DllPath ? DllPath : L""); - } - - /* Check if the DLL is already loaded */ - if (!LdrpCheckForLoadedDll(DllPath, - &RawDllName, - FALSE, - Redirected, - &LdrEntry)) - { - /* Map it */ - Status = LdrpMapDll(DllPath, - DllPath, - NameBuffer, - DllCharacteristics, - FALSE, - Redirected, - &LdrEntry); - if (!NT_SUCCESS(Status)) goto Quickie; - - /* FIXME: Need to mark the DLL range for the stack DB */ - //RtlpStkMarkDllRange(LdrEntry); - - /* Check if IMAGE_FILE_EXECUTABLE_IMAGE was provided */ - if ((DllCharacteristics) && - (*DllCharacteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) + /* Show debug message */ + if (ShowSnaps) { - /* This is not a DLL, so remove such data */ - LdrEntry->EntryPoint = NULL; - LdrEntry->Flags &= ~LDRP_IMAGE_DLL; + DPRINT1("LDR: LdrLoadDll, loading %wZ from %ws\n", + &RawDllName, + DllPath ? DllPath : L""); } - /* Make sure it's a DLL */ - if (LdrEntry->Flags & LDRP_IMAGE_DLL) + /* Check if the DLL is already loaded */ + if (!LdrpCheckForLoadedDll(DllPath, + &RawDllName, + FALSE, + Redirected, + &LdrEntry)) { - /* Check if this is a .NET Image */ - if (!(LdrEntry->Flags & LDRP_COR_IMAGE)) - { - /* Walk the Import Descriptor */ - Status = LdrpWalkImportDescriptor(DllPath, LdrEntry); - } + /* Map it */ + Status = LdrpMapDll(DllPath, + DllPath, + NameBuffer, + DllCharacteristics, + FALSE, + Redirected, + &LdrEntry); + if (!NT_SUCCESS(Status)) + _SEH2_LEAVE; - /* Update load count, unless it's locked */ - if (LdrEntry->LoadCount != 0xFFFF) LdrEntry->LoadCount++; - LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); + /* FIXME: Need to mark the DLL range for the stack DB */ + //RtlpStkMarkDllRange(LdrEntry); - /* Check if we failed */ - if (!NT_SUCCESS(Status)) + /* Check if IMAGE_FILE_EXECUTABLE_IMAGE was provided */ + if ((DllCharacteristics) && + (*DllCharacteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) { - /* Clear entrypoint, and insert into list */ + /* This is not a DLL, so remove such data */ LdrEntry->EntryPoint = NULL; - InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &LdrEntry->InInitializationOrderLinks); - - /* Cancel the load */ - LdrpClearLoadInProgress(); + LdrEntry->Flags &= ~LDRP_IMAGE_DLL; + } - /* Unload the DLL */ - if (ShowSnaps) + /* Make sure it's a DLL */ + if (LdrEntry->Flags & LDRP_IMAGE_DLL) + { + /* Check if this is a .NET Image */ + if (!(LdrEntry->Flags & LDRP_COR_IMAGE)) { - DbgPrint("LDR: Unloading %wZ due to error %x walking " - "import descriptors\n", - DllName, - Status); + /* Walk the Import Descriptor */ + Status = LdrpWalkImportDescriptor(DllPath, LdrEntry); } - LdrUnloadDll(LdrEntry->DllBase); - /* Return the error */ - goto Quickie; - } - } - else if (LdrEntry->LoadCount != 0xFFFF) - { - /* Increase load count */ - LdrEntry->LoadCount++; - } + /* Update load count, unless it's locked */ + if (LdrEntry->LoadCount != 0xFFFF) LdrEntry->LoadCount++; + LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); - /* Insert it into the list */ - InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, - &LdrEntry->InInitializationOrderLinks); + /* Check if we failed */ + if (!NT_SUCCESS(Status)) + { + /* Clear entrypoint, and insert into list */ + LdrEntry->EntryPoint = NULL; + InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, + &LdrEntry->InInitializationOrderLinks); - /* If we have to run the entrypoint, make sure the DB is ready */ - if (CallInit && LdrpLdrDatabaseIsSetup) - { - /* Notify Shim Engine */ - if (g_ShimsEnabled) + /* Cancel the load */ + LdrpClearLoadInProgress(); + + /* Unload the DLL */ + if (ShowSnaps) + { + DbgPrint("LDR: Unloading %wZ due to error %x walking " + "import descriptors\n", + DllName, + Status); + } + LdrUnloadDll(LdrEntry->DllBase); + + /* Return the error */ + _SEH2_LEAVE; + } + } + else if (LdrEntry->LoadCount != 0xFFFF) { - VOID (NTAPI* SE_DllLoaded)(PLDR_DATA_TABLE_ENTRY) = RtlDecodeSystemPointer(g_pfnSE_DllLoaded); - SE_DllLoaded(LdrEntry); + /* Increase load count */ + LdrEntry->LoadCount++; } - /* Run the init routine */ - Status = LdrpRunInitializeRoutines(NULL); - if (!NT_SUCCESS(Status)) + /* Insert it into the list */ + InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, + &LdrEntry->InInitializationOrderLinks); + + /* If we have to run the entrypoint, make sure the DB is ready */ + if (CallInit && LdrpLdrDatabaseIsSetup) { - /* Failed, unload the DLL */ - if (ShowSnaps) + /* Notify Shim Engine */ + if (g_ShimsEnabled) { - DbgPrint("LDR: Unloading %wZ because either its init " - "routine or one of its static imports failed; " - "status = 0x%08lx\n", - DllName, - Status); + VOID (NTAPI* SE_DllLoaded)(PLDR_DATA_TABLE_ENTRY) = RtlDecodeSystemPointer(g_pfnSE_DllLoaded); + SE_DllLoaded(LdrEntry); + } + + /* Run the init routine */ + Status = LdrpRunInitializeRoutines(NULL); + if (!NT_SUCCESS(Status)) + { + /* Failed, unload the DLL */ + if (ShowSnaps) + { + DbgPrint("LDR: Unloading %wZ because either its init " + "routine or one of its static imports failed; " + "status = 0x%08lx\n", + DllName, + Status); + } + LdrUnloadDll(LdrEntry->DllBase); } - LdrUnloadDll(LdrEntry->DllBase); + } + else + { + /* The DB isn't ready, which means we were loaded because of a forwarder */ + Status = STATUS_SUCCESS; } } else { - /* The DB isn't ready, which means we were loaded because of a forwarder */ - Status = STATUS_SUCCESS; + /* We were already loaded. Are we a DLL? */ + if ((LdrEntry->Flags & LDRP_IMAGE_DLL) && (LdrEntry->LoadCount != 0xFFFF)) + { + /* Increase load count */ + LdrEntry->LoadCount++; + LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); + + /* Clear the load in progress */ + LdrpClearLoadInProgress(); + } + else + { + /* Not a DLL, just increase the load count */ + if (LdrEntry->LoadCount != 0xFFFF) LdrEntry->LoadCount++; + } } + } - else + _SEH2_FINALLY { - /* We were already loaded. Are we a DLL? */ - if ((LdrEntry->Flags & LDRP_IMAGE_DLL) && (LdrEntry->LoadCount != 0xFFFF)) - { - /* Increase load count */ - LdrEntry->LoadCount++; - LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT); - - /* Clear the load in progress */ - LdrpClearLoadInProgress(); - } - else - { - /* Not a DLL, just increase the load count */ - if (LdrEntry->LoadCount != 0xFFFF) LdrEntry->LoadCount++; - } + /* Release the lock */ + if (!InInit) RtlLeaveCriticalSection(&LdrpLoaderLock); } - -Quickie: - /* Release the lock */ - if (!InInit) RtlLeaveCriticalSection(&LdrpLoaderLock); + _SEH2_END; /* Check for success */ if (NT_SUCCESS(Status))

1 0

03/06: [NTDLL_APITEST] Show behavior with exceptions in DllMain. CORE-14532
by Mark Jansen 13 Aug '18

13 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86fe412d5c9aa2bee0032… commit 86fe412d5c9aa2bee0032381401a892319040df1 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Apr 14 21:00:18 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Aug 13 13:24:12 2018 +0200 [NTDLL_APITEST] Show behavior with exceptions in DllMain. CORE-14532 --- modules/rostests/apitests/ntdll/CMakeLists.txt | 14 +- .../rostests/apitests/ntdll/load_notifications.c | 330 +++++++++++++++++++++ .../ntdll/load_notifications/CMakeLists.txt | 6 + .../ntdll/load_notifications/load_notifications.c | 72 +++++ modules/rostests/apitests/ntdll/ntdll_apitest.spec | 2 + modules/rostests/apitests/ntdll/testdata.rc | 2 + modules/rostests/apitests/ntdll/testlist.c | 2 + 7 files changed, 427 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index a7fdc5a2cd..2bb13f2d3e 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -1,6 +1,12 @@ +add_subdirectory(load_notifications) + +include_directories($<TARGET_FILE_DIR:load_notifications>) +spec2def(ntdll_apitest.exe ntdll_apitest.spec) + list(APPEND SOURCE LdrEnumResources.c + load_notifications.c NtAcceptConnectPort.c NtAllocateVirtualMemory.c NtApphelpCacheControl.c @@ -62,7 +68,13 @@ if(ARCH STREQUAL "i386") add_asm_files(ntdll_apitest_asm i386/NtContinue.S) endif() -add_executable(ntdll_apitest ${SOURCE} ${ntdll_apitest_asm} testlist.c) +add_rc_deps(testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/load_notifications/load_notifications.dll) +add_executable(ntdll_apitest + ${SOURCE} + ${ntdll_apitest_asm} + testdata.rc + ${CMAKE_CURRENT_BINARY_DIR}/ntdll_apitest.def + testlist.c) target_link_libraries(ntdll_apitest wine uuid ${PSEH_LIB}) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) diff --git a/modules/rostests/apitests/ntdll/load_notifications.c b/modules/rostests/apitests/ntdll/load_notifications.c new file mode 100644 index 0000000000..430e2fc5cb --- /dev/null +++ b/modules/rostests/apitests/ntdll/load_notifications.c @@ -0,0 +1,330 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for exception behavior in dll notifications + * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "precomp.h" + +WCHAR dllpath[MAX_PATH]; + +LONG g_TlsCalled = 0; +LONG g_DllMainCalled = 0; + +LONG g_TlsExcept = 0xffffff; +LONG g_DllMainExcept = 0xffffff; + +ULONG g_BaseHandlers = 0; + +DWORD g_dwWinVer = 0; + +ULONG CountHandlers(VOID) +{ + EXCEPTION_REGISTRATION_RECORD* exc; + ULONG Count = 0; + + exc = NtCurrentTeb()->NtTib.ExceptionList; + + while (exc && exc != (EXCEPTION_REGISTRATION_RECORD*)~0) + { + Count++; + exc = exc->Next; + } + + return Count; +} + +int g_TLS_ATTACH = 4; +int g_TLS_DETACH = 3; + +VOID WINAPI notify_TlsCallback(IN HINSTANCE hDllHandle, IN DWORD dwReason, IN LPVOID lpvReserved) +{ + ULONG handlers = CountHandlers() - g_BaseHandlers; + + InterlockedIncrement(&g_TlsCalled); + if (dwReason == DLL_PROCESS_ATTACH) + { + ok_int(handlers, g_TLS_ATTACH); + } + else + { + ok_int(handlers, g_TLS_DETACH); + } + + if (InterlockedCompareExchange(&g_TlsExcept, 0xffffff, dwReason) == dwReason) + { + RaiseException(EXCEPTION_DATATYPE_MISALIGNMENT, EXCEPTION_NONCONTINUABLE, 0, NULL); + } +} + +int g_DLL_ATTACH = 3; +int g_DLL_DETACH = 2; + +BOOL WINAPI notify_DllMain(IN HINSTANCE hDllHandle, IN DWORD dwReason, IN LPVOID lpvReserved) +{ + ULONG handlers = CountHandlers() - g_BaseHandlers; + + InterlockedIncrement(&g_DllMainCalled); + if (dwReason == DLL_PROCESS_ATTACH) + { + ok_int(handlers, g_DLL_ATTACH); + } + else + { + ok_int(handlers, g_DLL_DETACH); + } + + if (InterlockedCompareExchange(&g_DllMainExcept, 0xffffff, dwReason) == dwReason) + { + RaiseException(EXCEPTION_DATATYPE_MISALIGNMENT, EXCEPTION_NONCONTINUABLE, 0, NULL); + } + return TRUE; +} + + +static void execute_test(void) +{ + HMODULE mod; + DWORD dwErr; + _SEH2_TRY + { + g_TlsExcept = 0xffffff; + g_DllMainExcept = 0xffffff; + g_DllMainCalled = 0; + g_TlsCalled = 0; + g_BaseHandlers = CountHandlers(); + mod = LoadLibraryW(dllpath); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) != NULL, "Unable to load module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + if (g_TlsCalled == 0) + trace("Tls not active\n"); + g_BaseHandlers = CountHandlers(); + FreeLibrary(mod); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Unable to unload module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 2); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Unable to load it normally\n"); + } + _SEH2_END; + + + _SEH2_TRY + { + g_TlsExcept = 0xffffff; + g_DllMainExcept = DLL_PROCESS_ATTACH; + g_DllMainCalled = 0; + g_TlsCalled = 0; + g_BaseHandlers = CountHandlers(); + mod = LoadLibraryW(dllpath); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Module loaded (0x%lx)\n", dwErr); + if (g_dwWinVer <= _WIN32_WINNT_WIN7) + ok_hex(dwErr, ERROR_NOACCESS); + else + ok_hex(dwErr, ERROR_DLL_INIT_FAILED); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + if (mod) + { + FreeLibrary(mod); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Unable to unload module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Unable to execute test\n"); + } + _SEH2_END; + + _SEH2_TRY + { + g_TlsExcept = 0xffffff; + g_DllMainExcept = DLL_PROCESS_DETACH; + g_DllMainCalled = 0; + g_TlsCalled = 0; + g_BaseHandlers = CountHandlers(); + mod = LoadLibraryW(dllpath); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) != NULL, "Unable to load module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + g_BaseHandlers = CountHandlers(); + FreeLibrary(mod); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Unable to unload module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 2); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Unable to execute test\n"); + } + _SEH2_END; + + _SEH2_TRY + { + g_TlsExcept = DLL_PROCESS_ATTACH; + g_DllMainExcept = 0xffffff; + g_DllMainCalled = 0; + g_TlsCalled = 0; + g_BaseHandlers = CountHandlers(); + mod = LoadLibraryW(dllpath); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) != NULL, "Unable to load module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + g_BaseHandlers = CountHandlers(); + FreeLibrary(mod); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Unable to unload module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 2); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Unable to execute test\n"); + } + _SEH2_END; + + _SEH2_TRY + { + g_TlsExcept = DLL_PROCESS_DETACH; + g_DllMainExcept = 0xffffff; + g_DllMainCalled = 0; + g_TlsCalled = 0; + g_BaseHandlers = CountHandlers(); + mod = LoadLibraryW(dllpath); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) != NULL, "Unable to load module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 1); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 1); + g_BaseHandlers = CountHandlers(); + FreeLibrary(mod); + dwErr = GetLastError(); + ok(GetModuleHandleW(dllpath) == NULL, "Unable to unload module (0x%lx)\n", dwErr); + ok_hex(g_DllMainCalled, 2); + if (g_dwWinVer > _WIN32_WINNT_WS03 || g_TlsCalled) + ok_hex(g_TlsCalled, 2); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Unable to execute test\n"); + } + _SEH2_END; + +} + + +BOOL extract_resource(const WCHAR* Filename, LPCWSTR ResourceName) +{ + BOOL Success; + DWORD dwWritten, Size; + HGLOBAL hGlobal; + LPVOID pData; + HANDLE Handle; + HRSRC hRsrc = FindResourceW(GetModuleHandleW(NULL), ResourceName, (LPCWSTR)10); + ok(!!hRsrc, "Unable to find %s\n", wine_dbgstr_w(ResourceName)); + if (!hRsrc) + return FALSE; + + hGlobal = LoadResource(GetModuleHandleW(NULL), hRsrc); + Size = SizeofResource(GetModuleHandleW(NULL), hRsrc); + pData = LockResource(hGlobal); + + ok(Size && !!pData, "Unable to load %s\n", wine_dbgstr_w(ResourceName)); + if (!Size || !pData) + return FALSE; + + Handle = CreateFileW(Filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + if (Handle == INVALID_HANDLE_VALUE) + { + skip("Failed to create temp file %ls, error %lu\n", Filename, GetLastError()); + return FALSE; + } + Success = WriteFile(Handle, pData, Size, &dwWritten, NULL); + ok(Success == TRUE, "WriteFile failed with %lu\n", GetLastError()); + ok(dwWritten == Size, "WriteFile wrote %lu bytes instead of %lu\n", dwWritten, Size); + CloseHandle(Handle); + Success = Success && (dwWritten == Size); + + UnlockResource(pData); + return Success; +} + + +START_TEST(load_notifications) +{ + WCHAR workdir[MAX_PATH]; + BOOL ret; + UINT Length; + PPEB Peb = NtCurrentPeb(); + + g_dwWinVer = (DWORD)(Peb->OSMajorVersion << 8) | Peb->OSMinorVersion; + trace("Winver: 0x%lx\n", g_dwWinVer); + + if (g_dwWinVer <= _WIN32_WINNT_WS03) + { + g_DLL_ATTACH = 4; + g_DLL_DETACH = 1; + } + else if (g_dwWinVer <= _WIN32_WINNT_WS08) + { + g_TLS_ATTACH = 5; + g_DLL_ATTACH = 4; + } + else if (g_dwWinVer <= _WIN32_WINNT_WIN7) + { + g_TLS_ATTACH = 3; + g_DLL_ATTACH = 2; + } + else if (g_dwWinVer <= _WIN32_WINNT_WINBLUE) + { + g_TLS_DETACH = 5; + g_DLL_DETACH = 4; + } + + ret = GetTempPathW(_countof(workdir), workdir); + ok(ret, "GetTempPathW error: %lu\n", GetLastError()); + + Length = GetTempFileNameW(workdir, L"ntdll", 0, dllpath); + ok(Length != 0, "GetTempFileNameW failed with %lu\n", GetLastError()); + + if (extract_resource(dllpath, (LPCWSTR)101)) + { + _SEH2_TRY + { + execute_test(); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ok(0, "Ldr didnt handle exception\n"); + } + _SEH2_END; + } + else + { + ok(0, "Failed to extract resource\n"); + } + + DeleteFileW(dllpath); +} diff --git a/modules/rostests/apitests/ntdll/load_notifications/CMakeLists.txt b/modules/rostests/apitests/ntdll/load_notifications/CMakeLists.txt new file mode 100644 index 0000000000..75436635e8 --- /dev/null +++ b/modules/rostests/apitests/ntdll/load_notifications/CMakeLists.txt @@ -0,0 +1,6 @@ + +add_library(load_notifications SHARED load_notifications.c) +set_module_type(load_notifications win32dll ENTRYPOINT DllMain 12) +add_importlibs(load_notifications kernel32 ntdll) +add_dependencies(load_notifications psdk) +add_rostests_file(TARGET load_notifications) diff --git a/modules/rostests/apitests/ntdll/load_notifications/load_notifications.c b/modules/rostests/apitests/ntdll/load_notifications/load_notifications.c new file mode 100644 index 0000000000..04578fbc43 --- /dev/null +++ b/modules/rostests/apitests/ntdll/load_notifications/load_notifications.c @@ -0,0 +1,72 @@ +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windows.h> + + +#if defined(_MSC_VER) +#define _CRTALLOC(x) __declspec(allocate(x)) +#elif defined(__GNUC__) +#define _CRTALLOC(x) __attribute__ ((section (x) )) +#else +#error Your compiler is not supported. +#endif + + +static VOID (WINAPI* pTlsCallback)(IN HINSTANCE hDllHandle, IN DWORD dwReason, IN LPVOID lpvReserved); + +VOID WINAPI +TlsCallback(IN HANDLE hDllHandle, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + if (!pTlsCallback) + pTlsCallback = (VOID*)GetProcAddress(NULL, "notify_TlsCallback"); + if (pTlsCallback) + { + pTlsCallback(hDllHandle, dwReason, lpvReserved); + return; + } + OutputDebugStringA("WARNING: load_notifications.dll loaded from a process without notify_TlsCallback\n"); +} + +/* Tls magic stolen from sdk/lib/crt/startup/tlssup.c */ + +#if defined(_MSC_VER) +#pragma section(".rdata$T",long,read) +#pragma section(".tls",long,read,write) +#pragma section(".tls$ZZZ",long,read,write) +#endif + +_CRTALLOC(".tls") char _tls_start = 0; +_CRTALLOC(".tls$ZZZ") char _tls_end = 0; + +PIMAGE_TLS_CALLBACK __xl_a[2] = { &TlsCallback, NULL }; + +ULONG _tls_index = 0; + +_CRTALLOC(".rdata$T") const IMAGE_TLS_DIRECTORY _tls_used = { + (ULONG_PTR) &_tls_start+1, (ULONG_PTR) &_tls_end, + (ULONG_PTR) &_tls_index, (ULONG_PTR) (__xl_a), + (ULONG) 0, (ULONG) 0 +}; + + +static BOOL (WINAPI* pDllMain)(IN HINSTANCE hDllHandle, IN DWORD dwReason, IN LPVOID lpvReserved); + + +BOOL WINAPI +DllMain(IN HINSTANCE hDllHandle, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + if (!pDllMain) + pDllMain = (VOID*)GetProcAddress(NULL, "notify_DllMain"); + if (pDllMain) + { + return pDllMain(hDllHandle, dwReason, lpvReserved); + } + OutputDebugStringA("WARNING: load_notifications.dll loaded from a process without notify_DllMain\n"); + return TRUE; +} diff --git a/modules/rostests/apitests/ntdll/ntdll_apitest.spec b/modules/rostests/apitests/ntdll/ntdll_apitest.spec new file mode 100644 index 0000000000..7100a7c7ef --- /dev/null +++ b/modules/rostests/apitests/ntdll/ntdll_apitest.spec @@ -0,0 +1,2 @@ +@ stdcall notify_TlsCallback(ptr long ptr) +@ stdcall notify_DllMain(ptr long ptr) diff --git a/modules/rostests/apitests/ntdll/testdata.rc b/modules/rostests/apitests/ntdll/testdata.rc new file mode 100644 index 0000000000..3c16769902 --- /dev/null +++ b/modules/rostests/apitests/ntdll/testdata.rc @@ -0,0 +1,2 @@ + +101 10 "load_notifications.dll" diff --git a/modules/rostests/apitests/ntdll/testlist.c b/modules/rostests/apitests/ntdll/testlist.c index c6afd1d342..cd96ef8142 100644 --- a/modules/rostests/apitests/ntdll/testlist.c +++ b/modules/rostests/apitests/ntdll/testlist.c @@ -4,6 +4,7 @@ #include <apitest.h> extern void func_LdrEnumResources(void); +extern void func_load_notifications(void); extern void func_NtAcceptConnectPort(void); extern void func_NtAllocateVirtualMemory(void); extern void func_NtApphelpCacheControl(void); @@ -63,6 +64,7 @@ extern void func_TimerResolution(void); const struct test winetest_testlist[] = { { "LdrEnumResources", func_LdrEnumResources }, + { "load_notifications", func_load_notifications }, { "NtAcceptConnectPort", func_NtAcceptConnectPort }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtApphelpCacheControl", func_NtApphelpCacheControl },

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs