Moved some stubs and added forwards in order to make both winapi_check

and checklink happy.

dlls/oleaut32/Makefile.in

@@ -16,6 +16,7 @@ C_SRCS = \
 	olefont.c \
 	parsedt.c \
 	safearray.c \
+	stubs.c \
 	typelib.c \
 	variant.c
 

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
+415 stdcall OleIconToCursor(long long) OleIconToCursor
-416 stub OleCreatePropertyFrameIndirect
+416 stdcall OleCreatePropertyFrameIndirect(ptr) OleCreatePropertyFrameIndirect
-417 stub OleCreatePropertyFrame
+417 stdcall OleCreatePropertyFrame(ptr long long ptr long ptr long ptr ptr long ptr) OleCreatePropertyFrame
-418 stub OleLoadPicture
+418 stdcall OleLoadPicture(ptr long long ptr ptr) OleLoadPicture
-419 stub OleCreatePictureIndirect
+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

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;
+}

dlls/olepro32/olepro32.spec

@@ -1,13 +1,15 @@
 name olepro32
 type win32
 
-@ stdcall OleIconToCursor( ptr ptr) OleIconToCursor
+import oleaut32.dll
-@ stdcall OleCreatePropertyFrameIndirect( ptr ) OleCreatePropertyFrameIndirect
+
-@ stdcall OleCreatePropertyFrame( ptr long long ptr long ptr long ptr ptr long ptr ) OleCreatePropertyFrame
+@ forward OleIconToCursor OLEAUT32.OleIconToCursor
-@ stdcall OleLoadPicture( ptr long long ptr ptr ) OleLoadPicture
+@ forward OleCreatePropertyFrameIndirect OLEAUT32.OleCreatePropertyFrameIndirect
-@ stdcall OleCreatePictureIndirect( ptr ptr long ptr ) OleCreatePictureIndirect
+@ forward OleCreatePropertyFrame OLEAUT32.OleCreatePropertyFrame
-@ stdcall OleCreateFontIndirect( ptr ptr ptr ) OleCreateFontIndirect
+@ forward OleLoadPicture OLEAUT32.OleLoadPicture
-@ stdcall OleTranslateColor( long ptr ptr ) OleTranslateColor
+@ 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

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)
+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;
-}
  
 HRESULT WINAPI OLEPRO32_DllUnregisterServer()
 {