fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-02-13 09:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbmzip/3rd/minizip/minizip.dif
  * contrib/hbmzip/3rd/minizip/ioapi.h
    * Shot in the dark for OS/2. Pls make tests.
This commit is contained in:
Viktor Szakats
2011-02-13 08:24:21 +00:00
parent 0b562ede5b
commit aaa0d62317
3 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
harbour/ChangeLog
View File

@@ -16,6 +16,11 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-02-13 09:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbmzip/3rd/minizip/minizip.dif
* contrib/hbmzip/3rd/minizip/ioapi.h
* Shot in the dark for OS/2. Pls make tests.
2011-02-12 16:53 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* doc/en/gnulice.txt
* doc/en/setmode.txt
@@ -28,10 +33,10 @@
* contrib/hbxbp/hbpprocess.prg
! Reworked: how command line parameters are passed to the appln.
* contrib/hbide/idebrowse.prg
! Fixed: Goto() usage was broken in ideDBU ( result of strict
! Fixed: Goto() usage was broken in ideDBU ( result of strict
parameter checking introduced lately ).
* contrib/hbide/ideharbourhelp.prg
! Tried: yet another time to cover case sensitivity in
! Tried: yet another time to cover case sensitivity in
"Document Viewer".
* contrib/hbide/idetools.prg
! Tweaked: to pass application parameters for new protocol.
@@ -39,7 +44,7 @@
2011-02-12 12:59 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* src/rtl/browse.prg
! Reversed some of the changes in previous commit.
Still I am trying to understand how a record can be
Still I am trying to understand how a record can be
edited without RLock() ( only for lAppend == TRUE, it is OK ).
2011-02-12 19:02 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
@@ -54,7 +59,7 @@
* contrib/hbqt/qtgui/hbqt_init.cpp
* contrib/hbqt/qtnetwork/hbqt_init.cpp
! Fixed: to return GC Collectible pointers instead of raw ones.
TODO: add 3 more classes which are required to handle
TODO: add 3 more classes which are required to handle
Qt events. These methods will not work until then.
2011-02-11 15:36 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
@@ -75,11 +80,11 @@
* contrib/hbide/idehome.prg
! Fixed: "Welcom" tab - tooltip and links were broken sometimes.
+ Added: "ideBrowse" - "Structure" dialog - <Copy Struct> button.
Click results in structure of the current table structure
Click results in structure of the current table structure
be pasted on the clipboard under this format:
. LOCAL aStruct := { { "Name", "C", 20, 0 },;
{ "Code", "C", 8, 0 } }
% Tried to fix "nix" dependant path cases. Hopefully
% Tried to fix "nix" dependant path cases. Hopefully
"Documents Viewer" be avialble on "nixes".
2011-02-11 21:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

1
harbour/contrib/hbmzip/3rd/minizip/ioapi.h
View File

@@ -66,6 +66,7 @@
defined( HB_OS_DARWIN ) || \
defined( HB_OS_HAIKU ) || \
defined( HB_OS_DOS ) || \
defined( HB_OS_OS2 ) || \
defined( HB_OS_MINIX )
# define USE_FILE32API
#endif

49
harbour/contrib/hbmzip/3rd/minizip/minizip.dif
View File

@@ -1,6 +1,6 @@
diff -urN minizip.orig/crypt.h minizip/crypt.h
--- minizip.orig/crypt.h 2011-02-03 13:51:16.772916603 +0100
+++ minizip/crypt.h 2011-02-03 13:51:16.772916603 +0100
diff -urN minizip.orig\crypt.h minizip\crypt.h
--- minizip.orig\crypt.h Sat Feb 12 23:42:50 2011
+++ minizip\crypt.h Sat Feb 12 23:42:50 2011
@@ -38,6 +38,8 @@
* unpredictable manner on 16-bit systems; not a problem
* with any known compiler so far, though */
@@ -10,9 +10,9 @@ diff -urN minizip.orig/crypt.h minizip/crypt.h
temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
}
diff -urN minizip.orig/ioapi.c minizip/ioapi.c
--- minizip.orig/ioapi.c 2011-02-03 13:51:16.782915990 +0100
+++ minizip/ioapi.c 2011-02-03 13:51:16.782915990 +0100
diff -urN minizip.orig\ioapi.c minizip\ioapi.c
--- minizip.orig\ioapi.c Sat Feb 12 23:42:50 2011
+++ minizip\ioapi.c Sat Feb 12 23:42:50 2011
@@ -15,6 +15,7 @@
#endif
@@ -142,15 +142,19 @@ diff -urN minizip.orig/ioapi.c minizip/ioapi.c
{
pzlib_filefunc_def->zopen_file = fopen_file_func;
pzlib_filefunc_def->zread_file = fread_file_func;
diff -urN minizip.orig/ioapi.h minizip/ioapi.h
--- minizip.orig/ioapi.h 2011-02-03 13:51:16.782915990 +0100
+++ minizip/ioapi.h 2011-02-03 13:51:16.782915990 +0100
@@ -21,29 +21,55 @@
diff -urN minizip.orig\ioapi.h minizip\ioapi.h
--- minizip.orig\ioapi.h Sat Feb 12 23:42:50 2011
+++ minizip\ioapi.h Sat Feb 12 23:42:50 2011
@@ -21,28 +21,55 @@
#ifndef _ZLIBIOAPI64_H
#define _ZLIBIOAPI64_H
-#if (!defined(_WIN32)) && (!defined(WIN32))
-
+#if !(defined(_WIN32) || defined(WIN32)) && \
+ !(defined(__MSDOS__) || defined(MSDOS)) && \
+ !(defined(OS_2) || defined(__OS2__) || defined(OS2)) && \
+ !defined(__WATCOMC__)
- // Linux needs this to support file operation on files larger then 4+GB
- // But might need better if/def to select just the platforms that needs them.
-
@@ -166,11 +170,6 @@ diff -urN minizip.orig/ioapi.h minizip/ioapi.h
- #ifndef _FILE_OFFSET_BIT
- #define _FILE_OFFSET_BIT 64
- #endif
+#if !(defined(_WIN32) || defined(WIN32)) && \
+ !(defined(__MSDOS__) || defined(MSDOS)) && \
+ !(defined(OS_2) || defined(__OS2__) || defined(OS2)) && \
+ !defined(__WATCOMC__)
+
+ /* Linux needs this to support file operation on files larger then 4+GB
+ * on 32bit platforms
+ * But might need better if/def to select just the platforms that needs them.
@@ -189,7 +188,7 @@ diff -urN minizip.orig/ioapi.h minizip/ioapi.h
#include <stdio.h>
#include <stdlib.h>
#include "zlib.h"
+
+#include "hbsetup.h"
+
+#if defined( HB_OS_VXWORKS ) && defined( _STD_USING_INT_TYPES )
@@ -211,16 +210,16 @@ diff -urN minizip.orig/ioapi.h minizip/ioapi.h
+ defined( HB_OS_DARWIN ) || \
+ defined( HB_OS_HAIKU ) || \
+ defined( HB_OS_DOS ) || \
+ defined( HB_OS_OS2 ) || \
+ defined( HB_OS_MINIX )
+# define USE_FILE32API
+#endif
+
#if defined(USE_FILE32API)
#define fopen64 fopen
#define ftello64 ftell
diff -urN minizip.orig/unzip.c minizip/unzip.c
--- minizip.orig/unzip.c 2011-02-03 13:51:16.822914936 +0100
+++ minizip/unzip.c 2011-02-03 13:51:16.822914936 +0100
diff -urN minizip.orig\unzip.c minizip\unzip.c
--- minizip.orig\unzip.c Sat Feb 12 23:42:50 2011
+++ minizip\unzip.c Sat Feb 12 23:42:50 2011
@@ -68,13 +68,17 @@
#include <stdlib.h>
#include <string.h>
@@ -307,9 +306,9 @@ diff -urN minizip.orig/unzip.c minizip/unzip.c
pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
pfile_in_zip_read_info->crc32=0;
diff -urN minizip.orig/zip.c minizip/zip.c
--- minizip.orig/zip.c 2011-02-03 13:51:16.872914945 +0100
+++ minizip/zip.c 2011-02-03 13:51:16.872914945 +0100
diff -urN minizip.orig\zip.c minizip\zip.c
--- minizip.orig\zip.c Sat Feb 12 23:42:50 2011
+++ minizip\zip.c Sat Feb 12 23:42:50 2011
@@ -29,16 +29,20 @@
#include "zlib.h"
#include "zip.h"