Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 49680: [RTL] - Use portable interlocked functions in code, define them to intrinsics for x86 and x64 in the header
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 10:05:20 2010 New Revision: 49680 URL: http://svn.reactos.org/svn/reactos?rev=49680&view=rev Log: [RTL] - Use portable interlocked functions in code, define them to intrinsics for x86 and x64 in the header Modified: branches/cmake-bringup/lib/rtl/actctx.c branches/cmake-bringup/lib/rtl/critical.c branches/cmake-bringup/lib/rtl/rtl.h branches/cmake-bringup/lib/rtl/srw.c branches/cmake-bringup/lib/rtl/timerqueue.c branches/cmake-bringup/lib/rtl/vectoreh.c branches/cmake-bringup/lib/rtl/wait.c branches/cmake-bringup/lib/rtl/workitem.c Modified: branches/cmake-bringup/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/actctx.c?… ============================================================================== --- branches/cmake-bringup/lib/rtl/actctx.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/actctx.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -575,12 +575,12 @@ static inline void actctx_addref( ACTIVATION_CONTEXT *actctx ) { - _InterlockedExchangeAdd( &actctx->ref_count, 1 ); + InterlockedExchangeAdd( &actctx->ref_count, 1 ); } static void actctx_release( ACTIVATION_CONTEXT *actctx ) { - if (_InterlockedExchangeAdd( &actctx->ref_count, -1 ) == 1) + if (InterlockedExchangeAdd( &actctx->ref_count, -1 ) == 1) { unsigned int i, j; Modified: branches/cmake-bringup/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/critical.… ============================================================================== --- branches/cmake-bringup/lib/rtl/critical.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/critical.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -59,7 +59,7 @@ /* We failed, this is bad... */ DPRINT1("Failed to Create Event!\n"); - _InterlockedDecrement(&CriticalSection->LockCount); + InterlockedDecrement(&CriticalSection->LockCount); RtlRaiseStatus(Status); return; } @@ -437,7 +437,7 @@ HANDLE Thread = (HANDLE)NtCurrentTeb()->ClientId.UniqueThread; /* Try to Lock it */ - if (_InterlockedIncrement(&CriticalSection->LockCount) != 0) { + if (InterlockedIncrement(&CriticalSection->LockCount) != 0) { /* * We've failed to lock it! Does this thread @@ -621,7 +621,7 @@ if (--CriticalSection->RecursionCount) { /* Someone still owns us, but we are free. This needs to be done atomically. */ - _InterlockedDecrement(&CriticalSection->LockCount); + InterlockedDecrement(&CriticalSection->LockCount); } else { @@ -630,7 +630,7 @@ CriticalSection->OwningThread = 0; /* Was someone wanting us? This needs to be done atomically. */ - if (-1 != _InterlockedDecrement(&CriticalSection->LockCount)) { + if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) { /* Let him have us */ RtlpUnWaitCriticalSection(CriticalSection); @@ -662,7 +662,7 @@ RtlTryEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { /* Try to take control */ - if (_InterlockedCompareExchange(&CriticalSection->LockCount, + if (InterlockedCompareExchange(&CriticalSection->LockCount, 0, -1) == -1) { @@ -674,7 +674,7 @@ } else if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { /* It's already ours */ - _InterlockedIncrement(&CriticalSection->LockCount); + InterlockedIncrement(&CriticalSection->LockCount); CriticalSection->RecursionCount++; return TRUE; } Modified: branches/cmake-bringup/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/rtl.h?rev… ============================================================================== --- branches/cmake-bringup/lib/rtl/rtl.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/rtl.h [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -32,6 +32,14 @@ #include <intrin.h> +/* Use intrinsics for x86 and x64 */ +#if defined(_M_IX86) || defined(_M_AMD64) +#define InterlockedCompareExchange _InterlockedCompareExchange +#define InterlockedIncrement _InterlockedIncrement +#define InterlockedDecrement _InterlockedDecrement +#define InterlockedExchangeAdd _InterlockedExchangeAdd +#endif + #endif /* RTL_H */ /* EOF */ Modified: branches/cmake-bringup/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/srw.c?rev… ============================================================================== --- branches/cmake-bringup/lib/rtl/srw.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/srw.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -131,7 +131,7 @@ } } - (void)_InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); + (void)InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); if (FirstWaitBlock->Exclusive) { @@ -186,7 +186,7 @@ NewValue = RTL_SRWLOCK_OWNED; } - (void)_InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); + (void)InterlockedExchange((PLONG)&SRWLock->Ptr, NewValue); (void)InterlockedOr(&FirstWaitBlock->Wake, TRUE); @@ -420,7 +420,7 @@ NewValue = (CurrentValue >> RTL_SRWLOCK_BITS) + 1; NewValue = (NewValue << RTL_SRWLOCK_BITS) | (CurrentValue & RTL_SRWLOCK_MASK); - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -499,7 +499,7 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -521,7 +521,7 @@ RTL_SRWLOCK_SHARED nor the RTL_SRWLOCK_OWNED bit is set */ ASSERT(!(CurrentValue & RTL_SRWLOCK_CONTENDED)); - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -580,7 +580,7 @@ NewValue = (NewValue << RTL_SRWLOCK_BITS) | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; } - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -639,7 +639,7 @@ NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENDED | RTL_SRWLOCK_OWNED; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -697,7 +697,7 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { @@ -767,7 +767,7 @@ ASSERT(!(CurrentValue & ~RTL_SRWLOCK_OWNED)); NewValue = 0; - if (_InterlockedCompareExchange((PLONG)&SRWLock->Ptr, + if (InterlockedCompareExchange((PLONG)&SRWLock->Ptr, NewValue, CurrentValue) == CurrentValue) { Modified: branches/cmake-bringup/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/timerqueu… ============================================================================== --- branches/cmake-bringup/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/timerqueue.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -372,7 +372,7 @@ NTSTATUS status = RtlCreateTimerQueue(&q); if (status == STATUS_SUCCESS) { - PVOID p = _InterlockedCompareExchangePointer( + PVOID p = InterlockedCompareExchangePointer( (void **) &default_timer_queue, q, NULL); if (p) /* Got beat to the punch. */ Modified: branches/cmake-bringup/lib/rtl/vectoreh.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/vectoreh.… ============================================================================== --- branches/cmake-bringup/lib/rtl/vectoreh.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/vectoreh.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -61,7 +61,7 @@ if (--veh->Refs == 0) { RemoveEntryList (&veh->ListEntry); - _InterlockedDecrement (&RtlpVectoredExceptionsInstalled); + InterlockedDecrement (&RtlpVectoredExceptionsInstalled); Remove = TRUE; } Ret = TRUE; @@ -74,7 +74,7 @@ { CurrentEntry = veh->ListEntry.Flink; RemoveEntryList (&veh->ListEntry); - _InterlockedDecrement (&RtlpVectoredExceptionsInstalled); + InterlockedDecrement (&RtlpVectoredExceptionsInstalled); RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); RtlFreeHeap(RtlGetProcessHeap(), @@ -136,7 +136,7 @@ InsertTailList(&RtlpVectoredExceptionHead, &veh->ListEntry); } - _InterlockedIncrement (&RtlpVectoredExceptionsInstalled); + InterlockedIncrement (&RtlpVectoredExceptionsInstalled); RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); } Modified: branches/cmake-bringup/lib/rtl/wait.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/wait.c?re… ============================================================================== --- branches/cmake-bringup/lib/rtl/wait.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/wait.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -91,7 +91,7 @@ completion_event = Wait->CompletionEvent; if (completion_event) NtSetEvent( completion_event, NULL ); - if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + if (InterlockedIncrement( &Wait->DeleteCount ) == 2 ) { NtClose( Wait->CancelEvent ); RtlFreeHeap( RtlGetProcessHeap(), 0, Wait ); @@ -220,7 +220,7 @@ if (Status != STATUS_SUCCESS) return Status; - (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + (void)InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); if (Wait->CallbackInProgress) NtWaitForSingleObject( CompletionEvent, FALSE, NULL ); @@ -229,7 +229,7 @@ } else { - (void)_InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); + (void)InterlockedExchangePointer( &Wait->CompletionEvent, CompletionEvent ); if (Wait->CallbackInProgress) Status = STATUS_PENDING; @@ -239,7 +239,7 @@ Status = STATUS_PENDING; } - if (_InterlockedIncrement( &Wait->DeleteCount ) == 2 ) + if (InterlockedIncrement( &Wait->DeleteCount ) == 2 ) { Status = STATUS_SUCCESS; NtClose( Wait->CancelEvent ); Modified: branches/cmake-bringup/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/workitem.… ============================================================================== --- branches/cmake-bringup/lib/rtl/workitem.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/workitem.c [iso-8859-1] Sun Nov 21 10:05:20 2010 @@ -55,7 +55,7 @@ do { - InitStatus = _InterlockedCompareExchange(&ThreadPoolInitialized, + InitStatus = InterlockedCompareExchange(&ThreadPoolInitialized, 2, 0); if (InitStatus == 0) @@ -91,7 +91,7 @@ Finish: /* Initialization done */ - _InterlockedExchange(&ThreadPoolInitialized, + InterlockedExchange(&ThreadPoolInitialized, 1); break; } @@ -223,11 +223,11 @@ } /* update the requests counter */ - _InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); } } @@ -237,11 +237,11 @@ { NTSTATUS Status = STATUS_SUCCESS; - _InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); + InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); } if (WorkItem->Flags & WT_EXECUTEINPERSISTENTTHREAD) @@ -270,11 +270,11 @@ if (!NT_SUCCESS(Status)) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); } } @@ -351,11 +351,11 @@ } /* update the requests counter */ - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); } } @@ -461,14 +461,14 @@ ASSERT(IoThread != NULL); - _InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { /* We're about to queue a long function, mark the thread */ IoThread->Flags |= WT_EXECUTELONGFUNCTION; - _InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); } /* It's time to queue the work item */ @@ -480,11 +480,11 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to queue APC for work item 0x%p\n", WorkItem->Function); - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - _InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); } } @@ -543,7 +543,7 @@ BOOLEAN Terminate; NTSTATUS Status = STATUS_SUCCESS; - if (_InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) + if (InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) { /* Oops, too many worker threads... */ goto InitFailed; @@ -562,10 +562,10 @@ DPRINT1("Failed to create handle to own thread! Status: 0x%x\n", Status); InitFailed: - _InterlockedDecrement(&ThreadPoolIOWorkerThreads); + InterlockedDecrement(&ThreadPoolIOWorkerThreads); /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); RtlExitUserThread(Status); @@ -579,7 +579,7 @@ (PLIST_ENTRY)&ThreadInfo.ListEntry); /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); for (;;) @@ -626,7 +626,7 @@ if (Terminate) { /* Rundown the thread and unlink it from the list */ - _InterlockedDecrement(&ThreadPoolIOWorkerThreads); + InterlockedDecrement(&ThreadPoolIOWorkerThreads); RemoveEntryList((PLIST_ENTRY)&ThreadInfo.ListEntry); } @@ -663,10 +663,10 @@ PKNORMAL_ROUTINE ApcRoutine; NTSTATUS Status = STATUS_SUCCESS; - if (_InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) + if (InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) { /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); /* Oops, too many worker threads... */ @@ -675,7 +675,7 @@ } /* Signal initialization completion */ - _InterlockedExchange((PLONG)Parameter, + InterlockedExchange((PLONG)Parameter, 1); for (;;) @@ -736,7 +736,7 @@ if (Terminate) { - _InterlockedDecrement(&ThreadPoolWorkerThreads); + InterlockedDecrement(&ThreadPoolWorkerThreads); Status = STATUS_SUCCESS; break; }

1 0

[tkreuzer] 49679: [CRT] - Use ___readcr4 instead of __readcr4, because MSVC doesn't like this intrinsic to be redefined. - Add _ftol2
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 09:36:26 2010 New Revision: 49679 URL: http://svn.reactos.org/svn/reactos?rev=49679&view=rev Log: [CRT] - Use ___readcr4 instead of __readcr4, because MSVC doesn't like this intrinsic to be redefined. - Add _ftol2 Added: branches/cmake-bringup/lib/sdk/crt/math/i386/ftol2_asm.s (with props) Modified: branches/cmake-bringup/include/crt/msc/intrin.h branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/misc/i386/readcr4.S Modified: branches/cmake-bringup/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/msc/i… ============================================================================== --- branches/cmake-bringup/include/crt/msc/intrin.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/msc/intrin.h [iso-8859-1] Sun Nov 21 09:36:26 2010 @@ -283,9 +283,12 @@ unsigned long __readcr0(void); unsigned long __readcr2(void); unsigned long __readcr3(void); -unsigned long __readcr4(void); +//unsigned long __readcr4(void); //#pragma intrinsic(__readcr4) -#pragma function(__readcr4) // HACK: MSVC is broken +// HACK: MSVC is broken +unsigned long ___readcr4(void); +#define __readcr4 ___readcr4 + unsigned int __readdr(unsigned int reg); void __writedr(unsigned reg, unsigned int value); #endif Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sun Nov 21 09:36:26 2010 @@ -486,12 +486,14 @@ math/i386/fabs_asm.s math/i386/floor_asm.s math/i386/ftol_asm.s + math/i386/ftol2_asm.s math/i386/log_asm.s math/i386/pow_asm.s math/i386/sin_asm.s math/i386/sqrt_asm.s math/i386/tan_asm.s - math/i386/ci.c) + math/i386/ci.c + misc/i386/readcr4.S) elseif(ARCH MATCHES amd64) list(APPEND LIBCNTPR_SOURCE math/cos.c Added: branches/cmake-bringup/lib/sdk/crt/math/i386/ftol2_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/i386/ftol2_asm.s (added) +++ branches/cmake-bringup/lib/sdk/crt/math/i386/ftol2_asm.s [iso-8859-1] Sun Nov 21 09:36:26 2010 @@ -1,0 +1,28 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Run-Time Library + * FILE: lib/rtl/i386/ftol2.S + * PROGRAMER: + * + */ + +#include <asm.inc> + +EXTERN __ftol:PROC +PUBLIC __ftol2 +PUBLIC __ftol2_sse + +/* FUNCTIONS ***************************************************************/ +.code + +/* + * This routine is called by MSVC-generated code to convert from floating point + * to integer representation. The floating point number to be converted is + * on the top of the floating point stack. + */ +__ftol2: +__ftol2_sse: + jmp __ftol + +END Propchange: branches/cmake-bringup/lib/sdk/crt/math/i386/ftol2_asm.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/lib/sdk/crt/misc/i386/readcr4.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/misc/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/misc/i386/readcr4.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/misc/i386/readcr4.S [iso-8859-1] Sun Nov 21 09:36:26 2010 @@ -3,8 +3,8 @@ .code -PUBLIC ___readcr4 -___readcr4: +PUBLIC ____readcr4 +____readcr4: mov eax, cr4 ret

1 0

[tkreuzer] 49678: [RTL] Don't use _InterlockedCompareExchangePointer, that function doesn't exist on x86
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 01:36:51 2010 New Revision: 49678 URL: http://svn.reactos.org/svn/reactos?rev=49678&view=rev Log: [RTL] Don't use _InterlockedCompareExchangePointer, that function doesn't exist on x86 Modified: branches/cmake-bringup/lib/rtl/critical.c Modified: branches/cmake-bringup/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/critical.… ============================================================================== --- branches/cmake-bringup/lib/rtl/critical.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rtl/critical.c [iso-8859-1] Sun Nov 21 01:36:51 2010 @@ -65,9 +65,9 @@ } DPRINT("Created Event: %p \n", hNewEvent); - if (_InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, - (PVOID)hNewEvent, - 0)) { + if (InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, + (PVOID)hNewEvent, + 0)) { /* Some just created an event */ DPRINT("Closing already created event: %p\n", hNewEvent);

1 0

[tkreuzer] 49677: [CMAKE] Add EXTERNAL_OBJECT TRUE for generated def files on gcc builds. Fixes empty exports. Add kernelmodedriver module type for MSVC
by tkreuzer＠svn.reactos.org 21 Nov '10

21 Nov '10

Author: tkreuzer Date: Sun Nov 21 00:55:46 2010 New Revision: 49677 URL: http://svn.reactos.org/svn/reactos?rev=49677&view=rev Log: [CMAKE] Add EXTERNAL_OBJECT TRUE for generated def files on gcc builds. Fixes empty exports. Add kernelmodedriver module type for MSVC Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Nov 21 00:55:46 2010 @@ -161,7 +161,7 @@ COMMAND native-spec2def --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - PROPERTIES GENERATED TRUE) + PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) endmacro() # Optional 3rd parameter: dllname Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Nov 21 00:55:46 2010 @@ -75,6 +75,13 @@ target_link_libraries(${MODULE} mingw_common mingw_dllmain) add_linkerflag(${MODULE} "/DLL") endif() + if(${TYPE} MATCHES kernelmodedriver) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") + set_entrypoint(${MODULE} DriverEntry@8) + set_subsystem(${MODULE} native) + set_image_base(${MODULE} 0x00010000) + add_dependencies(${MODULE} bugcodes) + endif() endmacro()

1 0

[fireball] 49676: [NTDLL] - Fix LdrVerifyImageMatchesChecksum() prototype.
by fireball＠svn.reactos.org 20 Nov '10

20 Nov '10

Author: fireball Date: Sat Nov 20 22:05:42 2010 New Revision: 49676 URL: http://svn.reactos.org/svn/reactos?rev=49676&view=rev Log: [NTDLL] - Fix LdrVerifyImageMatchesChecksum() prototype. Modified: trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sat Nov 20 22:05:42 2010 @@ -3236,9 +3236,9 @@ */ NTSTATUS NTAPI LdrVerifyImageMatchesChecksum (IN HANDLE FileHandle, - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3) + IN PLDR_CALLBACK Callback, + IN PVOID CallbackContext, + OUT PUSHORT ImageCharacterstics) { FILE_STANDARD_INFORMATION FileInfo; IO_STATUS_BLOCK IoStatusBlock; Modified: trunk/reactos/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/umfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/umfuncs.h [iso-8859-1] Sat Nov 20 22:05:42 2010 @@ -295,13 +295,14 @@ IN PVOID BaseAddress ); +typedef VOID NTAPI (*PLDR_CALLBACK)(PVOID CallbackContext, PVOID Name); NTSTATUS NTAPI LdrVerifyImageMatchesChecksum( IN HANDLE FileHandle, - ULONG Unknown1, - ULONG Unknown2, - ULONG Unknown3 + IN PLDR_CALLBACK Callback, + IN PVOID CallbackContext, + OUT PUSHORT ImageCharacterstics ); #endif

1 0

[tkreuzer] 49675: [CMAKE] Bye, bye, winebuild. Welcome spec2def.
by tkreuzer＠svn.reactos.org 20 Nov '10

20 Nov '10

Author: tkreuzer Date: Sat Nov 20 21:43:57 2010 New Revision: 49675 URL: http://svn.reactos.org/svn/reactos?rev=49675&view=rev Log: [CMAKE] Bye, bye, winebuild. Welcome spec2def. Removed: branches/cmake-bringup/tools/winebuild/ Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/gcc.cmake branches/cmake-bringup/tools/CMakeLists.txt branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sat Nov 20 21:43:57 2010 @@ -41,9 +41,9 @@ add_subdirectory(lib) if(NOT MSVC) -export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS widl nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() -export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +export(TARGETS nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() else() Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sat Nov 20 21:43:57 2010 @@ -61,7 +61,7 @@ add_custom_command( OUTPUT ${_object_file} COMMAND nasm -o ${_object_file} ${result_incs} ${result_defs} -f bin ${_asm_file} - DEPENDS native-winebuild) + DEPENDS ${_asm_file}) set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE) add_custom_target(${_target_name} ALL DEPENDS ${_object_file}) add_minicd(${_object_file} loader ${OBJECT_NAME}) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=496… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Nov 20 21:43:57 2010 @@ -158,10 +158,10 @@ get_filename_component(_file ${_spec_file} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} --filename ${_dllname} + COMMAND native-spec2def --dll ${_dllname} ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def - PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE) + PROPERTIES GENERATED TRUE) endmacro() # Optional 3rd parameter: dllname Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sat Nov 20 21:43:57 2010 @@ -12,7 +12,6 @@ add_subdirectory(nci) add_subdirectory(spec2def) add_subdirectory(unicode) -add_subdirectory(winebuild) if(NOT MSVC) #add_subdirectory(rsym) add_subdirectory(wpp) Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Sat Nov 20 21:43:57 2010 @@ -294,6 +294,12 @@ while (*pc > ',') pc++; } } + else if (CompareToken(pc, "-noname") || + CompareToken(pc, "-ret64") || + CompareToken(pc, "-private")) + { + /* silently ignore these */ + } else { fprintf(stderr, "info: ignored option: '%.10s'\n", pc); @@ -386,8 +392,6 @@ OutputLine(fileDest, &exp); } -printf("done\n"); - return 0; }

1 0

[tkreuzer] 49674: [SPEC2DEF] Add support for different architectures, handle win32/win64
by tkreuzer＠svn.reactos.org 20 Nov '10

20 Nov '10

Author: tkreuzer Date: Sat Nov 20 20:20:26 2010 New Revision: 49674 URL: http://svn.reactos.org/svn/reactos?rev=49674&view=rev Log: [SPEC2DEF] Add support for different architectures, handle win32/win64 Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Sat Nov 20 20:20:26 2010 @@ -19,6 +19,7 @@ int no_decoration = 0; int no_redirections = 0; char *pszArchString = "i386"; +char *pszArchString2; enum { @@ -283,7 +284,8 @@ while (*pc == '=' || *pc == ',') { pc++; - if (CompareToken(pc, pszArchString)) + if (CompareToken(pc, pszArchString) || + CompareToken(pc, pszArchString2)) { included = 1; } @@ -397,7 +399,8 @@ " -d=<file> --dll=<file> names the dll\n" " -h --help prints this screen\n" " -s --stubs generates an asm lib stub\n" - " -n --no-decoration removes @xx decorations from def file\n"); + " -n --no-decoration removes @xx decorations from def file\n" + " --arch <arch> Set architecture to <arch>. (i386, x86_64, arm)\n"); } int main(int argc, char *argv[]) @@ -449,12 +452,25 @@ { no_redirections = 1; } + else if ((_stricmp(argv[i], "--arch") == 0)) + { + pszArchString = argv[i + 1]; + i++; + } else { fprintf(stderr, "Unrecognized option: %s\n", argv[i]); return -1; } } + + if ((_stricmp(pszArchString, "x86_64") == 0) || + (_stricmp(pszArchString, "ia64") == 0)) + { + pszArchString2 = "win64"; + } + else + pszArchString2 = "win32"; /* Set a default dll name */ if (!pszDllName)

1 0

[tkreuzer] 49673: [LOADPERF] add proper stubs
by tkreuzer＠svn.reactos.org 20 Nov '10

20 Nov '10

Author: tkreuzer Date: Sat Nov 20 18:37:19 2010 New Revision: 49673 URL: http://svn.reactos.org/svn/reactos?rev=49673&view=rev Log: [LOADPERF] add proper stubs Added: branches/cmake-bringup/dll/win32/loadperf/stubs.c (with props) Modified: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt branches/cmake-bringup/dll/win32/loadperf/loadperf.spec Modified: branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/loadper… ============================================================================== --- branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/loadperf/CMakeLists.txt [iso-8859-1] Sat Nov 20 18:37:19 2010 @@ -4,7 +4,10 @@ spec2def(loadperf.dll loadperf.spec) -add_library(loadperf SHARED loadperf_main.c ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def) +add_library(loadperf SHARED + loadperf_main.c + stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/loadperf.def) set_module_type(loadperf win32dll) Modified: branches/cmake-bringup/dll/win32/loadperf/loadperf.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/loadper… ============================================================================== --- branches/cmake-bringup/dll/win32/loadperf/loadperf.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/loadperf/loadperf.spec [iso-8859-1] Sat Nov 20 18:37:19 2010 @@ -1,14 +1,14 @@ -@ stub BackupPerfRegistryToFileW +@ stdcall BackupPerfRegistryToFileW(long long) @ stdcall InstallPerfDllA(str str ptr) @ stdcall InstallPerfDllW(wstr wstr ptr) -@ stub LoadMofFromInstalledServiceA -@ stub LoadMofFromInstalledServiceW +@ stdcall LoadMofFromInstalledServiceA(ptr ptr ptr) +@ stdcall LoadMofFromInstalledServiceW(ptr ptr ptr) @ stdcall LoadPerfCounterTextStringsA(str long) @ stdcall LoadPerfCounterTextStringsW(wstr long) -@ stub RestorePerfRegistryFromFileW -@ stub SetServiceAsTrustedA -@ stub SetServiceAsTrustedW +@ stdcall RestorePerfRegistryFromFileW(ptr ptr) +@ stdcall SetServiceAsTrustedA(ptr ptr) +@ stdcall SetServiceAsTrustedW(ptr ptr) @ stdcall UnloadPerfCounterTextStringsA(str long) @ stdcall UnloadPerfCounterTextStringsW(wstr long) -@ stub UpdatePerfNameFilesA -@ stub UpdatePerfNameFilesW +@ stdcall UpdatePerfNameFilesA(ptr ptr ptr ptr) +@ stdcall UpdatePerfNameFilesW(ptr ptr ptr ptr) Added: branches/cmake-bringup/dll/win32/loadperf/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/loadper… ============================================================================== --- branches/cmake-bringup/dll/win32/loadperf/stubs.c (added) +++ branches/cmake-bringup/dll/win32/loadperf/stubs.c [iso-8859-1] Sat Nov 20 18:37:19 2010 @@ -1,0 +1,85 @@ + +#include <windows.h> +#define NDEBUG +#include <debug.h> + +#define LOADPERF_FUNCTION DWORD WINAPI + +LOADPERF_FUNCTION +BackupPerfRegistryToFileW( + IN LPCWSTR szFileName, + IN LPCWSTR szCommentString OPTIONAL) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +LoadMofFromInstalledServiceA( + IN LPCSTR szServiceName, + IN LPCSTR szMofFilename, + IN ULONG_PTR dwFlags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +LoadMofFromInstalledServiceW( + IN LPCWSTR szServiceName, + IN LPCWSTR szMofFilename, + IN ULONG_PTR dwFlags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +RestorePerfRegistryFromFileW( + IN LPCWSTR szFileName, + IN LPCWSTR szLangId) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +SetServiceAsTrustedA( + IN LPCSTR szReserved, + IN LPCSTR szServiceName) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +SetServiceAsTrustedW( + IN LPCWSTR szReserved OPTIONAL, + IN LPCWSTR szServiceName) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +UpdatePerfNameFilesA( + IN LPCSTR szNewCtrFilePath, + IN LPCSTR szNewHlpFilePath OPTIONAL, + IN LPSTR szLanguageID, + IN ULONG_PTR dwFlags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +UpdatePerfNameFilesW( + IN LPCWSTR szNewCtrFilePath, + IN LPCWSTR szNewHlpFilePath OPTIONAL, + IN LPWSTR szLanguageID, + IN ULONG_PTR dwFlags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + Propchange: branches/cmake-bringup/dll/win32/loadperf/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 49672: add missing file.
by tkreuzer＠svn.reactos.org 20 Nov '10

20 Nov '10

Author: tkreuzer Date: Sat Nov 20 18:04:06 2010 New Revision: 49672 URL: http://svn.reactos.org/svn/reactos?rev=49672&view=rev Log: add missing file. Added: branches/cmake-bringup/dll/directx/quartz/stubs.c (with props) Added: branches/cmake-bringup/dll/directx/quartz/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quart… ============================================================================== --- branches/cmake-bringup/dll/directx/quartz/stubs.c (added) +++ branches/cmake-bringup/dll/directx/quartz/stubs.c [iso-8859-1] Sat Nov 20 18:04:06 2010 @@ -1,0 +1,12 @@ + +typedef void* ProxyFileInfo; +typedef void* CLSID; +#define RPC_ENTRY + +void +RPC_ENTRY +GetProxyDllInfo(const ProxyFileInfo *** pInfo, const CLSID ** pId) +{ + *pInfo = 0; + *pId = 0; +}; Propchange: branches/cmake-bringup/dll/directx/quartz/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 49671: [CRYPTDLL] Add proper stubs.
by tkreuzer＠svn.reactos.org 20 Nov '10

20 Nov '10

Author: tkreuzer Date: Sat Nov 20 18:03:01 2010 New Revision: 49671 URL: http://svn.reactos.org/svn/reactos?rev=49671&view=rev Log: [CRYPTDLL] Add proper stubs. Added: branches/cmake-bringup/dll/win32/cryptdll/stubs.c (with props) Modified: branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt branches/cmake-bringup/dll/win32/cryptdll/cryptdll.spec Modified: branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptdll/CMakeLists.txt [iso-8859-1] Sat Nov 20 18:03:01 2010 @@ -5,7 +5,10 @@ spec2def(cryptdll.dll cryptdll.spec) -add_library(cryptdll SHARED cryptdll.c ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def) +add_library(cryptdll SHARED + cryptdll.c + stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/cryptdll.def) set_module_type(cryptdll win32dll) Modified: branches/cmake-bringup/dll/win32/cryptdll/cryptdll.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdll/cryptdll.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cryptdll/cryptdll.spec [iso-8859-1] Sat Nov 20 18:03:01 2010 @@ -1,14 +1,14 @@ -@ stub CDBuildIntegrityVect -@ stub CDBuildVect -@ stub CDFindCommonCSystem -@ stub CDFindCommonCSystemWithKey -@ stub CDGenerateRandomBits -@ stub CDLocateCSystem -@ stub CDLocateCheckSum -@ stub CDLocateRng -@ stub CDRegisterCSystem -@ stub CDRegisterCheckSum -@ stub CDRegisterRng +@ stdcall CDBuildIntegrityVect(long long) +@ stdcall CDBuildVect(long long) +@ stdcall CDFindCommonCSystem(long long long) +@ stdcall CDFindCommonCSystemWithKey(long long long long long) +@ stdcall CDGenerateRandomBits(long long) +@ stdcall CDLocateCSystem(long long) +@ stdcall CDLocateCheckSum(long long) +@ stdcall CDLocateRng(long long) +@ stdcall CDRegisterCSystem(long) +@ stdcall CDRegisterCheckSum(long) +@ stdcall CDRegisterRng(long) @ stdcall MD5Final(ptr) advapi32.MD5Final @ stdcall MD5Init(ptr) advapi32.MD5Init @ stdcall MD5Update(ptr ptr long) advapi32.MD5Update Added: branches/cmake-bringup/dll/win32/cryptdll/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cryptdl… ============================================================================== --- branches/cmake-bringup/dll/win32/cryptdll/stubs.c (added) +++ branches/cmake-bringup/dll/win32/cryptdll/stubs.c [iso-8859-1] Sat Nov 20 18:03:01 2010 @@ -1,0 +1,71 @@ + +#include <windows.h> +#define NDEBUG +#include <debug.h> + +void WINAPI +CDBuildIntegrityVect(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDBuildVect(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDFindCommonCSystem(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDFindCommonCSystemWithKey(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4, DWORD Unknown5) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDGenerateRandomBits(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDLocateCSystem(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDLocateCheckSum(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDLocateRng(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDRegisterCSystem(DWORD Unknown1) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDRegisterCheckSum(DWORD Unknown1) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDRegisterRng(DWORD Unknown1) +{ + UNIMPLEMENTED; +} + Propchange: branches/cmake-bringup/dll/win32/cryptdll/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs