2011-08-30 12:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/contrib/xhb/xhb.hbp * harbour/contrib/xhb/xhb.hbx + harbour/contrib/xhb/xhbwin.c + harbour/contrib/xhb/xhbolec.c + added xHarbour compatible functions removed from HBWIN * harbour/contrib/hbssl/hbssl.hbx + added SSL_SESSION_CMP(), SSL_SESSION_HASH()
2011-08-30 10:30:47 +00:00
parent 3c8cb69bda
commit 80670ebaf8
6 changed files with 205 additions and 2 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2011-08-30 12:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/xhb/xhb.hbp
+  * harbour/contrib/xhb/xhb.hbx
+  + harbour/contrib/xhb/xhbwin.c
+  + harbour/contrib/xhb/xhbolec.c
+    + added xHarbour compatible functions removed from HBWIN
+
+  * harbour/contrib/hbssl/hbssl.hbx
+    + added SSL_SESSION_CMP(), SSL_SESSION_HASH()
+
 2011-08-29 22:38 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
  * contrib/hbide/hbide.hbp
    * Missed from prev commit.
@@ -89,7 +99,7 @@
  * harbour/contrib/xhb/xhb.hbp
  * harbour/contrib/xhb/xhb.hbx
  + harbour/contrib/xhb/xhbole.prg
-    * added xHarbour comnpatible TOLEAUTO class and OLE functions:
+    * added xHarbour compatible TOLEAUTO class and OLE functions:
      CreateObject(), GetActiveObject(), CreateOLEObject()

 2011-08-27 10:09 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
--- a/harbour/contrib/hbssl/hbssl.hbx
+++ b/harbour/contrib/hbssl/hbssl.hbx
@@ -310,8 +310,10 @@ DYNAMIC SSL_READ
 DYNAMIC SSL_RENEGOTIATE
 DYNAMIC SSL_RSTATE_STRING
 DYNAMIC SSL_RSTATE_STRING_LONG
+DYNAMIC SSL_SESSION_CMP
 DYNAMIC SSL_SESSION_GET_TIME
 DYNAMIC SSL_SESSION_GET_TIMEOUT
+DYNAMIC SSL_SESSION_HASH
 DYNAMIC SSL_SESSION_NEW
 DYNAMIC SSL_SESSION_REUSED
 DYNAMIC SSL_SESSION_SET_TIME
--- a/harbour/contrib/xhb/xhb.hbp
+++ b/harbour/contrib/xhb/xhb.hbp
@@ -65,13 +65,15 @@ xhbis.c
 xhbmsgs.c
 xhbmtc.c
 xhbmvinf.c
-xhbqself.c
+xhbolec.c
 xhbprn.c
 xhbproc.c
+xhbqself.c
 xhbregx.c
 xhbsave.c
 xhbscr.c
 xhbtrim.c
+xhbwin.c
 xhbwith.c
 xstrdel.c
 xthrow.c
--- a/harbour/contrib/xhb/xhb.hbx
+++ b/harbour/contrib/xhb/xhb.hbx
@@ -27,6 +27,7 @@

 DYNAMIC ALENALLOC
 DYNAMIC AMERGE
+DYNAMIC ANSITOWIDE
 DYNAMIC ANY2STR
 DYNAMIC AREMOVE
 DYNAMIC ASIZEALLOC
@@ -306,6 +307,7 @@ DYNAMIC KILLALLTHREADS
 DYNAMIC KILLTHREAD
 DYNAMIC LIBFREE
 DYNAMIC LIBLOAD
+DYNAMIC MESSAGEBOX
 DYNAMIC METHODNAME
 DYNAMIC MINUTE
 DYNAMIC NETAPPEND
@@ -323,6 +325,8 @@ DYNAMIC NETRECLOCK
 DYNAMIC NOTIFY
 DYNAMIC NOTIFYALL
 DYNAMIC NUMTOHEX
+DYNAMIC OLE2TXTERROR
+DYNAMIC OLEERROR
 DYNAMIC OS_ISWIN2000
 DYNAMIC OS_ISWIN2000_OR_LATER
 DYNAMIC OS_ISWIN2003
@@ -412,6 +416,7 @@ DYNAMIC VALTOPRG
 DYNAMIC VALTOPRGEXP
 DYNAMIC VALTOTYPE
 DYNAMIC WAITFORTHREADS
+DYNAMIC WIDETOANSI
 DYNAMIC WILDMATCH
 DYNAMIC WIN32BMP
 DYNAMIC WIN32PRN
@@ -467,6 +472,7 @@ DYNAMIC __ERRORBLOCK
 DYNAMIC __INIT_LONGLONGS
 DYNAMIC __MINIMALERRORHANDLER
 DYNAMIC __MVSYMBOLINFO
+DYNAMIC __OLEPDISP
 DYNAMIC __OUTDEBUG
 DYNAMIC __SENDRAWMSG

--- a/harbour/contrib/xhb/xhbolec.c
+++ b/harbour/contrib/xhb/xhbolec.c
@@ -0,0 +1,85 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Compatibility calls (OLE).
+ *
+ * Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
+ * www - http://harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+#include "hbapi.h"
+
+#if ! defined( HB_OS_WIN )
+
+HB_FUNC( OLEERROR ) {}
+HB_FUNC( OLE2TXTERROR ) {}
+HB_FUNC( __OLEPDISP ) {}
+
+#else
+
+#include "hbwin.h"
+#include "hbwinole.h"
+
+HB_FUNC_EXTERN( WIN_OLEERROR );
+HB_FUNC( OLEERROR )
+{
+   HB_FUNC_EXEC( WIN_OLEERROR );
+}
+
+HB_FUNC_EXTERN( WIN_OLEERRORTEXT );
+HB_FUNC( OLE2TXTERROR )
+{
+   HB_FUNC_EXEC( WIN_OLEERRORTEXT );
+}
+
+HB_FUNC( __OLEPDISP )
+{
+   hb_oleInit();
+   hb_oleItemPut( hb_param( -1, HB_IT_ANY ),
+                  ( IDispatch * ) ( HB_PTRUINT ) hb_parnint( 1 ) );
+}
+
+#endif /* HB_OS_WIN */
--- a/harbour/contrib/xhb/xhbwin.c
+++ b/harbour/contrib/xhb/xhbwin.c
@@ -0,0 +1,98 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Compatibility calls (MS-Win).
+ *
+ * Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
+ * www - http://harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+/* This functions are deprecated, kept for compatibility with old
+   OLE implementation. Please update your code to use this new API,
+   the old one will be removed in a future revision. [vszakats] */
+
+/* NOTE: Add to this file functions coming from old OLE source only.
+         [vszakats] */
+
+#include "hbapi.h"
+
+#if ! defined( HB_OS_WIN )
+
+HB_FUNC( ANSITOWIDE ) {}
+HB_FUNC( WIDETOANSI ) {}
+HB_FUNC( MESSAGEBOX ) {}
+
+#else
+
+#include "hbwinuni.h"
+#include <windows.h>
+
+HB_FUNC_EXTERN( WIN_ANSITOWIDE );
+/* Original version may have returned NIL in some error situations. */
+HB_FUNC( ANSITOWIDE )
+{
+   HB_FUNC_EXEC( WIN_ANSITOWIDE );
+}
+
+HB_FUNC_EXTERN( WIN_WIDETOANSI );
+/* Original version may have returned NIL in some error situations. */
+HB_FUNC( WIDETOANSI )
+{
+   HB_FUNC_EXEC( WIN_WIDETOANSI );
+}
+
+HB_FUNC( MESSAGEBOX )
+{
+   void * hStr1;
+   void * hStr2;
+   HWND hWnd = HB_ISNUM( 1 ) ? ( HWND ) ( HB_PTRUINT ) hb_parnint( 1 ) :
+                               ( HWND ) hb_parptr( 1 );
+   hb_retni( MessageBox( hWnd, HB_PARSTR( 2, &hStr1, NULL ), HB_PARSTR( 3, &hStr2, NULL ), hb_parni( 4 ) ) );
+   hb_strfree( hStr1 );
+   hb_strfree( hStr2 );
+}
+
+#endif /* HB_OS_WIN */