From 5c2dd45cbeba4c40ffc0f3f02bba6f9dafdc2250 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 4 Jul 2008 02:31:03 +0000
Subject: [PATCH] 2008-07-04 04:06 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)    * contrib/hbmzip/hbmzip.c      + Reenabled new OS/2 code.      ! Fixed
 defines in OS/2 part. Requested definitions.        Fixed one potential
 error. Pls review and test, all        this was done blindly.

---
 harbour/ChangeLog               |  7 +++++++
 harbour/contrib/hbmzip/hbmzip.c | 33 ++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 315ba70cbb..200e3197b0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-04 04:06 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/hbmzip/hbmzip.c
+     + Reenabled new OS/2 code.
+     ! Fixed defines in OS/2 part. Requested definitions.
+       Fixed one potential error. Pls review and test, all 
+       this was done blindly.
+
 2008-07-04 03:06 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * include/Makefile
      ! Removed hbwmain.c from the header list to be installed.
diff --git a/harbour/contrib/hbmzip/hbmzip.c b/harbour/contrib/hbmzip/hbmzip.c
index 26da616ca4..d65d30d478 100644
--- a/harbour/contrib/hbmzip/hbmzip.c
+++ b/harbour/contrib/hbmzip/hbmzip.c
@@ -51,6 +51,7 @@
  *
  */
 
+#define INCL_DOSFILEMGR
 
 #include "hbapi.h"
 #include "hbapiitm.h"
@@ -498,7 +499,8 @@ static int hb_zipStoreFile( zipFile hZip, char* szFileName, char* szName, char*
          if( ulLen > 4 )
          {
             pString = &szZipName[ ulLen - 4 ];
-            if( hb_stricmp( pString, ".exe" ) == 0 || hb_stricmp( pString, ".com" ) == 0 ||
+            if( hb_stricmp( pString, ".exe" ) == 0 || 
+                hb_stricmp( pString, ".com" ) == 0 ||
                 hb_stricmp( pString, ".bat" ) == 0 )
             {
                ulExtAttr |= 0x00490000; /* --x--x--x */
@@ -593,7 +595,7 @@ static int hb_zipStoreFile( zipFile hZip, char* szFileName, char* szName, char*
    }
 #  endif
 
-#elif defined( HB_OS_OS2 ) && defined( _TEMP_GUARD_FOR_RC2_ )
+#elif defined( HB_OS_OS2 )
    {
       FILESTATUS3 fs3;
       APIRET ulrc;
@@ -604,22 +606,23 @@ static int hb_zipStoreFile( zipFile hZip, char* szFileName, char* szName, char*
       {
          ulAttr = 0;
          if( fs3.attrFile & FILE_READONLY )
-            ulAttr |= FA_READONLY;
+            ulAttr |= HB_FA_READONLY;
          if( fs3.attrFile & FILE_HIDDEN )
-            ulAttr |= FA_HIDDEN;
+            ulAttr |= HB_FA_HIDDEN;
          if( fs3.attrFile & FILE_SYSTEM )
-            ulAttr |= FA_SYSTEM;
+            ulAttr |= HB_FA_SYSTEM;
          if( fs3.attrFile & FILE_DIRECTORY )
-            ulAttr |= FA_DIRECTORY;
+            ulAttr |= HB_FA_DIRECTORY;
          if( fs3.attrFile & FILE_ARCHIVED )
-            ulAttr |= FA_ARCHIVE;
-            
-         if( ulExtAttr | FILE_ATTRIBUTE_READONLY )
+            ulAttr |= HB_FA_ARCHIVE;
+
+         ulExtAttr = ulAttr; 
+         if( ulExtAttr | HB_FA_READONLY )
             ulExtAttr |= 0x01240000;  /* r--r--r-- */
          else
             ulExtAttr |= 0x01B60000;  /* rw-rw-rw- */
 
-         if( ulExtAttr & FILE_ATTRIBUTE_DIRECTORY )
+         if( ulExtAttr & HB_FA_DIRECTORY )
             ulExtAttr |= 0x40000000;
          else
             ulExtAttr |= 0x80000000;
@@ -869,20 +872,20 @@ static int hb_unzipExtractCurrentFile( unzFile hUnzip, char* szFileName, char* s
    }
 #  endif
 
-#elif defined( HB_OS_OS2 ) && defined( _TEMP_GUARD_FOR_RC2_ )
+#elif defined( HB_OS_OS2 )
    {
       FILESTATUS3 fs3;
       APIRET ulrc;
       ULONG ulAttr = FILE_NORMAL;
       int iAttr = ufi.external_fa & 0xFF;
     
-      if( iAttr & FA_READONLY )
+      if( iAttr & HB_FA_READONLY )
          ulAttr |= FILE_READONLY;
-      if( iAttr & FA_HIDDEN )
+      if( iAttr & HB_FA_HIDDEN )
          ulAttr |= FILE_HIDDEN;
-      if( iAttr & FA_SYSTEM )
+      if( iAttr & HB_FA_SYSTEM )
          ulAttr |= FILE_SYSTEM;
-      if( iAttr & FA_ARCHIVE )
+      if( iAttr & HB_FA_ARCHIVE )
          ulAttr |= FILE_ARCHIVED;
     
       ulrc = DosQueryPathInfo( szName, FIL_STANDARD, &fs3, sizeof( fs3 ) );