pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

richmemo: fix win32 compilation for trunk. #34970

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6810 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2019-01-29 19:04:54 +00:00
parent 70aa57d3bb
commit 412cb29f9a
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/richmemo/win32/win32richmemoole.pas
View File

@ -20,9 +20,16 @@ unit Win32RichMemoOle;
interface interface
{$if FPC_FULLVERSION < 30200}
{$undef MEDVAR}
{$else}
{$define MEDVAR}
{$endif}
uses uses
Windows, ActiveX, ComObj, Win32RichMemoProc; Windows, ActiveX, ComObj, Win32RichMemoProc;
{.$define oledebug} {.$define oledebug}
type type
@ -62,7 +69,9 @@ type
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL; Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL; Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
Function GetCanonicalFormatEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl; Function GetCanonicalFormatEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
Function SetData (Const pformatetc : FORMATETC;const medium:STGMEDIUM;FRelease : BOOL):HRESULT; StdCall; Function SetData (Const pformatetc : FORMATETC;
{$ifdef MEDVAR}var{$ELSE}const{$ENDIF} medium:STGMEDIUM;
FRelease : BOOL):HRESULT; StdCall;
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall; Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall; Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
Function DUnadvise(dwconnection :DWord) :HRESULT;StdCall; Function DUnadvise(dwconnection :DWord) :HRESULT;StdCall;
@ -261,7 +270,8 @@ begin
end; end;
function TCustomDataObject.SetData(const pformatetc: FORMATETC; function TCustomDataObject.SetData(const pformatetc: FORMATETC;
const medium: STGMEDIUM; FRelease: BOOL): HRESULT; StdCall; {$ifdef MEDVAR}var{$ELSE}const{$ENDIF} medium: STGMEDIUM;
FRelease: BOOL): HRESULT; StdCall;
begin begin
{$ifdef oledebug}writeln('IDataObject.SetData');{$endif} {$ifdef oledebug}writeln('IDataObject.SetData');{$endif}
Result:=S_OK; Result:=S_OK;