mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 09:34:09 +00:00
mshtml: Use nameless unions/structs.
This commit is contained in:
parent
2ba8129ce0
commit
102a9bd94b
|
@ -19,8 +19,6 @@
|
|||
#include <stdarg.h>
|
||||
|
||||
#define COBJMACROS
|
||||
#define NONAMELESSUNION
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winuser.h"
|
||||
|
@ -362,11 +360,11 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc,
|
|||
|
||||
for(i=0; i < info->argc; i++) {
|
||||
TYPEDESC *tdesc = &desc->lprgelemdescParam[i].tdesc;
|
||||
if(tdesc->vt == VT_PTR && tdesc->u.lptdesc->vt == VT_USERDEFINED) {
|
||||
if(tdesc->vt == VT_PTR && tdesc->lptdesc->vt == VT_USERDEFINED) {
|
||||
ITypeInfo *ref_type_info;
|
||||
TYPEATTR *attr;
|
||||
|
||||
hres = ITypeInfo_GetRefTypeInfo(dti, tdesc->u.lptdesc->u.hreftype, &ref_type_info);
|
||||
hres = ITypeInfo_GetRefTypeInfo(dti, tdesc->lptdesc->hreftype, &ref_type_info);
|
||||
if(FAILED(hres)) {
|
||||
ERR("Could not get referenced type info: %08lx\n", hres);
|
||||
return;
|
||||
|
@ -389,9 +387,9 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc,
|
|||
return; /* Fallback to ITypeInfo for unsupported arg types */
|
||||
}
|
||||
|
||||
if(desc->lprgelemdescParam[i].u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) {
|
||||
if(desc->lprgelemdescParam[i].paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) {
|
||||
hres = VariantCopy(&info->arg_info[i].default_value,
|
||||
&desc->lprgelemdescParam[i].u.paramdesc.pparamdescex->varDefaultValue);
|
||||
&desc->lprgelemdescParam[i].paramdesc.pparamdescex->varDefaultValue);
|
||||
if(FAILED(hres)) {
|
||||
ERR("Could not copy default value: %08lx\n", hres);
|
||||
return;
|
||||
|
|
|
@ -19,8 +19,6 @@
|
|||
#include <stdarg.h>
|
||||
|
||||
#define COBJMACROS
|
||||
#define NONAMELESSUNION
|
||||
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winuser.h"
|
||||
|
@ -386,7 +384,7 @@ static HRESULT WINAPI BindStatusCallback_GetBindInfo(IBindStatusCallback *iface,
|
|||
pbindinfo->dwBindVerb = BINDVERB_POST;
|
||||
|
||||
pbindinfo->stgmedData.tymed = TYMED_HGLOBAL;
|
||||
pbindinfo->stgmedData.u.hGlobal = This->request_data.post_data;
|
||||
pbindinfo->stgmedData.hGlobal = This->request_data.post_data;
|
||||
pbindinfo->stgmedData.pUnkForRelease = (IUnknown*)&This->IBindStatusCallback_iface;
|
||||
IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface);
|
||||
}
|
||||
|
@ -401,7 +399,7 @@ static HRESULT WINAPI BindStatusCallback_OnDataAvailable(IBindStatusCallback *if
|
|||
|
||||
TRACE("(%p)->(%08lx %ld %p %p)\n", This, grfBSCF, dwSize, pformatetc, pstgmed);
|
||||
|
||||
return This->vtbl->read_data(This, pstgmed->u.pstm);
|
||||
return This->vtbl->read_data(This, pstgmed->pstm);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback *iface,
|
||||
|
|
Loading…
Reference in a new issue