system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-15 01:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

ole32/tests: Skip some tests if not allowed to modify the Classes registry key.

Browse source
This commit is contained in:
Francois Gouget 2011-09-21 00:42:06 +02:00 committed by Alexandre Julliard
parent b883b5574e
commit 88ba9c3274
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/ole32/tests/marshal.c
View file

@ -2268,7 +2268,7 @@ static void test_freethreadedmarshaler(void)
IMarshal_Release(pFTMarshal);
}
static void reg_unreg_wine_test_class(BOOL Register)
static HRESULT reg_unreg_wine_test_class(BOOL Register)
{
HRESULT hr;
char buffer[256];
@ -2286,9 +2286,16 @@ static void reg_unreg_wine_test_class(BOOL Register)
if (Register)
{
error = RegCreateKeyEx(HKEY_CLASSES_ROOT, buffer, 0, NULL, 0, KEY_SET_VALUE, NULL, &hkey, &dwDisposition);
if (error == ERROR_ACCESS_DENIED)
{
skip("Not authorized to modify the Classes key\n");
return E_FAIL;
}
ok(error == ERROR_SUCCESS, "RegCreateKeyEx failed with error %d\n", error);
if (error != ERROR_SUCCESS) hr = E_FAIL;
error = RegSetValueEx(hkey, NULL, 0, REG_SZ, (const unsigned char *)"\"ole32.dll\"", strlen("\"ole32.dll\"") + 1);
ok(error == ERROR_SUCCESS, "RegSetValueEx failed with error %d\n", error);
if (error != ERROR_SUCCESS) hr = E_FAIL;
RegCloseKey(hkey);
}
else
@ -2297,6 +2304,7 @@ static void reg_unreg_wine_test_class(BOOL Register)
*strrchr(buffer, '\\') = '\0';
RegDeleteKey(HKEY_CLASSES_ROOT, buffer);
}
return hr;
}
static void test_inproc_handler(void)
@ -2305,7 +2313,8 @@ static void test_inproc_handler(void)
IUnknown *pObject;
IUnknown *pObject2;
reg_unreg_wine_test_class(TRUE);
if (FAILED(reg_unreg_wine_test_class(TRUE)))
return;
hr = CoCreateInstance(&CLSID_WineTest, NULL, CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void **)&pObject);
ok_ole_success(hr, "CoCreateInstance");
@ -2386,7 +2395,8 @@ static void test_handler_marshaling(void)
HANDLE thread;
static const LARGE_INTEGER ullZero;
reg_unreg_wine_test_class(TRUE);
if (FAILED(reg_unreg_wine_test_class(TRUE)))
return;
cLocks = 0;
hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream);