[ros-diffs] [sginsberg] 69238: Sprinkle cdecl declarations liberally all around to make a bunch of the base components compile (freeldr compiles but does not link yet). Some of these should really be NTAPI, wo...

Author: sginsberg
Date: Tue Sep 15 10:35:49 2015
New Revision: 69238

URL: http://svn.reactos.org/svn/reactos?rev=69238&view=rev
Log:
Sprinkle cdecl declarations liberally all around to make a bunch of the base components
compile (freeldr compiles but does not link yet). Some of these should really be NTAPI,
working on that.

Modified:
    trunk/reactos/boot/freeldr/freeldr/freeldr.c
    trunk/reactos/hal/halx86/apic/apic.c
    trunk/reactos/hal/halx86/apic/apic.h
    trunk/reactos/hal/halx86/apic/tsc.h
    trunk/reactos/hal/halx86/generic/bios.c
    trunk/reactos/hal/halx86/include/halp.h
    trunk/reactos/hal/halx86/up/pic.c
    trunk/reactos/include/crt/msc/intrin.h
    trunk/reactos/include/crt/wchar.h
    trunk/reactos/include/ndk/kefuncs.h
    trunk/reactos/lib/3rdparty/libwine/debug_ros.c
    trunk/reactos/lib/sdk/crt/float/isnan.c
    trunk/reactos/lib/sdk/crt/math/abs.c
    trunk/reactos/lib/sdk/crt/math/div.c
    trunk/reactos/lib/sdk/crt/math/rand_nt.c
    trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c
    trunk/reactos/lib/sdk/crt/mem/memccpy.c
    trunk/reactos/lib/sdk/crt/mem/memchr.c
    trunk/reactos/lib/sdk/crt/mem/memcmp.c
    trunk/reactos/lib/sdk/crt/mem/memcpy.c
    trunk/reactos/lib/sdk/crt/mem/memicmp.c
    trunk/reactos/lib/sdk/crt/mem/memmove.c
    trunk/reactos/lib/sdk/crt/mem/memset.c
    trunk/reactos/lib/sdk/crt/precomp.h
    trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c
    trunk/reactos/lib/sdk/crt/search/bsearch.c
    trunk/reactos/lib/sdk/crt/search/lfind.c
    trunk/reactos/lib/sdk/crt/search/lsearch.c
    trunk/reactos/lib/sdk/crt/stdlib/qsort.c
    trunk/reactos/lib/sdk/crt/string/atoi.c
    trunk/reactos/lib/sdk/crt/string/atoi64.c
    trunk/reactos/lib/sdk/crt/string/atol.c
    trunk/reactos/lib/sdk/crt/string/ctype.c
    trunk/reactos/lib/sdk/crt/string/iswctype.c
    trunk/reactos/lib/sdk/crt/string/itoa.c
    trunk/reactos/lib/sdk/crt/string/itow.c
    trunk/reactos/lib/sdk/crt/string/stricmp.c
    trunk/reactos/lib/sdk/crt/string/strlwr.c
    trunk/reactos/lib/sdk/crt/string/strnicmp.c
    trunk/reactos/lib/sdk/crt/string/strpbrk.c
    trunk/reactos/lib/sdk/crt/string/strrev.c
    trunk/reactos/lib/sdk/crt/string/strstr.c
    trunk/reactos/lib/sdk/crt/string/strtol.c
    trunk/reactos/lib/sdk/crt/string/strtoull.c
    trunk/reactos/lib/sdk/crt/string/strupr.c
    trunk/reactos/lib/sdk/crt/string/strxspn.h
    trunk/reactos/lib/sdk/crt/string/wcstol.c
    trunk/reactos/lib/sdk/crt/string/wcstoul.c
    trunk/reactos/lib/sdk/crt/string/wtoi64.c
    trunk/reactos/lib/sdk/crt/wstring/wcscoll.c
    trunk/reactos/lib/sdk/crt/wstring/wcscspn.c
    trunk/reactos/lib/sdk/crt/wstring/wcsicmp.c
    trunk/reactos/lib/sdk/crt/wstring/wcslwr.c
    trunk/reactos/lib/sdk/crt/wstring/wcsnicmp.c
    trunk/reactos/lib/sdk/crt/wstring/wcsspn.c
    trunk/reactos/lib/sdk/crt/wstring/wcsstr.c
    trunk/reactos/lib/sdk/crt/wstring/wcsupr.c
    trunk/reactos/lib/sdk/crt/wstring/wcsxfrm.c
    trunk/reactos/ntoskrnl/ke/i386/irqobj.c
    trunk/reactos/ntoskrnl/ke/i386/traphdlr.c

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr.c	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -80,7 +80,7 @@
 }
 
 // The wctype table is 144 KB, too much for poor freeldr
-int iswctype(wint_t wc, wctype_t wctypeFlags)
+int __cdecl iswctype(wint_t wc, wctype_t wctypeFlags)
 {
     return _isctype((char)wc, wctypeFlags);
 }

Modified: trunk/reactos/hal/halx86/apic/apic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev…
==============================================================================
--- trunk/reactos/hal/halx86/apic/apic.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/apic/apic.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -16,7 +16,7 @@
 #include <debug.h>
 
 #include "apic.h"
-void HackEoi(void);
+void __cdecl HackEoi(void);
 
 #ifndef _M_AMD64
 #define APIC_LAZY_IRQL

Modified: trunk/reactos/hal/halx86/apic/apic.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.h?rev…
==============================================================================
--- trunk/reactos/hal/halx86/apic/apic.h	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/apic/apic.h	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -276,5 +276,5 @@
 NTAPI
 ApicInitializeTimer(ULONG Cpu);
 
-VOID ApicSpuriousService(VOID);
-
+VOID __cdecl ApicSpuriousService(VOID);
+

Modified: trunk/reactos/hal/halx86/apic/tsc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/tsc.h?rev=…
==============================================================================
--- trunk/reactos/hal/halx86/apic/tsc.h	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/apic/tsc.h	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -5,7 +5,7 @@
 
 #ifndef __ASM__
 
-void TscCalibrationISR(void);
+void __cdecl TscCalibrationISR(void);
 extern LARGE_INTEGER HalpCpuClockFrequency;
 VOID NTAPI HalpInitializeTsc();
 

Modified: trunk/reactos/hal/halx86/generic/bios.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?…
==============================================================================
--- trunk/reactos/hal/halx86/generic/bios.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/bios.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -14,7 +14,7 @@
 #include <debug.h>
 #include <setjmp.h>
 
-void HalpTrap0D();
+void __cdecl HalpTrap0D();
 
 /* GLOBALS ********************************************************************/
 

Modified: trunk/reactos/hal/halx86/include/halp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?…
==============================================================================
--- trunk/reactos/hal/halx86/include/halp.h	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/include/halp.h	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -42,7 +42,7 @@
 
 typedef
 VOID
-(*PHAL_SW_INTERRUPT_HANDLER)(
+(__cdecl *PHAL_SW_INTERRUPT_HANDLER)(
     VOID
 );
 
@@ -501,6 +501,7 @@
 );
 
 VOID
+__cdecl
 HalpHardwareInterruptLevel(
     VOID
 );
@@ -575,9 +576,9 @@
 
 /* pic.c */
 VOID NTAPI HalpInitializePICs(IN BOOLEAN EnableInterrupts);
-VOID HalpApcInterrupt(VOID);
-VOID HalpDispatchInterrupt(VOID);
-VOID HalpDispatchInterrupt2(VOID);
+VOID __cdecl HalpApcInterrupt(VOID);
+VOID __cdecl HalpDispatchInterrupt(VOID);
+VOID __cdecl HalpDispatchInterrupt2(VOID);
 DECLSPEC_NORETURN VOID FASTCALL HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame);
 DECLSPEC_NORETURN VOID FASTCALL HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME
TrapFrame);
 
@@ -586,8 +587,8 @@
 
 /* timer.c */
 VOID NTAPI HalpInitializeClock(VOID);
-VOID HalpClockInterrupt(VOID);
-VOID HalpProfileInterrupt(VOID);
+VOID __cdecl HalpClockInterrupt(VOID);
+VOID __cdecl HalpProfileInterrupt(VOID);
 
 VOID
 NTAPI
@@ -695,7 +696,7 @@
 );
 
 VOID
-DECLSPEC_NORETURN
+__cdecl
 HalpRealModeStart(
     VOID
 );

Modified: trunk/reactos/hal/halx86/up/pic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=69…
==============================================================================
--- trunk/reactos/hal/halx86/up/pic.c	[iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/up/pic.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -330,8 +330,9 @@
 #if defined(__GNUC__)
 
 #define HalpDelayedHardwareInterrupt(x)                             \
-    VOID HalpHardwareInterrupt##x(VOID);                            \
+    VOID __cdecl HalpHardwareInterrupt##x(VOID);                    \
     VOID                                                            \
+    __cdecl                                                         \
     HalpHardwareInterrupt##x(VOID)                                  \
     {                                                               \
         asm volatile ("int $%c0\n"::"i"(PRIMARY_VECTOR_BASE + x)); 
\
@@ -340,8 +341,9 @@
 #elif defined(_MSC_VER)
 
 #define HalpDelayedHardwareInterrupt(x)                             \
-    VOID HalpHardwareInterrupt##x(VOID);                            \
+    VOID __cdecl HalpHardwareInterrupt##x(VOID);                    \
     VOID                                                            \
+    __cdecl                                                         \
     HalpHardwareInterrupt##x(VOID)                                  \
     {                                                               \
         __asm                                                       \
@@ -375,10 +377,10 @@
 /* Handlers for pending interrupts */
 PHAL_SW_INTERRUPT_HANDLER SWInterruptHandlerTable[20] =
 {
-    KiUnexpectedInterrupt,
+    (PHAL_SW_INTERRUPT_HANDLER)KiUnexpectedInterrupt,
     HalpApcInterrupt,
     HalpDispatchInterrupt2,
-    KiUnexpectedInterrupt,
+    (PHAL_SW_INTERRUPT_HANDLER)KiUnexpectedInterrupt,
     HalpHardwareInterrupt0,
     HalpHardwareInterrupt1,
     HalpHardwareInterrupt2,
@@ -1067,6 +1069,7 @@
 }
 
 VOID
+__cdecl
 HalpHardwareInterruptLevel(VOID)
 {
     PKPCR Pcr = KeGetPcr();
@@ -1347,6 +1350,7 @@
 }
 
 VOID
+__cdecl
 HalpDispatchInterrupt2(VOID)
 {
     ULONG PendingIrqlMask, PendingIrql;

Modified: trunk/reactos/include/crt/msc/intrin.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r…
==============================================================================
--- trunk/reactos/include/crt/msc/intrin.h	[iso-8859-1] (original)
+++ trunk/reactos/include/crt/msc/intrin.h	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -299,7 +299,7 @@
 #pragma intrinsic(__readcr3)
 //#pragma intrinsic(__readcr4)
 // HACK: MSVC is broken
-unsigned long  ___readcr4(void);
+unsigned long __cdecl  ___readcr4(void);
 #define __readcr4 ___readcr4
 #pragma intrinsic(__readcr8)
 #pragma intrinsic(__readdr)

Modified: trunk/reactos/include/crt/wchar.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=69…
==============================================================================
--- trunk/reactos/include/crt/wchar.h	[iso-8859-1] (original)
+++ trunk/reactos/include/crt/wchar.h	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -2450,6 +2450,7 @@
     _In_ size_t _N);
 
   int
+  __cdecl
   wmemcmp(
     _In_reads_(_N) const wchar_t *_S1,
     _In_reads_(_N) const wchar_t *_S2,

Modified: trunk/reactos/include/ndk/kefuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=…
==============================================================================
--- trunk/reactos/include/ndk/kefuncs.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/kefuncs.h	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -188,7 +188,9 @@
     VOID
 );
 
-VOID
+DECLSPEC_NORETURN
+VOID
+__cdecl
 KiUnexpectedInterrupt(
     VOID
 );

Modified: trunk/reactos/lib/3rdparty/libwine/debug_ros.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/debug…
==============================================================================
--- trunk/reactos/lib/3rdparty/libwine/debug_ros.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libwine/debug_ros.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -9,24 +9,24 @@
 #include "debug.c"
 
 __MINGW_ATTRIB_MALLOC
-void *malloc(size_t size)
+void * __cdecl malloc(size_t size)
 {
     return LocalAlloc(0, size);
 }
 
-void free(void *ptr)
+void __cdecl free(void *ptr)
 {
     LocalFree(ptr);
 }
 
-void *realloc(void *ptr, size_t size)
+void * __cdecl realloc(void *ptr, size_t size)
 {
     if (ptr == NULL) return malloc(size);
     return LocalReAlloc(ptr, size, LMEM_MOVEABLE);
 }
 
 __MINGW_ATTRIB_MALLOC
-char *_strdup(const char *str)
+char * __cdecl _strdup(const char *str)
 {
     char *newstr = malloc(strlen(str) + 1);
     if (newstr) strcpy(newstr, str);

Modified: trunk/reactos/lib/sdk/crt/float/isnan.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/isnan.c?…
==============================================================================
--- trunk/reactos/lib/sdk/crt/float/isnan.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/float/isnan.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -26,7 +26,7 @@
 /*
  * @implemented
  */
-int _isnan(double __x)
+int CDECL _isnan(double __x)
 {
 	union
 	{
@@ -40,7 +40,7 @@
 /*
  * @implemented
  */
-int _finite(double __x)
+int CDECL _finite(double __x)
 {
 	union
 	{

Modified: trunk/reactos/lib/sdk/crt/math/abs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/abs.c?rev…
==============================================================================
--- trunk/reactos/lib/sdk/crt/math/abs.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/math/abs.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -9,6 +9,7 @@
  * @implemented
  */
 int
+__cdecl
 abs(int j)
 {
   return j<0 ? -j : j;

Modified: trunk/reactos/lib/sdk/crt/math/div.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/div.c?rev…
==============================================================================
--- trunk/reactos/lib/sdk/crt/math/div.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/math/div.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -5,6 +5,7 @@
  * @implemented
  */
 div_t
+CDECL
 div(int num, int denom)
 {
   div_t r;

Modified: trunk/reactos/lib/sdk/crt/math/rand_nt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/rand_nt.c…
==============================================================================
--- trunk/reactos/lib/sdk/crt/math/rand_nt.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/math/rand_nt.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -9,7 +9,7 @@
 /*
  * @implemented
  */
-int rand(void)
+int __cdecl rand(void)
 {
 #if defined(__GNUC__)
 	next = next * 0x5deece66dLL + 11;
@@ -23,7 +23,7 @@
 /*
  * @implemented
  */
-void srand(unsigned seed)
+void __cdecl srand(unsigned seed)
 {
 	next = seed;
 }

Modified: trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbstr…
==============================================================================
--- trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -22,7 +22,7 @@
 /*
  * @implemented
  */
-size_t _mbstrlen( const char *str )
+size_t __cdecl _mbstrlen( const char *str )
 {
   size_t len = 0;
   while(*str)

Modified: trunk/reactos/lib/sdk/crt/mem/memccpy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memccpy.c?…
==============================================================================
--- trunk/reactos/lib/sdk/crt/mem/memccpy.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/mem/memccpy.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -3,6 +3,7 @@
 
 
 void *
+__cdecl
 _memccpy (void *to, const void *from,int c,size_t count)
 {
     char t;

Modified: trunk/reactos/lib/sdk/crt/mem/memchr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memchr.c?r…
==============================================================================
--- trunk/reactos/lib/sdk/crt/mem/memchr.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/mem/memchr.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -5,7 +5,7 @@
 #pragma function(memchr)
 #endif /* _MSC_VER */
 
-void* memchr(const void *s, int c, size_t n)
+void* __cdecl memchr(const void *s, int c, size_t n)
 {
     if (n)
     {

Modified: trunk/reactos/lib/sdk/crt/mem/memcmp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memcmp.c?r…
==============================================================================
--- trunk/reactos/lib/sdk/crt/mem/memcmp.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/mem/memcmp.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -6,7 +6,7 @@
 #pragma function(memcmp)
 #endif
 
-int memcmp(const void *s1, const void *s2, size_t n)
+int __cdecl memcmp(const void *s1, const void *s2, size_t n)
 {
     if (n != 0) {
         const unsigned char *p1 = s1, *p2 = s2;

Modified: trunk/reactos/lib/sdk/crt/mem/memcpy.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memcpy.c?r…
==============================================================================
--- trunk/reactos/lib/sdk/crt/mem/memcpy.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/mem/memcpy.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -5,7 +5,7 @@
 #endif /* _MSC_VER */
 
 /* NOTE: This code is a duplicate of memmove implementation! */
-void* memcpy(void* dest, const void* src, size_t count)
+void* __cdecl memcpy(void* dest, const void* src, size_t count)
 {
     char *char_dest = (char *)dest;
     char *char_src = (char *)src;

Modified: trunk/reactos/lib/sdk/crt/mem/memicmp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memicmp.c?…
==============================================================================
--- trunk/reactos/lib/sdk/crt/mem/memicmp.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/mem/memicmp.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -5,6 +5,7 @@
  * @implemented
  */
 int
+CDECL
 _memicmp(const void *s1, const void *s2, size_t n)
 {
   if (n != 0)

Modified: trunk/reactos/lib/sdk/crt/mem/memmove.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memmove.c?…
==============================================================================
--- trunk/reactos/lib/sdk/crt/mem/memmove.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/mem/memmove.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -1,7 +1,7 @@
 #include <string.h>
 
 /* NOTE: This code is duplicated in memcpy function */
-void * memmove(void *dest,const void *src,size_t count)
+void * __cdecl memmove(void *dest,const void *src,size_t count)
 {
     char *char_dest = (char *)dest;
     char *char_src = (char *)src;

Modified: trunk/reactos/lib/sdk/crt/mem/memset.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/memset.c?r…
==============================================================================
--- trunk/reactos/lib/sdk/crt/mem/memset.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/mem/memset.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -5,7 +5,7 @@
 #pragma function(memset)
 #endif /* _MSC_VER */
 
-void* memset(void* src, int val, size_t count)
+void* __cdecl memset(void* src, int val, size_t count)
 {
     char *char_src = (char *)src;
 

Modified: trunk/reactos/lib/sdk/crt/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/precomp.h?rev=…
==============================================================================
--- trunk/reactos/lib/sdk/crt/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/precomp.h	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -36,6 +36,14 @@
 #include <winuser.h>
 #include <ndk/rtlfuncs.h>
 
+// Our headers are pretty messed up
+#undef CDECL
+#if defined(_M_IX86)
+#define CDECL __cdecl
+#else
+#define CDECL
+#endif
+
 #if !defined(_MSC_VER)
   #include <stdint.h>
 #endif

Modified: trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/_vscwpr…
==============================================================================
--- trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/printf/_vscwprintf.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -15,6 +15,7 @@
 int __cdecl wstreamout(FILE *stream, const wchar_t *format, va_list argptr);
 
 int
+__cdecl
 _vscwprintf(
    const wchar_t *format,
    va_list argptr)

Modified: trunk/reactos/lib/sdk/crt/search/bsearch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/bsearch…
==============================================================================
--- trunk/reactos/lib/sdk/crt/search/bsearch.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/search/bsearch.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -5,6 +5,7 @@
  * @implemented
  */
 void *
+__cdecl
 bsearch(const void *key, const void *base0, size_t nelem,
 	size_t size, int (__cdecl *cmp)(const void *ck, const void *ce))
 {

Modified: trunk/reactos/lib/sdk/crt/search/lfind.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/lfind.c…
==============================================================================
--- trunk/reactos/lib/sdk/crt/search/lfind.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/search/lfind.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -4,7 +4,7 @@
 /*
  * @implemented
  */
-void *_lfind(const void *key, const void *base, unsigned int *nelp,
+void * __cdecl _lfind(const void *key, const void *base, unsigned int *nelp,
          unsigned int width, int (__cdecl *compar)(const void *, const void *))
 {
 	char* char_base = (char*)base;

Modified: trunk/reactos/lib/sdk/crt/search/lsearch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/search/lsearch…
==============================================================================
--- trunk/reactos/lib/sdk/crt/search/lsearch.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/search/lsearch.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -5,7 +5,7 @@
 /*
  * @implemented
  */
-void *_lsearch(const void *key, void *base, unsigned int *nelp, unsigned int width,
+void * __cdecl _lsearch(const void *key, void *base, unsigned int *nelp, unsigned int
width,
          int (__cdecl *compar)(const void *, const void *))
 {
   void *ret_find = _lfind(key,base,nelp,width,compar);

Modified: trunk/reactos/lib/sdk/crt/stdlib/qsort.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/qsort.c…
==============================================================================
--- trunk/reactos/lib/sdk/crt/stdlib/qsort.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/stdlib/qsort.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -49,7 +49,7 @@
  * (And there are only three places where this is done).
  */
 
-static void
+static void __cdecl
 qst(size_t size, int (__cdecl *compar)(const void*, const void*), char *base, char *max)
 {
   char c, *i, *j, *jj;
@@ -176,6 +176,7 @@
  * @implemented
  */
 void
+__cdecl
 qsort(void *base0, size_t n, size_t size, int (__cdecl *compar)(const void*, const
void*))
 {
   char *base = (char *)base0;

Modified: trunk/reactos/lib/sdk/crt/string/atoi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atoi.c?…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/atoi.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/atoi.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -6,6 +6,7 @@
  * @implemented
  */
 int
+CDECL
 _ttoi(const _TCHAR *str)
 {
   return (int)_ttoi64(str);

Modified: trunk/reactos/lib/sdk/crt/string/atoi64.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atoi64.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/atoi64.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/atoi64.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -14,6 +14,7 @@
  * @implemented
  */
 __int64
+CDECL
 _atoi64(const char *nptr)
 {
   char *s = (char *)nptr;

Modified: trunk/reactos/lib/sdk/crt/string/atol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/atol.c?…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/atol.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/atol.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -4,7 +4,7 @@
 /*
  * @implemented
  */
-long atol(const char *str)
+long CDECL atol(const char *str)
 {
     return (long)_atoi64(str);
 }
@@ -12,7 +12,7 @@
 /*
  * @unimplemented
  */
-int _atoldbl(_LDOUBLE *value, char *str)
+int CDECL _atoldbl(_LDOUBLE *value, char *str)
 {
   /* FIXME needs error checking for huge/small values */
 #if 0

Modified: trunk/reactos/lib/sdk/crt/string/ctype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/ctype.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/ctype.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -628,7 +628,7 @@
 /*
  * @implemented
  */
-int isalpha(int c)
+int __cdecl isalpha(int c)
 {
    return(_isctype(c, _ALPHA));
 }
@@ -636,7 +636,7 @@
 /*
  * @implemented
  */
-int isalnum(int c)
+int __cdecl isalnum(int c)
 {
    return(_isctype(c, _ALPHA | _DIGIT));
 }
@@ -644,7 +644,7 @@
 /*
  * @implemented
  */
-int iswalnum(wint_t c)
+int __cdecl iswalnum(wint_t c)
 {
     return iswctype(c, _ALPHA | _DIGIT);
 }
@@ -652,7 +652,7 @@
 /*
  * @implemented
  */
-int __isascii(int c)
+int __cdecl __isascii(int c)
 {
    return ((unsigned char)c <= 0x7f);
 }
@@ -660,7 +660,7 @@
 /*
  * @implemented
  */
-int iswascii(wint_t c)
+int __cdecl iswascii(wint_t c)
 {
     return __isascii(c);
 }
@@ -668,7 +668,7 @@
 /*
  * @implemented
  */
-int iscntrl(int c)
+int __cdecl iscntrl(int c)
 {
    return(_isctype(c, _CONTROL));
 }
@@ -676,7 +676,7 @@
 /*
  * @implemented
  */
-int __iscsym(int c)
+int __cdecl __iscsym(int c)
 {
    return (c < 127 && (isalnum(c) || (c == '_')));
 }
@@ -684,7 +684,7 @@
 /*
  * @implemented
  */
-int __iscsymf(int c)
+int __cdecl __iscsymf(int c)
 {
    return (c < 127 && (isalpha(c) || (c == '_')));
 }
@@ -692,7 +692,7 @@
 /*
  * @implemented
  */
-int isdigit(int c)
+int __cdecl isdigit(int c)
 {
    return(_isctype(c, _DIGIT));
 }
@@ -700,7 +700,7 @@
 /*
  * @implemented
  */
-int isgraph(int c)
+int __cdecl isgraph(int c)
 {
    return (_isctype (c, _PUNCT | _ALPHA | _DIGIT));
 }
@@ -708,7 +708,7 @@
 /*
  * @implemented
  */
-int islower(int c)
+int __cdecl islower(int c)
 {
    return (_isctype (c, _LOWER));
 }
@@ -716,7 +716,7 @@
 /*
  * @implemented
  */
-int isprint(int c)
+int __cdecl isprint(int c)
 {
    return (_isctype (c, _BLANK | _PUNCT | _ALPHA | _DIGIT));
 }
@@ -724,7 +724,7 @@
 /*
  * @implemented
  */
-int ispunct(int c)
+int __cdecl ispunct(int c)
 {
    return (_isctype (c, _PUNCT));
 }
@@ -732,7 +732,7 @@
 /*
  * @implemented
  */
-int isspace(int c)
+int __cdecl isspace(int c)
 {
    return (_isctype (c, _SPACE));
 }
@@ -740,7 +740,7 @@
 /*
  * @implemented
  */
-int isupper(int c)
+int __cdecl isupper(int c)
 {
    return (_isctype (c, _UPPER));
 }
@@ -748,7 +748,7 @@
 /*
  * @implemented
  */
-int isxdigit(int c)
+int __cdecl isxdigit(int c)
 {
    return (_isctype (c, _HEX));
 }
@@ -757,7 +757,7 @@
 /*
  * @implemented
  */
-int iswalpha(wint_t c)
+int __cdecl iswalpha(wint_t c)
 {
    return (iswctype (c, _ALPHA));
 }
@@ -765,7 +765,7 @@
 /*
  * @implemented
  */
-int iswcntrl(wint_t c)
+int __cdecl iswcntrl(wint_t c)
 {
     return iswctype(c, _CONTROL);
 }
@@ -773,7 +773,7 @@
 /*
  * @implemented
  */
-int iswdigit(wint_t c)
+int __cdecl iswdigit(wint_t c)
 {
    return (iswctype (c, _DIGIT));
 }
@@ -781,7 +781,7 @@
 /*
  * @implemented
  */
-int iswgraph(wint_t c)
+int __cdecl iswgraph(wint_t c)
 {
   return iswctype(c,_PUNCT | _ALPHA | _DIGIT);
 }
@@ -789,7 +789,7 @@
 /*
  * @implemented
  */
-int iswprint(wint_t c)
+int __cdecl iswprint(wint_t c)
 {
   return iswctype((unsigned short)c,_BLANK | _PUNCT | _ALPHA | _DIGIT);
 }
@@ -798,7 +798,7 @@
 /*
  * @implemented
  */
-int iswpunct(wint_t c)
+int __cdecl iswpunct(wint_t c)
 {
     return iswctype(c, _PUNCT);
 }
@@ -806,7 +806,7 @@
 /*
  * @implemented
  */
-int iswlower(wint_t c)
+int __cdecl iswlower(wint_t c)
 {
    return (iswctype (c, _LOWER));
 }
@@ -814,7 +814,7 @@
 /*
  * @implemented
  */
-int iswupper(wint_t c)
+int __cdecl iswupper(wint_t c)
 {
     return iswctype(c, _UPPER);
 }
@@ -823,7 +823,7 @@
 /*
  * @implemented
  */
-int iswspace(wint_t c)
+int __cdecl iswspace(wint_t c)
 {
    return (iswctype (c, _SPACE));
 }
@@ -831,7 +831,7 @@
 /*
  * @implemented
  */
-int iswxdigit(wint_t c)
+int __cdecl iswxdigit(wint_t c)
 {
    return (iswctype (c, _HEX));
 }
@@ -840,7 +840,7 @@
 /*
  * @implemented
  */
-int __toascii(int c)
+int __cdecl __toascii(int c)
 {
    return((unsigned int)(c) & 0x7f);
 }
@@ -848,7 +848,7 @@
 /*
  * @implemented
  */
-int _tolower(int c)
+int __cdecl _tolower(int c)
 {
    if (_isctype (c, _UPPER))
        return (c - upalpha);
@@ -858,7 +858,7 @@
 /*
  * @implemented
  */
-int _toupper(int c)
+int __cdecl _toupper(int c)
 {
    if (_isctype (c, _LOWER))
       return (c + upalpha);
@@ -868,7 +868,7 @@
 /*
  * @implemented
  */
-int tolower(int c)
+int __cdecl tolower(int c)
 {
    if (_isctype (c, _UPPER))
        return (c - upalpha);
@@ -878,7 +878,7 @@
 /*
  * @implemented
  */
-int toupper(int c)
+int __cdecl toupper(int c)
 {
    if (_isctype (c, _LOWER))
       return (c + upalpha);
@@ -888,7 +888,7 @@
 /*
  * @implemented
  */
-wint_t towlower(wint_t c)
+wint_t __cdecl towlower(wint_t c)
 {
    if (iswctype (c, _UPPER))
        return (c - upalpha);
@@ -898,7 +898,7 @@
 /*
  * @implemented
  */
-wint_t towupper(wint_t c)
+wint_t __cdecl towupper(wint_t c)
 {
    if (iswctype (c, _LOWER))
       return (c + upalpha);

Modified: trunk/reactos/lib/sdk/crt/string/iswctype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/iswctyp…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/iswctype.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/iswctype.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -5,7 +5,7 @@
 /*
  * @implemented
  */
-int iswctype(wint_t wc, wctype_t wctypeFlags)
+int __cdecl iswctype(wint_t wc, wctype_t wctypeFlags)
 {
     return (wine_wctype_table[wine_wctype_table[wc >> 8] + (wc & 0xff)] &
wctypeFlags);
 }

Modified: trunk/reactos/lib/sdk/crt/string/itoa.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/itoa.c?…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/itoa.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/itoa.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -6,6 +6,7 @@
  * @implemented
  */
 char *
+CDECL
 _i64toa(__int64 value, char *string, int radix)
 {
     ULONGLONG  val;
@@ -125,6 +126,7 @@
  * @implemented
  */
 char *
+CDECL
 _ui64toa(unsigned __int64 value, char *string, int radix)
 {
     char buffer[65];
@@ -199,6 +201,7 @@
  * @implemented
  */
 char *
+CDECL
 _itoa(int value, char *string, int radix)
 {
   return _ltoa(value, string, radix);
@@ -208,6 +211,7 @@
  * @implemented
  */
 char *
+CDECL
 _ltoa(long value, char *string, int radix)
 {
     unsigned long val;
@@ -328,6 +332,7 @@
  * @implemented
  */
 char *
+CDECL
 _ultoa(unsigned long value, char *string, int radix)
 {
     char buffer[33];

Modified: trunk/reactos/lib/sdk/crt/string/itow.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/itow.c?…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/itow.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/itow.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,6 +13,7 @@
  * @implemented
  */
 wchar_t *
+CDECL
 _i64tow(__int64 value, wchar_t *string, int radix)
 {
     ULONGLONG val;
@@ -56,6 +57,7 @@
  * @implemented
  */
 int
+CDECL
 _i64tow_s(__int64 value, wchar_t *str, size_t size, int radix)
 {
     unsigned __int64 val;
@@ -136,6 +138,7 @@
  * @implemented
  */
 wchar_t *
+CDECL
 _ui64tow(unsigned __int64 value, wchar_t *string, int radix)
 {
     WCHAR buffer[65];
@@ -165,6 +168,7 @@
  * @implemented
  */
 int
+CDECL
 _ui64tow_s( unsigned __int64 value, wchar_t *str,
                              size_t size, int radix )
 {
@@ -204,6 +208,7 @@
  * @implemented
  */
 wchar_t *
+CDECL
 _itow(int value, wchar_t *string, int radix)
 {
   return _ltow(value, string, radix);
@@ -213,6 +218,7 @@
  * @implemented
  */
 int
+CDECL
 _itow_s(int value, wchar_t *str, size_t size, int radix)
 {
     return _ltow_s(value, str, size, radix);
@@ -222,6 +228,7 @@
  * @implemented
  */
 wchar_t *
+CDECL
 _ltow(long value, wchar_t *string, int radix)
 {
     unsigned long val;
@@ -265,6 +272,7 @@
  * @implemented
  */
 int
+CDECL
 _ltow_s(long value, wchar_t *str, size_t size, int radix)
 {
     unsigned long val;
@@ -345,6 +353,7 @@
  * @implemented
  */
 wchar_t *
+CDECL
 _ultow(unsigned long value, wchar_t *string, int radix)
 {
     WCHAR buffer[33];

Modified: trunk/reactos/lib/sdk/crt/string/stricmp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/stricmp…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/stricmp.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/stricmp.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -4,6 +4,7 @@
  * @implemented
  */
 int
+CDECL
 _stricmp(const char *s1, const char *s2)
 {
   while (toupper(*s1) == toupper(*s2))
@@ -20,6 +21,7 @@
  * @implemented
  */
 int
+CDECL
 _strcmpi(const char *s1, const char *s2)
 {
 	return _stricmp(s1,s2);

Modified: trunk/reactos/lib/sdk/crt/string/strlwr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strlwr.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/strlwr.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/strlwr.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -4,7 +4,7 @@
 /*
  * @implemented
  */
-char * _strlwr(char *x)
+char * CDECL _strlwr(char *x)
 {
 	char  *y=x;
 

Modified: trunk/reactos/lib/sdk/crt/string/strnicmp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strnicm…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/strnicmp.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/strnicmp.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -3,7 +3,7 @@
 /*
  * @implemented
  */
-int _strnicmp(const char *s1, const char *s2, size_t n)
+int CDECL _strnicmp(const char *s1, const char *s2, size_t n)
 {
 
   if (n == 0)

Modified: trunk/reactos/lib/sdk/crt/string/strpbrk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strpbrk…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/strpbrk.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/strpbrk.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -4,7 +4,7 @@
 
 #define BIT_SIZE (CHAR_BIT * sizeof(unsigned long) / sizeof(char))
 
-char* strpbrk(const char *s1, const char *s2)
+char* __cdecl strpbrk(const char *s1, const char *s2)
 {
     if (*s2 == 0)
     {

Modified: trunk/reactos/lib/sdk/crt/string/strrev.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strrev.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/strrev.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/strrev.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,7 +13,7 @@
 /*
  * @implemented
  */
-char * _strrev(char *s)
+char * CDECL _strrev(char *s)
 {
 	char a, *b, *e;
 	b=e=s;

Modified: trunk/reactos/lib/sdk/crt/string/strstr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strstr.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/strstr.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/strstr.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,6 +13,7 @@
  * @implemented
  */
 char *
+CDECL
 strstr(const char *s, const char *find)
 {
   char c, sc;

Modified: trunk/reactos/lib/sdk/crt/string/strtol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtol.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/strtol.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/strtol.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -4,6 +4,7 @@
  * @implemented
  */
 long
+CDECL
 strtol(const char *nptr, char **endptr, int base)
 {
   const char *s = nptr;

Modified: trunk/reactos/lib/sdk/crt/string/strtoull.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoul…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/strtoull.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/strtoull.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -1,6 +1,7 @@
 #include <precomp.h>
 
 unsigned long long
+CDECL
 strtoull(const char *nptr, char **endptr, int base)
 {
   const char *s = nptr;

Modified: trunk/reactos/lib/sdk/crt/string/strupr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strupr.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/strupr.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/strupr.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,7 +13,7 @@
 /*
  * @implemented
  */
-char *_strupr(char *x)
+char * CDECL _strupr(char *x)
 {
 	char  *y=x;
 

Modified: trunk/reactos/lib/sdk/crt/string/strxspn.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strxspn…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/strxspn.h	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/strxspn.h	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -2,7 +2,7 @@
 #include <limits.h>
 #include <string.h>
 
-size_t _strxspn(const char *s1, const char *s2)
+size_t __cdecl _strxspn(const char *s1, const char *s2)
 {
  unsigned char char_map[1 << CHAR_BIT * sizeof(char)];
  const unsigned char * us2 = (const unsigned char *)s2;

Modified: trunk/reactos/lib/sdk/crt/string/wcstol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstol.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/wcstol.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/wcstol.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,6 +13,7 @@
  * @implemented
  */
 long
+CDECL
 wcstol(const wchar_t *nptr, wchar_t **endptr, int base)
 {
   const wchar_t *s = nptr;

Modified: trunk/reactos/lib/sdk/crt/string/wcstoul.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstoul…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/wcstoul.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/wcstoul.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -10,6 +10,7 @@
  * @implemented
  */
 unsigned long
+CDECL
 wcstoul(const wchar_t *nptr, wchar_t **endptr, int base)
 {
   const wchar_t *s = nptr;

Modified: trunk/reactos/lib/sdk/crt/string/wtoi64.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wtoi64.…
==============================================================================
--- trunk/reactos/lib/sdk/crt/string/wtoi64.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/string/wtoi64.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -14,6 +14,7 @@
  * @implemented
  */
 __int64
+CDECL
 _wtoi64 (const wchar_t *nptr)
 {
    int c;
@@ -50,6 +51,7 @@
  * @unimplemented
  */
 __int64
+CDECL
 _wcstoi64 (const wchar_t *nptr, wchar_t **endptr, int base)
 {
    TRACE("_wcstoi64 is UNIMPLEMENTED\n");
@@ -60,6 +62,7 @@
  * @unimplemented
  */
 unsigned __int64
+CDECL
 _wcstoui64 (const wchar_t *nptr, wchar_t **endptr, int base)
 {
    TRACE("_wcstoui64 is UNIMPLEMENTED\n");

Modified: trunk/reactos/lib/sdk/crt/wstring/wcscoll.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcscol…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wstring/wcscoll.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/wstring/wcscoll.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,7 +13,7 @@
 /*
  * @unimplemented
  */
-int _wcsncoll (const wchar_t *s1, const wchar_t *s2, size_t c)
+int CDECL _wcsncoll (const wchar_t *s1, const wchar_t *s2, size_t c)
 {
   /* FIXME: handle collates */
   return wcsncmp(s1,s2,c);
@@ -22,7 +22,7 @@
 /*
  * @unimplemented
  */
-int _wcsnicoll (const wchar_t *s1, const wchar_t *s2, size_t c)
+int CDECL _wcsnicoll (const wchar_t *s1, const wchar_t *s2, size_t c)
 {
   /* FIXME: handle collates */
   return _wcsnicmp(s1,s2,c);

Modified: trunk/reactos/lib/sdk/crt/wstring/wcscspn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcscsp…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wstring/wcscspn.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/wstring/wcscspn.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,7 +13,7 @@
 /*
  * @implemented
  */
-size_t wcscspn(const wchar_t *str,const wchar_t *reject)
+size_t CDECL wcscspn(const wchar_t *str,const wchar_t *reject)
 {
 	wchar_t *s;
 	wchar_t *t;

Modified: trunk/reactos/lib/sdk/crt/wstring/wcsicmp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsicm…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wstring/wcsicmp.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/wstring/wcsicmp.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -5,7 +5,7 @@
 /*
  * @implemented
  */
-int _wcsicmp(const wchar_t* cs,const wchar_t * ct)
+int CDECL _wcsicmp(const wchar_t* cs,const wchar_t * ct)
 {
 	while (towlower(*cs) == towlower(*ct))
 	{

Modified: trunk/reactos/lib/sdk/crt/wstring/wcslwr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcslwr…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wstring/wcslwr.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/wstring/wcslwr.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,7 +13,7 @@
 /*
  * @implemented
  */
-wchar_t * _wcslwr(wchar_t *x)
+wchar_t * CDECL _wcslwr(wchar_t *x)
 {
 	wchar_t  *y=x;
 

Modified: trunk/reactos/lib/sdk/crt/wstring/wcsnicmp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsnic…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wstring/wcsnicmp.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/wstring/wcsnicmp.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,7 +13,7 @@
 /*
  * @implemented
  */
-int _wcsnicmp (const wchar_t *cs, const wchar_t *ct, size_t count)
+int CDECL _wcsnicmp (const wchar_t *cs, const wchar_t *ct, size_t count)
 {
 	if (count == 0)
 		return 0;

Modified: trunk/reactos/lib/sdk/crt/wstring/wcsspn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsspn…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wstring/wcsspn.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/wstring/wcsspn.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,7 +13,7 @@
 /*
  * @implemented
  */
-size_t wcsspn(const wchar_t *str,const wchar_t *accept)
+size_t CDECL wcsspn(const wchar_t *str,const wchar_t *accept)
 {
 	wchar_t  *s;
 	wchar_t  *t;

Modified: trunk/reactos/lib/sdk/crt/wstring/wcsstr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsstr…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wstring/wcsstr.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/wstring/wcsstr.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,7 +13,7 @@
 /*
  * @implemented
  */
-wchar_t *wcsstr(const wchar_t *s,const wchar_t *b)
+wchar_t * CDECL wcsstr(const wchar_t *s,const wchar_t *b)
 {
 	wchar_t *x;
 	wchar_t *y;

Modified: trunk/reactos/lib/sdk/crt/wstring/wcsupr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsupr…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wstring/wcsupr.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/wstring/wcsupr.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,7 +13,7 @@
 /*
  * @implemented
  */
-wchar_t *_wcsupr(wchar_t *x)
+wchar_t * CDECL _wcsupr(wchar_t *x)
 {
 	wchar_t  *y = x;
 

Modified: trunk/reactos/lib/sdk/crt/wstring/wcsxfrm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wstring/wcsxfr…
==============================================================================
--- trunk/reactos/lib/sdk/crt/wstring/wcsxfrm.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/wstring/wcsxfrm.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -13,7 +13,7 @@
 /*
  * @implemented
  */
-size_t wcsxfrm(wchar_t *dst,const wchar_t *src, size_t n)
+size_t CDECL wcsxfrm(wchar_t *dst,const wchar_t *src, size_t n)
 {
   size_t r = 0;
   int c;

Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/irqobj.c	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -148,7 +148,9 @@
     KiEoiHelper(TrapFrame);
 }
 
-VOID
+DECLSPEC_NORETURN
+VOID
+__cdecl
 KiUnexpectedInterrupt(VOID)
 {
     /* Crash the machine */

Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c	[iso-8859-1] Tue Sep 15 10:35:49 2015
@@ -12,8 +12,8 @@
 #define NDEBUG
 #include <debug.h>
 
-VOID KiFastCallEntry(VOID);
-VOID KiFastCallEntryWithSingleStep(VOID);
+VOID __cdecl KiFastCallEntry(VOID);
+VOID __cdecl KiFastCallEntryWithSingleStep(VOID);
 
 extern PVOID FrRestore;
 VOID FASTCALL Ke386LoadFpuState(IN PFX_SAVE_AREA SaveArea);