2012-11-22 11:27 UTC+0100 Viktor Szakats (harbour syenar.net)

+ src/codepage/cp_gbk.c
  + src/codepage/gbk.c
  * src/codepage/Makefile
  * include/hbcpage.hbx
    + added GBK CP.
      GBK is an extension of the GB2312 character set for simplified Chinese
      characters, used in the People's Republic of China. GBK encoding support
      for Simplified Chinese, while fully contained BIG5. Microsoft implemented
      GBK in Windows 95 and Windows NT 3.51 as Code Page 936.
      Thanks to Wang Dongming for the two new source files.
      Please review/test it.

  * src/rtl/langcomp.prg
    ! use GBK CP instead of BIG5 for legacy CP "ZHGB"

  * extras/httpsrv/session.prg
    * cleanup

harbour/ChangeLog

@@ -10,6 +10,25 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-22 11:27 UTC+0100 Viktor Szakats (harbour syenar.net)
+  + src/codepage/cp_gbk.c
+  + src/codepage/gbk.c
+  * src/codepage/Makefile
+  * include/hbcpage.hbx
+    + added GBK CP.
+      GBK is an extension of the GB2312 character set for simplified Chinese
+      characters, used in the People's Republic of China. GBK encoding support
+      for Simplified Chinese, while fully contained BIG5. Microsoft implemented
+      GBK in Windows 95 and Windows NT 3.51 as Code Page 936.
+      Thanks to Wang Dongming for the two new source files.
+      Please review/test it.
+
+  * src/rtl/langcomp.prg
+    ! use GBK CP instead of BIG5 for legacy CP "ZHGB"
+
+  * extras/httpsrv/session.prg
+    * cleanup
+
 2012-11-21 19:52 UTC+0100 Viktor Szakats (harbour syenar.net)
   * website/index.html
     ! corrected link to .7z nightly package.

harbour/extras/httpsrv/session.prg

@@ -237,20 +237,14 @@ METHOD Start( cSID ) CLASS uhttpd_Session
 
       // hb_ToOutDebug( "hUrl = %s\n\r", hb_ValToExp( hUrl ) )
 
-      // IF !( oUrl:cServer == _SERVER[ "SERVER_NAME" ] )
+      // Check whether the current request was referred to by
+      // an external site which invalidates the previously found ID
+
       IF !( hUrl[ "HOST" ] == _SERVER[ "SERVER_NAME" ] )
          ::cSID      := NIL   // invalidate current SID, i'll generate a new one
          lSendCookie := .T.
          lDefine_SID := .T.
       ENDIF
-
-      // // Check whether the current request was referred to by
-      // // an external site which invalidates the previously found ID
-      // $url = parse_url($GLOBALS['HTTP_REFERER']);
-      // IF !(Trim($url['host']) == $GLOBALS['SERVER_NAME'])
-      //    unset(session->id)
-      //    send_cookie := .T.
-      //    define_sid := .T.
    ENDIF
 
    // Do we have an existing session ID?

harbour/include/hbcpage.hbx

@@ -9,6 +9,7 @@
 
 // HB_FUNC_EXCLUDE HB_CODEPAGE_BIG5
 // HB_FUNC_EXCLUDE HB_CODEPAGE_CP950
+// HB_FUNC_EXCLUDE HB_CODEPAGE_GBK
 
 /* --------------------------------------------------------------------
  * WARNING: Automatically generated code below. DO NOT EDIT!

harbour/src/codepage/Makefile

@@ -7,6 +7,7 @@ ROOT := ../../
 C_SOURCES := \
    cp_950.c \
    cp_big5.c \
+   cp_gbk.c \
    cp_utf8.c \
    cp_u16le.c \
    cpbg866.c \

harbour/src/codepage/cp_gbk.c

@@ -0,0 +1,189 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * National Collation Support Module (GBK)
+ *
+ * Copyright 2012 Dongming Wang <wangdongming / at / gmail.com>
+ * Copyright 2011 Przemyslaw Czerpak <druzus / at / priv.onet.pl>
+ * 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"
+#include "hbapicdp.h"
+
+#include "gbk.c"
+
+static HB_CDP_GET_FUNC( GBK_get )
+{
+   *wc = 0;
+   if( *pnIndex < nLen )
+   {
+      HB_UCHAR uc = pSrc[ ( * pnIndex )++ ];
+
+      if( uc >= ( HB_GBK_FIRST >> 8 ) && uc <= ( HB_GBK_LAST >> 8 ) &&
+          *pnIndex < nLen )
+      {
+         *wc = s_gbk_to_ucs16( ( ( int ) uc << 8 ) | ( HB_UCHAR ) pSrc[ * pnIndex ] );
+         if( *wc )
+         {
+            ( * pnIndex )++;
+            return HB_TRUE;
+         }
+      }
+      *wc = cdp->uniTable->uniCodes[ uc ];
+      if( *wc == 0 )
+         *wc = uc;
+      return HB_TRUE;
+   }
+   return HB_FALSE;
+}
+
+static HB_CDP_PUT_FUNC( GBK_put )
+{
+   if( * pnIndex < nLen )
+   {
+      HB_USHORT gb18030 = s_ucs16_to_gbk( wc );
+
+      if( gb18030 )
+      {
+         if( * pnIndex + 1 < nLen )
+         {
+            HB_PUT_BE_UINT16( &pDst[ ( * pnIndex ) ], gb18030 );
+            * pnIndex += 2;
+            return HB_TRUE;
+         }
+      }
+      else
+      {
+         if( cdp->uniTable->uniTrans == NULL )
+            hb_cdpBuildTransTable( cdp->uniTable );
+
+         if( wc <= cdp->uniTable->wcMax &&
+             cdp->uniTable->uniTrans[ wc ] )
+            pDst[ ( * pnIndex )++ ] = cdp->uniTable->uniTrans[ wc ];
+         else
+            pDst[ ( * pnIndex )++ ] = wc >= 0x100 ? '?' : ( HB_UCHAR ) wc;
+         return HB_TRUE;
+      }
+   }
+   return HB_FALSE;
+}
+
+static HB_CDP_LEN_FUNC( GBK_len )
+{
+   HB_USHORT gb18030 = s_ucs16_to_gbk( wc );
+
+   HB_SYMBOL_UNUSED( cdp );
+
+   return gb18030 ? 2 : 1;
+}
+
+static void hb_cp_init( PHB_CODEPAGE cdp )
+{
+   HB_UCHAR * flags, * upper, * lower;
+   int i;
+
+   cdp->buffer = ( HB_UCHAR * ) hb_xgrab( 0x300 );
+   cdp->flags = flags = ( HB_UCHAR * ) cdp->buffer;
+   cdp->upper = upper = ( HB_UCHAR * ) cdp->buffer + 0x100;
+   cdp->lower = lower = ( HB_UCHAR * ) cdp->buffer + 0x200;
+
+   for( i = 0; i < 0x100; ++i )
+   {
+      flags[ i ] = 0;
+      if( HB_ISDIGIT( i ) )
+         flags[ i ] |= HB_CDP_DIGIT;
+      if( HB_ISALPHA( i ) )
+         flags[ i ] |= HB_CDP_ALPHA;
+      if( HB_ISUPPER( i ) )
+         flags[ i ] |= HB_CDP_UPPER;
+      if( HB_ISLOWER( i ) )
+         flags[ i ] |= HB_CDP_LOWER;
+      upper[ i ] = ( HB_UCHAR ) HB_TOUPPER( i );
+      lower[ i ] = ( HB_UCHAR ) HB_TOLOWER( i );
+   }
+
+#if 0
+   for( i = 0; i < 0x10000; ++i )
+   {
+      HB_WCHAR wc = s_gbk_to_ucs16( i );
+      if( wc )
+      {
+         if( i != s_ucs16_to_gbk( wc ) )
+         {
+            printf( "irreversible translation: (GBK)%04X -> U+%04X -> (GBK)%04X\r\n",
+                    i, wc, s_ucs16_to_gbk( wc ) );
+            fflush(stdout);
+         }
+      }
+   }
+#endif
+}
+
+#define HB_CP_RAW
+
+#define HB_CP_ID              GBK
+#define HB_CP_INFO            "CP936"
+#define HB_CP_UNITB           HB_UNITB_437
+
+#define HB_CP_GET_FUNC        GBK_get
+#define HB_CP_PUT_FUNC        GBK_put
+#define HB_CP_LEN_FUNC        GBK_len
+
+#define HB_CP_CMP_FUNC        NULL
+#define HB_CP_FLAGS_FUNC      NULL
+#define HB_CP_UPPER_FUNC      NULL
+#define HB_CP_LOWER_FUNC      NULL
+
+#define s_flags               NULL
+#define s_upper               NULL
+#define s_lower               NULL
+#define s_sort                NULL
+
+#define HB_CP_INIT hb_cp_init
+
+/* include CP registration code */
+#include "hbcdpreg.h"

harbour/src/rtl/langcomp.prg

@@ -127,7 +127,7 @@ FUNCTION hb_langSelect( cLangID, cCP )
       CASE "UAKOI8" ; cCPDef := "UAKOI8"; cLangIDBase := "uk" ; EXIT
       CASE "UAWIN"  ; cCPDef := "UA1251"; cLangIDBase := "uk" ; EXIT
       CASE "ZHB5"   ; cCPDef := "BIG5"  ; cLangIDBase := "zh_tra" ; EXIT
-      CASE "ZHGB"   ; cCPDef := "BIG5"  ; cLangIDBase := "zh_sim" ; EXIT /* INCOMPATIBILITY: Was using CP936 in legacy implementation. */
+      CASE "ZHGB"   ; cCPDef := "GBK"   ; cLangIDBase := "zh_sim" ; EXIT
       OTHERWISE
          /* Case sensitive legacy IDs. Lowercase flavours denote new
             language module IDs, so they won't be recognized as