https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6756c2ad03f51efa96789be33a426b508e4541ec
commit 6756c2ad03f51efa96789be33a426b508e4541ec
Author: Serge Gautherie <reactos-git_serge_171...@gautherie.fr>
AuthorDate: Sun Jun 14 13:49:22 2020 +0200
Commit: Mark Jansen <mark.jan...@reactos.org>
CommitDate: Tue Aug 13 12:39:42 2024 +0200
[*_VISTA] Add/Improve version resources
---
dll/ntdll/nt_0600/CMakeLists.txt | 2 +-
dll/ntdll/nt_0600/ntdll_vista.rc | 5 +++++
dll/win32/advapi32_vista/CMakeLists.txt | 2 +-
dll/win32/advapi32_vista/advapi32_vista.rc | 5 +++++
dll/win32/kernel32/kernel32_vista/CMakeLists.txt | 6 +++++-
dll/win32/kernel32/kernel32_vista/kernel32_vista.rc | 5 +++++
win32ss/gdi/gdi32_vista/gdi32_vista.rc | 2 +-
win32ss/user/user32_vista/user32_vista.rc | 2 +-
8 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/dll/ntdll/nt_0600/CMakeLists.txt b/dll/ntdll/nt_0600/CMakeLists.txt
index 9cc2c32e192..2eec0df9940 100644
--- a/dll/ntdll/nt_0600/CMakeLists.txt
+++ b/dll/ntdll/nt_0600/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND SOURCE
DllMain.c
${CMAKE_CURRENT_BINARY_DIR}/ntdll_vista.def)
-add_library(ntdll_vista MODULE ${SOURCE})
+add_library(ntdll_vista MODULE ${SOURCE} ntdll_vista.rc)
set_module_type(ntdll_vista win32dll ENTRYPOINT DllMain 12)
target_link_libraries(ntdll_vista smlib rtl_vista)
if(ARCH STREQUAL "arm")
diff --git a/dll/ntdll/nt_0600/ntdll_vista.rc b/dll/ntdll/nt_0600/ntdll_vista.rc
new file mode 100644
index 00000000000..1bd314f36c5
--- /dev/null
+++ b/dll/ntdll/nt_0600/ntdll_vista.rc
@@ -0,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS NtDll Extensions DLL"
+#define REACTOS_STR_INTERNAL_NAME "ntdll_vista"
+#define REACTOS_STR_ORIGINAL_FILENAME "ntdll_vista.dll"
+#include <reactos/version.rc>
diff --git a/dll/win32/advapi32_vista/CMakeLists.txt
b/dll/win32/advapi32_vista/CMakeLists.txt
index 3af7909efb7..0a168565dbb 100644
--- a/dll/win32/advapi32_vista/CMakeLists.txt
+++ b/dll/win32/advapi32_vista/CMakeLists.txt
@@ -15,7 +15,7 @@ list(APPEND SOURCE
../advapi32/reg/reg.c
${CMAKE_CURRENT_BINARY_DIR}/advapi32_vista.def)
-add_library(advapi32_vista MODULE ${SOURCE})
+add_library(advapi32_vista MODULE ${SOURCE} advapi32_vista.rc)
set_module_type(advapi32_vista win32dll ENTRYPOINT DllMain 12)
target_link_libraries(advapi32_vista wine ${PSEH_LIB})
add_importlibs(advapi32_vista advapi32 kernel32 ntdll)
diff --git a/dll/win32/advapi32_vista/advapi32_vista.rc
b/dll/win32/advapi32_vista/advapi32_vista.rc
new file mode 100644
index 00000000000..48344fca178
--- /dev/null
+++ b/dll/win32/advapi32_vista/advapi32_vista.rc
@@ -0,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS AdvApi32 Extensions DLL"
+#define REACTOS_STR_INTERNAL_NAME "advapi32_vista"
+#define REACTOS_STR_ORIGINAL_FILENAME "advapi32_vista.dll"
+#include <reactos/version.rc>
diff --git a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt
b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt
index 35ac4be550e..248ae6f2c22 100644
--- a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt
+++ b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt
@@ -24,7 +24,11 @@ endif()
add_library(kernel32_vista_static ${SOURCE})
target_link_libraries(kernel32_vista_static ${PSEH_LIB})
add_dependencies(kernel32_vista_static psdk)
-add_library(kernel32_vista MODULE DllMain.c
${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def)
+
+add_library(kernel32_vista MODULE
+ DllMain.c
+ kernel32_vista.rc
+ ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def)
set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12)
target_link_libraries(kernel32_vista kernel32_vista_static kernel32_shared)
add_importlibs(kernel32_vista kernel32 ntdll_vista ntdll)
diff --git a/dll/win32/kernel32/kernel32_vista/kernel32_vista.rc
b/dll/win32/kernel32/kernel32_vista/kernel32_vista.rc
new file mode 100644
index 00000000000..2523cb41011
--- /dev/null
+++ b/dll/win32/kernel32/kernel32_vista/kernel32_vista.rc
@@ -0,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Kernel32 Extensions DLL"
+#define REACTOS_STR_INTERNAL_NAME "kernel32_vista"
+#define REACTOS_STR_ORIGINAL_FILENAME "kernel32_vista.dll"
+#include <reactos/version.rc>
diff --git a/win32ss/gdi/gdi32_vista/gdi32_vista.rc
b/win32ss/gdi/gdi32_vista/gdi32_vista.rc
index 116013b55e2..8904f19a9c0 100644
--- a/win32ss/gdi/gdi32_vista/gdi32_vista.rc
+++ b/win32ss/gdi/gdi32_vista/gdi32_vista.rc
@@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION "GDI Client DLL"
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Gdi32 Extensions DLL"
#define REACTOS_STR_INTERNAL_NAME "gdi32_vista"
#define REACTOS_STR_ORIGINAL_FILENAME "gdi32_vista.dll"
#include <reactos/version.rc>
diff --git a/win32ss/user/user32_vista/user32_vista.rc
b/win32ss/user/user32_vista/user32_vista.rc
index 543d9e4a3a0..5a0e658cb7a 100644
--- a/win32ss/user/user32_vista/user32_vista.rc
+++ b/win32ss/user/user32_vista/user32_vista.rc
@@ -1,5 +1,5 @@
#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION "User32 Extensions DLL"
+#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User32 Extensions DLL"
#define REACTOS_STR_INTERNAL_NAME "user32_vista"
#define REACTOS_STR_ORIGINAL_FILENAME "user32_vista.dll"
#include <reactos/version.rc>
