[PATCH] mlang/tests: We link to mlang.dll, so remove LoadLibraryA
Detlef Riekenberg
wine.dev at web.de
Mon May 25 07:41:17 CDT 2009
---
dlls/mlang/tests/mlang.c | 70 +++++++++++++++-------------------------------
1 files changed, 23 insertions(+), 47 deletions(-)
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index 075e1f6..b95660e 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -45,10 +45,6 @@
#endif /* 0 */
static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA);
-static HRESULT (WINAPI *pConvertINetMultiByteToUnicode)(LPDWORD, DWORD, LPCSTR,
- LPINT, LPWSTR, LPINT);
-static HRESULT (WINAPI *pConvertINetUnicodeToMultiByte)(LPDWORD, DWORD, LPCWSTR,
- LPINT, LPSTR, LPINT);
typedef struct lcid_tag_table {
LPCSTR rfc1766;
@@ -176,25 +172,6 @@ static const info_table_entry info_table[] = {
0, "kok", "Konkani"}
};
-static BOOL init_function_ptrs(void)
-{
- HMODULE hMlang;
-
- hMlang = LoadLibraryA("mlang.dll");
- if (!hMlang)
- {
- skip("mlang not available\n");
- return FALSE;
- }
-
- pConvertINetMultiByteToUnicode = (void *)GetProcAddress(hMlang, "ConvertINetMultiByteToUnicode");
- pConvertINetUnicodeToMultiByte = (void *)GetProcAddress(hMlang, "ConvertINetUnicodeToMultiByte");
-
- pGetCPInfoExA = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetCPInfoExA");
-
- return TRUE;
-}
-
#define ok_w2(format, szString1, szString2) \
\
if (lstrcmpW((szString1), (szString2)) != 0) \
@@ -271,7 +248,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2)
memset(bufW, 'x', sizeof(bufW));
lenA = lstrlenA(stringA);
lenW = sizeof(bufW)/sizeof(bufW[0]);
- ret = pConvertINetMultiByteToUnicode(NULL, 1252, stringA, (INT *)&lenA, NULL, (INT *)&lenW);
+ ret = ConvertINetMultiByteToUnicode(NULL, 1252, stringA, (INT *)&lenA, NULL, (INT *)&lenW);
ok(ret == S_OK, "ConvertINetMultiByteToUnicode failed: %08x\n", ret);
ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA);
expected_len = MultiByteToWideChar(1252, 0, stringA, lenA, NULL, 0);
@@ -280,7 +257,7 @@ static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2)
memset(bufW, 'x', sizeof(bufW));
lenA = lstrlenA(stringA);
lenW = 0;
- ret = pConvertINetMultiByteToUnicode(NULL, 1252, stringA, (INT *)&lenA, NULL, (INT *)&lenW);
+ ret = ConvertINetMultiByteToUnicode(NULL, 1252, stringA, (INT *)&lenA, NULL, (INT *)&lenW);
ok(ret == S_OK, "ConvertINetMultiByteToUnicode failed: %08x\n", ret);
ok(lenA == lstrlenA(stringA), "expected lenA %u, got %u\n", lstrlenA(stringA), lenA);
expected_len = MultiByteToWideChar(1252, 0, stringA, lenA, NULL, 0);
@@ -1402,7 +1379,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
memset(dest, 'x', sizeof(dest));
srcsz = lstrlenW(src) + 1;
destsz = sizeof(dest);
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, NULL, &srcsz, dest, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, NULL, &srcsz, dest, &destsz);
ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08x\n", hr);
if (hr == S_OK)
ok(srcsz == lstrlenW(src) + 1,
@@ -1417,7 +1394,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
/* lpnWideCharCount NULL */
memset(dest, 'x', sizeof(dest));
destsz = sizeof(dest);
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, NULL, dest, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, src, NULL, dest, &destsz);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok(!strncmp(dest, "abc", 3),
"Expected first three chars to be \"abc\"\n");
@@ -1429,7 +1406,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
/* both lpSrcStr and lpnWideCharCount NULL */
memset(dest, 'x', sizeof(dest));
destsz = sizeof(dest);
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, NULL, NULL, dest, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, NULL, NULL, dest, &destsz);
ok(hr == S_OK || hr == E_FAIL, "Expected S_OK or E_FAIL, got %08x\n", hr);
ok(!memcmp(dest, invariate, sizeof(dest)),
"Expected dest to be unchanged, got %s\n", dest);
@@ -1439,7 +1416,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
memset(dest, 'x', sizeof(dest));
srcsz = lstrlenW(src) + 1;
destsz = sizeof(dest);
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, NULL, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, NULL, &destsz);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok(srcsz == lstrlenW(src) + 1,
"Expected %u, got %u\n", lstrlenW(src) + 1, srcsz);
@@ -1448,7 +1425,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
/* lpnMultiCharCount NULL */
memset(dest, 'x', sizeof(dest));
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, NULL);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, NULL);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok(srcsz == lstrlenW(src) + 1,
"Expected %u, got %u\n", lstrlenW(src) + 1, srcsz);
@@ -1459,7 +1436,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
memset(dest, 'x', sizeof(dest));
srcsz = 0;
destsz = sizeof(dest);
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok(srcsz == 0, "Expected 0, got %u\n", srcsz);
ok(!memcmp(dest, invariate, sizeof(dest)),
@@ -1470,7 +1447,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
memset(dest, 'x', sizeof(dest));
srcsz = lstrlenW(src);
destsz = sizeof(dest);
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok(srcsz == lstrlenW(src),
"Expected %u, got %u\n", lstrlenW(src), srcsz);
@@ -1484,7 +1461,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
memset(dest, 'x', sizeof(dest));
srcsz = lstrlenW(src) + 1;
destsz = sizeof(dest);
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok(srcsz == lstrlenW(src) + 1, "Expected 3, got %u\n", srcsz);
ok(!lstrcmpA(dest, "abc"), "Expected \"abc\", got \"%s\"\n", dest);
@@ -1495,7 +1472,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
memset(dest, 'x', sizeof(dest));
srcsz = -1;
destsz = sizeof(dest);
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok(srcsz == lstrlenW(src),
"Expected %u, got %u\n", lstrlenW(src), srcsz);
@@ -1509,7 +1486,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
memset(dest, 'x', sizeof(dest));
srcsz = lstrlenW(src) + 1;
destsz = 0;
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok(srcsz == lstrlenW(src) + 1,
"Expected %u, got %u\n", lstrlenW(src) + 1, srcsz);
@@ -1522,7 +1499,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
memset(dest, 'x', sizeof(dest));
srcsz = lstrlenW(src) + 1;
destsz = lstrlenW(src);
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
ok(hr == E_FAIL, "Expected E_FAIL, got %08x\n", hr);
ok(srcsz == 0, "Expected 0, got %u\n", srcsz);
ok(!strncmp(dest, "abc", 3), "Expected first three chars to be \"abc\"\n");
@@ -1534,7 +1511,7 @@ static void test_ConvertINetUnicodeToMultiByte(void)
memset(dest, 'x', sizeof(dest));
srcsz = lstrlenW(src) + 1;
destsz = lstrlenW(src) * sizeof(WCHAR);
- hr = pConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 1252, src, &srcsz, dest, &destsz);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
ok(srcsz == lstrlenW(src) + 1,
"Expected %u, got %u\n", lstrlenW(src) + 1, srcsz);
@@ -1614,7 +1591,7 @@ static void test_JapaneseConversion(void)
destsz = 30;
outlen = jis_jp[i][0];
srcsz = unc_jp[i][0];
- hr = pConvertINetUnicodeToMultiByte(NULL, 50220, &unc_jp[i][1], &srcsz, output, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 50220, &unc_jp[i][1], &srcsz, output, &destsz);
if (hr == S_FALSE)
{
skip("Code page identifier 50220 is not supported\n");
@@ -1628,7 +1605,7 @@ static void test_JapaneseConversion(void)
/* and back */
srcsz = outlen;
destsz = 30;
- hr = pConvertINetMultiByteToUnicode(NULL, 50220, output, &srcsz, outputW,&destsz);
+ hr = ConvertINetMultiByteToUnicode(NULL, 50220, output, &srcsz, outputW,&destsz);
/*
* JIS does not have hankata so it get automatically converted to
@@ -1652,7 +1629,7 @@ static void test_JapaneseConversion(void)
outlen = sjis_jp[i][0];
srcsz = unc_jp[i][0];
- hr = pConvertINetUnicodeToMultiByte(NULL, 932, &unc_jp[i][1], &srcsz, output, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 932, &unc_jp[i][1], &srcsz, output, &destsz);
if (hr == S_FALSE)
{
skip("Code page identifier 932 is not supported\n");
@@ -1665,7 +1642,7 @@ static void test_JapaneseConversion(void)
srcsz = outlen;
destsz = 30;
- hr = pConvertINetMultiByteToUnicode(NULL, 932, output, &srcsz, outputW,&destsz);
+ hr = ConvertINetMultiByteToUnicode(NULL, 932, output, &srcsz, outputW,&destsz);
ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n", i, hr);
ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz);
@@ -1680,7 +1657,7 @@ static void test_JapaneseConversion(void)
outlen = euc_jp[i][0];
srcsz = unc_jp[i][0];
- hr = pConvertINetUnicodeToMultiByte(NULL, 51932, &unc_jp[i][1], &srcsz, output, &destsz);
+ hr = ConvertINetUnicodeToMultiByte(NULL, 51932, &unc_jp[i][1], &srcsz, output, &destsz);
if (hr == S_FALSE)
{
skip("Code page identifier 51932 is not supported\n");
@@ -1693,7 +1670,7 @@ static void test_JapaneseConversion(void)
srcsz = outlen;
destsz = 30;
- hr = pConvertINetMultiByteToUnicode(NULL, 51932, output, &srcsz, outputW,&destsz);
+ hr = ConvertINetMultiByteToUnicode(NULL, 51932, output, &srcsz, outputW,&destsz);
ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr);
ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz);
@@ -1705,7 +1682,7 @@ static void test_JapaneseConversion(void)
i = 0;
destsz = 30;
srcsz = jis_jp[i][0];
- hr = pConvertINetMultiByteToUnicode(NULL, 50932, &jis_jp[i][1], &srcsz, outputW, &destsz);
+ hr = ConvertINetMultiByteToUnicode(NULL, 50932, &jis_jp[i][1], &srcsz, outputW, &destsz);
if (hr == S_FALSE)
{
skip("Code page identifier 50932 is not supported\n");
@@ -1719,7 +1696,7 @@ static void test_JapaneseConversion(void)
i = 1;
destsz = 30;
srcsz = sjis_jp[i][0];
- hr = pConvertINetMultiByteToUnicode(NULL, 50932, &sjis_jp[i][1], &srcsz, outputW, &destsz);
+ hr = ConvertINetMultiByteToUnicode(NULL, 50932, &sjis_jp[i][1], &srcsz, outputW, &destsz);
ok(hr == S_OK,"(%i) Expected S_OK, got %08x\n",i,hr);
ok(destsz == unc_jp[i][0],"(%i) Expected %i, got %i\n",i,unc_jp[i][0],destsz);
ok(srcsz == sjis_jp[i][0],"(%i) Expected %i, got %i\n",i,sjis_jp[i][0],srcsz);
@@ -1771,8 +1748,7 @@ START_TEST(mlang)
IMLangFontLink2 *iMLFL2 = NULL;
HRESULT ret;
- if (!init_function_ptrs())
- return;
+ pGetCPInfoExA = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "GetCPInfoExA");
CoInitialize(NULL);
test_Rfc1766ToLcid();
--
1.5.4.3
--=-I9eB/MFRwUCcALO5kmKY--
More information about the wine-patches
mailing list