mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-18 11:48:07 +00:00
oleaut32/tests: Fix some pointer sizes in typelib tests for 64-bit.
This commit is contained in:
parent
9955350ea1
commit
538c706787
|
@ -1090,7 +1090,7 @@ typedef struct _function_info
|
|||
CALLCONV callconv;
|
||||
short cParams;
|
||||
short cParamsOpt;
|
||||
short oVft;
|
||||
short vtbl_index;
|
||||
short cScodes;
|
||||
WORD wFuncFlags;
|
||||
element_info ret_type;
|
||||
|
@ -1115,7 +1115,7 @@ static const interface_info info[] = {
|
|||
{
|
||||
"IDualIface",
|
||||
/*kind*/ TKIND_DISPATCH, /*flags*/ 0x1040, /*align*/ 4, /*size*/ 4,
|
||||
/*#vtbl*/ 28, /*#func*/ 8,
|
||||
/*#vtbl*/ 7, /*#func*/ 8,
|
||||
{
|
||||
{
|
||||
0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4,
|
||||
|
@ -1135,7 +1135,7 @@ static const interface_info info[] = {
|
|||
},
|
||||
{
|
||||
0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4,
|
||||
/*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
/*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
{19, 0}, /* ret */
|
||||
{ /* params */
|
||||
{-1, -1}
|
||||
|
@ -1147,7 +1147,7 @@ static const interface_info info[] = {
|
|||
},
|
||||
{
|
||||
0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4,
|
||||
/*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
/*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
{19, 0}, /* ret */
|
||||
{ /* params */
|
||||
{-1, -1}
|
||||
|
@ -1159,7 +1159,7 @@ static const interface_info info[] = {
|
|||
},
|
||||
{
|
||||
0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4,
|
||||
/*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
/*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
{24, 0}, /* ret */
|
||||
{ /* params */
|
||||
{26, 2},
|
||||
|
@ -1173,7 +1173,7 @@ static const interface_info info[] = {
|
|||
},
|
||||
{
|
||||
0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4,
|
||||
/*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 16, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
/*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
{24, 0}, /* ret */
|
||||
{ /* params */
|
||||
{23, 1},
|
||||
|
@ -1191,7 +1191,7 @@ static const interface_info info[] = {
|
|||
},
|
||||
{
|
||||
0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4,
|
||||
/*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 20, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
/*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
{24, 0}, /* ret */
|
||||
{ /* params */
|
||||
{26, 1},
|
||||
|
@ -1213,7 +1213,7 @@ static const interface_info info[] = {
|
|||
},
|
||||
{
|
||||
0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4,
|
||||
/*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 24, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
/*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ 0x1,
|
||||
{24, 0}, /* ret */
|
||||
{ /* params */
|
||||
{3, 1},
|
||||
|
@ -1241,7 +1241,7 @@ static const interface_info info[] = {
|
|||
},
|
||||
{
|
||||
0x60020000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ 0x4,
|
||||
/*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 28, /*#scodes*/ 0, /*flags*/ 0x0,
|
||||
/*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0x0,
|
||||
{24, 0}, /* ret */
|
||||
{ /* params */
|
||||
{-1, -1}
|
||||
|
@ -1256,11 +1256,11 @@ static const interface_info info[] = {
|
|||
{
|
||||
"ISimpleIface",
|
||||
/*kind*/ TKIND_INTERFACE, /*flags*/ 0x1000, /*align*/ 4, /*size*/ 4,
|
||||
/*#vtbl*/ 32, /*#func*/ 1,
|
||||
/*#vtbl*/ 8, /*#func*/ 1,
|
||||
{
|
||||
{
|
||||
0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ 0x4,
|
||||
/*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 28, /*#scodes*/ 0, /*flags*/ 0x0,
|
||||
/*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0x0,
|
||||
{25, 0}, /* ret */
|
||||
{ /* params */
|
||||
{-1, -1}
|
||||
|
@ -1307,7 +1307,7 @@ static void test_dump_typelib(const char *name)
|
|||
expect_hex(typeattr->wTypeFlags, if_info->wTypeFlags);
|
||||
expect_int(typeattr->cbAlignment, if_info->cbAlignment);
|
||||
expect_int(typeattr->cbSizeInstance, if_info->cbSizeInstance);
|
||||
expect_int(typeattr->cbSizeVft, if_info->cbSizeVft);
|
||||
expect_int(typeattr->cbSizeVft, if_info->cbSizeVft * sizeof(void*));
|
||||
expect_int(typeattr->cFuncs, if_info->cFuncs);
|
||||
|
||||
for (func = 0; func < typeattr->cFuncs; func++)
|
||||
|
@ -1326,7 +1326,7 @@ static void test_dump_typelib(const char *name)
|
|||
expect_int(desc->callconv, fn_info->callconv);
|
||||
expect_int(desc->cParams, fn_info->cParams);
|
||||
expect_int(desc->cParamsOpt, fn_info->cParamsOpt);
|
||||
expect_int(desc->oVft, fn_info->oVft);
|
||||
expect_int(desc->oVft, fn_info->vtbl_index * sizeof(void*));
|
||||
expect_int(desc->cScodes, fn_info->cScodes);
|
||||
expect_int(desc->wFuncFlags, fn_info->wFuncFlags);
|
||||
ole_check(ITypeInfo_GetNames(typeinfo, desc->memid, namesTab, 256, &cNames));
|
||||
|
|
Loading…
Reference in a new issue