From 0213c66fd3b747ebcb2366f58ef9659d84c728ff Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 22 May 2009 18:00:05 +0000
Subject: [PATCH] 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.
---
 harbour/ChangeLog              |  8 ++++++++
 harbour/contrib/hbwin/axcore.c | 36 +++++++++++++++++-----------------
 harbour/utils/hbmk2/hbmk2.prg  |  6 +++---
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5abebff700..051663f5ff 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -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
diff --git a/harbour/contrib/hbwin/axcore.c b/harbour/contrib/hbwin/axcore.c
index 05af592fe8..45478d6519 100644
--- a/harbour/contrib/hbwin/axcore.c
+++ b/harbour/contrib/hbwin/axcore.c
@@ -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;
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 106ed324e1..9cc94b0ba6 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -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 := " "