From a57f7b50c01efadc50336b5b6664edbf645aff72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bi=C8=99oc=20George?= Date: Sat, 1 Feb 2020 22:47:32 +0100 Subject: [PATCH] [SHELL32] Display the ReactOS version to the About dialog programmatically (#2276) The current control parameters don't fit well with the version string since ReactOS migrated from SVN to Git. However, modifying the resource parameters doesn't fix the problem as well because the string itself is dynamic (as it can change in words specially the build architecture if the version build is AMD64 or x86 for example). CORE-16571 --- dll/win32/shell32/lang/bg-BG.rc | 5 +---- dll/win32/shell32/lang/ca-ES.rc | 5 +---- dll/win32/shell32/lang/cs-CZ.rc | 5 +---- dll/win32/shell32/lang/da-DK.rc | 5 +---- dll/win32/shell32/lang/de-DE.rc | 5 +---- dll/win32/shell32/lang/el-GR.rc | 5 +---- dll/win32/shell32/lang/en-GB.rc | 5 +---- dll/win32/shell32/lang/en-US.rc | 5 +---- dll/win32/shell32/lang/es-ES.rc | 5 +---- dll/win32/shell32/lang/et-EE.rc | 5 +---- dll/win32/shell32/lang/fi-FI.rc | 5 +---- dll/win32/shell32/lang/fr-FR.rc | 5 +---- dll/win32/shell32/lang/he-IL.rc | 5 +---- dll/win32/shell32/lang/hi-IN.rc | 5 +---- dll/win32/shell32/lang/hu-HU.rc | 5 +---- dll/win32/shell32/lang/id-ID.rc | 5 +---- dll/win32/shell32/lang/it-IT.rc | 5 +---- dll/win32/shell32/lang/ja-JP.rc | 5 +---- dll/win32/shell32/lang/ko-KR.rc | 5 +---- dll/win32/shell32/lang/nl-NL.rc | 5 +---- dll/win32/shell32/lang/no-NO.rc | 5 +---- dll/win32/shell32/lang/pl-PL.rc | 5 +---- dll/win32/shell32/lang/pt-BR.rc | 5 +---- dll/win32/shell32/lang/pt-PT.rc | 5 +---- dll/win32/shell32/lang/ro-RO.rc | 5 +---- dll/win32/shell32/lang/ru-RU.rc | 5 +---- dll/win32/shell32/lang/sk-SK.rc | 5 +---- dll/win32/shell32/lang/sl-SI.rc | 5 +---- dll/win32/shell32/lang/sq-AL.rc | 5 +---- dll/win32/shell32/lang/sv-SE.rc | 5 +---- dll/win32/shell32/lang/tr-TR.rc | 5 +---- dll/win32/shell32/lang/uk-UA.rc | 5 +---- dll/win32/shell32/lang/zh-CN.rc | 5 +---- dll/win32/shell32/lang/zh-TW.rc | 5 +---- dll/win32/shell32/shresdef.h | 1 + dll/win32/shell32/wine/shell32_main.c | 20 ++++++++++++++++++++ 36 files changed, 55 insertions(+), 136 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 985f2a224c7..8e1f2e298c7 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -137,10 +137,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Версия ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 39362f0ac23..8d66a2a7ea8 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 23309ae0886..909bf5988d6 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -142,10 +142,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Verze ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index f8e4e2cad18..ef0465e09da 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -142,10 +142,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index b3cd79284bb..80217e1f372 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Das ReactOS Team\0", IDC_STATIC, 105, 75, 70, 10 diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 6d5b6723089..9aa9c0c00f4 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Έκδοση ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index 51fca668df6..cc866d38999 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index ed98c1b7aa8..663b55a533b 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index 93e91a4e768..dc495722c51 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -144,10 +144,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versión ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " El equipo de ReactOS\0", IDC_STATIC, 105, 75, 100, 10 diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index a99537ad508..8e853b4828e 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -143,10 +143,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versioon ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Autoriõigus 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index da4aedfef72..77d68c20ad7 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 5f461fe0515..5a4bd2b1420 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 51e0d2e522d..0bf6fab9d42 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -138,10 +138,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "גירסה ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "זכויות יוצרים 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " צוות ReactOS\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index 1af9c794021..cc570f42b71 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "वर्ज़न ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "कॉपीराइट 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " रिऐक्ट ओएस टीम\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index 118b7a7119c..f74d10075e0 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index 4c02d4f7992..f15dac10660 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versi ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Tim ReactOS\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 8f8a5770b09..59fa5b4bc58 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versione ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index d7636305da7..abbb82c5eab 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "バージョン ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index fcd392bda63..38cd18e92da 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index b58dc6b6718..78130c243ce 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 095b0f511c8..40aa382549e 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versjon ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 8070daa7591..dd92f3e1f15 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -141,10 +141,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Wersja ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index 8163b706296..e2c2c5fba59 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versão ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 7be75d988b6..72d31e6f952 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versão ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 68da676c032..dc3d97a2f03 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -138,10 +138,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versiune", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 68, 65, 27, 10 - LTEXT " (", IDC_STATIC, 95, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 100, 65, 58, 10 - LTEXT ")", IDC_STATIC, 158, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Drept de autor 1998-", IDC_STATIC, 35, 75, 68, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 103, 75, 17, 10 LTEXT " Echipa ReactOS\0", IDC_STATIC, 120, 75, 53, 10 diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index d62530482e4..674ce5fd4ce 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -143,10 +143,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Версия ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Команда ReactOS\0", IDC_STATIC, 105, 75, 65, 10 diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index ea65f70c084..6c70fa24e58 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Verzia ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index dcde0fe407e..a4b2ac0bb85 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 36c13146a68..824e812e1f4 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -140,10 +140,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Versioni ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Ekipi ReactOS\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 9cf56008ec0..51b330036ff 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS-gruppen\0", IDC_STATIC, 105, 75, 60, 10 diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 63d1e9b53a7..51820e05724 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -138,10 +138,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Sürüm ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Telif Hakkı 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Takımı\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index b4570c32c1e..c2eb5864333 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -136,10 +136,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "Версія ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index f70a424ed77..3630ec665fd 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -146,10 +146,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "版本 ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "版权所有 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 6cd59a7841d..020fc6ce8b4 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -145,10 +145,7 @@ BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 LTEXT "版本 ", IDC_STATIC, 35, 65, 28, 10 - LTEXT KERNEL_VERSION_STR, IDC_STATIC, 63, 65, 27, 10 - LTEXT " (", IDC_STATIC, 90, 65, 5, 10 - LTEXT KERNEL_VERSION_BUILD_STR, IDC_STATIC, 95, 65, 58, 10 - LTEXT ")", IDC_STATIC, 153, 65, 5, 10 + LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 166068a756c..3984486ec60 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -312,6 +312,7 @@ #define IDD_ABOUT 2 #define IDC_ABOUT_ICON 0x3009 #define IDC_ABOUT_APPNAME 0x3500 +#define IDC_ABOUT_VERSION 0x3501 #define IDC_ABOUT_OTHERSTUFF 0x350D #define IDC_ABOUT_REG_USERNAME 0x3507 #define IDC_ABOUT_REG_ORGNAME 0x3508 diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index 4ae3ea0d50b..e37d8a7e68f 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -31,6 +31,8 @@ #include #include #include +#include +#include #include "undocshell.h" #include "pidl.h" @@ -41,6 +43,7 @@ #include #include +#include WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -961,6 +964,9 @@ VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) typedef struct { LPCWSTR szApp; +#ifdef __REACTOS__ + LPCWSTR szOSVersion; +#endif LPCWSTR szOtherStuff; HICON hIcon; } ABOUT_INFO; @@ -1176,6 +1182,9 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM SetWindowTextW( hWnd, szAppTitle ); SetDlgItemTextW( hWnd, IDC_ABOUT_APPNAME, info->szApp ); +#ifdef __REACTOS__ + SetDlgItemTextW( hWnd, IDC_ABOUT_VERSION, info->szOSVersion ); +#endif SetDlgItemTextW( hWnd, IDC_ABOUT_OTHERSTUFF, info->szOtherStuff ); // Set the registered user and organization name @@ -1369,6 +1378,9 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, HRSRC hRes; DLGTEMPLATE *DlgTemplate; BOOL bRet; +#ifdef __REACTOS__ + WCHAR szVersionString[256]; +#endif TRACE("\n"); @@ -1381,7 +1393,15 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, if(!DlgTemplate) return FALSE; +#ifdef __REACTOS__ + /* Output the version OS kernel strings */ + StringCchPrintfW(szVersionString, _countof(szVersionString), L"%S (%S)", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR); +#endif + info.szApp = szApp; +#ifdef __REACTOS__ + info.szOSVersion = szVersionString; +#endif info.szOtherStuff = szOtherStuff; info.hIcon = hIcon ? hIcon : LoadIconW( 0, (LPWSTR)IDI_WINLOGO );