October 2015 - Wine-commits

Alex Henrie : user32: Move misplaced break statement.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: d687512674d92d5075447feba075297fa141a344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d687512674d92d5075447feba… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 4 21:27:54 2015 -0600 user32: Move misplaced break statement. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/spy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index b370aea..c0acd82 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2520,10 +2520,10 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) TRACE("NMHDR hwndFrom=%p idFrom=0x%08lx code=0x%08x\n", pnmh->hwndFrom, pnmh->idFrom, pnmh->code); } + break; default: if (sp_e->data_len > 0) SPY_DumpMem ("MSG lParam", (UINT *)sp_e->lParam, sp_e->data_len); - break; } }

1 0

Alex Henrie : user32: Remove unused parameter istep from release_icon_frame.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: be5015fb74531408cbd5347c6724ba03500820c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5015fb74531408cbd5347c6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 4 21:27:55 2015 -0600 user32: Remove unused parameter istep from release_icon_frame. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/cursoricon.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 5594909..b94a177 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -178,7 +178,7 @@ static struct cursoricon_frame *get_icon_frame( struct cursoricon_object *obj, i return &req_frame->frame; } -static void release_icon_frame( struct cursoricon_object *obj, int istep, struct cursoricon_frame *frame ) +static void release_icon_frame( struct cursoricon_object *obj, struct cursoricon_frame *frame ) { if (obj->is_ani) { @@ -220,7 +220,7 @@ static BOOL free_icon_handle( HICON handle ) if (frame->alpha) DeleteObject( frame->alpha ); if (frame->color) DeleteObject( frame->color ); DeleteObject( frame->mask ); - release_icon_frame( obj, 0, frame ); + release_icon_frame( obj, frame ); } else { @@ -476,7 +476,7 @@ BOOL get_icon_size( HICON handle, SIZE *size ) frame = get_icon_frame( info, 0 ); size->cx = frame->width; size->cy = frame->height; - release_icon_frame( info, 0, frame); + release_icon_frame( info, frame); release_user_handle_ptr( info ); return TRUE; } @@ -956,7 +956,7 @@ done: frame->color = color; frame->mask = mask; frame->alpha = alpha; - release_icon_frame( info, 0, frame ); + release_icon_frame( info, frame ); if (!IS_INTRESOURCE(resname)) { info->resname = HeapAlloc( GetProcessHeap(), 0, (strlenW(resname) + 1) * sizeof(WCHAR) ); @@ -1264,7 +1264,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const BYTE *bits, DWORD bits_size, frame->delay = frame_rates[i]; else frame->delay = ~0; - release_icon_frame( info, i, frame ); + release_icon_frame( info, frame ); } HeapFree( GetProcessHeap(), 0, frames ); @@ -1591,7 +1591,7 @@ HICON WINAPI CopyIcon( HICON hIcon ) } if (!(frameNew = get_icon_frame( ptrNew, 0 ))) { - release_icon_frame( ptrOld, 0, frameOld ); + release_icon_frame( ptrOld, frameOld ); release_user_handle_ptr( ptrOld ); SetLastError( ERROR_INVALID_CURSOR_HANDLE ); return 0; @@ -1602,8 +1602,8 @@ HICON WINAPI CopyIcon( HICON hIcon ) frameNew->mask = copy_bitmap( frameOld->mask ); frameNew->color = copy_bitmap( frameOld->color ); frameNew->alpha = copy_bitmap( frameOld->alpha ); - release_icon_frame( ptrOld, 0, frameOld ); - release_icon_frame( ptrNew, 0, frameNew ); + release_icon_frame( ptrOld, frameOld ); + release_icon_frame( ptrNew, frameNew ); release_user_handle_ptr( ptrNew ); } release_user_handle_ptr( ptrOld ); @@ -1975,7 +1975,7 @@ HCURSOR WINAPI GetCursorFrameInfo(HCURSOR hCursor, DWORD reserved, DWORD istep, *rate_jiffies = ptr->delay; else *rate_jiffies = frame->delay; - release_icon_frame( ptr, istep, frame ); + release_icon_frame( ptr, frame ); } } @@ -2077,7 +2077,7 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) ret = FALSE; } module = ptr->module; - release_icon_frame( ptr, 0, frame ); + release_icon_frame( ptr, frame ); release_user_handle_ptr( ptr ); if (ret && module) GetModuleFileNameW( module, info->szModName, MAX_PATH ); return ret; @@ -2196,7 +2196,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) frame->color = color; frame->mask = mask; frame->alpha = create_alpha_bitmap( iconinfo->hbmColor, mask, NULL, NULL ); - release_icon_frame( info, 0, frame ); + release_icon_frame( info, frame ); if (info->is_icon) { info->hotspot.x = width / 2; @@ -2264,7 +2264,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, } if (!(hMemDC = CreateCompatibleDC( hdc ))) { - release_icon_frame( ptr, istep, frame ); + release_icon_frame( ptr, frame ); release_user_handle_ptr( ptr ); return FALSE; } @@ -2378,7 +2378,7 @@ done: if (hB_off) DeleteObject(hB_off); failed: DeleteDC( hMemDC ); - release_icon_frame( ptr, istep, frame ); + release_icon_frame( ptr, frame ); release_user_handle_ptr( ptr ); return result; }

1 0

Alex Henrie : user32: Remove unused parameter mask from create_alpha_bitmap.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 9c750bb956d1cf5ccd180048ccc1b45e2b369835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c750bb956d1cf5ccd180048c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 4 21:27:56 2015 -0600 user32: Remove unused parameter mask from create_alpha_bitmap. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/cursoricon.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index b94a177..6a05822 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -725,8 +725,7 @@ static BOOL bmi_has_alpha( const BITMAPINFO *info, const void *bits ) * * Create the alpha bitmap for a 32-bpp icon that has an alpha channel. */ -static HBITMAP create_alpha_bitmap( HBITMAP color, HBITMAP mask, - const BITMAPINFO *src_info, const void *color_bits ) +static HBITMAP create_alpha_bitmap( HBITMAP color, const BITMAPINFO *src_info, const void *color_bits ) { HBITMAP alpha = 0; BITMAPINFO *info = NULL; @@ -904,7 +903,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); if (bmi_has_alpha( bmi_copy, color_bits )) - alpha = create_alpha_bitmap( color, mask, bmi_copy, color_bits ); + alpha = create_alpha_bitmap( color, bmi_copy, color_bits ); /* convert info to monochrome to copy the mask */ bmi_copy->bmiHeader.biBitCount = 1; @@ -2195,7 +2194,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) frame->height = height; frame->color = color; frame->mask = mask; - frame->alpha = create_alpha_bitmap( iconinfo->hbmColor, mask, NULL, NULL ); + frame->alpha = create_alpha_bitmap( iconinfo->hbmColor, NULL, NULL ); release_icon_frame( info, frame ); if (info->is_icon) {

1 0

Dmitry Timoshkov : widl: Do not create duplicate type info entries when tag and typedef names are the same.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: fb5293f0ce5c0218c5ab89dc9e3195f184b88337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5293f0ce5c0218c5ab89dc9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:02 2015 +0800 widl: Do not create duplicate type info entries when tag and typedef names are the same. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/winhttp/tests/winhttp.c | 1 - tools/widl/write_msft.c | 33 ++++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index e221809..bd6b47f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3780,7 +3780,6 @@ todo_wine VariantInit(&ret); hr = IWinHttpRequest_Invoke(request, DISPID_HTTPREQUEST_SETAUTOLOGONPOLICY, &IID_NULL, 0, DISPATCH_METHOD, &params, &ret, NULL, NULL); -todo_wine ok(hr == S_OK, "error %#x\n", hr); IWinHttpRequest_Release(request); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 26600e4..a39e986 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1836,7 +1836,7 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ MSFT_TypeInfoBase *typeinfo; MSFT_GuidEntry guidentry; - chat("create_msft_typeinfo: name %s kind %d\n", name, kind); + chat("create_msft_typeinfo: name %s kind %d index %d\n", name, kind, typelib->typelib_header.nrtypeinfos); msft_typeinfo = xmalloc(sizeof(*msft_typeinfo)); memset( msft_typeinfo, 0, sizeof(*msft_typeinfo) ); @@ -2143,20 +2143,31 @@ static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration) static void add_typedef_typeinfo(msft_typelib_t *typelib, type_t *tdef) { - msft_typeinfo_t *msft_typeinfo; - int alignment; + msft_typeinfo_t *msft_typeinfo = NULL; + int alignment, datatype1, datatype2, size; + type_t *type; if (-1 < tdef->typelib_idx) return; - tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; - msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); - encode_type(typelib, get_type_vt(type_alias_get_aliasee(tdef)), - type_alias_get_aliasee(tdef), - &msft_typeinfo->typeinfo->datatype1, - &msft_typeinfo->typeinfo->size, - &alignment, &msft_typeinfo->typeinfo->datatype2); - msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); + type = type_alias_get_aliasee(tdef); + + if (!type->name || strcmp(tdef->name, type->name) != 0) + { + tdef->typelib_idx = typelib->typelib_header.nrtypeinfos; + msft_typeinfo = create_msft_typeinfo(typelib, TKIND_ALIAS, tdef->name, tdef->attrs); + } + + encode_type(typelib, get_type_vt(type), type, + &datatype1, &size, &alignment, &datatype2); + + if (msft_typeinfo) + { + msft_typeinfo->typeinfo->datatype1 = datatype1; + msft_typeinfo->typeinfo->size = size; + msft_typeinfo->typeinfo->datatype2 = datatype2; + msft_typeinfo->typeinfo->typekind |= (alignment << 11 | alignment << 6); + } } static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls)

1 0

Dmitry Timoshkov : oleaut32/tests: Fix compilation of typelib test with PSDK tools.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: ed0c9ba69465ef0e613f346bd067e37eeebc6e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed0c9ba69465ef0e613f346bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:08 2015 +0800 oleaut32/tests: Fix compilation of typelib test with PSDK tools. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 3ce2bd7..0c3ab84 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #define COBJMACROS #define CONST_VTABLE @@ -71,8 +74,8 @@ #define ARCH "none" #endif -static HRESULT WINAPI (*pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); -static HRESULT WINAPI (*pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); +static HRESULT (WINAPI *pRegisterTypeLibForUser)(ITypeLib*,OLECHAR*,OLECHAR*); +static HRESULT (WINAPI *pUnRegisterTypeLibForUser)(REFGUID,WORD,WORD,LCID,SYSKIND); static BOOL (WINAPI *pActivateActCtx)(HANDLE,ULONG_PTR*); static HANDLE (WINAPI *pCreateActCtxW)(PCACTCTXW); @@ -3773,12 +3776,12 @@ static void test_dump_typelib(const char *name) desc->callconv); printf(" /*#param*/ %d, /*#opt*/ %d, /*vtbl*/ %d, /*#scodes*/ %d, /*flags*/ 0x%x,\n", desc->cParams, desc->cParamsOpt, desc->oVft, desc->cScodes, desc->wFuncFlags); - printf(" {%d, %x}, /* ret */\n", desc->elemdescFunc.tdesc.vt, desc->elemdescFunc.paramdesc.wParamFlags); + printf(" {%d, %x}, /* ret */\n", desc->elemdescFunc.tdesc.vt, U(desc->elemdescFunc).paramdesc.wParamFlags); printf(" { /* params */\n"); for (p = 0; p < desc->cParams; p++) { ELEMDESC e = desc->lprgelemdescParam[p]; - printf(" {%d, %x},\n", e.tdesc.vt, e.paramdesc.wParamFlags); + printf(" {%d, %x},\n", e.tdesc.vt, U(e).paramdesc.wParamFlags); } printf(" {-1, -1}\n"); printf(" },\n");

1 0

Dmitry Timoshkov : oleaut32/tests: Update the typelib test generator to match existing data.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 016985f67deddfa844235546d0246300c91010d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=016985f67deddfa844235546d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:13 2015 +0800 oleaut32/tests: Update the typelib test generator to match existing data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 152 ++++++++++++++++++++++++++++++++---------- 1 file changed, 118 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=016985f67deddfa844235…

1 0

Dmitry Timoshkov : oleaut32/tests: Replace magic values by symbolic names in the typelib data.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 2ce0efd3b19a3e972874c21592908594939804b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce0efd3b19a3e972874c2159… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:20 2015 +0800 oleaut32/tests: Replace magic values by symbolic names in the typelib data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 213 +++++++++++++++++++++++++++++++++--------- 1 file changed, 170 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ce0efd3b19a3e972874c…

1 0

Dmitry Timoshkov : oleaut32/tests: Add a check for referenced type of VT_USERDEFINED parameters.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 5081ce3e37e305246f462c4deaa0807818b09372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5081ce3e37e305246f462c4de… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 5 20:36:25 2015 +0800 oleaut32/tests: Add a check for referenced type of VT_USERDEFINED parameters. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 121 ++++++++++++++++++++++++++++-------------- 1 file changed, 81 insertions(+), 40 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index dfc7bee..a9ef5fb 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3929,6 +3929,30 @@ static const char *dump_func_flags(DWORD flags) return buf; } +static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc) +{ + int href_type = -1; + + if (tdesc->vt == VT_USERDEFINED) + { + HRESULT hr; + ITypeInfo *param; + TYPEATTR *attr; + + hr = ITypeInfo_GetRefTypeInfo(info, U(*tdesc).hreftype, &param); + ok(hr == S_OK, "GetRefTypeInfo error %#x\n", hr); + hr = ITypeInfo_GetTypeAttr(param, &attr); + ok(hr == S_OK, "GetTypeAttr error %#x\n", hr); + + href_type = attr->typekind; + + ITypeInfo_ReleaseTypeAttr(param, attr); + ITypeInfo_Release(param); + } + + return href_type; +} + static void test_dump_typelib(const char *name) { WCHAR wszString[260]; @@ -3982,14 +4006,16 @@ static void test_dump_typelib(const char *name) map_value(desc->callconv, callconv_map)); printf(" /*#param*/ %d, /*#opt*/ %d, /*vtbl*/ %d, /*#scodes*/ %d, /*flags*/ %s,\n", desc->cParams, desc->cParamsOpt, desc->oVft/sizeof(void*), desc->cScodes, dump_func_flags(desc->wFuncFlags)); - printf(" {%s, %s}, /* ret */\n", map_value(desc->elemdescFunc.tdesc.vt, vt_map), dump_param_flags(U(desc->elemdescFunc).paramdesc.wParamFlags)); + printf(" {%s, %s, %s}, /* ret */\n", map_value(desc->elemdescFunc.tdesc.vt, vt_map), + map_value(get_href_type(info, &desc->elemdescFunc.tdesc), tkind_map), dump_param_flags(U(desc->elemdescFunc).paramdesc.wParamFlags)); printf(" { /* params */\n"); for (p = 0; p < desc->cParams; p++) { ELEMDESC e = desc->lprgelemdescParam[p]; - printf(" {%s, %s},\n", map_value(e.tdesc.vt, vt_map), dump_param_flags(U(e).paramdesc.wParamFlags)); + printf(" {%s, %s, %s},\n", map_value(e.tdesc.vt, vt_map), + map_value(get_href_type(info, &e.tdesc), tkind_map), dump_param_flags(U(e).paramdesc.wParamFlags)); } - printf(" {-1, -1}\n"); + printf(" {-1, 0, 0}\n"); printf(" },\n"); printf(" { /* names */\n"); OLE_CHECK(ITypeInfo_GetNames(info, desc->memid, tab, 256, &cNames)); @@ -4018,6 +4044,7 @@ static void test_dump_typelib(const char *name) typedef struct _element_info { VARTYPE vt; + TYPEKIND type; USHORT wParamFlags; } element_info; @@ -4061,11 +4088,11 @@ static const type_info info[] = { { /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_PTR, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "QueryInterface", @@ -4077,9 +4104,9 @@ static const type_info info[] = { { /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_UI4, PARAMFLAG_NONE}, /* ret */ + {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "AddRef", @@ -4089,9 +4116,9 @@ static const type_info info[] = { { /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_UI4, PARAMFLAG_NONE}, /* ret */ + {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "Release", @@ -4101,10 +4128,10 @@ static const type_info info[] = { { /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "GetTypeInfoCount", @@ -4115,12 +4142,12 @@ static const type_info info[] = { { /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_UINT, PARAMFLAG_FIN}, - {VT_UI4, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_UINT, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "GetTypeInfo", @@ -4133,14 +4160,14 @@ static const type_info info[] = { { /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_PTR, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FIN}, - {VT_UINT, PARAMFLAG_FIN}, - {VT_UI4, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_UINT, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "GetIDsOfNames", @@ -4155,17 +4182,17 @@ static const type_info info[] = { { /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ FUNCFLAG_FRESTRICTED, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {VT_I4, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FIN}, - {VT_UI4, PARAMFLAG_FIN}, - {VT_UI2, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FIN}, - {VT_PTR, PARAMFLAG_FOUT}, - {VT_PTR, PARAMFLAG_FOUT}, - {VT_PTR, PARAMFLAG_FOUT}, - {-1, -1} + {VT_I4, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_UI4, -1, PARAMFLAG_FIN}, + {VT_UI2, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FIN}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {VT_PTR, -1, PARAMFLAG_FOUT}, + {-1, 0, 0} }, { /* names */ "Invoke", @@ -4183,9 +4210,9 @@ static const type_info info[] = { { /*id*/ 0x60020000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, - {VT_VOID, PARAMFLAG_NONE}, /* ret */ + {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "Test", @@ -4203,9 +4230,9 @@ static const type_info info[] = { { /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, - {VT_HRESULT, PARAMFLAG_NONE}, /* ret */ + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ { /* params */ - {-1, -1} + {-1, 0, 0} }, { /* names */ "Test", @@ -4316,6 +4343,20 @@ static void test_dump_typelib(const char *name) for (i = 0 ; i < desc->cParams; i++) { check_type(&desc->lprgelemdescParam[i], &fn_info->params[i]); + + if (desc->lprgelemdescParam[i].tdesc.vt == VT_USERDEFINED) + { + ITypeInfo *param; + TYPEATTR *var_attr; + + ole_check(ITypeInfo_GetRefTypeInfo(typeinfo, U(desc->lprgelemdescParam[i].tdesc).hreftype, &param)); + ole_check(ITypeInfo_GetTypeAttr(param, &var_attr)); + + ok(var_attr->typekind == fn_info->params[i].type, "expected %#x, got %#x\n", fn_info->params[i].type, var_attr->typekind); + + ITypeInfo_ReleaseTypeAttr(param, var_attr); + ITypeInfo_Release(param); + } } expect_int(fn_info->params[desc->cParams].vt, (VARTYPE)-1);

1 0

Dmitry Timoshkov : oleaut32/tests: Add more tests for typelib data.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: e1760f84229abf107afa5414bb20251e01127951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1760f84229abf107afa5414b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 6 15:55:03 2015 +0800 oleaut32/tests: Add more tests for typelib data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/test_tlb.idl | 15 ++++++ dlls/oleaut32/tests/typelib.c | 111 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 126 insertions(+) diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index fa084ec..8275c37 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -58,4 +58,19 @@ library Test IDispatch *disp; BSTR bstr; }; + + typedef [public] enum _a { a1, a2 } a; + typedef [public] enum aa { aa1, aa2 } aa; + typedef enum _b { b1, b2 } b; + typedef enum bb { bb1, bb2 } bb; + typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396b)] enum _c { c1, c2 } c; + typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396c)] enum cc { cc1, cc2 } cc; + + [uuid(ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a)] + interface ITestIface : IDispatch + { + HRESULT test1(a value); + HRESULT test2(b value); + HRESULT test3(c value); + } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index a9ef5fb..1d13b89 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4252,6 +4252,104 @@ static const type_info info[] = { "{4029f190-ca4a-4611-aeb9-673983cb96de}", /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct2), /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "a", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "_a", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "aa", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "_b", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "bb", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "c", + "{016fe2ec-b2c8-45f8-b23b-39e53a75396b}", + /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "_c", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "cc", + "{00000000-0000-0000-0000-000000000000}", + /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4, + /*#vtbl*/ 0, /*#func*/ 0 +}, +{ + "ITestIface", + "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}", + /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/ sizeof(ITestIface*), + /*#vtbl*/ 10, /*#func*/ 3, + { + { + /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, + {-1, 0, 0} + }, + { /* names */ + "test1", + "value", + NULL, + }, + }, + { + /*id*/ 0x60020001, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_USERDEFINED, TKIND_ENUM, PARAMFLAG_NONE}, + {-1, 0, 0} + }, + { /* names */ + "test2", + "value", + NULL, + }, + }, + { + /*id*/ 0x60020002, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL, + /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0, + {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */ + { /* params */ + {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE}, + {-1, 0, 0} + }, + { /* names */ + "test3", + "value", + NULL, + }, + }, + } } }; @@ -4286,8 +4384,21 @@ static void test_dump_typelib(const char *name) ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr)); expect_int(typeattr->typekind, ti->type); expect_hex(typeattr->wTypeFlags, ti->wTypeFlags); + /* FIXME: remove once widl is fixed */ + if (typeattr->typekind == TKIND_ALIAS) + { +todo_wine /* widl generates broken typelib and typeattr just reflects that */ + ok(typeattr->cbAlignment == ti->cbAlignment || broken(typeattr->cbAlignment == 1), + "expected %d, got %d\n", ti->cbAlignment, typeattr->cbAlignment); +todo_wine /* widl generates broken typelib and typeattr just reflects that */ + ok(typeattr->cbSizeInstance == ti->cbSizeInstance || broken(typeattr->cbSizeInstance == 0), + "expected %d, got %d\n", ti->cbSizeInstance, typeattr->cbSizeInstance); + } + else + { expect_int(typeattr->cbAlignment, ti->cbAlignment); expect_int(typeattr->cbSizeInstance, ti->cbSizeInstance); + } expect_int(typeattr->cbSizeVft, ti->cbSizeVft * sizeof(void*)); expect_int(typeattr->cFuncs, ti->cFuncs);

1 0

Jacek Caban : mshtml: Updated nsIDocShellLoadInfo declaration to recent Wine Gecko version.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: d25737b38176edf918c6b89d384647b38b67d179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d25737b38176edf918c6b89d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 5 17:45:48 2015 +0200 mshtml: Updated nsIDocShellLoadInfo declaration to recent Wine Gecko version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/nsiface.idl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 13c610f..c0b120c 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3735,12 +3735,13 @@ interface nsIContentViewer : nsISupports [ object, - uuid(c8d3b1e1-565a-427e-9d68-b109910ce9b7), + uuid(c63e9d64-490d-48bf-8013-b5d8ee4dbc25), local ] interface nsIDocShellLoadInfo : nsISupports { - typedef int nsDocShellInfoLoadType; + typedef int32_t nsDocShellInfoLoadType; + typedef uint32_t nsDocShellInfoReferrerPolicy; nsresult GetReferrer(nsIURI **aReferrer); nsresult SetReferrer(nsIURI *aReferrer); @@ -3762,6 +3763,8 @@ interface nsIDocShellLoadInfo : nsISupports nsresult SetHeadersStream(nsIInputStream *aHeadersStream); nsresult GetSendReferrer(bool *aSendReferrer); nsresult SetSendReferrer(bool aSendReferrer); + nsresult GetReferrerPolicy(nsDocShellInfoReferrerPolicy *aReferrerPolicy); + nsresult SetReferrerPolicy(nsDocShellInfoReferrerPolicy aReferrerPolicy); nsresult GetIsSrcdocLoad(bool *aIsSrcdocLoad); nsresult GetSrcdocData(nsAString *aSrcdocData); nsresult SetSrcdocData(const nsAString *aSrcdocData);

1 0