From aaed681d85c9e8b245415b093f54607a6700f45e Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 5 Oct 2013 20:50:11 +0000
Subject: [PATCH] [MSVCRTD_WINETEST] * Sync with Wine 1.7.1. CORE-7469

svn path=/trunk/; revision=60547
---
 rostests/winetests/msvcrtd/CMakeLists.txt | 7 +------
 rostests/winetests/msvcrtd/debug.c        | 8 ++++++--
 rostests/winetests/msvcrtd/testlist.c     | 5 +----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/rostests/winetests/msvcrtd/CMakeLists.txt b/rostests/winetests/msvcrtd/CMakeLists.txt
index b656065e677..714cdcfc8ca 100644
--- a/rostests/winetests/msvcrtd/CMakeLists.txt
+++ b/rostests/winetests/msvcrtd/CMakeLists.txt
@@ -1,10 +1,5 @@
 
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
-
 add_executable(msvcrtd_winetest debug.c testlist.c)
-target_link_libraries(msvcrtd_winetest wine)
 set_module_type(msvcrtd_winetest win32cui)
-add_importlibs(msvcrtd_winetest msvcrt kernel32 ntdll)
+add_importlibs(msvcrtd_winetest msvcrt kernel32)
 add_cd_file(TARGET msvcrtd_winetest DESTINATION reactos/bin FOR all)
diff --git a/rostests/winetests/msvcrtd/debug.c b/rostests/winetests/msvcrtd/debug.c
index 40fceac05cd..f73fef1751b 100644
--- a/rostests/winetests/msvcrtd/debug.c
+++ b/rostests/winetests/msvcrtd/debug.c
@@ -34,7 +34,7 @@ static void * (__cdecl *pMSVCRTD_operator_new_dbg)(size_t, int, const char *, in
 
 /* Some exports are only available in later versions */
 #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hModule,y)
-#define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y)
+#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0)
 
 static int init_functions(void)
 {
@@ -45,7 +45,11 @@ static int init_functions(void)
     return FALSE;
   }
 
-  SET(pMSVCRTD_operator_new_dbg, "??2@YAPAXIHPBDH@Z");
+  if (sizeof(void *) > sizeof(int))  /* 64-bit has a different mangled name */
+      SET(pMSVCRTD_operator_new_dbg, "??2@YAPEAX_KHPEBDH@Z");
+  else
+      SET(pMSVCRTD_operator_new_dbg, "??2@YAPAXIHPBDH@Z");
+
   if (pMSVCRTD_operator_new_dbg == NULL)
     return FALSE;
 
diff --git a/rostests/winetests/msvcrtd/testlist.c b/rostests/winetests/msvcrtd/testlist.c
index e17c0185376..a41e3a43543 100644
--- a/rostests/winetests/msvcrtd/testlist.c
+++ b/rostests/winetests/msvcrtd/testlist.c
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>
 
 extern void func_debug(void);