[ros-diffs] [reactos] 01/03: [KERNEL32_VISTA] Move under kernel32

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e72da08584e4f21c86bb…

commit 4e72da08584e4f21c86bbe527536a31c8c566d26
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sun Sep 13 09:16:17 2020 +0200
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Fri Sep 25 09:45:54 2020 +0200

    [KERNEL32_VISTA] Move under kernel32
---
 dll/win32/CMakeLists.txt                                               | 1 -
 dll/win32/kernel32/CMakeLists.txt                                      | 2 ++
 dll/win32/{ => kernel32}/kernel32_vista/CMakeLists.txt                 | 0
 dll/win32/{ => kernel32}/kernel32_vista/DllMain.c                      | 0
 dll/win32/{ => kernel32}/kernel32_vista/GetFileInformationByHandleEx.c | 0
 dll/win32/{ => kernel32}/kernel32_vista/GetTickCount64.c               | 0
 dll/win32/{ => kernel32}/kernel32_vista/InitOnceExecuteOnce.c          | 0
 dll/win32/{ => kernel32}/kernel32_vista/k32_vista.h                    | 0
 dll/win32/{ => kernel32}/kernel32_vista/kernel32_vista.spec            | 0
 dll/win32/{ => kernel32}/kernel32_vista/sync.c                         | 0
 10 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index 01e6dee240e..9e7c13363ab 100644
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@@ -74,7 +74,6 @@ add_subdirectory(itss)
 add_subdirectory(jscript)
 add_subdirectory(jsproxy)
 add_subdirectory(kernel32)
-add_subdirectory(kernel32_vista)
 add_subdirectory(loadperf)
 add_subdirectory(lpk)
 add_subdirectory(lsasrv)
diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt
index f2a4e0f0292..984cb8eaa0d 100644
--- a/dll/win32/kernel32/CMakeLists.txt
+++ b/dll/win32/kernel32/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+add_subdirectory(kernel32_vista)
+
 add_definitions(-D_KERNEL32_)
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys)
 spec2def(kernel32.dll kernel32.spec ADD_IMPORTLIB)
diff --git a/dll/win32/kernel32_vista/CMakeLists.txt
b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt
similarity index 100%
rename from dll/win32/kernel32_vista/CMakeLists.txt
rename to dll/win32/kernel32/kernel32_vista/CMakeLists.txt
diff --git a/dll/win32/kernel32_vista/DllMain.c
b/dll/win32/kernel32/kernel32_vista/DllMain.c
similarity index 100%
rename from dll/win32/kernel32_vista/DllMain.c
rename to dll/win32/kernel32/kernel32_vista/DllMain.c
diff --git a/dll/win32/kernel32_vista/GetFileInformationByHandleEx.c
b/dll/win32/kernel32/kernel32_vista/GetFileInformationByHandleEx.c
similarity index 100%
rename from dll/win32/kernel32_vista/GetFileInformationByHandleEx.c
rename to dll/win32/kernel32/kernel32_vista/GetFileInformationByHandleEx.c
diff --git a/dll/win32/kernel32_vista/GetTickCount64.c
b/dll/win32/kernel32/kernel32_vista/GetTickCount64.c
similarity index 100%
rename from dll/win32/kernel32_vista/GetTickCount64.c
rename to dll/win32/kernel32/kernel32_vista/GetTickCount64.c
diff --git a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c
b/dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c
similarity index 100%
rename from dll/win32/kernel32_vista/InitOnceExecuteOnce.c
rename to dll/win32/kernel32/kernel32_vista/InitOnceExecuteOnce.c
diff --git a/dll/win32/kernel32_vista/k32_vista.h
b/dll/win32/kernel32/kernel32_vista/k32_vista.h
similarity index 100%
rename from dll/win32/kernel32_vista/k32_vista.h
rename to dll/win32/kernel32/kernel32_vista/k32_vista.h
diff --git a/dll/win32/kernel32_vista/kernel32_vista.spec
b/dll/win32/kernel32/kernel32_vista/kernel32_vista.spec
similarity index 100%
rename from dll/win32/kernel32_vista/kernel32_vista.spec
rename to dll/win32/kernel32/kernel32_vista/kernel32_vista.spec
diff --git a/dll/win32/kernel32_vista/sync.c b/dll/win32/kernel32/kernel32_vista/sync.c
similarity index 100%
rename from dll/win32/kernel32_vista/sync.c
rename to dll/win32/kernel32/kernel32_vista/sync.c