[ros-diffs] [reactos] 02/02: [APISETS] Remove default kernel32 import library, since stubs no longer need it

[Mark Jansen]

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

commit bb6dfbc473c8e67b1676ab96dc080377466df0cf
Author:     Mark Jansen <mark.jansen(a)reactos.org>
AuthorDate: Sun Dec 23 22:39:10 2018 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Fri Jan 4 20:33:37 2019 +0100

    [APISETS] Remove default kernel32 import library, since stubs no longer need it
---
 dll/apisets/CMakeLists.txt                  | 192 ++++++++++++++--------------
 dll/apisets/CMakeLists.txt.in               |   2 +-
 dll/apisets/api-ms-win-core-com-l1-1-0.spec |   2 +-
 dll/apisets/api-ms-win-core-com-l1-1-1.spec |   2 +-
 dll/apisets/update.py                       |   4 +-
 5 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt
index 8e3518ebbf..645a2fcdec 100644
--- a/dll/apisets/CMakeLists.txt
+++ b/dll/apisets/CMakeLists.txt
@@ -30,7 +30,7 @@ function (add_apiset apiset_name baseaddress)
         add_target_compile_flags(${apiset_name} "/wd4026 /wd4273")
     endif()
 
-    add_importlibs(${apiset_name} ${ARGN} kernel32 ntdll)
+    add_importlibs(${apiset_name} ${ARGN} ntdll)
 
     add_cd_file(TARGET ${apiset_name} DESTINATION
reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all)
 endfunction()
@@ -43,124 +43,124 @@ add_apiset(api-ms-win-appmodel-identity-l1-1-0 0x60000000 )
 add_apiset(api-ms-win-appmodel-runtime-l1-1-1 0x60020000 )
 add_apiset(api-ms-win-appmodel-runtime-l1-1-2 0x60040000 )
 add_apiset(api-ms-win-core-apiquery-l1-1-0 0x60060000 )
-add_apiset(api-ms-win-core-appcompat-l1-1-1 0x60070000 )
+add_apiset(api-ms-win-core-appcompat-l1-1-1 0x60070000 kernel32)
 add_apiset(api-ms-win-core-appinit-l1-1-0 0x60080000 )
-add_apiset(api-ms-win-core-atoms-l1-1-0 0x60090000 )
+add_apiset(api-ms-win-core-atoms-l1-1-0 0x60090000 kernel32)
 add_apiset(api-ms-win-core-bem-l1-1-0 0x600a0000 )
 add_apiset(api-ms-win-core-com-l1-1-0 0x600b0000 ole32)
 add_apiset(api-ms-win-core-com-l1-1-1 0x600c0000 ole32)
 add_apiset(api-ms-win-core-com-private-l1-1-0 0x600e0000 ole32)
-add_apiset(api-ms-win-core-comm-l1-1-0 0x60130000 )
-add_apiset(api-ms-win-core-console-l1-1-0 0x60140000 )
-add_apiset(api-ms-win-core-console-l2-1-0 0x60150000 )
+add_apiset(api-ms-win-core-comm-l1-1-0 0x60130000 kernel32)
+add_apiset(api-ms-win-core-console-l1-1-0 0x60140000 kernel32)
+add_apiset(api-ms-win-core-console-l2-1-0 0x60150000 kernel32)
 add_apiset(api-ms-win-core-crt-l1-1-0 0x60160000 msvcrt)
 add_apiset(api-ms-win-core-crt-l2-1-0 0x60190000 msvcrt)
-add_apiset(api-ms-win-core-datetime-l1-1-0 0x601a0000 )
-add_apiset(api-ms-win-core-datetime-l1-1-1 0x601b0000 )
-add_apiset(api-ms-win-core-debug-l1-1-0 0x601c0000 )
-add_apiset(api-ms-win-core-debug-l1-1-1 0x601d0000 )
-add_apiset(api-ms-win-core-delayload-l1-1-0 0x601e0000 )
-add_apiset(api-ms-win-core-delayload-l1-1-1 0x601f0000 )
-add_apiset(api-ms-win-core-errorhandling-l1-1-0 0x60200000 )
-add_apiset(api-ms-win-core-errorhandling-l1-1-1 0x60210000 )
-add_apiset(api-ms-win-core-errorhandling-l1-1-2 0x60220000 )
-add_apiset(api-ms-win-core-errorhandling-l1-1-3 0x60230000 )
-add_apiset(api-ms-win-core-fibers-l1-1-0 0x60240000 )
-add_apiset(api-ms-win-core-fibers-l1-1-1 0x60250000 )
-add_apiset(api-ms-win-core-file-l1-1-0 0x60260000 )
-add_apiset(api-ms-win-core-file-l1-2-0 0x60270000 )
-add_apiset(api-ms-win-core-file-l1-2-1 0x60280000 )
-add_apiset(api-ms-win-core-file-l1-2-2 0x60290000 )
-add_apiset(api-ms-win-core-file-l2-1-0 0x602a0000 )
-add_apiset(api-ms-win-core-file-l2-1-1 0x602b0000 )
-add_apiset(api-ms-win-core-file-l2-1-2 0x602c0000 )
-add_apiset(api-ms-win-core-handle-l1-1-0 0x602d0000 )
-add_apiset(api-ms-win-core-heap-l1-1-0 0x602e0000 )
-add_apiset(api-ms-win-core-heap-l1-2-0 0x602f0000 )
-add_apiset(api-ms-win-core-heap-l2-1-0 0x60300000 )
-add_apiset(api-ms-win-core-heap-obsolete-l1-1-0 0x60310000 )
-add_apiset(api-ms-win-core-interlocked-l1-1-0 0x60320000 )
-add_apiset(api-ms-win-core-interlocked-l1-2-0 0x60330000 )
-add_apiset(api-ms-win-core-io-l1-1-0 0x60340000 )
-add_apiset(api-ms-win-core-io-l1-1-1 0x60350000 )
-add_apiset(api-ms-win-core-job-l1-1-0 0x60360000 )
-add_apiset(api-ms-win-core-job-l2-1-0 0x60370000 )
-add_apiset(api-ms-win-core-kernel32-legacy-l1-1-0 0x60380000 )
-add_apiset(api-ms-win-core-kernel32-legacy-l1-1-1 0x60390000 )
-add_apiset(api-ms-win-core-kernel32-private-l1-1-1 0x603a0000 )
-add_apiset(api-ms-win-core-largeinteger-l1-1-0 0x603b0000 )
-add_apiset(api-ms-win-core-libraryloader-l1-1-0 0x603c0000 user32)
-add_apiset(api-ms-win-core-libraryloader-l1-1-1 0x603d0000 user32)
-add_apiset(api-ms-win-core-libraryloader-l1-2-0 0x603e0000 user32)
-add_apiset(api-ms-win-core-libraryloader-l1-2-1 0x603f0000 )
-add_apiset(api-ms-win-core-libraryloader-l1-2-2 0x60400000 )
-add_apiset(api-ms-win-core-localization-l1-1-0 0x60410000 )
-add_apiset(api-ms-win-core-localization-l1-2-0 0x60420000 )
-add_apiset(api-ms-win-core-localization-l1-2-1 0x60430000 )
-add_apiset(api-ms-win-core-localization-l2-1-0 0x60440000 )
-add_apiset(api-ms-win-core-localization-obsolete-l1-1-0 0x60450000 )
-add_apiset(api-ms-win-core-localization-obsolete-l1-2-0 0x60460000 )
-add_apiset(api-ms-win-core-localization-obsolete-l1-3-0 0x60470000 )
-add_apiset(api-ms-win-core-localization-private-l1-1-0 0x60480000 )
+add_apiset(api-ms-win-core-datetime-l1-1-0 0x601a0000 kernel32)
+add_apiset(api-ms-win-core-datetime-l1-1-1 0x601b0000 kernel32)
+add_apiset(api-ms-win-core-debug-l1-1-0 0x601c0000 kernel32)
+add_apiset(api-ms-win-core-debug-l1-1-1 0x601d0000 kernel32)
+add_apiset(api-ms-win-core-delayload-l1-1-0 0x601e0000 kernel32)
+add_apiset(api-ms-win-core-delayload-l1-1-1 0x601f0000 kernel32)
+add_apiset(api-ms-win-core-errorhandling-l1-1-0 0x60200000 kernel32)
+add_apiset(api-ms-win-core-errorhandling-l1-1-1 0x60210000 kernel32)
+add_apiset(api-ms-win-core-errorhandling-l1-1-2 0x60220000 kernel32)
+add_apiset(api-ms-win-core-errorhandling-l1-1-3 0x60230000 kernel32)
+add_apiset(api-ms-win-core-fibers-l1-1-0 0x60240000 kernel32)
+add_apiset(api-ms-win-core-fibers-l1-1-1 0x60250000 kernel32)
+add_apiset(api-ms-win-core-file-l1-1-0 0x60260000 kernel32)
+add_apiset(api-ms-win-core-file-l1-2-0 0x60270000 kernel32)
+add_apiset(api-ms-win-core-file-l1-2-1 0x60280000 kernel32)
+add_apiset(api-ms-win-core-file-l1-2-2 0x60290000 kernel32)
+add_apiset(api-ms-win-core-file-l2-1-0 0x602a0000 kernel32)
+add_apiset(api-ms-win-core-file-l2-1-1 0x602b0000 kernel32)
+add_apiset(api-ms-win-core-file-l2-1-2 0x602c0000 kernel32)
+add_apiset(api-ms-win-core-handle-l1-1-0 0x602d0000 kernel32)
+add_apiset(api-ms-win-core-heap-l1-1-0 0x602e0000 kernel32)
+add_apiset(api-ms-win-core-heap-l1-2-0 0x602f0000 kernel32)
+add_apiset(api-ms-win-core-heap-l2-1-0 0x60300000 kernel32)
+add_apiset(api-ms-win-core-heap-obsolete-l1-1-0 0x60310000 kernel32)
+add_apiset(api-ms-win-core-interlocked-l1-1-0 0x60320000 kernel32)
+add_apiset(api-ms-win-core-interlocked-l1-2-0 0x60330000 kernel32)
+add_apiset(api-ms-win-core-io-l1-1-0 0x60340000 kernel32)
+add_apiset(api-ms-win-core-io-l1-1-1 0x60350000 kernel32)
+add_apiset(api-ms-win-core-job-l1-1-0 0x60360000 kernel32)
+add_apiset(api-ms-win-core-job-l2-1-0 0x60370000 kernel32)
+add_apiset(api-ms-win-core-kernel32-legacy-l1-1-0 0x60380000 kernel32)
+add_apiset(api-ms-win-core-kernel32-legacy-l1-1-1 0x60390000 kernel32)
+add_apiset(api-ms-win-core-kernel32-private-l1-1-1 0x603a0000 kernel32)
+add_apiset(api-ms-win-core-largeinteger-l1-1-0 0x603b0000 kernel32)
+add_apiset(api-ms-win-core-libraryloader-l1-1-0 0x603c0000 kernel32 user32)
+add_apiset(api-ms-win-core-libraryloader-l1-1-1 0x603d0000 kernel32 user32)
+add_apiset(api-ms-win-core-libraryloader-l1-2-0 0x603e0000 kernel32 user32)
+add_apiset(api-ms-win-core-libraryloader-l1-2-1 0x603f0000 kernel32)
+add_apiset(api-ms-win-core-libraryloader-l1-2-2 0x60400000 kernel32)
+add_apiset(api-ms-win-core-localization-l1-1-0 0x60410000 kernel32)
+add_apiset(api-ms-win-core-localization-l1-2-0 0x60420000 kernel32)
+add_apiset(api-ms-win-core-localization-l1-2-1 0x60430000 kernel32)
+add_apiset(api-ms-win-core-localization-l2-1-0 0x60440000 kernel32)
+add_apiset(api-ms-win-core-localization-obsolete-l1-1-0 0x60450000 kernel32)
+add_apiset(api-ms-win-core-localization-obsolete-l1-2-0 0x60460000 kernel32)
+add_apiset(api-ms-win-core-localization-obsolete-l1-3-0 0x60470000 kernel32)
+add_apiset(api-ms-win-core-localization-private-l1-1-0 0x60480000 kernel32)
 add_apiset(api-ms-win-core-localregistry-l1-1-0 0x60490000 advapi32 advapi32_vista)
-add_apiset(api-ms-win-core-memory-l1-1-0 0x604a0000 )
-add_apiset(api-ms-win-core-memory-l1-1-1 0x604b0000 )
-add_apiset(api-ms-win-core-memory-l1-1-2 0x604c0000 )
-add_apiset(api-ms-win-core-misc-l1-1-0 0x604d0000 )
-add_apiset(api-ms-win-core-namedpipe-l1-1-0 0x604e0000 advapi32)
-add_apiset(api-ms-win-core-namedpipe-l1-2-0 0x604f0000 advapi32)
-add_apiset(api-ms-win-core-namespace-l1-1-0 0x60500000 )
-add_apiset(api-ms-win-core-normalization-l1-1-0 0x60510000 )
+add_apiset(api-ms-win-core-memory-l1-1-0 0x604a0000 kernel32)
+add_apiset(api-ms-win-core-memory-l1-1-1 0x604b0000 kernel32)
+add_apiset(api-ms-win-core-memory-l1-1-2 0x604c0000 kernel32)
+add_apiset(api-ms-win-core-misc-l1-1-0 0x604d0000 kernel32)
+add_apiset(api-ms-win-core-namedpipe-l1-1-0 0x604e0000 kernel32 advapi32)
+add_apiset(api-ms-win-core-namedpipe-l1-2-0 0x604f0000 kernel32 advapi32)
+add_apiset(api-ms-win-core-namespace-l1-1-0 0x60500000 kernel32)
+add_apiset(api-ms-win-core-normalization-l1-1-0 0x60510000 kernel32)
 add_apiset(api-ms-win-core-path-l1-1-0 0x60520000 )
-add_apiset(api-ms-win-core-privateprofile-l1-1-1 0x60540000 )
-add_apiset(api-ms-win-core-processenvironment-l1-1-0 0x60550000 )
-add_apiset(api-ms-win-core-processenvironment-l1-2-0 0x60560000 )
-add_apiset(api-ms-win-core-processthreads-l1-1-0 0x60570000 advapi32)
-add_apiset(api-ms-win-core-processthreads-l1-1-1 0x60580000 advapi32)
-add_apiset(api-ms-win-core-processthreads-l1-1-2 0x60590000 advapi32)
-add_apiset(api-ms-win-core-processthreads-l1-1-3 0x605a0000 )
-add_apiset(api-ms-win-core-processtopology-obsolete-l1-1-0 0x605b0000 )
-add_apiset(api-ms-win-core-profile-l1-1-0 0x605c0000 )
-add_apiset(api-ms-win-core-psapi-ansi-l1-1-0 0x605d0000 )
-add_apiset(api-ms-win-core-psapi-l1-1-0 0x605e0000 )
+add_apiset(api-ms-win-core-privateprofile-l1-1-1 0x60540000 kernel32)
+add_apiset(api-ms-win-core-processenvironment-l1-1-0 0x60550000 kernel32)
+add_apiset(api-ms-win-core-processenvironment-l1-2-0 0x60560000 kernel32)
+add_apiset(api-ms-win-core-processthreads-l1-1-0 0x60570000 kernel32 advapi32)
+add_apiset(api-ms-win-core-processthreads-l1-1-1 0x60580000 kernel32 advapi32)
+add_apiset(api-ms-win-core-processthreads-l1-1-2 0x60590000 kernel32 advapi32)
+add_apiset(api-ms-win-core-processthreads-l1-1-3 0x605a0000 kernel32)
+add_apiset(api-ms-win-core-processtopology-obsolete-l1-1-0 0x605b0000 kernel32)
+add_apiset(api-ms-win-core-profile-l1-1-0 0x605c0000 kernel32)
+add_apiset(api-ms-win-core-psapi-ansi-l1-1-0 0x605d0000 kernel32)
+add_apiset(api-ms-win-core-psapi-l1-1-0 0x605e0000 kernel32)
 add_apiset(api-ms-win-core-psapi-obsolete-l1-1-0 0x605f0000 )
 add_apiset(api-ms-win-core-quirks-l1-1-0 0x60600000 )
-add_apiset(api-ms-win-core-realtime-l1-1-0 0x60610000 )
+add_apiset(api-ms-win-core-realtime-l1-1-0 0x60610000 kernel32)
 add_apiset(api-ms-win-core-registry-l1-1-0 0x60620000 advapi32 advapi32_vista)
 add_apiset(api-ms-win-core-registry-l2-1-0 0x60630000 advapi32 advapi32_vista)
 add_apiset(api-ms-win-core-registryuserspecific-l1-1-0 0x60640000 shlwapi)
-add_apiset(api-ms-win-core-rtlsupport-l1-1-0 0x60650000 )
+add_apiset(api-ms-win-core-rtlsupport-l1-1-0 0x60650000 kernel32)
 add_apiset(api-ms-win-core-rtlsupport-l1-2-0 0x60660000 )
 add_apiset(api-ms-win-core-shlwapi-legacy-l1-1-0 0x60670000 shlwapi)
 add_apiset(api-ms-win-core-shlwapi-obsolete-l1-1-0 0x60680000 shlwapi)
 add_apiset(api-ms-win-core-shlwapi-obsolete-l1-2-0 0x60690000 shlwapi)
 add_apiset(api-ms-win-core-shutdown-l1-1-0 0x606a0000 advapi32)
-add_apiset(api-ms-win-core-sidebyside-l1-1-0 0x606b0000 )
-add_apiset(api-ms-win-core-string-l1-1-0 0x606c0000 )
+add_apiset(api-ms-win-core-sidebyside-l1-1-0 0x606b0000 kernel32)
+add_apiset(api-ms-win-core-string-l1-1-0 0x606c0000 kernel32)
 add_apiset(api-ms-win-core-string-l2-1-0 0x606d0000 user32)
-add_apiset(api-ms-win-core-string-obsolete-l1-1-0 0x606e0000 )
+add_apiset(api-ms-win-core-string-obsolete-l1-1-0 0x606e0000 kernel32)
 add_apiset(api-ms-win-core-stringansi-l1-1-0 0x606f0000 user32)
 add_apiset(api-ms-win-core-stringloader-l1-1-1 0x60700000 user32)
-add_apiset(api-ms-win-core-synch-ansi-l1-1-0 0x60710000 )
-add_apiset(api-ms-win-core-synch-l1-1-0 0x60720000 )
-add_apiset(api-ms-win-core-synch-l1-2-0 0x60730000 )
-add_apiset(api-ms-win-core-synch-l1-2-1 0x60740000 )
-add_apiset(api-ms-win-core-sysinfo-l1-1-0 0x60750000 )
-add_apiset(api-ms-win-core-sysinfo-l1-2-0 0x60760000 )
-add_apiset(api-ms-win-core-sysinfo-l1-2-1 0x60770000 )
-add_apiset(api-ms-win-core-threadpool-l1-1-0 0x60780000 )
-add_apiset(api-ms-win-core-threadpool-l1-2-0 0x60790000 )
-add_apiset(api-ms-win-core-threadpool-legacy-l1-1-0 0x607a0000 )
-add_apiset(api-ms-win-core-threadpool-private-l1-1-0 0x607b0000 )
-add_apiset(api-ms-win-core-timezone-l1-1-0 0x607c0000 )
-add_apiset(api-ms-win-core-toolhelp-l1-1-0 0x607d0000 )
+add_apiset(api-ms-win-core-synch-ansi-l1-1-0 0x60710000 kernel32)
+add_apiset(api-ms-win-core-synch-l1-1-0 0x60720000 kernel32)
+add_apiset(api-ms-win-core-synch-l1-2-0 0x60730000 kernel32)
+add_apiset(api-ms-win-core-synch-l1-2-1 0x60740000 kernel32)
+add_apiset(api-ms-win-core-sysinfo-l1-1-0 0x60750000 kernel32)
+add_apiset(api-ms-win-core-sysinfo-l1-2-0 0x60760000 kernel32)
+add_apiset(api-ms-win-core-sysinfo-l1-2-1 0x60770000 kernel32)
+add_apiset(api-ms-win-core-threadpool-l1-1-0 0x60780000 kernel32)
+add_apiset(api-ms-win-core-threadpool-l1-2-0 0x60790000 kernel32)
+add_apiset(api-ms-win-core-threadpool-legacy-l1-1-0 0x607a0000 kernel32)
+add_apiset(api-ms-win-core-threadpool-private-l1-1-0 0x607b0000 kernel32)
+add_apiset(api-ms-win-core-timezone-l1-1-0 0x607c0000 kernel32)
+add_apiset(api-ms-win-core-toolhelp-l1-1-0 0x607d0000 kernel32)
 add_apiset(api-ms-win-core-url-l1-1-0 0x607e0000 shlwapi)
-add_apiset(api-ms-win-core-util-l1-1-0 0x607f0000 )
+add_apiset(api-ms-win-core-util-l1-1-0 0x607f0000 kernel32)
 add_apiset(api-ms-win-core-version-l1-1-0 0x60800000 version)
 add_apiset(api-ms-win-core-version-l1-1-1 0x60810000 version)
 add_apiset(api-ms-win-core-version-private-l1-1-0 0x60820000 )
 add_apiset(api-ms-win-core-versionansi-l1-1-0 0x60830000 version)
-add_apiset(api-ms-win-core-windowserrorreporting-l1-1-0 0x60840000 )
+add_apiset(api-ms-win-core-windowserrorreporting-l1-1-0 0x60840000 kernel32)
 add_apiset(api-ms-win-core-winrt-error-l1-1-0 0x60850000 )
 add_apiset(api-ms-win-core-winrt-error-l1-1-1 0x60860000 )
 add_apiset(api-ms-win-core-winrt-errorprivate-l1-1-1 0x60880000 )
@@ -169,8 +169,8 @@ add_apiset(api-ms-win-core-winrt-registration-l1-1-0 0x608a0000 )
 add_apiset(api-ms-win-core-winrt-roparameterizediid-l1-1-0 0x608b0000 )
 add_apiset(api-ms-win-core-winrt-string-l1-1-0 0x608c0000 )
 add_apiset(api-ms-win-core-winrt-string-l1-1-1 0x608e0000 )
-add_apiset(api-ms-win-core-wow64-l1-1-0 0x60900000 )
-add_apiset(api-ms-win-core-wow64-l1-1-1 0x60910000 )
+add_apiset(api-ms-win-core-wow64-l1-1-0 0x60900000 kernel32)
+add_apiset(api-ms-win-core-wow64-l1-1-1 0x60910000 kernel32)
 add_apiset(api-ms-win-core-xstate-l1-1-0 0x60920000 )
 add_apiset(api-ms-win-core-xstate-l2-1-0 0x60930000 )
 add_apiset(api-ms-win-crt-conio-l1-1-0 0x60940000 msvcrt)
@@ -181,7 +181,7 @@ add_apiset(api-ms-win-crt-heap-l1-1-0 0x60a00000 msvcrt)
 add_apiset(api-ms-win-crt-locale-l1-1-0 0x60a10000 msvcrt)
 add_apiset(api-ms-win-crt-math-l1-1-0 0x60a20000 msvcrt)
 add_apiset(api-ms-win-crt-multibyte-l1-1-0 0x60b30000 msvcrt)
-add_apiset(api-ms-win-crt-private-l1-1-0 0x60bb0000 msvcrt)
+add_apiset(api-ms-win-crt-private-l1-1-0 0x60bb0000 msvcrt kernel32)
 add_apiset(api-ms-win-crt-process-l1-1-0 0x61020000 msvcrt)
 add_apiset(api-ms-win-crt-runtime-l1-1-0 0x61030000 msvcrt)
 add_apiset(api-ms-win-crt-stdio-l1-1-0 0x61070000 msvcrt)
@@ -193,7 +193,7 @@ add_apiset(api-ms-win-devices-config-l1-1-1 0x61170000 setupapi)
 add_apiset(api-ms-win-devices-query-l1-1-1 0x61180000 )
 add_apiset(api-ms-win-downlevel-advapi32-l1-1-0 0x61190000 advapi32 advapi32_vista)
 add_apiset(api-ms-win-downlevel-advapi32-l2-1-0 0x611b0000 advapi32)
-add_apiset(api-ms-win-downlevel-normaliz-l1-1-0 0x611c0000 )
+add_apiset(api-ms-win-downlevel-normaliz-l1-1-0 0x611c0000 kernel32)
 add_apiset(api-ms-win-downlevel-ole32-l1-1-0 0x611d0000 ole32)
 add_apiset(api-ms-win-downlevel-shell32-l1-1-0 0x611e0000 shell32)
 add_apiset(api-ms-win-downlevel-shlwapi-l1-1-0 0x611f0000 shlwapi)
diff --git a/dll/apisets/CMakeLists.txt.in b/dll/apisets/CMakeLists.txt.in
index cbe9003f46..6d127583ce 100644
--- a/dll/apisets/CMakeLists.txt.in
+++ b/dll/apisets/CMakeLists.txt.in
@@ -30,7 +30,7 @@ function (add_apiset apiset_name baseaddress)
         add_target_compile_flags(${apiset_name} "/wd4026 /wd4273")
     endif()
 
-    add_importlibs(${apiset_name} ${ARGN} kernel32 ntdll)
+    add_importlibs(${apiset_name} ${ARGN} ntdll)
 
     add_cd_file(TARGET ${apiset_name} DESTINATION
reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all)
 endfunction()
diff --git a/dll/apisets/api-ms-win-core-com-l1-1-0.spec
b/dll/apisets/api-ms-win-core-com-l1-1-0.spec
index 8e20346a07..2162f4040b 100644
--- a/dll/apisets/api-ms-win-core-com-l1-1-0.spec
+++ b/dll/apisets/api-ms-win-core-com-l1-1-0.spec
@@ -15,7 +15,7 @@
 @ stub CoDecodeProxy
 @ stub CoDecrementMTAUsage
 @ stdcall CoDisableCallCancellation() ole32.CoDisableCallCancellation
-@ stub CoDisconnectContext
+@ stdcall -version=0x600+ CoDisconnectContext() ole32.CoDisconnectContext
 @ stdcall CoDisconnectObject() ole32.CoDisconnectObject
 @ stdcall CoEnableCallCancellation() ole32.CoEnableCallCancellation
 @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries
diff --git a/dll/apisets/api-ms-win-core-com-l1-1-1.spec
b/dll/apisets/api-ms-win-core-com-l1-1-1.spec
index db415e1b3a..1d29bc173c 100644
--- a/dll/apisets/api-ms-win-core-com-l1-1-1.spec
+++ b/dll/apisets/api-ms-win-core-com-l1-1-1.spec
@@ -15,7 +15,7 @@
 @ stub CoDecodeProxy
 @ stub CoDecrementMTAUsage
 @ stdcall CoDisableCallCancellation() ole32.CoDisableCallCancellation
-@ stub CoDisconnectContext
+@ stdcall -version=0x600+ CoDisconnectContext() ole32.CoDisconnectContext
 @ stdcall CoDisconnectObject() ole32.CoDisconnectObject
 @ stdcall CoEnableCallCancellation() ole32.CoEnableCallCancellation
 @ stdcall CoFreeUnusedLibraries() ole32.CoFreeUnusedLibraries
diff --git a/dll/apisets/update.py b/dll/apisets/update.py
index 73fee10977..c30a8bef7d 100644
--- a/dll/apisets/update.py
+++ b/dll/apisets/update.py
@@ -375,9 +375,9 @@ class SpecFile(object):
 
     def write_cmake(self, cmakelists, baseaddress):
         seen = set()
-        # ntdll and kernel32 are linked against everything, self = internal,
+        # ntdll is linked against everything, self = internal,
         # we cannot link cfgmgr32 and wmi?
-        ignore = ['ntdll', 'kernel32', 'self',
'cfgmgr32', 'wmi']
+        ignore = ['ntdll', 'self', 'cfgmgr32', 'wmi']
         forwarders = self.forwarder_modules()
         fwd_strings = [x for x in forwarders if not (x in seen or x in ignore or
seen.add(x))]
         fwd_strings = ' '.join(fwd_strings)