[dquintana] 75397: [APITESTS] MSVCRT_CRT_APITEST: Remove getmainargs tests from X64 build. DELAYIMP: Fix callback prototype. CComHeapPtr: Fix implementation of IMallocSpy to match the actual interf...

Author: dquintana
Date: Mon Jul 24 15:09:22 2017
New Revision: 75397

URL: http://svn.reactos.org/svn/reactos?rev=75397&view=rev
Log:
[APITESTS]
MSVCRT_CRT_APITEST: Remove getmainargs tests from X64 build.
DELAYIMP: Fix callback prototype.
CComHeapPtr: Fix implementation of IMallocSpy to match the actual interface.

[WINETESTS]
ntdll: Disable 'generated' tests when not i386 platform, since they were generated for x86 and not x64 or ARM.

Fixes x64 compilation for tests.

Modified:
    trunk/rostests/apitests/atl/CComHeapPtr.cpp
    trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake
    trunk/rostests/apitests/crt/testlist.c
    trunk/rostests/apitests/sdk/delayimp.cpp
    trunk/rostests/winetests/ntdll/CMakeLists.txt
    trunk/rostests/winetests/ntdll/testlist.c

Modified: trunk/rostests/apitests/atl/CComHeapPtr.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CComHeapPtr.c...
==============================================================================
--- trunk/rostests/apitests/atl/CComHeapPtr.cpp	[iso-8859-1] (original)
+++ trunk/rostests/apitests/atl/CComHeapPtr.cpp	[iso-8859-1] Mon Jul 24 15:09:22 2017
@@ -33,7 +33,7 @@

virtual ULONG STDMETHODCALLTYPE AddRef() { return 1; }
     virtual ULONG STDMETHODCALLTYPE Release() { return 1; }
-    virtual ULONG STDMETHODCALLTYPE PreAlloc(ULONG cbRequest) { return cbRequest; }
+    virtual SIZE_T STDMETHODCALLTYPE PreAlloc(SIZE_T cbRequest) { return cbRequest; }
     virtual LPVOID STDMETHODCALLTYPE PostAlloc(LPVOID pActual)
     {
         InterlockedIncrement(&g_OpenAllocations);
@@ -45,7 +45,7 @@
         if (fSpyed)
             InterlockedDecrement(&g_OpenAllocations);
     }
-    virtual ULONG STDMETHODCALLTYPE PreRealloc(LPVOID pRequest, ULONG cbRequest, LPVOID *ppNewRequest, BOOL)
+    virtual SIZE_T STDMETHODCALLTYPE PreRealloc(LPVOID pRequest, SIZE_T cbRequest, LPVOID *ppNewRequest, BOOL)
     {
         *ppNewRequest = pRequest;
         return cbRequest;
@@ -57,7 +57,7 @@
         return pActual;
     }
     virtual LPVOID STDMETHODCALLTYPE PreGetSize(LPVOID pRequest, BOOL) { return pRequest; }
-    virtual ULONG STDMETHODCALLTYPE PostGetSize(ULONG cbActual, BOOL) { return cbActual; }
+    virtual SIZE_T STDMETHODCALLTYPE PostGetSize(SIZE_T cbActual, BOOL) { return cbActual; }
     virtual LPVOID STDMETHODCALLTYPE PreDidAlloc(LPVOID pRequest, BOOL) { return pRequest; }
     virtual int STDMETHODCALLTYPE PostDidAlloc(LPVOID, BOOL, int fActual) { return fActual; }
     virtual void STDMETHODCALLTYPE PreHeapMinimize() {}

Modified: trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/msvcrt_crt_ap...
==============================================================================
--- trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/msvcrt_crt_apitest.cmake	[iso-8859-1] Mon Jul 24 15:09:22 2017
@@ -66,7 +66,7 @@
 #    __doserrno.c
 #    __fpecode.c
 #    __get_app_type.c
-    __getmainargs.c
+#    __getmainargs.c
 #    __initenv
 #    __iob_func.c
 #    __isascii.c
@@ -1267,6 +1267,7 @@

if(ARCH STREQUAL "i386")
     list(APPEND SOURCE_MSVCRT
+        __getmainargs.c ##FIXME: Moved here because it doesn't work on x64
     #    _CIacos.c
     #    _CIasin.c
     #    _CIatan.c

Modified: trunk/rostests/apitests/crt/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/testlist.c?re...
==============================================================================
--- trunk/rostests/apitests/crt/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/testlist.c	[iso-8859-1] Mon Jul 24 15:09:22 2017
@@ -51,7 +51,9 @@
 #endif
 #if defined(TEST_STATIC_CRT)
 #elif defined(TEST_MSVCRT)
+#if !defined(_M_X64)
     { "__getmainargs", func___getmainargs },
+#endif
     { "_vscprintf", func__vscprintf },
     { "_vscwprintf", func__vscwprintf },

Modified: trunk/rostests/apitests/sdk/delayimp.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/sdk/delayimp.cpp?...
==============================================================================
--- trunk/rostests/apitests/sdk/delayimp.cpp	[iso-8859-1] (original)
+++ trunk/rostests/apitests/sdk/delayimp.cpp	[iso-8859-1] Mon Jul 24 15:09:22 2017
@@ -127,7 +127,7 @@

/* Replacement functions */
-int __stdcall MyFunction()
+INT_PTR WINAPI MyFunction()
 {
     return 123;
 }

Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeLists...
==============================================================================
--- trunk/rostests/winetests/ntdll/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/CMakeLists.txt	[iso-8859-1] Mon Jul 24 15:09:22 2017
@@ -11,7 +11,6 @@
     error.c
     exception.c
     file.c
-    generated.c
     info.c
     large_int.c
     om.c
@@ -26,6 +25,12 @@
     time.c
     testlist.c)

+if(ARCH STREQUAL "i386")
+    list(APPEND SOURCE
+    generated.c
+    )
+endif()
+
 add_executable(ntdll_winetest ${SOURCE})
 set_module_type(ntdll_winetest win32cui)
 add_importlibs(ntdll_winetest user32 ole32 advapi32 msvcrt kernel32 ntdll)

Modified: trunk/rostests/winetests/ntdll/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/testlist.c...
==============================================================================
--- trunk/rostests/winetests/ntdll/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/ntdll/testlist.c	[iso-8859-1] Mon Jul 24 15:09:22 2017
@@ -33,7 +33,9 @@
     { "error", func_error },
     { "exception", func_exception },
     { "file", func_file },
+#ifdef _M_IX86
     { "generated", func_generated },
+#endif
     { "info", func_info },
     { "large_int", func_large_int },
     { "om", func_om },