fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-05-22 19:59 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/hbwin/axcore.c
    ! Fixed 'this' -> 'lpThis'
    ; Lots of errors remain with msvc.

  * utils/hbmk2/hbmk2.prg
    * Minor cleanup.
This commit is contained in:
Viktor Szakats
2009-05-22 18:00:05 +00:00
parent b59476a409
commit 0213c66fd3
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to these authors: Viktor Szakats.
*/
2009-05-22 19:59 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/hbwin/axcore.c
! Fixed 'this' -> 'lpThis'
; Lots of errors remain with msvc.
* utils/hbmk2/hbmk2.prg
* Minor cleanup.
2009-05-22 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* utils/hbmk2/hbmk2.prg
! Fixed to only add -march/-mtune gcc parameters for mingw/gcc

36
harbour/contrib/hbwin/axcore.c
View File

@@ -185,12 +185,12 @@ static HB_GARBAGE_FUNC( hb_sink_destructor )
}
static HRESULT STDMETHODCALLTYPE QueryInterface( IDispatch* this, REFIID riid, void** ppRet )
static HRESULT STDMETHODCALLTYPE QueryInterface( IDispatch* lpThis, REFIID riid, void** ppRet )
{
if( IsEqualIID( riid, &IID_IUnknown ) || IsEqualIID( riid, &IID_IDispatch ) )
{
*ppRet = ( void* ) this;
( ( ISink* ) this)->lpVtbl->AddRef( this );
*ppRet = ( void* ) lpThis;
( ( ISink* ) lpThis)->lpVtbl->AddRef( lpThis );
return S_OK;
}
*ppRet = NULL;
@@ -198,34 +198,34 @@ static HRESULT STDMETHODCALLTYPE QueryInterface( IDispatch* this, REFIID riid, v
}
static ULONG STDMETHODCALLTYPE AddRef( IDispatch* this )
static ULONG STDMETHODCALLTYPE AddRef( IDispatch* lpThis )
{
return ++( ( ISink* ) this)->count;
return ++( ( ISink* ) lpThis)->count;
}
static ULONG STDMETHODCALLTYPE Release( IDispatch* this )
static ULONG STDMETHODCALLTYPE Release( IDispatch* lpThis )
{
if( --( ( ISink* ) this)->count == 0 )
if( --( ( ISink* ) lpThis)->count == 0 )
{
hb_xfree( this );
hb_xfree( lpThis );
return 0;
}
return ( ( ISink* ) this)->count;
return ( ( ISink* ) lpThis)->count;
}
static HRESULT STDMETHODCALLTYPE GetTypeInfoCount( IDispatch* this, UINT* pInfoCount )
static HRESULT STDMETHODCALLTYPE GetTypeInfoCount( IDispatch* lpThis, UINT* pInfoCount )
{
HB_SYMBOL_UNUSED( this );
HB_SYMBOL_UNUSED( lpThis );
HB_SYMBOL_UNUSED( pInfoCount );
return E_NOTIMPL;
}
static HRESULT STDMETHODCALLTYPE GetTypeInfo( IDispatch* this, UINT iTInfo, LCID lcid, ITypeInfo** ppTypeInfo )
static HRESULT STDMETHODCALLTYPE GetTypeInfo( IDispatch* lpThis, UINT iTInfo, LCID lcid, ITypeInfo** ppTypeInfo )
{
HB_SYMBOL_UNUSED( this );
HB_SYMBOL_UNUSED( lpThis );
HB_SYMBOL_UNUSED( iTInfo );
HB_SYMBOL_UNUSED( lcid );
HB_SYMBOL_UNUSED( ppTypeInfo );
@@ -233,9 +233,9 @@ static HRESULT STDMETHODCALLTYPE GetTypeInfo( IDispatch* this, UINT iTInfo, LCID
}
static HRESULT STDMETHODCALLTYPE GetIDsOfNames( IDispatch* this, REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId )
static HRESULT STDMETHODCALLTYPE GetIDsOfNames( IDispatch* lpThis, REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId )
{
HB_SYMBOL_UNUSED( this );
HB_SYMBOL_UNUSED( lpThis );
HB_SYMBOL_UNUSED( riid );
HB_SYMBOL_UNUSED( rgszNames );
HB_SYMBOL_UNUSED( cNames );
@@ -245,7 +245,7 @@ static HRESULT STDMETHODCALLTYPE GetIDsOfNames( IDispatch* this, REFIID riid, LP
}
static HRESULT STDMETHODCALLTYPE Invoke( IDispatch* this, DISPID dispid, REFIID riid,
static HRESULT STDMETHODCALLTYPE Invoke( IDispatch* lpThis, DISPID dispid, REFIID riid,
LCID lcid, WORD wFlags, DISPPARAMS* pParams,
VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr )
{
@@ -261,12 +261,12 @@ static HRESULT STDMETHODCALLTYPE Invoke( IDispatch* this, DISPID dispid, REFIID
if( ! IsEqualIID( riid, &IID_NULL ) )
return DISP_E_UNKNOWNINTERFACE;
if( ! ( ( ISink* ) this)->pItemHandler )
if( ! ( ( ISink* ) lpThis)->pItemHandler )
return S_OK;
hb_vmPushState();
hb_vmPushSymbol( &hb_symEval );
hb_vmPush( ( ( ISink* ) this)->pItemHandler );
hb_vmPush( ( ( ISink* ) lpThis)->pItemHandler );
hb_vmPushLong( dispid );
iCount = pParams->cArgs;

6
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -1781,9 +1781,9 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
cBin_Link := cBin_CompC
cOpt_Link := "{LO} {LA} {FL} {DL}"
IF ! Empty( hbmk[ _HBMK_cCCPATH ] )
cBin_Lib := hbmk[ _HBMK_cCCPATH ] + "/" + cBin_Lib
cBin_CompC := hbmk[ _HBMK_cCCPATH ] + "/" + cBin_CompC
cBin_Link := hbmk[ _HBMK_cCCPATH ] + "/" + cBin_Link
cBin_Lib := hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Lib
cBin_CompC := hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_CompC
cBin_Link := hbmk[ _HBMK_cCCPATH ] + hb_osPathSeparator() + cBin_Link
ENDIF
cLibPathPrefix := "-L"
cLibPathSep := " "