From 30a8a02f549545571b526c6e7d48499a81b8f1a2 Mon Sep 17 00:00:00 2001
From: David Quintana <gigaherz@gmail.com>
Date: Mon, 24 Jul 2017 15:09:22 +0000
Subject: [PATCH] [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.

svn path=/trunk/; revision=75397
---
 rostests/apitests/atl/CComHeapPtr.cpp          | 6 +++---
 rostests/apitests/crt/msvcrt_crt_apitest.cmake | 3 ++-
 rostests/apitests/crt/testlist.c               | 2 ++
 rostests/apitests/sdk/delayimp.cpp             | 2 +-
 rostests/winetests/ntdll/CMakeLists.txt        | 7 ++++++-
 rostests/winetests/ntdll/testlist.c            | 2 ++
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/rostests/apitests/atl/CComHeapPtr.cpp b/rostests/apitests/atl/CComHeapPtr.cpp
index 6c561485f74..d18a75fae23 100644
--- a/rostests/apitests/atl/CComHeapPtr.cpp
+++ b/rostests/apitests/atl/CComHeapPtr.cpp
@@ -33,7 +33,7 @@ struct CMallocSpy : public IMallocSpy
 
     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 @@ struct CMallocSpy : public IMallocSpy
         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 @@ struct CMallocSpy : public IMallocSpy
         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() {}
diff --git a/rostests/apitests/crt/msvcrt_crt_apitest.cmake b/rostests/apitests/crt/msvcrt_crt_apitest.cmake
index eda23e48b87..cb387c63447 100644
--- a/rostests/apitests/crt/msvcrt_crt_apitest.cmake
+++ b/rostests/apitests/crt/msvcrt_crt_apitest.cmake
@@ -66,7 +66,7 @@ list(APPEND SOURCE_MSVCRT
 #    __doserrno.c
 #    __fpecode.c
 #    __get_app_type.c
-    __getmainargs.c
+#    __getmainargs.c
 #    __initenv
 #    __iob_func.c
 #    __isascii.c
@@ -1267,6 +1267,7 @@ list(APPEND SOURCE_MSVCRT
 
 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
diff --git a/rostests/apitests/crt/testlist.c b/rostests/apitests/crt/testlist.c
index 65b2a7846fc..fc28f01c36b 100644
--- a/rostests/apitests/crt/testlist.c
+++ b/rostests/apitests/crt/testlist.c
@@ -51,7 +51,9 @@ const struct test winetest_testlist[] =
 #endif
 #if defined(TEST_STATIC_CRT)
 #elif defined(TEST_MSVCRT)
+#if !defined(_M_X64)
     { "__getmainargs", func___getmainargs },
+#endif
     { "_vscprintf", func__vscprintf },
     { "_vscwprintf", func__vscwprintf },
 
diff --git a/rostests/apitests/sdk/delayimp.cpp b/rostests/apitests/sdk/delayimp.cpp
index 0993fe0066d..26ee4cdd76c 100644
--- a/rostests/apitests/sdk/delayimp.cpp
+++ b/rostests/apitests/sdk/delayimp.cpp
@@ -127,7 +127,7 @@ static void CheckDliDone_imp()
 
 
 /* Replacement functions */
-int __stdcall MyFunction()
+INT_PTR WINAPI MyFunction()
 {
     return 123;
 }
diff --git a/rostests/winetests/ntdll/CMakeLists.txt b/rostests/winetests/ntdll/CMakeLists.txt
index 46768541ac8..4fe5a26ed3b 100644
--- a/rostests/winetests/ntdll/CMakeLists.txt
+++ b/rostests/winetests/ntdll/CMakeLists.txt
@@ -11,7 +11,6 @@ list(APPEND SOURCE
     error.c
     exception.c
     file.c
-    generated.c
     info.c
     large_int.c
     om.c
@@ -26,6 +25,12 @@ list(APPEND SOURCE
     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)
diff --git a/rostests/winetests/ntdll/testlist.c b/rostests/winetests/ntdll/testlist.c
index ec81eed5b62..ae9be8da0e9 100644
--- a/rostests/winetests/ntdll/testlist.c
+++ b/rostests/winetests/ntdll/testlist.c
@@ -33,7 +33,9 @@ const struct test winetest_testlist[] =
     { "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 },
-- 
2.17.1