diff --git a/harbour/ChangeLog b/harbour/ChangeLog index e6809d1d77..ff30c8420f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-01 16:39 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt) + * harbour/contrib/hbwin/olecore.c + * harbour/contrib/hbwin/axcore.c + * changed error system name from OLE to WINOLE + * renumerated error subcodes starting from 1001 + 2009-12-01 13:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * examples/rddado/adordd.prg * examples/rddado/adordd.ch diff --git a/harbour/contrib/hbwin/axcore.c b/harbour/contrib/hbwin/axcore.c index 94abcfb770..e724e8d356 100644 --- a/harbour/contrib/hbwin/axcore.c +++ b/harbour/contrib/hbwin/axcore.c @@ -64,7 +64,7 @@ static PHB_AX_GETCTRL s_pAtlAxGetControl = NULL; static void hb_errRT_OLE( HB_ERRCODE errGenCode, HB_ERRCODE errSubCode, HB_ERRCODE errOsCode, const char * szDescription, const char * szOperation ) { PHB_ITEM pError; - pError = hb_errRT_New( ES_ERROR, "OLE", errGenCode, errSubCode, szDescription, szOperation, errOsCode, EF_NONE ); + pError = hb_errRT_New( ES_ERROR, "WINOLE", errGenCode, errSubCode, szDescription, szOperation, errOsCode, EF_NONE ); if( hb_pcount() != 0 ) { @@ -134,7 +134,7 @@ PHB_ITEM hb_oleAxControlNew( PHB_ITEM pItem, HWND hWnd ) if( ! hb_oleAxInit() || ! s_pAtlAxGetControl ) { hb_oleSetError( S_OK ); - hb_errRT_OLE( EG_UNSUPPORTED, 3012, 0, "ActiveX not initialized", HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_UNSUPPORTED, 1010, 0, "ActiveX not initialized", HB_ERR_FUNCNAME ); } else { @@ -153,7 +153,7 @@ PHB_ITEM hb_oleAxControlNew( PHB_ITEM pItem, HWND hWnd ) hb_oleSetError( lOleError ); if( lOleError != S_OK ) - hb_errRT_OLE( EG_ARG, 3012, ( HB_ERRCODE ) lOleError, NULL, HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_ARG, 1011, ( HB_ERRCODE ) lOleError, NULL, HB_ERR_FUNCNAME ); } return pItem; @@ -165,7 +165,7 @@ HB_FUNC( __AXGETCONTROL ) /* ( hWnd ) --> pDisp */ HWND hWnd = ( HWND ) hb_parptr( 1 ); if( ! hWnd ) - hb_errRT_OLE( EG_ARG, 3012, 0, NULL, HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_ARG, 1012, 0, NULL, HB_ERR_FUNCNAME ); else hb_oleAxControlNew( hb_stackReturnItem(), hWnd ); } @@ -179,7 +179,7 @@ HB_FUNC( __AXDOVERB ) /* ( hWndAx, iVerb ) --> hResult */ if( ! hb_oleAxInit() || ! s_pAtlAxGetControl ) { hb_oleSetError( S_OK ); - hb_errRT_OLE( EG_UNSUPPORTED, 3012, 0, "ActiveX not initialized", HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_UNSUPPORTED, 1013, 0, "ActiveX not initialized", HB_ERR_FUNCNAME ); return; } @@ -466,9 +466,9 @@ HB_FUNC( __AXREGISTERHANDLER ) /* ( pDisp, bHandler [, cID] ) --> pSink */ hb_oleSetError( lOleError ); if( lOleError != S_OK ) - hb_errRT_OLE( EG_ARG, 3012, ( HB_ERRCODE ) lOleError, "Failed to obtain connection point", HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_ARG, 1014, ( HB_ERRCODE ) lOleError, "Failed to obtain connection point", HB_ERR_FUNCNAME ); } else - hb_errRT_OLE( EG_ARG, 3012, 0, "Failed to obtain connection point", HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_ARG, 1015, 0, "Failed to obtain connection point", HB_ERR_FUNCNAME ); } } diff --git a/harbour/contrib/hbwin/olecore.c b/harbour/contrib/hbwin/olecore.c index 4824e33a9e..7f39606a09 100644 --- a/harbour/contrib/hbwin/olecore.c +++ b/harbour/contrib/hbwin/olecore.c @@ -178,7 +178,7 @@ static const HB_GC_FUNCS s_gcOleenumFuncs = static void hb_errRT_OLE( HB_ERRCODE errGenCode, HB_ERRCODE errSubCode, HB_ERRCODE errOsCode, const char * szDescription, const char * szOperation ) { PHB_ITEM pError; - pError = hb_errRT_New( ES_ERROR, "OLE", errGenCode, errSubCode, szDescription, szOperation, errOsCode, EF_NONE ); + pError = hb_errRT_New( ES_ERROR, "WINOLE", errGenCode, errSubCode, szDescription, szOperation, errOsCode, EF_NONE ); if( hb_pcount() != 0 ) { @@ -199,7 +199,7 @@ IDispatch* hb_oleParam( int iParam ) if( pOle && pOle->pDisp ) return pOle->pDisp; - hb_errRT_OLE( EG_ARG, 3012, 0, NULL, HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_ARG, 1001, 0, NULL, HB_ERR_FUNCNAME ); return NULL; } @@ -258,7 +258,7 @@ static IEnumVARIANT* hb_oleenumParam( int iParam ) if( ppEnum && *ppEnum ) return *ppEnum; - hb_errRT_OLE( EG_ARG, 3012, 0, NULL, HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_ARG, 1002, 0, NULL, HB_ERR_FUNCNAME ); return NULL; } @@ -1222,7 +1222,7 @@ HB_FUNC( __OLEENUMCREATE ) /* ( __hObj ) */ if( hb_parl( 2 ) ) { hb_oleSetError( S_OK ); - hb_errRT_OLE( EG_UNSUPPORTED, 3012, 0, NULL, HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_UNSUPPORTED, 1003, 0, NULL, HB_ERR_FUNCNAME ); return; } @@ -1248,7 +1248,7 @@ HB_FUNC( __OLEENUMCREATE ) /* ( __hObj ) */ else { hb_oleSetError( lOleError ); - hb_errRT_OLE( EG_ARG, 3012, ( HB_ERRCODE ) lOleError, NULL, HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_ARG, 1004, ( HB_ERRCODE ) lOleError, NULL, HB_ERR_FUNCNAME ); return; } @@ -1267,7 +1267,7 @@ HB_FUNC( __OLEENUMCREATE ) /* ( __hObj ) */ } } hb_oleSetError( lOleError ); - hb_errRT_OLE( EG_ARG, 3012, ( HB_ERRCODE ) lOleError, NULL, HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_ARG, 1005, ( HB_ERRCODE ) lOleError, NULL, HB_ERR_FUNCNAME ); } @@ -1390,7 +1390,7 @@ HB_FUNC( WIN_OLEAUTO___ONERROR ) hb_oleSetError( lOleError ); if( lOleError != S_OK ) - hb_errRT_OLE( EG_ARG, 3012, ( HB_ERRCODE ) lOleError, NULL, HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_ARG, 1006, ( HB_ERRCODE ) lOleError, NULL, HB_ERR_FUNCNAME ); return; } } @@ -1421,7 +1421,7 @@ HB_FUNC( WIN_OLEAUTO___ONERROR ) hb_oleSetError( lOleError ); if( lOleError != S_OK ) - hb_errRT_OLE( EG_ARG, 3012, ( HB_ERRCODE ) lOleError, NULL, HB_ERR_FUNCNAME ); + hb_errRT_OLE( EG_ARG, 1007, ( HB_ERRCODE ) lOleError, NULL, HB_ERR_FUNCNAME ); return; } @@ -1429,9 +1429,9 @@ HB_FUNC( WIN_OLEAUTO___ONERROR ) /* TODO: add description containing TypeName of the object */ if( szMethod[ 0 ] == '_' ) - hb_errRT_OLE( EG_NOVARMETHOD, 1005, ( HB_ERRCODE ) lOleError, NULL, szMethod + 1 ); + hb_errRT_OLE( EG_NOVARMETHOD, 1008, ( HB_ERRCODE ) lOleError, NULL, szMethod + 1 ); else - hb_errRT_OLE( EG_NOMETHOD, 1004, ( HB_ERRCODE ) lOleError, NULL, szMethod ); + hb_errRT_OLE( EG_NOMETHOD, 1009, ( HB_ERRCODE ) lOleError, NULL, szMethod ); }