[VERIFIER] Remove stub special case, since our normal 'stub' code no longer links against kernel32

+3 -3

dll/win32/verifier/CMakeLists.txt

··· 3 3 4 4 list(APPEND SOURCE 5 5 verifier.c 6 - verifier_customstubs.c 7 - ${CMAKE_CURRENT_BINARY_DIR}/verifier.def) 6 + ${CMAKE_CURRENT_BINARY_DIR}/verifier.def 7 + ${CMAKE_CURRENT_BINARY_DIR}/verifier_stubs.c) 8 8 9 9 add_library(verifier SHARED ${SOURCE}) 10 10 set_module_type(verifier win32dll UNICODE ENTRYPOINT DllMain 12) 11 - add_importlibs(verifier ntdll) 11 + add_importlibs(verifier ntdll) # Only ntdll! 12 12 add_cd_file(TARGET verifier DESTINATION reactos/system32 FOR all)

+17 -18

dll/win32/verifier/verifier.spec

··· 1 - # Do not add stubs here! 2 1 3 - @ stdcall VerifierAddFreeMemoryCallback(ptr) # stub 4 - @ stdcall VerifierCreateRpcPageHeap(ptr ptr ptr ptr ptr ptr) # stub 5 - @ stdcall VerifierDeleteFreeMemoryCallback(ptr) # stub 6 - @ stdcall VerifierDestroyRpcPageHeap(ptr) # stub 7 - @ stdcall VerifierDisableFaultInjectionExclusionRange(ptr) # stub 8 - @ stdcall VerifierDisableFaultInjectionTargetRange(ptr) # stub 9 - @ stdcall VerifierEnableFaultInjectionExclusionRange(ptr ptr) # stub 10 - @ stdcall VerifierEnableFaultInjectionTargetRange(ptr ptr) # stub 11 - @ stdcall VerifierEnumerateResource(ptr ptr ptr ptr ptr) # stub 12 - @ stdcall VerifierIsCurrentThreadHoldingLocks() # stub 13 - @ stdcall VerifierIsDllEntryActive(ptr) # stub 14 - @ cdecl VerifierLogMessage() # stub 15 - @ stdcall VerifierQueryRuntimeFlags(ptr ptr) # stub 16 - @ stdcall VerifierSetFaultInjectionProbability(ptr ptr) # stub 17 - @ stdcall VerifierSetFlags(ptr ptr ptr) # stub 18 - @ stdcall VerifierSetRuntimeFlags(ptr) # stub 19 - @ stdcall VerifierStopMessage(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) # stub 2 + @ stub VerifierAddFreeMemoryCallback 3 + @ stub VerifierCreateRpcPageHeap 4 + @ stub VerifierDeleteFreeMemoryCallback 5 + @ stub VerifierDestroyRpcPageHeap 6 + @ stub VerifierDisableFaultInjectionExclusionRange 7 + @ stub VerifierDisableFaultInjectionTargetRange 8 + @ stub VerifierEnableFaultInjectionExclusionRange 9 + @ stub VerifierEnableFaultInjectionTargetRange 10 + @ stub VerifierEnumerateResource 11 + @ stub VerifierIsCurrentThreadHoldingLocks 12 + @ stub VerifierIsDllEntryActive 13 + @ stub VerifierLogMessage 14 + @ stub VerifierQueryRuntimeFlags 15 + @ stub VerifierSetFaultInjectionProbability 16 + @ stub VerifierSetFlags 17 + @ stub VerifierSetRuntimeFlags 18 + @ stub VerifierStopMessage

-143

dll/win32/verifier/verifier_customstubs.c

··· 1 - /* 2 - * PROJECT: Application verifier 3 - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) 4 - * PURPOSE: Custom stubs, using only ntdll functions 5 - * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen@reactos.org) 6 - */ 7 - 8 - #define WIN32_NO_STATUS 9 - #include <ndk/rtlfuncs.h> 10 - 11 - #define EXCEPTION_WINE_STUB 0x80000100 12 - 13 - #define __wine_spec_unimplemented_stub(module, function) \ 14 - { \ 15 - EXCEPTION_RECORD ExceptionRecord = {0}; \ 16 - ExceptionRecord.ExceptionRecord = NULL; \ 17 - ExceptionRecord.ExceptionCode = EXCEPTION_WINE_STUB; \ 18 - ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; \ 19 - ExceptionRecord.ExceptionInformation[0] = (ULONG_PTR)module; \ 20 - ExceptionRecord.ExceptionInformation[1] = (ULONG_PTR)function; \ 21 - ExceptionRecord.NumberParameters = 2; \ 22 - RtlRaiseException(&ExceptionRecord); \ 23 - } 24 - 25 - int NTAPI VerifierAddFreeMemoryCallback(PVOID arg0) 26 - { 27 - DbgPrint("WARNING: calling stub VerifierAddFreeMemoryCallback(%p)\n", arg0); 28 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 29 - return 0; 30 - } 31 - 32 - int NTAPI VerifierCreateRpcPageHeap(PVOID arg0, PVOID arg1, PVOID arg2, PVOID arg3, PVOID arg4, PVOID arg5) 33 - { 34 - DbgPrint("WARNING: calling stub VerifierCreateRpcPageHeap(%p, %p, %p, %p, %p, %p)\n", arg0, arg1, arg2, arg3, arg4, arg5); 35 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 36 - return 0; 37 - } 38 - 39 - int NTAPI VerifierDeleteFreeMemoryCallback(PVOID arg0) 40 - { 41 - DbgPrint("WARNING: calling stub VerifierDeleteFreeMemoryCallback(%p)\n", arg0); 42 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 43 - return 0; 44 - } 45 - 46 - int NTAPI VerifierDestroyRpcPageHeap(PVOID arg0) 47 - { 48 - DbgPrint("WARNING: calling stub VerifierDestroyRpcPageHeap(%p)\n", arg0); 49 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 50 - return 0; 51 - } 52 - 53 - int NTAPI VerifierDisableFaultInjectionExclusionRange(PVOID arg0) 54 - { 55 - DbgPrint("WARNING: calling stub VerifierDisableFaultInjectionExclusionRange(%p)\n", arg0); 56 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 57 - return 0; 58 - } 59 - 60 - int NTAPI VerifierDisableFaultInjectionTargetRange(PVOID arg0) 61 - { 62 - DbgPrint("WARNING: calling stub VerifierDisableFaultInjectionTargetRange(%p)\n", arg0); 63 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 64 - return 0; 65 - } 66 - 67 - int NTAPI VerifierEnableFaultInjectionExclusionRange(PVOID arg0, PVOID arg1) 68 - { 69 - DbgPrint("WARNING: calling stub VerifierEnableFaultInjectionExclusionRange(%p, %p)\n", arg0, arg1); 70 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 71 - return 0; 72 - } 73 - 74 - int NTAPI VerifierEnableFaultInjectionTargetRange(PVOID arg0, PVOID arg1) 75 - { 76 - DbgPrint("WARNING: calling stub VerifierEnableFaultInjectionTargetRange(%p, %p)\n", arg0, arg1); 77 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 78 - return 0; 79 - } 80 - 81 - int NTAPI VerifierEnumerateResource(PVOID arg0, PVOID arg1, PVOID arg2, PVOID arg3, PVOID arg4) 82 - { 83 - DbgPrint("WARNING: calling stub VerifierEnumerateResource(%p, %p, %p, %p, %p)\n", arg0, arg1, arg2, arg3, arg4); 84 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 85 - return 0; 86 - } 87 - 88 - int NTAPI VerifierIsCurrentThreadHoldingLocks() 89 - { 90 - DbgPrint("WARNING: calling stub VerifierIsCurrentThreadHoldingLocks()\n"); 91 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 92 - return 0; 93 - } 94 - 95 - int NTAPI VerifierIsDllEntryActive(PVOID arg0) 96 - { 97 - DbgPrint("WARNING: calling stub VerifierIsDllEntryActive(%p)\n", arg0); 98 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 99 - return 0; 100 - } 101 - 102 - int __cdecl VerifierLogMessage() 103 - { 104 - DbgPrint("WARNING: calling stub VerifierLogMessage()\n"); 105 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 106 - return 0; 107 - } 108 - 109 - int NTAPI VerifierQueryRuntimeFlags(PVOID arg0, PVOID arg1) 110 - { 111 - DbgPrint("WARNING: calling stub VerifierQueryRuntimeFlags(%p, %p)\n", arg0, arg1); 112 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 113 - return 0; 114 - } 115 - 116 - int NTAPI VerifierSetFaultInjectionProbability(PVOID arg0, PVOID arg1) 117 - { 118 - DbgPrint("WARNING: calling stub VerifierSetFaultInjectionProbability(%p, %p)\n", arg0, arg1); 119 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 120 - return 0; 121 - } 122 - 123 - int NTAPI VerifierSetFlags(PVOID arg0, PVOID arg1, PVOID arg2) 124 - { 125 - DbgPrint("WARNING: calling stub VerifierSetFlags(%p, %p, %p)\n", arg0, arg1, arg2); 126 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 127 - return 0; 128 - } 129 - 130 - int NTAPI VerifierSetRuntimeFlags(PVOID arg0) 131 - { 132 - DbgPrint("WARNING: calling stub VerifierSetRuntimeFlags(%p)\n", arg0); 133 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 134 - return 0; 135 - } 136 - 137 - int NTAPI VerifierStopMessage(PVOID arg0, PVOID arg1, PVOID arg2, PVOID arg3, PVOID arg4, PVOID arg5, PVOID arg6, PVOID arg7, PVOID arg8, PVOID arg9) 138 - { 139 - DbgPrint("WARNING: calling stub VerifierStopMessage(%p, %p, %p, %p, %p, %p, %p, %p, %p, %p)\n", arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); 140 - __wine_spec_unimplemented_stub("verifier.dll", __FUNCTION__); 141 - return 0; 142 - } 143 -