From 194bd0526043f1484afdbfd8fd4c720d6f106614 Mon Sep 17 00:00:00 2001 From: Patrik Stridvall Date: Tue, 29 Feb 2000 22:02:11 +0000 Subject: [PATCH] Moved some stubs and added forwards in order to make both winapi_check and checklink happy. --- dlls/oleaut32/Makefile.in | 1 + dlls/oleaut32/oleaut32.spec | 10 ++--- dlls/oleaut32/stubs.c | 69 +++++++++++++++++++++++++++++++++++ dlls/olepro32/olepro32.spec | 16 ++++---- dlls/olepro32/olepro32stubs.c | 62 ++----------------------------- 5 files changed, 87 insertions(+), 71 deletions(-) create mode 100644 dlls/oleaut32/stubs.c diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index f43edbb5c48..177a0c70598 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ olefont.c \ parsedt.c \ safearray.c \ + stubs.c \ typelib.c \ variant.c diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index 84daddf29a1..51b6e054902 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -280,11 +280,11 @@ type win32 412 stdcall SafeArrayCopyData(ptr ptr) SafeArrayCopyData 413 stub VectorFromBstr 414 stub BstrFromVector -415 stub OleIconToCursor -416 stub OleCreatePropertyFrameIndirect -417 stub OleCreatePropertyFrame -418 stub OleLoadPicture -419 stub OleCreatePictureIndirect +415 stdcall OleIconToCursor(long long) OleIconToCursor +416 stdcall OleCreatePropertyFrameIndirect(ptr) OleCreatePropertyFrameIndirect +417 stdcall OleCreatePropertyFrame(ptr long long ptr long ptr long ptr ptr long ptr) OleCreatePropertyFrame +418 stdcall OleLoadPicture(ptr long long ptr ptr) OleLoadPicture +419 stdcall OleCreatePictureIndirect(ptr ptr long ptr) OleCreatePictureIndirect 420 stdcall OleCreateFontIndirect(ptr ptr ptr) OleCreateFontIndirect 421 stdcall OleTranslateColor(long long long) OleTranslateColor 422 stub OleLoadPictureFile diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/stubs.c new file mode 100644 index 00000000000..6bb9035a828 --- /dev/null +++ b/dlls/oleaut32/stubs.c @@ -0,0 +1,69 @@ +/* + * OlePro32 Stubs + * + * Copyright 1999 Corel Corporation + * + * Sean Langley + */ + +#include "windef.h" +#include "debugtools.h" +#include "olectl.h" + +DEFAULT_DEBUG_CHANNEL(ole); + +/***************************************************** + * OleIconToCursor + */ +HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon) +{ + FIXME("(%x,%x), not implemented (olepro32.dll)\n",hinstExe,hicon); + return S_OK; +} + +/***************************************************** + * OleCreatePropertyFrameIndirect + */ +HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams) +{ + FIXME("(%p), not implemented (olepro32.dll)\n",lpParams); + return S_OK; +} + +/***************************************************** + * OleCreatePropertyFrame + */ +HRESULT WINAPI OleCreatePropertyFrame( HWND hwndOwner, UINT x, UINT y, + LPCOLESTR lpszCaption,ULONG cObjects, LPUNKNOWN* ppUnk, + ULONG cPages, LPCLSID pPageClsID, LCID lcid, + DWORD dwReserved, LPVOID pvReserved ) +{ + FIXME("(%x,%d,%d,%p,%ld,%p,%ld,%p,%x,%ld,%p), not implemented (olepro32.dll)\n", + hwndOwner,x,y,lpszCaption,cObjects,ppUnk,cPages,pPageClsID, + (int)lcid,dwReserved,pvReserved); + return S_OK; +} + +/***************************************************** + * OleLoadPicture + */ +HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, + REFIID reed, LPVOID *lplpvObj ) +{ + FIXME("(%p,%ld,%d,%p,%p), not implemented (olepro32.dll) \n", + lpstream,lSize,fRunmode,reed,lplpvObj + ); + return S_OK; +} + +/***************************************************** + * OleCreatePictureIndirect + */ +HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, + BOOL fOwn, LPVOID * lplpvObj ) +{ + FIXME("(%p,%p,%d,%p), not implemented (olepro32.dll)\n", + lpPictDesc,riid,fOwn,lplpvObj + ); + return S_OK; +} diff --git a/dlls/olepro32/olepro32.spec b/dlls/olepro32/olepro32.spec index 405112a5a7f..b802144be39 100644 --- a/dlls/olepro32/olepro32.spec +++ b/dlls/olepro32/olepro32.spec @@ -1,13 +1,15 @@ name olepro32 type win32 -@ stdcall OleIconToCursor( ptr ptr) OleIconToCursor -@ stdcall OleCreatePropertyFrameIndirect( ptr ) OleCreatePropertyFrameIndirect -@ stdcall OleCreatePropertyFrame( ptr long long ptr long ptr long ptr ptr long ptr ) OleCreatePropertyFrame -@ stdcall OleLoadPicture( ptr long long ptr ptr ) OleLoadPicture -@ stdcall OleCreatePictureIndirect( ptr ptr long ptr ) OleCreatePictureIndirect -@ stdcall OleCreateFontIndirect( ptr ptr ptr ) OleCreateFontIndirect -@ stdcall OleTranslateColor( long ptr ptr ) OleTranslateColor +import oleaut32.dll + +@ forward OleIconToCursor OLEAUT32.OleIconToCursor +@ forward OleCreatePropertyFrameIndirect OLEAUT32.OleCreatePropertyFrameIndirect +@ forward OleCreatePropertyFrame OLEAUT32.OleCreatePropertyFrame +@ forward OleLoadPicture OLEAUT32.OleLoadPicture +@ forward OleCreatePictureIndirect OLEAUT32.OleCreatePictureIndirect +@ forward OleCreateFontIndirect OLEAUT32.OleCreateFontIndirect +@ forward OleTranslateColor OLEAUT32.OleTranslateColor @ stdcall DllCanUnloadNow() OLEPRO32_DllCanUnloadNow @ stdcall DllGetClassObjecti( ptr ptr ptr ) OLEPRO32_DllGetClassObject @ stdcall DllRegisterServer() OLEPRO32_DllRegisterServer diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c index aa62f2f3927..abd917871cf 100644 --- a/dlls/olepro32/olepro32stubs.c +++ b/dlls/olepro32/olepro32stubs.c @@ -6,67 +6,11 @@ * Sean Langley */ -#include "windef.h" #include "debugtools.h" -#include "olectl.h" +#include "ole2.h" +#include "windef.h" -DEFAULT_DEBUG_CHANNEL(ole) - -/***************************************************** - * OleIconToCursor - */ -HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon) -{ - FIXME("(%x,%x), not implemented (olepro32.dll)\n",hinstExe,hicon); - return S_OK; -} - -/***************************************************** - * OleCreatePropertyFrameIndirect - */ -HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams) -{ - FIXME("(%p), not implemented (olepro32.dll)\n",lpParams); - return S_OK; -} - -/***************************************************** - * OleCreatePropertyFrame - */ -HRESULT WINAPI OleCreatePropertyFrame( HWND hwndOwner, UINT x, UINT y, - LPCOLESTR lpszCaption,ULONG cObjects, LPUNKNOWN* ppUnk, - ULONG cPages, LPCLSID pPageClsID, LCID lcid, - DWORD dwReserved, LPVOID pvReserved ) -{ - FIXME("(%x,%d,%d,%p,%ld,%p,%ld,%p,%x,%ld,%p), not implemented (olepro32.dll)\n", - hwndOwner,x,y,lpszCaption,cObjects,ppUnk,cPages,pPageClsID, - (int)lcid,dwReserved,pvReserved); - return S_OK; -} - -/***************************************************** - * OleLoadPicture - */ -HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, - REFIID reed, LPVOID *lplpvObj ) -{ - FIXME("(%p,%ld,%d,%p,%p), not implemented (olepro32.dll) \n", - lpstream,lSize,fRunmode,reed,lplpvObj - ); - return S_OK; -} - -/***************************************************** - * OleCreatePictureIndirect - */ -HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, - BOOL fOwn, LPVOID * lplpvObj ) -{ - FIXME("(%p,%p,%d,%p), not implemented (olepro32.dll)\n", - lpPictDesc,riid,fOwn,lplpvObj - ); - return S_OK; -} +DEFAULT_DEBUG_CHANNEL(ole); HRESULT WINAPI OLEPRO32_DllUnregisterServer() {