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

quartz/tests: Fix test failures on Win95 by using A-functions.

This commit is contained in:
Paul Vriens 2009-01-27 10:15:50 +01:00 committed by Alexandre Julliard
parent ae79b02ca6
commit b4d246ba8f
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/quartz/tests/filtermapper.c
View File

@ -207,11 +207,10 @@ static void test_legacy_filter_registration(void)
static const CHAR szFilterName[] = "Testfilter"; static const CHAR szFilterName[] = "Testfilter";
static const WCHAR wszPinName[] = {'P', 'i', 'n', '1', 0 }; static const WCHAR wszPinName[] = {'P', 'i', 'n', '1', 0 };
CLSID clsidFilter; CLSID clsidFilter;
WCHAR wszRegKey[MAX_PATH];
CHAR szRegKey[MAX_PATH]; CHAR szRegKey[MAX_PATH];
static const WCHAR wszClsid[] = {'C','L','S','I','D', 0};
static const CHAR szClsid[] = "CLSID"; static const CHAR szClsid[] = "CLSID";
static const WCHAR wszSlash[] = {'\\', 0}; WCHAR wszGuidstring[MAX_PATH];
CHAR szGuidstring[MAX_PATH];
LONG lRet; LONG lRet;
HKEY hKey = NULL; HKEY hKey = NULL;
IEnumMoniker *pEnum = NULL; IEnumMoniker *pEnum = NULL;
@ -234,12 +233,14 @@ static void test_legacy_filter_registration(void)
hr = CoCreateGuid(&clsidFilter); hr = CoCreateGuid(&clsidFilter);
ok(hr == S_OK, "CoCreateGuid failed with %x\n", hr); ok(hr == S_OK, "CoCreateGuid failed with %x\n", hr);
lstrcpyW(wszRegKey, wszClsid); lRet = StringFromGUID2(&clsidFilter, wszGuidstring, MAX_PATH);
lstrcatW(wszRegKey, wszSlash);
lRet = StringFromGUID2(&clsidFilter, wszRegKey + lstrlenW(wszRegKey), MAX_PATH - lstrlenW(wszRegKey));
ok(lRet > 0, "StringFromGUID2 failed\n"); ok(lRet > 0, "StringFromGUID2 failed\n");
if (!lRet) goto out; if (!lRet) goto out;
WideCharToMultiByte(CP_ACP, 0, wszRegKey, -1, szRegKey, sizeof(szRegKey), 0, 0); WideCharToMultiByte(CP_ACP, 0, wszGuidstring, -1, szGuidstring, MAX_PATH, 0, 0);
lstrcpyA(szRegKey, szClsid);
lstrcatA(szRegKey, "\\");
lstrcatA(szRegKey, szGuidstring);
/* Register---- functions need a filter class key to write pin and pin media type data to. Create a bogus /* Register---- functions need a filter class key to write pin and pin media type data to. Create a bogus
* class key for it. */ * class key for it. */
@ -303,11 +304,7 @@ static void test_legacy_filter_registration(void)
lRet = RegOpenKeyExA(HKEY_CLASSES_ROOT, szClsid, 0, KEY_WRITE | DELETE, &hKey); lRet = RegOpenKeyExA(HKEY_CLASSES_ROOT, szClsid, 0, KEY_WRITE | DELETE, &hKey);
ok(lRet == ERROR_SUCCESS, "RegOpenKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet)); ok(lRet == ERROR_SUCCESS, "RegOpenKeyExA failed with %x\n", HRESULT_FROM_WIN32(lRet));
lRet = StringFromGUID2(&clsidFilter, wszRegKey, MAX_PATH); lRet = RegDeleteKeyA(hKey, szGuidstring);
ok(lRet > 0, "StringFromGUID2 failed\n");
WideCharToMultiByte(CP_ACP, 0, wszRegKey, -1, szRegKey, sizeof(szRegKey), 0, 0);
lRet = RegDeleteKeyA(hKey, szRegKey);
ok(lRet == ERROR_SUCCESS, "RegDeleteKeyA failed with %x\n", HRESULT_FROM_WIN32(lRet)); ok(lRet == ERROR_SUCCESS, "RegDeleteKeyA failed with %x\n", HRESULT_FROM_WIN32(lRet));
if (hKey) RegCloseKey(hKey); if (hKey) RegCloseKey(hKey);