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

Made OleCreateFontIndirect have the same signature (exactly) as the 

header file. Added olepro32 dll stubs.
This commit is contained in:
Sean Langley 2000-02-07 16:27:33 +00:00 committed by Alexandre Julliard
parent 58c71d4f7c
commit 9c92c7de2c
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/oleaut32/olefont.c
View File

@ -227,10 +227,10 @@ static ICOM_VTABLE(IPersistStream) OLEFontImpl_IPersistStream_VTable =
/****************************************************************************** /******************************************************************************
* OleCreateFontIndirect [OLEAUT32.420] * OleCreateFontIndirect [OLEAUT32.420]
*/ */
INT WINAPI OleCreateFontIndirect( HRESULT WINAPI OleCreateFontIndirect(
LPFONTDESC lpFontDesc, LPFONTDESC lpFontDesc,
REFIID riid, REFIID riid,
VOID** ppvObj) LPVOID* ppvObj)
{ {
OLEFontImpl* newFont = 0; OLEFontImpl* newFont = 0;
HRESULT hr = S_OK; HRESULT hr = S_OK;

28
include/olectl.h
View File

@ -2,6 +2,7 @@
#define __WINE_OLECTL_H #define __WINE_OLECTL_H
#include "windef.h" #include "windef.h"
#include "ocidl.h"
#ifdef __cplusplus #ifdef __cplusplus
#define DUMMY_UNION_NAME #define DUMMY_UNION_NAME
@ -81,11 +82,6 @@ typedef struct tagFONTDESC {
#define FONTSIZE(n) { n##0000, 0 } #define FONTSIZE(n) { n##0000, 0 }
/* COREL MOD PQ mar 9 - redecl in mfc */
#if 0
WINAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, VOID** ppvObj);
#endif
#define PICTYPE_UNINITIALIZED (-1) #define PICTYPE_UNINITIALIZED (-1)
#define PICTYPE_NONE 0 #define PICTYPE_NONE 0
#define PICTYPE_BITMAP 1 #define PICTYPE_BITMAP 1
@ -135,6 +131,28 @@ typedef VARIANT_BOOL OLE_OPTEXCLUSIVE;
typedef VARIANT_BOOL OLE_CANCELBOOL; typedef VARIANT_BOOL OLE_CANCELBOOL;
typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL;
HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon);
HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams);
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 );
HRESULT WINAPI OleLoadPicture( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
REFIID reed, LPVOID *lplpvObj );
HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid,
BOOL fOwn, LPVOID * lplpvObj );
HRESULT WINAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid,
LPVOID* lplpvObj);
HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal,
COLORREF* lpcolorref);
/* standard dispatch ID's */ /* standard dispatch ID's */
#define DISPID_AUTOSIZE (-500) #define DISPID_AUTOSIZE (-500)
#define DISPID_BACKCOLOR (-501) #define DISPID_BACKCOLOR (-501)