[PATCH 1/4] msvcr110/tests: Use macro to get function address.

[Daniel Lehman]

Signed-off-by: Daniel Lehman <dlehman25 at gmail.com>
---
 dlls/msvcr110/tests/msvcr110.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c
index 09876131f07..364dd26aa82 100644
--- a/dlls/msvcr110/tests/msvcr110.c
+++ b/dlls/msvcr110/tests/msvcr110.c
@@ -39,6 +39,9 @@ static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(v
 static unsigned int (CDECL *p_CurrentScheduler_Id)(void);
 static unsigned int (CDECL *p__CurrentScheduler__Id)(void);
 
+#define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y)
+#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0)
+
 static BOOL init(void)
 {
     HMODULE module;
@@ -50,12 +53,12 @@ static BOOL init(void)
         return FALSE;
     }
 
-    p_setlocale = (void*)GetProcAddress(module, "setlocale");
-    p___strncnt = (void*)GetProcAddress(module, "__strncnt");
-    p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors at CurrentScheduler@Concurrency@@SAIXZ");
-    p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors at _CurrentScheduler@details at Concurrency@@SAIXZ");
-    p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id at CurrentScheduler@Concurrency@@SAIXZ");
-    p__CurrentScheduler__Id = (void*)GetProcAddress(module, "?_Id at _CurrentScheduler@details at Concurrency@@SAIXZ");
+    SET(p_setlocale, "setlocale");
+    SET(p___strncnt, "__strncnt");
+    SET(p_CurrentScheduler_GetNumberOfVirtualProcessors, "?GetNumberOfVirtualProcessors at CurrentScheduler@Concurrency@@SAIXZ");
+    SET(p__CurrentScheduler__GetNumberOfVirtualProcessors, "?_GetNumberOfVirtualProcessors at _CurrentScheduler@details at Concurrency@@SAIXZ");
+    SET(p_CurrentScheduler_Id, "?Id at CurrentScheduler@Concurrency@@SAIXZ");
+    SET(p__CurrentScheduler__Id, "?_Id at _CurrentScheduler@details at Concurrency@@SAIXZ");
 
     return TRUE;
 }
-- 
2.25.1