Andrew Nguyen : mapi32/tests: Centralize utility function pointer initialization.
Alexandre Julliard
julliard at winehq.org
Mon Feb 1 08:56:00 CST 2010
Module: wine
Branch: master
Commit: 5ed70a69df77b8e32391628f30c64a6fd237cc5f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed70a69df77b8e32391628f30c64a6fd237cc5f
Author: Andrew Nguyen <arethusa26 at gmail.com>
Date: Sat Jan 30 18:58:24 2010 -0600
mapi32/tests: Centralize utility function pointer initialization.
---
dlls/mapi32/tests/util.c | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/dlls/mapi32/tests/util.c b/dlls/mapi32/tests/util.c
index a638cff..7450efe 100644
--- a/dlls/mapi32/tests/util.c
+++ b/dlls/mapi32/tests/util.c
@@ -40,11 +40,25 @@ static ULONG (WINAPI *pUlFromSzHex)(LPCSTR);
static ULONG (WINAPI *pCbOfEncoded)(LPCSTR);
static BOOL (WINAPI *pIsBadBoundedStringPtr)(LPCSTR,ULONG);
+static void init_function_pointers(void)
+{
+ hMapi32 = LoadLibraryA("mapi32.dll");
+
+ pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil at 4");
+ pSwapPword = (void*)GetProcAddress(hMapi32, "SwapPword at 8");
+ pSwapPlong = (void*)GetProcAddress(hMapi32, "SwapPlong at 8");
+ pHexFromBin = (void*)GetProcAddress(hMapi32, "HexFromBin at 12");
+ pFBinFromHex = (void*)GetProcAddress(hMapi32, "FBinFromHex at 8");
+ pUFromSz = (void*)GetProcAddress(hMapi32, "UFromSz at 4");
+ pUlFromSzHex = (void*)GetProcAddress(hMapi32, "UlFromSzHex at 4");
+ pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded at 4");
+ pIsBadBoundedStringPtr = (void*)GetProcAddress(hMapi32, "IsBadBoundedStringPtr at 8");
+}
+
static void test_SwapPword(void)
{
USHORT shorts[3];
- pSwapPword = (void*)GetProcAddress(hMapi32, "SwapPword at 8");
if (!pSwapPword)
{
win_skip("SwapPword is not available\n");
@@ -64,7 +78,6 @@ static void test_SwapPlong(void)
{
ULONG longs[3];
- pSwapPlong = (void*)GetProcAddress(hMapi32, "SwapPlong at 8");
if (!pSwapPlong)
{
win_skip("SwapPlong is not available\n");
@@ -95,8 +108,6 @@ static void test_HexFromBin(void)
BOOL bOk;
int i;
- pHexFromBin = (void*)GetProcAddress(hMapi32, "HexFromBin at 12");
- pFBinFromHex = (void*)GetProcAddress(hMapi32, "FBinFromHex at 8");
if (!pHexFromBin || !pFBinFromHex)
{
win_skip("Hexadecimal conversion functions are not available\n");
@@ -121,7 +132,6 @@ static void test_HexFromBin(void)
static void test_UFromSz(void)
{
- pUFromSz = (void*)GetProcAddress(hMapi32, "UFromSz at 4");
if (!pUFromSz)
{
win_skip("UFromSz is not available\n");
@@ -137,7 +147,6 @@ static void test_UFromSz(void)
static void test_UlFromSzHex(void)
{
- pUlFromSzHex = (void*)GetProcAddress(hMapi32, "UlFromSzHex at 4");
if (!pUlFromSzHex)
{
win_skip("UlFromSzHex is not available\n");
@@ -156,7 +165,6 @@ static void test_CbOfEncoded(void)
char buff[129];
unsigned int i;
- pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded at 4");
if (!pCbOfEncoded)
{
win_skip("CbOfEncoded is not available\n");
@@ -178,7 +186,6 @@ static void test_CbOfEncoded(void)
static void test_IsBadBoundedStringPtr(void)
{
- pIsBadBoundedStringPtr = (void*)GetProcAddress(hMapi32, "IsBadBoundedStringPtr at 8");
if (!pIsBadBoundedStringPtr)
{
win_skip("IsBadBoundedStringPtr is not available\n");
@@ -200,9 +207,7 @@ START_TEST(util)
return;
}
- hMapi32 = LoadLibraryA("mapi32.dll");
-
- pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil at 4");
+ init_function_pointers();
if (!pScInitMapiUtil)
{
More information about the wine-cvs
mailing list