mirror of
https://github.com/reactos/reactos.git
synced 2025-07-31 19:52:11 +00:00
[PROPSYS_WINETEST]
* Sync with Wine 1.7.17. CORE-8080 svn path=/trunk/; revision=62996
This commit is contained in:
parent
e124247fdd
commit
5e2046a6b9
2 changed files with 18 additions and 32 deletions
|
@ -2,5 +2,8 @@
|
|||
add_definitions(-DUSE_WINE_TODOS)
|
||||
add_executable(propsys_winetest propstore.c propsys.c testlist.c)
|
||||
set_module_type(propsys_winetest win32cui)
|
||||
add_importlibs(propsys_winetest propsys ole32 oleaut32 msvcrt kernel32 ntdll)
|
||||
add_importlibs(propsys_winetest propsys ole32 oleaut32 msvcrt kernel32)
|
||||
if(MSVC)
|
||||
add_importlibs(propsys_winetest ntdll)
|
||||
endif()
|
||||
add_cd_file(TARGET propsys_winetest DESTINATION reactos/bin FOR all)
|
||||
|
|
|
@ -47,22 +47,6 @@ DEFINE_GUID(expect_guid, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x12, 0x34, 0x5
|
|||
|
||||
#define GUID_MEMBERS(g) {(g).Data1, (g).Data2, (g).Data3, {(g).Data4[0], (g).Data4[1], (g).Data4[2], (g).Data4[3], (g).Data4[4], (g).Data4[5], (g).Data4[6], (g).Data4[7]}}
|
||||
|
||||
static char *show_guid(const GUID *guid, char *buf)
|
||||
{
|
||||
static char static_buf[40];
|
||||
|
||||
if(!buf)
|
||||
buf = static_buf;
|
||||
|
||||
sprintf(buf,
|
||||
"{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
|
||||
guid->Data1, guid->Data2, guid->Data3,
|
||||
guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
|
||||
guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] );
|
||||
|
||||
return buf;
|
||||
}
|
||||
|
||||
static int strcmp_wa(LPCWSTR strw, const char *stra)
|
||||
{
|
||||
CHAR buf[512];
|
||||
|
@ -124,9 +108,9 @@ static void test_PSStringFromPropertyKey(void)
|
|||
UINT cch;
|
||||
HRESULT hr_expect;
|
||||
const WCHAR *buf_expect;
|
||||
int hr_broken;
|
||||
BOOL hr_broken;
|
||||
HRESULT hr2;
|
||||
int buf_broken;
|
||||
BOOL buf_broken;
|
||||
const WCHAR *buf2;
|
||||
} testcases[] =
|
||||
{
|
||||
|
@ -134,15 +118,15 @@ static void test_PSStringFromPropertyKey(void)
|
|||
{&prop, NULL, 0, E_POINTER},
|
||||
{&prop, NULL, PKEYSTR_MAX, E_POINTER},
|
||||
{NULL, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
|
||||
{NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, 0, 0, 1, fillerW},
|
||||
{NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, FALSE, 0, TRUE, fillerW},
|
||||
{&prop, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
|
||||
{&prop, out, GUIDSTRING_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
|
||||
{&prop, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
|
||||
{&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, 1, S_OK, 1, truncatedW},
|
||||
{&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, 1, S_OK, 1, truncated2W},
|
||||
{&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, 1, S_OK, 1, truncated3W},
|
||||
{&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, TRUE, S_OK, TRUE, truncatedW},
|
||||
{&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, TRUE, S_OK, TRUE, truncated2W},
|
||||
{&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, TRUE, S_OK, TRUE, truncated3W},
|
||||
{&prop, out, PKEYSTR_MAX, S_OK, expectedW},
|
||||
{&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, 1, S_OK, 1, truncated4W},
|
||||
{&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, TRUE, S_OK, TRUE, truncated4W},
|
||||
{&prop2, out, GUIDSTRING_MAX + 6, S_OK, expected2W},
|
||||
{&prop2, out, PKEYSTR_MAX, S_OK, expected2W},
|
||||
{&prop3, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
|
||||
|
@ -356,7 +340,6 @@ static void test_PSPropertyKeyFromString(void)
|
|||
PROPERTYKEY out_init = {GUID_MEMBERS(dummy_guid), 0xdeadbeef};
|
||||
PROPERTYKEY out;
|
||||
HRESULT ret;
|
||||
char guid_buf[40], guid_buf2[40];
|
||||
|
||||
const struct
|
||||
{
|
||||
|
@ -448,7 +431,7 @@ static void test_PSPropertyKeyFromString(void)
|
|||
{
|
||||
ok(IsEqualGUID(&testcases[i].pkey->fmtid, &testcases[i].pkey_expect.fmtid),
|
||||
"[%d] Expected GUID %s, got %s\n",
|
||||
i, show_guid(&testcases[i].pkey_expect.fmtid, guid_buf), show_guid(&testcases[i].pkey->fmtid, guid_buf2));
|
||||
i, wine_dbgstr_guid(&testcases[i].pkey_expect.fmtid), wine_dbgstr_guid(&testcases[i].pkey->fmtid));
|
||||
ok(testcases[i].pkey->pid == testcases[i].pkey_expect.pid,
|
||||
"[%d] Expected property ID %u, got %u\n",
|
||||
i, testcases[i].pkey_expect.pid, testcases[i].pkey->pid);
|
||||
|
@ -588,7 +571,7 @@ static void test_PropVariantToGUID(void)
|
|||
|
||||
hres = PropVariantToGUID(&propvar, &guid);
|
||||
ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres);
|
||||
ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
|
||||
ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid));
|
||||
PropVariantClear(&propvar);
|
||||
|
||||
hres = InitPropVariantFromGUIDAsString(&dummy_guid, &propvar);
|
||||
|
@ -596,7 +579,7 @@ static void test_PropVariantToGUID(void)
|
|||
|
||||
hres = PropVariantToGUID(&propvar, &guid);
|
||||
ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres);
|
||||
ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
|
||||
ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid));
|
||||
|
||||
ok(propvar.vt == VT_LPWSTR, "incorrect PROPVARIANT type: %d\n", propvar.vt);
|
||||
propvar.u.pwszVal[1] = 'd';
|
||||
|
@ -604,7 +587,7 @@ static void test_PropVariantToGUID(void)
|
|||
propvar.u.pwszVal[3] = 'a';
|
||||
hres = PropVariantToGUID(&propvar, &guid);
|
||||
ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres);
|
||||
ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
|
||||
ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid));
|
||||
|
||||
propvar.u.pwszVal[1] = 'z';
|
||||
hres = PropVariantToGUID(&propvar, &guid);
|
||||
|
@ -617,7 +600,7 @@ static void test_PropVariantToGUID(void)
|
|||
|
||||
hres = VariantToGUID(&var, &guid);
|
||||
ok(hres == S_OK, "VariantToGUID failed %x\n", hres);
|
||||
ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
|
||||
ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid));
|
||||
VariantClear(&var);
|
||||
|
||||
hres = InitVariantFromGUIDAsString(&dummy_guid, &var);
|
||||
|
@ -625,7 +608,7 @@ static void test_PropVariantToGUID(void)
|
|||
|
||||
hres = VariantToGUID(&var, &guid);
|
||||
ok(hres == S_OK, "VariantToGUID failed %x\n", hres);
|
||||
ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
|
||||
ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid));
|
||||
|
||||
ok(V_VT(&var) == VT_BSTR, "incorrect VARIANT type: %d\n", V_VT(&var));
|
||||
V_BSTR(&var)[1] = 'z';
|
||||
|
@ -638,7 +621,7 @@ static void test_PropVariantToGUID(void)
|
|||
V_VT(&var) = VT_EMPTY;
|
||||
hres = PropVariantToGUID(&propvar, &guid);
|
||||
ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres);
|
||||
ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
|
||||
ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", wine_dbgstr_guid(&guid));
|
||||
PropVariantClear(&propvar);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue