Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-26 17:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

- declare IPicture OBJC macros

Browse source 
- enable olepicture.c

svn path=/trunk/; revision=8501
This commit is contained in:
Martin Fuchs 2004-03-01 22:57:20 +00:00
parent 897ccf0b08
commit 43a529f49b
5 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/oleaut32/Makefile.in
View file

@ -16,6 +16,7 @@ C_SRCS = \
dispatch.c \
hash.c \
oleaut.c \
olepicture.c \
stubs.c \
safearray.c \
varformat.c \
@ -24,7 +25,6 @@ C_SRCS = \
# regsvr.c \
# olefont.c \
# olepicture.c \
# tmarshal.c \
# usrmarshal.c \
# oaidl_p.c \

6
reactos/lib/oleaut32/oleaut32.spec
View file

@ -380,7 +380,7 @@
397 stub UserMSG_to_local
398 stub UserMSG_free_inst
399 stub UserMSG_free_local
#401 stdcall OleLoadPictureEx(ptr long long long long long long ptr)
401 stdcall OleLoadPictureEx(ptr long long long long long long ptr)
402 stub OleLoadPictureFileEx
410 stdcall -private DllCanUnloadNow() OLEAUT32_DllCanUnloadNow
411 stdcall SafeArrayCreateVector(long long long)
@ -390,8 +390,8 @@
415 stdcall OleIconToCursor(long long)
416 stdcall OleCreatePropertyFrameIndirect(ptr)
417 stdcall OleCreatePropertyFrame(ptr long long ptr long ptr long ptr ptr long ptr)
#418 stdcall OleLoadPicture(ptr long long ptr ptr)
#419 stdcall OleCreatePictureIndirect(ptr ptr long ptr)
418 stdcall OleLoadPicture(ptr long long ptr ptr)
419 stdcall OleCreatePictureIndirect(ptr ptr long ptr)
#420 stdcall OleCreateFontIndirect(ptr ptr ptr)
421 stdcall OleTranslateColor(long long long)
422 stub OleLoadPictureFile

2
reactos/lib/oleaut32/olepicture.c
View file

@ -1105,7 +1105,6 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) {
hr = S_OK;
break;
}
#ifndef __REACTOS__ /*FIXME: missing CURSORICONFILEDIR */
case 0x0000: { /* ICON , first word is dwReserved */
HICON hicon;
CURSORICONFILEDIR *cifd = (CURSORICONFILEDIR*)xbuf;
@ -1160,7 +1159,6 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) {
}
break;
}
#endif
default:
{
int i;

9
reactos/lib/oleaut32/variant.c
View file

@ -603,8 +603,7 @@ HRESULT WINAPI VariantClear(VARIANTARG* pVarg)
if (V_ARRAY(pVarg))
hres = SafeArrayDestroy(V_ARRAY(pVarg));
}
else
if (V_VT(pVarg) == VT_BSTR)
else if (V_VT(pVarg) == VT_BSTR)
{
if (V_BSTR(pVarg))
SysFreeString(V_BSTR(pVarg));
@ -724,8 +723,7 @@ HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc)
if (V_ARRAY(pvargSrc))
hres = SafeArrayCopy(V_ARRAY(pvargSrc), &V_ARRAY(pvargDest));
}
else
if (V_VT(pvargSrc) == VT_BSTR)
else if (V_VT(pvargSrc) == VT_BSTR)
{
if (V_BSTR(pvargSrc))
{
@ -859,8 +857,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc)
/* Native doesn't check that *V_ARRAYREF(pSrc) is valid */
hres = SafeArrayCopy(*V_ARRAYREF(pSrc), &V_ARRAY(pvargDest));
}
else
if (V_VT(pSrc) == (VT_BSTR|VT_BYREF))
else if (V_VT(pSrc) == (VT_BSTR|VT_BYREF))
{
/* Native doesn't check that *V_BSTRREF(pSrc) is valid */
V_BSTR(pvargDest) = SysAllocStringByteLen((char*)*V_BSTRREF(pSrc), SysStringByteLen(*V_BSTRREF(pSrc)));

20
reactos/w32api/include/ocidl.h
View file

@ -610,6 +610,26 @@ DECLARE_INTERFACE_(IPicture,IUnknown)
};
#undef INTERFACE
#ifdef COBJMACROS
#define IPicture_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IPicture_AddRef(p) (p)->lpVtbl->AddRef(p)
#define IPicture_Release(p) (p)->lpVtbl->Release(p)
#define IPicture_get_Handle(p,a) (p)->lpVtbl->get_Handle(p,a)
#define IPicture_get_hPal(p,a) (p)->lpVtbl->get_hPal(p,a)
#define IPicture_get_Type(p,a) (p)->lpVtbl->get_Type(p,a)
#define IPicture_get_Width(p,a) (p)->lpVtbl->get_Width(p,a)
#define IPicture_get_Height(p,a) (p)->lpVtbl->get_Height(p,a)
#define IPicture_Render(p,a,b,c,d,e,f,g,h,i,j) (p)->lpVtbl->Render(p,a,b,c,d,e,f,g,h,i,j)
#define IPicture_set_hPal(p,a) (p)->lpVtbl->set_hPal(p,a)
#define IPicture_get_CurDC(p,a) (p)->lpVtbl->get_CurDC(p,a)
#define IPicture_SelectPicture(p,a,b,c) (p)->lpVtbl->SelectPicture(p,a,b,c)
#define IPicture_get_KeepOriginalFormat(p,a) (p)->lpVtbl->get_KeepOriginalFormat(p,a)
#define IPicture_put_KeepOriginalFormat(p,a) (p)->lpVtbl->put_KeepOriginalFormat(p,a)
#define IPicture_PictureChanged(p) (p)->lpVtbl->PictureChanged(p)
#define IPicture_SaveAsFile(p,a,b,c) (p)->lpVtbl->SaveAsFile(p,a,b,c)
#define IPicture_get_Attributes(p,a) (p)->lpVtbl->get_Attributes(p,a)
#endif
EXTERN_C const IID IID_IPictureDisp;
#define INTERFACE IPictureDisp
DECLARE_INTERFACE_(IPictureDisp,IDispatch)