Skip to content

Commit b236c02

Browse files
author
skulltrail
committed
Changing the main kernel extension name from kernelbase to kernelex. It's avoid some issues with AV and VirtualBox. Changing the files what dependends that dll.
1 parent 29d0c33 commit b236c02

File tree

393 files changed

+160
-165953
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

393 files changed

+160
-165953
lines changed

wrappers/api-sets/api-ms-win-core-synch-l1-2-0.spec

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
@ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx
5252
@ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject
5353
@ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx
54-
@ stdcall WaitOnAddress(ptr ptr long long) kernelbase.WaitOnAddress
54+
@ stdcall WaitOnAddress(ptr ptr long long) kernelex.WaitOnAddress
5555
@ stdcall WakeAllConditionVariable(ptr) kernel32.WakeAllConditionVariable
56-
@ stdcall WakeByAddressAll(ptr) kernelbase.WakeByAddressAll
57-
@ stdcall WakeByAddressSingle(ptr) kernelbase.WakeByAddressSingle
56+
@ stdcall WakeByAddressAll(ptr) kernelex.WakeByAddressAll
57+
@ stdcall WakeByAddressSingle(ptr) kernelex.WakeByAddressSingle
5858
@ stdcall WakeConditionVariable(ptr) kernel32.WakeConditionVariable

wrappers/api-sets/api-ms-win-core-synch-l1-2-1.spec

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
@ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx
5555
@ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject
5656
@ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx
57-
@ stdcall WaitOnAddress(ptr ptr long long) kernelbase.WaitOnAddress
57+
@ stdcall WaitOnAddress(ptr ptr long long) kernelex.WaitOnAddress
5858
@ stdcall WakeAllConditionVariable(ptr) kernel32.WakeAllConditionVariable
59-
@ stdcall WakeByAddressAll(ptr) kernelbase.WakeByAddressAll
60-
@ stdcall WakeByAddressSingle(ptr) kernelbase.WakeByAddressSingle
59+
@ stdcall WakeByAddressAll(ptr) kernelex.WakeByAddressAll
60+
@ stdcall WakeByAddressSingle(ptr) kernelex.WakeByAddressSingle
6161
@ stdcall WakeConditionVariable(ptr) kernel32.WakeConditionVariable

wrappers/api-sets/update.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
ALIAS_DLL = {
3838
'ucrtbase': 'msvcrt',
39-
'kernelbase': 'kernel32',
39+
'kernelex': 'kernel32',
4040
'shcore': 'shlwapi',
4141
'combase': 'ole32',
4242

wrappers/base/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_subdirectory(comdlg32_wrapper)
55
#add_subdirectory(cryptex_wrapper)
66
add_subdirectory(gdi32_wrapper)
77
add_subdirectory(iphlpapi_wrapper)
8-
# add_subdirectory(kernelbase_wrapper)
8+
# add_subdirectory(kernelex_wrapper)
99
add_subdirectory(netapi32_wrapper)
1010
# add_subdirectory(ntext_wrapper)
1111
add_subdirectory(ole32_wrapper)

wrappers/base/advapi32_wrapper/perf.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static struct perf_provider *perf_provider_from_handle(HANDLE prov)
5151
}
5252

5353
/***********************************************************************
54-
* PerfCreateInstance (KERNELBASE.@)
54+
* PerfCreateInstance (kernelex.@)
5555
*/
5656
PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(
5757
HANDLE handle,
@@ -117,7 +117,7 @@ PPERF_COUNTERSET_INSTANCE WINAPI PerfCreateInstance(
117117

118118

119119
/***********************************************************************
120-
* PerfDeleteInstance (KERNELBASE.@)
120+
* PerfDeleteInstance (kernelex.@)
121121
*/
122122
ULONG WINAPI PerfDeleteInstance(HANDLE provider, PERF_COUNTERSET_INSTANCE *block)
123123
{
@@ -136,7 +136,7 @@ ULONG WINAPI PerfDeleteInstance(HANDLE provider, PERF_COUNTERSET_INSTANCE *block
136136
}
137137

138138
/***********************************************************************
139-
* PerfSetCounterSetInfo (KERNELBASE.@)
139+
* PerfSetCounterSetInfo (kernelex.@)
140140
*/
141141
ULONG WINAPI PerfSetCounterSetInfo( HANDLE handle, PERF_COUNTERSET_INFO *template, ULONG size )
142142
{
@@ -182,7 +182,7 @@ ULONG WINAPI PerfSetCounterSetInfo( HANDLE handle, PERF_COUNTERSET_INFO *templat
182182

183183

184184
/***********************************************************************
185-
* PerfSetCounterRefValue (KERNELBASE.@)
185+
* PerfSetCounterRefValue (kernelex.@)
186186
*/
187187
ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PERF_COUNTERSET_INSTANCE *instance,
188188
ULONG counterid, void *address)
@@ -210,7 +210,7 @@ ULONG WINAPI PerfSetCounterRefValue(HANDLE provider, PERF_COUNTERSET_INSTANCE *i
210210
}
211211

212212
/***********************************************************************
213-
* PerfStartProviderEx (KERNELBASE.@)
213+
* PerfStartProviderEx (kernelex.@)
214214
*/
215215
ULONG WINAPI PerfStartProviderEx( GUID *guid, PERF_PROVIDER_CONTEXT *context, HANDLE *provider )
216216
{
@@ -234,7 +234,7 @@ ULONG WINAPI PerfStartProviderEx( GUID *guid, PERF_PROVIDER_CONTEXT *context, HA
234234
}
235235

236236
/***********************************************************************
237-
* PerfStartProvider (KERNELBASE.@)
237+
* PerfStartProvider (kernelex.@)
238238
*/
239239
ULONG WINAPI PerfStartProvider( GUID *guid, PERFLIBREQUEST callback, HANDLE *provider )
240240
{
@@ -250,7 +250,7 @@ ULONG WINAPI PerfStartProvider( GUID *guid, PERFLIBREQUEST callback, HANDLE *pro
250250
}
251251

252252
/***********************************************************************
253-
* PerfStopProvider (KERNELBASE.@)
253+
* PerfStopProvider (kernelex.@)
254254
*/
255255
ULONG WINAPI PerfStopProvider(HANDLE handle)
256256
{

wrappers/base/advapi32_wrapper/reg.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ LSTATUS WINAPI RegRenameKey( HKEY hkey, LPCWSTR lpSubKey, LPCWSTR lpNewName )
12491249
}
12501250

12511251
/******************************************************************************
1252-
* RegLoadAppKeyA (kernelbase.@) - unimplemented
1252+
* RegLoadAppKeyA (kernelex.@) - unimplemented
12531253
*
12541254
*/
12551255
LSTATUS WINAPI RegLoadAppKeyA(const char *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)
@@ -1264,7 +1264,7 @@ LSTATUS WINAPI RegLoadAppKeyA(const char *file, HKEY *result, REGSAM sam, DWORD
12641264
}
12651265

12661266
/******************************************************************************
1267-
* RegLoadAppKeyW (kernelbase.@) - unimplemented
1267+
* RegLoadAppKeyW (kernelex.@) - unimplemented
12681268
*
12691269
*/
12701270
LSTATUS WINAPI RegLoadAppKeyW(const WCHAR *file, HKEY *result, REGSAM sam, DWORD options, DWORD reserved)

wrappers/base/advapi32_wrapper/security.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1110,7 +1110,7 @@ const char * debugstr_sid(PSID sid)
11101110
}
11111111

11121112
/******************************************************************************
1113-
* CreateWellKnownSid (kernelbase.@)
1113+
* CreateWellKnownSid (kernelex.@)
11141114
*/
11151115
BOOL WINAPI CreateWellKnownSid( WELL_KNOWN_SID_TYPE type, PSID domain, PSID sid, DWORD *size )
11161116
{
@@ -1184,7 +1184,7 @@ BOOL WINAPI CreateWellKnownSid( WELL_KNOWN_SID_TYPE type, PSID domain, PSID sid,
11841184
}
11851185

11861186
/******************************************************************************
1187-
* IsWellKnownSid (kernelbase.@)
1187+
* IsWellKnownSid (kernelex.@)
11881188
*/
11891189
BOOL WINAPI IsWellKnownSid( PSID sid, WELL_KNOWN_SID_TYPE type )
11901190
{

wrappers/base/progwrp_wrapper/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ set(baseaddress_progwrp_wrapper 0x54AE0000)
1313
add_library(progwrp_wrapper SHARED ${SOURCE})
1414
set_module_type(progwrp_wrapper win32dll ENTRYPOINT 0)
1515
target_link_libraries(progwrp_wrapper wine)
16-
add_importlibs(progwrp_wrapper setupapi ntext kernelbase user32 shlwapi idndl psapi ole32 shell32 iphlpapi uxtheme dxgi dwmapi wevtapi combase wtsapi32 ws2_32 dwrite dbghelp bcryptprimitives pdh usp10 shcore powrprof)
16+
add_importlibs(progwrp_wrapper setupapi ntext kernelex user32 shlwapi idndl psapi ole32 shell32 iphlpapi uxtheme dxgi dwmapi wevtapi combase wtsapi32 ws2_32 dwrite dbghelp bcryptprimitives pdh usp10 shcore powrprof)
1717
add_cd_file(TARGET progwrp_wrapper DESTINATION reactos/system32 FOR all)

wrappers/base/ws2_32_wrapper/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ set(baseaddress_ws2_32_wrapper 0x60070000)
1616
add_library(ws2_32_wrapper SHARED ${SOURCE})
1717
set_module_type(ws2_32_wrapper win32dll ENTRYPOINT 0)
1818
target_link_libraries(ws2_32_wrapper wine)
19-
add_importlibs(ws2_32_wrapper ws2_base msvcrt kernelbase ntdll)
19+
add_importlibs(ws2_32_wrapper ws2_base msvcrt kernelex ntdll)
2020
add_cd_file(TARGET ws2_32_wrapper DESTINATION reactos/system32 FOR all)

wrappers/dependencies/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ add_subdirectory(gdibase)
1414
add_subdirectory(idndl)
1515
#end
1616
add_subdirectory(iphlpapibase)
17-
add_subdirectory(kernelex)
17+
#add_subdirectory(kernelex)
1818
add_subdirectory(mfplat)
1919
add_subdirectory(netapibase)
2020
add_subdirectory(netapinew)

wrappers/dependencies/kernelex/CMakeLists.txt

-118
This file was deleted.

0 commit comments

Comments
 (0)