ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed some issues caused by the new oaidl.h.

This commit is contained in:
Alexandre Julliard 2003-01-05 20:32:30 +00:00
parent 6463e3823a
commit 52395b0eb9
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/oleaut32/dispatch.c
View File

@ -28,6 +28,7 @@
#include <ctype.h>
#include "windef.h"
#include "objbase.h"
#include "oleauto.h"
#include "winerror.h"
#include "winreg.h" /* for HKEY_LOCAL_MACHINE */
@ -71,11 +72,7 @@ HRESULT WINAPI DispInvoke(
*/
FIXME("Coercion of arguments not implemented\n");
hr = ICOM_CALL7(Invoke,
ptinfo,
_this,
dispidMember,
wFlags,
ITypeInfo_Invoke(ptinfo, _this, dispidMember, wFlags,
pparams, pvarResult, pexcepinfo, puArgErr);
return (hr);
@ -103,11 +100,7 @@ HRESULT WINAPI DispGetIDsOfNames(
{
HRESULT hr = E_FAIL;
hr = ICOM_CALL3(GetIDsOfNames,
ptinfo,
rgszNames,
cNames,
rgdispid);
ITypeInfo_GetIDsOfNames(ptinfo, rgszNames, cNames, rgdispid);
return (hr);
}

3
dlls/oleaut32/oleaut.c
View File

@ -37,6 +37,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole);
/* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */
extern const GUID CLSID_PSOAInterface;
/******************************************************************************
* SysStringLen [OLEAUT32.7]
*

17
dlls/oleaut32/typelib.c
View File

@ -76,6 +76,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole);
WINE_DECLARE_DEBUG_CHANNEL(typelib);
/* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */
const GUID CLSID_PSOAInterface = { 0x00020424, 0, 0, { 0xC0, 0, 0, 0, 0, 0, 0, 0x46 } };
/****************************************************************************
* FromLExxx
*
@ -4761,37 +4764,34 @@ static HRESULT WINAPI ITypeInfo_fnGetContainingTypeLib( ITypeInfo2 *iface,
* Releases a TYPEATTR previously returned by GetTypeAttr.
*
*/
static HRESULT WINAPI ITypeInfo_fnReleaseTypeAttr( ITypeInfo2 *iface,
static void WINAPI ITypeInfo_fnReleaseTypeAttr( ITypeInfo2 *iface,
TYPEATTR* pTypeAttr)
{
ICOM_THIS( ITypeInfoImpl, iface);
TRACE("(%p)->(%p)\n", This, pTypeAttr);
return S_OK;
}
/* ITypeInfo::ReleaseFuncDesc
*
* Releases a FUNCDESC previously returned by GetFuncDesc. *
*/
static HRESULT WINAPI ITypeInfo_fnReleaseFuncDesc(
static void WINAPI ITypeInfo_fnReleaseFuncDesc(
ITypeInfo2 *iface,
FUNCDESC *pFuncDesc)
{
ICOM_THIS( ITypeInfoImpl, iface);
TRACE("(%p)->(%p)\n", This, pFuncDesc);
return S_OK;
}
/* ITypeInfo::ReleaseVarDesc
*
* Releases a VARDESC previously returned by GetVarDesc.
*/
static HRESULT WINAPI ITypeInfo_fnReleaseVarDesc( ITypeInfo2 *iface,
static void WINAPI ITypeInfo_fnReleaseVarDesc( ITypeInfo2 *iface,
VARDESC *pVarDesc)
{
ICOM_THIS( ITypeInfoImpl, iface);
TRACE("(%p)->(%p)\n", This, pVarDesc);
return S_OK;
}
/* ITypeInfo2::GetTypeKind
@ -4815,12 +4815,11 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeKind( ITypeInfo2 * iface,
* attribute).
*
*/
static HRESULT WINAPI ITypeInfo2_fnGetTypeFlags( ITypeInfo2 * iface,
UINT *pTypeFlags)
static HRESULT WINAPI ITypeInfo2_fnGetTypeFlags( ITypeInfo2 *iface, ULONG *pTypeFlags)
{
ICOM_THIS( ITypeInfoImpl, iface);
*pTypeFlags=This->TypeAttr.wTypeFlags;
TRACE("(%p) flags 0x%04x\n", This,*pTypeFlags);
TRACE("(%p) flags 0x%lx\n", This,*pTypeFlags);
return S_OK;
}

4
include/wine/obj_webbrowser.h
View File

@ -92,7 +92,7 @@ typedef enum RefreshConstants
ICOM_METHOD1(HRESULT,get_LocationURL, BSTR*,LocationURL) \
ICOM_METHOD1(HRESULT,get_Busy, VARIANT*,pBool)
#define IWebBrowser_IMETHODS \
IDispatch_METHODS \
IDispatch_IMETHODS \
IWebBrowser_METHODS
ICOM_DEFINE(IWebBrowser,IDispatch)
#undef ICOM_INTERFACE
@ -156,7 +156,7 @@ ICOM_DEFINE(IWebBrowser,IDispatch)
ICOM_METHOD1(HRESULT,get_FullScreen,VARIANT_BOOL*,pbFullScreen) \
ICOM_METHOD1(HRESULT,put_FullScreen,VARIANT_BOOL,bFullScreen)
#define IWebBrowserApp_IMETHODS \
IDispatch_METHODS \
IDispatch_IMETHODS \
IWebBrowser_METHODS \
IWebBrowserApp_METHODS
ICOM_DEFINE(IWebBrowserApp,IWebBrowser)