ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mapi32/tests: Invoke MAPIInitialize before performing the HexFromBin tests.

Browse Source 
This avoids crashes with the native Outlook extended MAPI provider.
This commit is contained in:
Andrew Nguyen 2010-01-30 18:58:43 -06:00 committed by Alexandre Julliard
parent 491201a871
commit ad2fdafee9
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/mapi32/tests/util.c
View File

@ -31,6 +31,7 @@
static HMODULE hMapi32 = 0; static HMODULE hMapi32 = 0;
static SCODE (WINAPI *pScInitMapiUtil)(ULONG); static SCODE (WINAPI *pScInitMapiUtil)(ULONG);
static void (WINAPI *pDeinitMapiUtil)(void);
static void (WINAPI *pSwapPword)(PUSHORT,ULONG); static void (WINAPI *pSwapPword)(PUSHORT,ULONG);
static void (WINAPI *pSwapPlong)(PULONG,ULONG); static void (WINAPI *pSwapPlong)(PULONG,ULONG);
static void (WINAPI *pHexFromBin)(LPBYTE,int,LPWSTR); static void (WINAPI *pHexFromBin)(LPBYTE,int,LPWSTR);
@ -39,12 +40,15 @@ static UINT (WINAPI *pUFromSz)(LPCSTR);
static ULONG (WINAPI *pUlFromSzHex)(LPCSTR); static ULONG (WINAPI *pUlFromSzHex)(LPCSTR);
static ULONG (WINAPI *pCbOfEncoded)(LPCSTR); static ULONG (WINAPI *pCbOfEncoded)(LPCSTR);
static BOOL (WINAPI *pIsBadBoundedStringPtr)(LPCSTR,ULONG); static BOOL (WINAPI *pIsBadBoundedStringPtr)(LPCSTR,ULONG);
static SCODE (WINAPI *pMAPIInitialize)(LPVOID);
static void (WINAPI *pMAPIUninitialize)(void);
static void init_function_pointers(void) static void init_function_pointers(void)
{ {
hMapi32 = LoadLibraryA("mapi32.dll"); hMapi32 = LoadLibraryA("mapi32.dll");
pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil@4"); pScInitMapiUtil = (void*)GetProcAddress(hMapi32, "ScInitMapiUtil@4");
pDeinitMapiUtil = (void*)GetProcAddress(hMapi32, "DeinitMapiUtil@0");
pSwapPword = (void*)GetProcAddress(hMapi32, "SwapPword@8"); pSwapPword = (void*)GetProcAddress(hMapi32, "SwapPword@8");
pSwapPlong = (void*)GetProcAddress(hMapi32, "SwapPlong@8"); pSwapPlong = (void*)GetProcAddress(hMapi32, "SwapPlong@8");
pHexFromBin = (void*)GetProcAddress(hMapi32, "HexFromBin@12"); pHexFromBin = (void*)GetProcAddress(hMapi32, "HexFromBin@12");
@ -53,6 +57,8 @@ static void init_function_pointers(void)
pUlFromSzHex = (void*)GetProcAddress(hMapi32, "UlFromSzHex@4"); pUlFromSzHex = (void*)GetProcAddress(hMapi32, "UlFromSzHex@4");
pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded@4"); pCbOfEncoded = (void*)GetProcAddress(hMapi32, "CbOfEncoded@4");
pIsBadBoundedStringPtr = (void*)GetProcAddress(hMapi32, "IsBadBoundedStringPtr@8"); pIsBadBoundedStringPtr = (void*)GetProcAddress(hMapi32, "IsBadBoundedStringPtr@8");
pMAPIInitialize = (void*)GetProcAddress(hMapi32, "MAPIInitialize");
pMAPIUninitialize = (void*)GetProcAddress(hMapi32, "MAPIUninitialize");
} }
static void test_SwapPword(void) static void test_SwapPword(void)
@ -209,9 +215,9 @@ START_TEST(util)
init_function_pointers(); init_function_pointers();
if (!pScInitMapiUtil) if (!pScInitMapiUtil || !pDeinitMapiUtil)
{ {
win_skip("ScInitMapiUtil is not available\n"); win_skip("MAPI utility initialization functions are not available\n");
FreeLibrary(hMapi32); FreeLibrary(hMapi32);
return; return;
} }
@ -233,11 +239,22 @@ START_TEST(util)
test_SwapPword(); test_SwapPword();
test_SwapPlong(); test_SwapPlong();
/* We call MAPIInitialize here for the benefit of native extended MAPI
* providers which crash in the HexFromBin tests when MAPIInitialize has
* not been called. Since MAPIInitialize is irrelevant for HexFfromBin on
* Wine, we do not care whether MAPIInitialize succeeds. */
if (pMAPIInitialize)
ret = pMAPIInitialize(NULL);
test_HexFromBin(); test_HexFromBin();
if (pMAPIUninitialize && ret == S_OK)
pMAPIUninitialize();
test_UFromSz(); test_UFromSz();
test_UlFromSzHex(); test_UlFromSzHex();
test_CbOfEncoded(); test_CbOfEncoded();
test_IsBadBoundedStringPtr(); test_IsBadBoundedStringPtr();
pDeinitMapiUtil();
FreeLibrary(hMapi32); FreeLibrary(hMapi32);
} }