Menu
▾
▴
opengtoolkit-cvs — OpenG Toolkit CVS commits mailing list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(42) |
Nov
(368) |
Dec
(248) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(2) |
Feb
(207) |
Mar
(180) |
Apr
(9) |
May
(39) |
Jun
(9) |
Jul
(22) |
Aug
(56) |
Sep
(82) |
Oct
(113) |
Nov
(236) |
Dec
(219) |
| 2005 |
Jan
(119) |
Feb
(81) |
Mar
(53) |
Apr
(177) |
May
(2) |
Jun
(67) |
Jul
(17) |
Aug
(5) |
Sep
(53) |
Oct
(17) |
Nov
(122) |
Dec
(77) |
| 2006 |
Jan
(293) |
Feb
(16) |
Mar
(32) |
Apr
(14) |
May
(29) |
Jun
(6) |
Jul
|
Aug
|
Sep
(18) |
Oct
(28) |
Nov
|
Dec
(2) |
| 2007 |
Jan
(8) |
Feb
(19) |
Mar
(4) |
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(37) |
Oct
(1) |
Nov
(8) |
Dec
(25) |
| 2008 |
Jan
(1) |
Feb
(13) |
Mar
(17) |
Apr
(3) |
May
(2) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
(19) |
Dec
(16) |
| 2009 |
Jan
(6) |
Feb
(9) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rolf K. <lab...@us...> - 2007-11-15 09:36:15
|
Update of /cvsroot/opengtoolkit/portIO In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13430 Modified Files: change-log.txt portio.spec Log Message: Added support for physical memory access unter NT based OSes Index: portio.spec =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/portio.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** portio.spec 16 Dec 2005 13:55:59 -0000 1.5 --- portio.spec 15 Nov 2007 09:36:16 -0000 1.6 *************** *** 3,7 **** Name=oglib_portio ! Version=1.0 Release=1 --- 3,7 ---- Name=oglib_portio ! Version=1.2 Release=1 *************** *** 10,14 **** [Description] ! Description="The OpenG Port IO library supports direct access to hardware IO.\0D\0AIt comes with its own kernel device driver for Windows NT (NT4, W2K, WXP, W2003) systems, which will be installed automatically if not found to be present on the system already." Summary="OpenG Port IO Library" --- 10,14 ---- [Description] ! Description="The OpenG Port IO library supports direct access to hardware IO and physical memory.\0D\0AIt comes with its own kernel device driver for Windows NT (NT4, W2K, WXP, W2003) systems, which will be installed automatically if not found to be present on the system already." Summary="OpenG Port IO Library" *************** *** 16,20 **** License=LGPL ! Copyright="2003-2005 Rolf Kalbermatter" Distribution="OpenG Toolkit" --- 16,20 ---- License=LGPL ! Copyright="2003-2007 Rolf Kalbermatter" Distribution="OpenG Toolkit" Index: change-log.txt =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/change-log.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** change-log.txt 5 Apr 2005 20:41:46 -0000 1.1 --- change-log.txt 15 Nov 2007 09:36:16 -0000 1.2 *************** *** 1,2 **** --- 1,13 ---- + -= oglib_portio-1.2-1.ogp =- + + * Added physical memory access functions. + + + -= oglib_portio-1.1-1.ogp =- + + * Not really sure + + -= oglib_portio-1.0-1.ogp =- + * Initiali Build \ No newline at end of file |
|
From: Rolf K. <lab...@us...> - 2007-11-15 09:35:36
|
Update of /cvsroot/opengtoolkit/portIO/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13046 Modified Files: readme.txt Log Message: Added support for physical memory access unter NT based OSes Index: readme.txt =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/readme.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme.txt 5 Mar 2004 23:21:04 -0000 1.2 --- readme.txt 15 Nov 2007 09:35:39 -0000 1.3 *************** *** 2,6 **** * Generic Port IO library for LabVIEW for Windows 9x/ME/NT/2000/XP/2003 * ! * Copyright (C) 2004 Rolf Kalbermatter, r.k...@hc... * * Please visit http://www.OpenG.org to learn about the --- 2,6 ---- * Generic Port IO library for LabVIEW for Windows 9x/ME/NT/2000/XP/2003 * ! * Copyright (C) 2004-2007 Rolf Kalbermatter, r.k...@hc... * * Please visit http://www.OpenG.org to learn about the *************** *** 25,38 **** --------------- ! With this library it is possible to access Port IO from within LabVIEW ! in a uniform way. It comes with a LabVIEW VI library, a shared library ! to access from LabVIEW, and a device driver which is used under ! Windows NT (NT 4, 2000, XP, 2003) based systems to access the low level ! kernel functionality necessary for this library. This library consists of four parts: readme.txt This file ! ogportio.llb LabVIEW VI library for LabVIEW 6.0 and higher ogportio.dll Shared library implementing Port IO functionality ogportio.sys Device Driver for Windows NT based systems --- 25,38 ---- --------------- ! With this library it is possible to access Port IO and physical memory ! from within LabVIEW in a uniform way. It comes with a LabVIEW VI library, ! a shared library to access from LabVIEW, and a device driver which is used ! under Windows NT (NT 4, 2000, XP, 2003) based systems to access the low ! level kernel functionality necessary for this library. This library consists of four parts: readme.txt This file ! ogportio.llb LabVIEW VI library for LabVIEW 6.1 and higher ogportio.dll Shared library implementing Port IO functionality ogportio.sys Device Driver for Windows NT based systems *************** *** 43,47 **** The shared library will work directly on Windows 9x/ME systems as they ! need no device driver support to access the CPU port IO space. On Windows NT (NT4/2000/XP/2003) the shared library will check for --- 43,48 ---- The shared library will work directly on Windows 9x/ME systems as they ! need no device driver support to access the CPU port IO space. Access ! to physical memory under Widnows 9x/CE is not supported. On Windows NT (NT4/2000/XP/2003) the shared library will check for |
|
From: Rolf K. <lab...@us...> - 2007-11-15 09:34:41
|
Update of /cvsroot/opengtoolkit/portIO/source/docs In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12616/docs Modified Files: readme.txt Log Message: Added support for physical memory access unter NT based OSes Index: readme.txt =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/docs/readme.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** readme.txt 5 Apr 2005 20:37:11 -0000 1.1 --- readme.txt 15 Nov 2007 09:34:40 -0000 1.2 *************** *** 2,6 **** * Generic Port IO library for LabVIEW for Windows 9x/ME/NT/2000/XP/2003 * ! * Copyright (C) 2004 Rolf Kalbermatter, r.k...@hc... * * Please visit http://www.OpenG.org to learn about the --- 2,6 ---- * Generic Port IO library for LabVIEW for Windows 9x/ME/NT/2000/XP/2003 * ! * Copyright (C) 2004-2007 Rolf Kalbermatter, r.k...@hc... * * Please visit http://www.OpenG.org to learn about the *************** *** 25,33 **** --------------- ! With this library it is possible to access Port IO from within LabVIEW ! in a uniform way. It comes with a LabVIEW VI library, a shared library ! to access from LabVIEW, and a device driver which is used under ! Windows NT (NT 4, 2000, XP, 2003) based systems to access the low level ! kernel functionality necessary for this library. This library consists of four parts: --- 25,33 ---- --------------- ! With this library it is possible to access Port IO and physical memory ! from within LabVIEW in a uniform way. It comes with a LabVIEW VI library, ! a shared library to access from LabVIEW, and a device driver which is used ! under Windows NT (NT 4, 2000, XP, 2003) based systems to access the low ! level kernel functionality necessary for this library. This library consists of four parts: *************** *** 43,47 **** The shared library will work directly on Windows 9x/ME systems as they ! need no device driver support to access the CPU port IO space. On Windows NT (NT4/2000/XP/2003) the shared library will check for --- 43,48 ---- The shared library will work directly on Windows 9x/ME systems as they ! need no device driver support to access the CPU port IO space. Access ! to physical memory under Widnows 9x/CE is not supported. On Windows NT (NT4/2000/XP/2003) the shared library will check for |
Update of /cvsroot/opengtoolkit/portIO/source/ogportio.llb In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12616/ogportio.llb Modified Files: PORT IO Disable Range.vi PORT IO Enable Range.vi PORT IO Error Translation.vi PORT IO Get Version.vi PORT IO Install Driver.vi PORT IO Read Byte.vi PORT IO Read Long.vi PORT IO Read Word.vi PORT IO Read.vi PORT IO Uninstall Driver.vi PORT IO VI Tree.vi PORT IO Write Byte.vi PORT IO Write Long.vi PORT IO Write Word.vi PORT IO Write.vi Added Files: MEM IO Read Bytes.vi MEM IO Read Longs.vi MEM IO Read Words.vi MEM IO Read.vi MEM IO Write Bytes.vi MEM IO Write Longs.vi MEM IO Write Words.vi MEM IO Write.vi Log Message: Added support for physical memory access unter NT based OSes --- NEW FILE: MEM IO Read Longs.vi --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MEM IO Read.vi --- (This appears to be a binary file; contents omitted.) Index: PORT IO Read.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Read.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsmDEkEk and /tmp/cvsw5f0zM differ Index: PORT IO Write Byte.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Write Byte.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsdGTGyo and /tmp/cvstM68wQ differ Index: PORT IO Read Byte.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Read Byte.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvs3Wq4Kn and /tmp/cvsxpcZLP differ Index: PORT IO VI Tree.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO VI Tree.vi,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 Binary files /tmp/cvsTuce8p and /tmp/cvsySPjdS differ --- NEW FILE: MEM IO Read Words.vi --- (This appears to be a binary file; contents omitted.) Index: PORT IO Read Long.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Read Long.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsUySibu and /tmp/cvsqqYWiW differ --- NEW FILE: MEM IO Read Bytes.vi --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MEM IO Write Words.vi --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MEM IO Write Bytes.vi --- (This appears to be a binary file; contents omitted.) Index: PORT IO Get Version.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Get Version.vi,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 Binary files /tmp/cvs6kVTDv and /tmp/cvsCN0XNX differ Index: PORT IO Install Driver.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Install Driver.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsonzhCu and /tmp/cvs8yAGOW differ Index: PORT IO Enable Range.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Enable Range.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsMHg4hy and /tmp/cvs3k7Kw0 differ Index: PORT IO Read Word.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Read Word.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsYWHZux and /tmp/cvsq8IdMZ differ Index: PORT IO Write Word.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Write Word.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsJimmlB and /tmp/cvsozO2E3 differ --- NEW FILE: MEM IO Write Longs.vi --- (This appears to be a binary file; contents omitted.) Index: PORT IO Disable Range.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Disable Range.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsX5XYRC and /tmp/cvs6Cy3d5 differ Index: PORT IO Write.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Write.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsBfhWTB and /tmp/cvs7IlWh4 differ Index: PORT IO Write Long.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Write Long.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsTvZDeF and /tmp/cvsPcSTE7 differ --- NEW FILE: MEM IO Write.vi --- (This appears to be a binary file; contents omitted.) Index: PORT IO Uninstall Driver.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Uninstall Driver.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsdNOOrE and /tmp/cvsfEXmU6 differ Index: PORT IO Error Translation.vi =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.llb/PORT IO Error Translation.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsthr35H and /tmp/cvsFITTAa differ |
|
From: Rolf K. <lab...@us...> - 2007-11-15 09:34:38
|
Update of /cvsroot/opengtoolkit/portIO/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12616 Modified Files: ogportio.dll Log Message: Added support for physical memory access unter NT based OSes Index: ogportio.dll =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/source/ogportio.dll,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsjIlwJN and /tmp/cvslLQWMe differ |
|
From: Rolf K. <lab...@us...> - 2007-11-15 09:12:57
|
Update of /cvsroot/opengtoolkit/portIO/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3792 Modified Files: ogportio.c ogportiodll.c ogportiodll.h ogportiodll.rc Log Message: Added support for physical memory access unter NT based OSes Index: ogportio.c =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/c_source/ogportio.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ogportio.c 5 Mar 2004 23:16:40 -0000 1.2 --- ogportio.c 15 Nov 2007 09:12:57 -0000 1.3 *************** *** 239,256 **** physAddr.HighPart = 0; ! if (BusAddress(Isa, 0, physAddr, memType, mappedAddr) == FALSE) { ! KdPrint(("HalTranslateBusAddress failed in IOCTL_READ_PHYSMEM\n")); ntStatus = STATUS_UNSUCCESSFUL; } - else if (memType == 0) - { - logicAddr = MmMapIoSpace(mappedAddr, portreg->size, FALSE); - if (logicAddr == 0) - { - KdPrint(("MmMapIoSpace failed in IOCTL_READ_PHYSMEM\n")); - ntStatus = STATUS_UNSUCCESSFUL; - } - } else { --- 239,247 ---- physAddr.HighPart = 0; ! if (HalTranslateBusAddress(Isa, 0, physAddr, memType, mappedAddr) == FALSE) { ! KdPrint(("HalTranslateBusAddress failed in IOCTL_READ_PORT\n")); ntStatus = STATUS_UNSUCCESSFUL; } else { *************** *** 279,287 **** break; } - - if (memType == 0) - { - MmUnmapIoSpace(logicAddr, portreg->size); - } } } --- 270,273 ---- *************** *** 310,327 **** physAddr.HighPart = 0; ! if (BusAddress(Isa, 0, physAddr, memType, mappedAddr) == FALSE) { ! KdPrint(("HalTranslateBusAddress failed in IOCTL_READ_PHYSMEM\n")); ntStatus = STATUS_UNSUCCESSFUL; } - else if (memType == 0) - { - logicAddr = MmMapIoSpace(mappedAddr, portreg->size, FALSE); - if (logicAddr == 0) - { - KdPrint(("MmMapIoSpace failed in IOCTL_READ_PHYSMEM\n")); - ntStatus = STATUS_UNSUCCESSFUL; - } - } else { --- 296,304 ---- physAddr.HighPart = 0; ! if (HalTranslateBusAddress(Isa, 0, physAddr, memType, mappedAddr) == FALSE) { ! KdPrint(("HalTranslateBusAddress failed in IOCTL_WRITE_PORT\n")); ntStatus = STATUS_UNSUCCESSFUL; } else { *************** *** 350,358 **** break; } - - if (memType == 0) - { - MmUnmapIoSpace(logicAddr, portreg->size); - } } } --- 327,330 ---- *************** *** 378,382 **** physAddr.HighPart = 0; ! if (BusAddress(Isa, 0, physAddr, memType, mappedAddr) == FALSE) { KdPrint(("HalTranslateBusAddress failed in IOCTL_READ_PHYSMEM\n")); --- 350,354 ---- physAddr.HighPart = 0; ! if (HalTranslateBusAddress(Isa, 0, physAddr, memType, mappedAddr) == FALSE) { KdPrint(("HalTranslateBusAddress failed in IOCTL_READ_PHYSMEM\n")); *************** *** 446,450 **** physAddr.HighPart = 0; ! if (BusAddress(Isa, 0, physAddr, memType, mappedAddr) == FALSE) { KdPrint(("HalTranslateBusAddress failed in IOCTL_WRITE_PHYSMEM\n")); --- 418,422 ---- physAddr.HighPart = 0; ! if (HalTranslateBusAddress(Isa, 0, physAddr, memType, mappedAddr) == FALSE) { KdPrint(("HalTranslateBusAddress failed in IOCTL_WRITE_PHYSMEM\n")); Index: ogportiodll.c =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/c_source/ogportiodll.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ogportiodll.c 5 Apr 2005 20:41:45 -0000 1.4 --- ogportiodll.c 15 Nov 2007 09:12:57 -0000 1.5 *************** *** 276,280 **** if (gWinNT && hDevice != INVALID_HANDLE_VALUE) { ! return CloseHandle(hDevice); } return ERROR_SUCCESS; --- 276,280 ---- if (gWinNT && hDevice != INVALID_HANDLE_VALUE) { ! CloseHandle(hDevice); } return ERROR_SUCCESS; *************** *** 490,494 **** if (hDevice == INVALID_HANDLE_VALUE) { ! err = PortIOOpen(FALSE); if (err) return err; } --- 490,494 ---- if (hDevice == INVALID_HANDLE_VALUE) { ! err = PortIOOpen(FALSE); if (err) return err; } *************** *** 542,546 **** if (hDevice == INVALID_HANDLE_VALUE) { ! err = PortIOOpen(FALSE); if (err) return err; } --- 542,546 ---- if (hDevice == INVALID_HANDLE_VALUE) { ! err = PortIOOpen(FALSE); if (err) return err; } *************** *** 550,560 **** param.u.dword = *(DWORD *)value; if (!DeviceIoControl(hDevice, ! IOCTL_WRITE_PORT, ! ¶m, ! sizeof(PORTREG), ! NULL, ! 0, ! &BytesReturned, ! NULL)) { err = GetLastError(); --- 550,627 ---- param.u.dword = *(DWORD *)value; if (!DeviceIoControl(hDevice, ! IOCTL_WRITE_PORT, ! ¶m, ! sizeof(PORTREG), ! NULL, ! 0, ! &BytesReturned, ! NULL)) ! { ! err = GetLastError(); ! } ! return err; ! } ! ! DWORD LibAPI PortIOWriteMem(unsigned long address, long size, long unit, void *value) ! { ! DWORD BytesReturned, err = ERROR_SUCCESS; ! MEMMAP param; ! ! if (!gWinNT) ! { ! return ERROR_NOT_SUPPORTED; ! } ! ! if (hDevice == INVALID_HANDLE_VALUE) ! { ! err = PortIOOpen(FALSE); ! if (err) return err; ! } ! ! param.address = address; ! param.size = size; ! param.unit = unit; ! memcpy(param.buf, value, size); ! if (!DeviceIoControl(hDevice, ! IOCTL_WRITE_PHYSMEM, ! ¶m, ! sizeof(MEMMAP) + size, ! NULL, ! 0, ! &BytesReturned, ! NULL)) ! { ! err = GetLastError(); ! } ! return err; ! } ! ! DWORD LibAPI PortIOReadMem(unsigned long address, long size, long unit, void *value) ! { ! DWORD BytesReturned, err = ERROR_SUCCESS; ! MEMMAP param; ! ! if (!gWinNT) ! { ! return ERROR_NOT_SUPPORTED; ! } ! ! if (hDevice == INVALID_HANDLE_VALUE) ! { ! err = PortIOOpen(FALSE); ! if (err) return err; ! } ! ! param.address = address; ! param.size = size; ! param.unit = unit; ! if (!DeviceIoControl(hDevice, ! IOCTL_READ_PHYSMEM, ! ¶m, ! sizeof(MEMMAP), ! value, ! size, ! &BytesReturned, ! NULL)) { err = GetLastError(); Index: ogportiodll.rc =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/c_source/ogportiodll.rc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ogportiodll.rc 3 Mar 2004 13:20:24 -0000 1.1 --- ogportiodll.rc 15 Nov 2007 09:12:57 -0000 1.2 *************** *** 1,21 **** #include <windows.h> ! #include <ntverp.h> #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_DRV_SYSTEM #define VER_FILEDESCRIPTION_STR "OpenG Generic Port I/O User Space Library" #define VER_INTERNALNAME_STR "OGPortIO.dll" #define VER_ORIGINALFILENAME_STR "OGPortIO.dll" ! #define VER_LEGALCOPYRIGHT_YEARS "\2512004" #define VER_LEGALCOPYRIGHT_STR VER_LEGALCOPYRIGHT_YEARS " Rolf Kalbermatter" #define VER_COMPANYNAME_STR "OpenG, http://www.openg.org" #define VER_PRODUCTNAME_STR "OpenG Generic Port I/O Driver" ! #define VER_FILEVERSION 1,0,1,0 ! #define VER_FILEVERSION_STR "Version 1.0.1" ! #define VER_PRODUCTVERSION 1,0,1 ! #define VER_PRODUCTVERSION_STR "OpenG Generic Port I/O Driver Version 1.0.1" #include "common.ver" --- 1,28 ---- #include <windows.h> ! #if _DEBUG ! #define VER_DEBUG VS_FF_DEBUG ! #else ! #define VER_DEBUG 0 ! #endif #define VER_FILETYPE VFT_DRV #define VER_FILESUBTYPE VFT2_DRV_SYSTEM + #define VER_FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + #define VER_FILEFLAGS (VER_DEBUG) + #define VER_FILEOS VOS_NT_WINDOWS32 #define VER_FILEDESCRIPTION_STR "OpenG Generic Port I/O User Space Library" #define VER_INTERNALNAME_STR "OGPortIO.dll" #define VER_ORIGINALFILENAME_STR "OGPortIO.dll" ! #define VER_LEGALCOPYRIGHT_YEARS "\2512004-2007" #define VER_LEGALCOPYRIGHT_STR VER_LEGALCOPYRIGHT_YEARS " Rolf Kalbermatter" #define VER_COMPANYNAME_STR "OpenG, http://www.openg.org" #define VER_PRODUCTNAME_STR "OpenG Generic Port I/O Driver" ! #define VER_FILEVERSION 1,1,0,0 ! #define VER_FILEVERSION_STR "Version 1.1.0" ! #define VER_PRODUCTVERSION 1,1,0 ! #define VER_PRODUCTVERSION_STR "OpenG Generic Port I/O Driver Version 1.1.0" #include "common.ver" Index: ogportiodll.h =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/c_source/ogportiodll.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ogportiodll.h 10 Jun 2004 22:49:10 -0000 1.3 --- ogportiodll.h 15 Nov 2007 09:12:57 -0000 1.4 *************** *** 42,47 **** DWORD LibAPI PortIOWriteDirect(unsigned short address, unsigned long size, void *value); DWORD LibAPI PortIOWrite(unsigned short address, unsigned long size, void *value); ! ! /* Not yet implemented */ ! DWORD LibAPI PortIOReadMem(unsigned long address, unsigned long size, char *value); ! DWORD LibAPI PortIOWriteMem(unsigned long address, unsigned long size, char *value); --- 42,45 ---- DWORD LibAPI PortIOWriteDirect(unsigned short address, unsigned long size, void *value); DWORD LibAPI PortIOWrite(unsigned short address, unsigned long size, void *value); ! DWORD LibAPI PortIOReadMem(unsigned long address, long size, long unit, void *value); ! DWORD LibAPI PortIOWriteMem(unsigned long address, long size, long unit, void *value); |
|
From: Rolf K. <lab...@us...> - 2007-10-17 15:37:26
|
Update of /cvsroot/opengtoolkit/pipe/source/ogpipe.llb In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11550 Modified Files: OGPIPE Open System Command.vi Log Message: Index: OGPIPE Open System Command.vi =================================================================== RCS file: /cvsroot/opengtoolkit/pipe/source/ogpipe.llb/OGPIPE Open System Command.vi,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 Binary files /tmp/cvsQXSB3U and /tmp/cvsGKOOAh differ |
|
From: Rolf K. <lab...@us...> - 2007-09-18 04:50:21
|
Update of /cvsroot/opengtoolkit/lvzip/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8748/source Modified Files: lvzlib.dll lvzlib.so Log Message: Made it compile with Linux Index: lvzlib.dll =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.dll,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 Binary files /tmp/cvsJjyGUa and /tmp/cvsEmJSnc differ Index: lvzlib.so =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.so,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsnkz95e and /tmp/cvs3p2BCg differ |
|
From: Rolf K. <lab...@us...> - 2007-09-18 04:50:20
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv8748/c_source Modified Files: Makefile lvutil.c Log Message: Made it compile with Linux Index: Makefile =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 17 Sep 2007 16:13:02 -0000 1.8 --- Makefile 18 Sep 2007 04:50:19 -0000 1.9 *************** *** 1,5 **** # Makefile for lvzlib # Copyright (C) 1995-2003 Jean-loup Gailly. ! # Copyright (C) 2003-2004 Rolf Kalbermatter. # For conditions of distribution and use, see copyright notice in zlib.h --- 1,5 ---- # Makefile for lvzlib # Copyright (C) 1995-2003 Jean-loup Gailly. ! # Copyright (C) 2003-2007 Rolf Kalbermatter. # For conditions of distribution and use, see copyright notice in zlib.h *************** *** 138,156 **** adler32.o: zlib.h zconf.h compress.o: zlib.h zconf.h ! crc32.o: crc32.h zlib.h zconf.h ! deflate.o: deflate.h zutil.h zlib.h zconf.h ! example.o: zlib.h zconf.h ! gzio.o: zutil.h zlib.h zconf.h ! inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h ! inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h ! infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h ! inftrees.o: zutil.h zlib.h zconf.h inftrees.h ! lvutil.o: zlib.h zconf.h ioapi.h iomem.h lvutil.h ! minigzip.o: zlib.h zconf.h ! trees.o: deflate.h zutil.h zlib.h zconf.h trees.h uncompr.o: zlib.h zconf.h ! zutil.o: zutil.h zlib.h zconf.h ! ioapi.o: zlib.h zconf.h ioapi.h ! iomem.o: zlib.h zconf.h zutil.h ioapi.h lvutil.h ! zip.o: zlib.h zconf.h ioapi.h zip.h ! unzip.o: zlib.h zconf.h ioapi.h unzip.h --- 138,482 ---- adler32.o: zlib.h zconf.h compress.o: zlib.h zconf.h ! crc32.o: zutil.h zlib.h zconf.h /usr/include/string.h /usr/include/features.h ! crc32.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! crc32.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! crc32.o: /usr/include/stdlib.h /usr/include/sys/types.h ! crc32.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! crc32.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h ! crc32.o: /usr/include/sys/select.h /usr/include/bits/select.h ! crc32.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! crc32.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! crc32.o: /usr/include/alloca.h /usr/include/errno.h /usr/include/bits/errno.h ! crc32.o: /usr/include/linux/errno.h /usr/include/asm/errno.h ! crc32.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h ! crc32.o: /usr/include/asm-generic/errno-base.h /usr/include/limits.h ! crc32.o: /usr/include/bits/posix1_lim.h /usr/include/bits/local_lim.h ! crc32.o: /usr/include/linux/limits.h /usr/include/bits/posix2_lim.h crc32.h ! deflate.o: deflate.h zutil.h zlib.h zconf.h /usr/include/string.h ! deflate.o: /usr/include/features.h /usr/include/sys/cdefs.h ! deflate.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h ! deflate.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h ! deflate.o: /usr/include/sys/types.h /usr/include/bits/types.h ! deflate.o: /usr/include/bits/typesizes.h /usr/include/time.h ! deflate.o: /usr/include/endian.h /usr/include/bits/endian.h ! deflate.o: /usr/include/sys/select.h /usr/include/bits/select.h ! deflate.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! deflate.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! deflate.o: /usr/include/alloca.h /usr/include/errno.h ! deflate.o: /usr/include/bits/errno.h /usr/include/linux/errno.h ! deflate.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h ! deflate.o: /usr/include/asm-generic/errno.h ! deflate.o: /usr/include/asm-generic/errno-base.h ! deflate.o: zutil.h zlib.h zconf.h /usr/include/string.h ! deflate.o: /usr/include/features.h /usr/include/sys/cdefs.h ! deflate.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h ! deflate.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h ! deflate.o: /usr/include/sys/types.h /usr/include/bits/types.h ! deflate.o: /usr/include/bits/typesizes.h /usr/include/time.h ! deflate.o: /usr/include/endian.h /usr/include/bits/endian.h ! deflate.o: /usr/include/sys/select.h /usr/include/bits/select.h ! deflate.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! deflate.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! deflate.o: /usr/include/alloca.h /usr/include/errno.h ! deflate.o: /usr/include/bits/errno.h /usr/include/linux/errno.h ! deflate.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h ! deflate.o: /usr/include/asm-generic/errno.h ! deflate.o: /usr/include/asm-generic/errno-base.h ! example.o: /usr/include/stdio.h /usr/include/features.h ! example.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! example.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! example.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! example.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h ! example.o: /usr/include/bits/wchar.h /usr/include/gconv.h ! example.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h ! example.o: zlib.h zconf.h /usr/include/string.h /usr/include/stdlib.h ! example.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h ! example.o: /usr/include/bits/endian.h /usr/include/sys/select.h ! example.o: /usr/include/bits/select.h /usr/include/bits/sigset.h ! example.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h ! example.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h ! gzio.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h ! gzio.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h ! gzio.o: /usr/include/gnu/stubs-32.h /usr/include/bits/types.h ! gzio.o: /usr/include/bits/typesizes.h /usr/include/libio.h ! gzio.o: /usr/include/_G_config.h /usr/include/wchar.h ! gzio.o: /usr/include/bits/wchar.h /usr/include/gconv.h ! gzio.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h zutil.h ! gzio.o: zlib.h zconf.h /usr/include/string.h /usr/include/stdlib.h ! gzio.o: /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h ! gzio.o: /usr/include/bits/endian.h /usr/include/sys/select.h ! gzio.o: /usr/include/bits/select.h /usr/include/bits/sigset.h ! gzio.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h ! gzio.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h ! gzio.o: /usr/include/errno.h /usr/include/bits/errno.h ! gzio.o: /usr/include/linux/errno.h /usr/include/asm/errno.h ! gzio.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h ! gzio.o: /usr/include/asm-generic/errno-base.h ! infback.o: zutil.h zlib.h zconf.h /usr/include/string.h ! infback.o: /usr/include/features.h /usr/include/sys/cdefs.h ! infback.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h ! infback.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h ! infback.o: /usr/include/sys/types.h /usr/include/bits/types.h ! infback.o: /usr/include/bits/typesizes.h /usr/include/time.h ! infback.o: /usr/include/endian.h /usr/include/bits/endian.h ! infback.o: /usr/include/sys/select.h /usr/include/bits/select.h ! infback.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! infback.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! infback.o: /usr/include/alloca.h /usr/include/errno.h ! infback.o: /usr/include/bits/errno.h /usr/include/linux/errno.h ! infback.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h ! infback.o: /usr/include/asm-generic/errno.h ! infback.o: /usr/include/asm-generic/errno-base.h inftrees.h inflate.h ! infback.o: inffast.h inffixed.h ! inffast.o: zutil.h zlib.h zconf.h /usr/include/string.h ! inffast.o: /usr/include/features.h /usr/include/sys/cdefs.h ! inffast.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h ! inffast.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h ! inffast.o: /usr/include/sys/types.h /usr/include/bits/types.h ! inffast.o: /usr/include/bits/typesizes.h /usr/include/time.h ! inffast.o: /usr/include/endian.h /usr/include/bits/endian.h ! inffast.o: /usr/include/sys/select.h /usr/include/bits/select.h ! inffast.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! inffast.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! inffast.o: /usr/include/alloca.h /usr/include/errno.h ! inffast.o: /usr/include/bits/errno.h /usr/include/linux/errno.h ! inffast.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h ! inffast.o: /usr/include/asm-generic/errno.h ! inffast.o: /usr/include/asm-generic/errno-base.h inftrees.h inflate.h ! inffast.o: inffast.h ! inflate.o: zutil.h zlib.h zconf.h /usr/include/string.h ! inflate.o: /usr/include/features.h /usr/include/sys/cdefs.h ! inflate.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h ! inflate.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h ! inflate.o: /usr/include/sys/types.h /usr/include/bits/types.h ! inflate.o: /usr/include/bits/typesizes.h /usr/include/time.h ! inflate.o: /usr/include/endian.h /usr/include/bits/endian.h ! inflate.o: /usr/include/sys/select.h /usr/include/bits/select.h ! inflate.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! inflate.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! inflate.o: /usr/include/alloca.h /usr/include/errno.h ! inflate.o: /usr/include/bits/errno.h /usr/include/linux/errno.h ! inflate.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h ! inflate.o: /usr/include/asm-generic/errno.h ! inflate.o: /usr/include/asm-generic/errno-base.h inftrees.h inflate.h ! inflate.o: inffast.h inffixed.h ! inftrees.o: zutil.h zlib.h zconf.h /usr/include/string.h ! inftrees.o: /usr/include/features.h /usr/include/sys/cdefs.h ! inftrees.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h ! inftrees.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h ! inftrees.o: /usr/include/sys/types.h /usr/include/bits/types.h ! inftrees.o: /usr/include/bits/typesizes.h /usr/include/time.h ! inftrees.o: /usr/include/endian.h /usr/include/bits/endian.h ! inftrees.o: /usr/include/sys/select.h /usr/include/bits/select.h ! inftrees.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! inftrees.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! inftrees.o: /usr/include/alloca.h /usr/include/errno.h ! inftrees.o: /usr/include/bits/errno.h /usr/include/linux/errno.h ! inftrees.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h ! inftrees.o: /usr/include/asm-generic/errno.h ! inftrees.o: /usr/include/asm-generic/errno-base.h inftrees.h ! ioapi.o: /usr/include/stdio.h /usr/include/features.h ! ioapi.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! ioapi.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! ioapi.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! ioapi.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h ! ioapi.o: /usr/include/bits/wchar.h /usr/include/gconv.h ! ioapi.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h ! ioapi.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h ! ioapi.o: /usr/include/endian.h /usr/include/bits/endian.h ! ioapi.o: /usr/include/sys/select.h /usr/include/bits/select.h ! ioapi.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! ioapi.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! ioapi.o: /usr/include/alloca.h /usr/include/string.h zlib.h zconf.h ioapi.h ! iomem.o: zutil.h zlib.h zconf.h /usr/include/string.h /usr/include/features.h ! iomem.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! iomem.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! iomem.o: /usr/include/stdlib.h /usr/include/sys/types.h ! iomem.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! iomem.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h ! iomem.o: /usr/include/sys/select.h /usr/include/bits/select.h ! iomem.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! iomem.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! iomem.o: /usr/include/alloca.h /usr/include/errno.h /usr/include/bits/errno.h ! iomem.o: /usr/include/linux/errno.h /usr/include/asm/errno.h ! iomem.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h ! iomem.o: /usr/include/asm-generic/errno-base.h ioapi.h lvutil.h iomem.h ! iomem.o: /usr/include/stdlib.h /usr/include/features.h ! iomem.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! iomem.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! iomem.o: /usr/include/sys/types.h /usr/include/bits/types.h ! iomem.o: /usr/include/bits/typesizes.h /usr/include/time.h ! iomem.o: /usr/include/endian.h /usr/include/bits/endian.h ! iomem.o: /usr/include/sys/select.h /usr/include/bits/select.h ! iomem.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! iomem.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! iomem.o: /usr/include/alloca.h ! iowin32.o: /usr/include/stdlib.h /usr/include/features.h ! iowin32.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! iowin32.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! iowin32.o: /usr/include/sys/types.h /usr/include/bits/types.h ! iowin32.o: /usr/include/bits/typesizes.h /usr/include/time.h ! iowin32.o: /usr/include/endian.h /usr/include/bits/endian.h ! iowin32.o: /usr/include/sys/select.h /usr/include/bits/select.h ! iowin32.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! iowin32.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! iowin32.o: /usr/include/alloca.h zlib.h zconf.h ioapi.h iowin32.h ! lvutil.o: /usr/include/stdio.h /usr/include/features.h ! lvutil.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! lvutil.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! lvutil.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! lvutil.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h ! lvutil.o: /usr/include/bits/wchar.h /usr/include/gconv.h ! lvutil.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h ! lvutil.o: /usr/include/string.h zlib.h zconf.h ioapi.h lvutil.h iomem.h ! lvutil.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h ! lvutil.o: /usr/include/endian.h /usr/include/bits/endian.h ! lvutil.o: /usr/include/sys/select.h /usr/include/bits/select.h ! lvutil.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! lvutil.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! lvutil.o: /usr/include/alloca.h /usr/include/sys/stat.h ! lvutil.o: /usr/include/bits/stat.h /usr/include/utime.h ! minigzip.o: /usr/include/stdio.h /usr/include/features.h ! minigzip.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! minigzip.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! minigzip.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! minigzip.o: /usr/include/libio.h /usr/include/_G_config.h ! minigzip.o: /usr/include/wchar.h /usr/include/bits/wchar.h ! minigzip.o: /usr/include/gconv.h /usr/include/bits/stdio_lim.h ! minigzip.o: /usr/include/bits/sys_errlist.h zlib.h zconf.h ! minigzip.o: /usr/include/string.h /usr/include/stdlib.h ! minigzip.o: /usr/include/sys/types.h /usr/include/time.h ! minigzip.o: /usr/include/endian.h /usr/include/bits/endian.h ! minigzip.o: /usr/include/sys/select.h /usr/include/bits/select.h ! minigzip.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! minigzip.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! minigzip.o: /usr/include/alloca.h ! miniunz.o: /usr/include/stdio.h /usr/include/features.h ! miniunz.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! miniunz.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! miniunz.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! miniunz.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h ! miniunz.o: /usr/include/bits/wchar.h /usr/include/gconv.h ! miniunz.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h ! miniunz.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h ! miniunz.o: /usr/include/endian.h /usr/include/bits/endian.h ! miniunz.o: /usr/include/sys/select.h /usr/include/bits/select.h ! miniunz.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! miniunz.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! miniunz.o: /usr/include/alloca.h /usr/include/string.h /usr/include/errno.h ! miniunz.o: /usr/include/bits/errno.h /usr/include/linux/errno.h ! miniunz.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h ! miniunz.o: /usr/include/asm-generic/errno.h ! miniunz.o: /usr/include/asm-generic/errno-base.h /usr/include/fcntl.h ! miniunz.o: /usr/include/bits/fcntl.h unzip.h zlib.h zconf.h ioapi.h ! minizip.o: /usr/include/stdio.h /usr/include/features.h ! minizip.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! minizip.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! minizip.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! minizip.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h ! minizip.o: /usr/include/bits/wchar.h /usr/include/gconv.h ! minizip.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h ! minizip.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h ! minizip.o: /usr/include/endian.h /usr/include/bits/endian.h ! minizip.o: /usr/include/sys/select.h /usr/include/bits/select.h ! minizip.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! minizip.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! minizip.o: /usr/include/alloca.h /usr/include/string.h /usr/include/errno.h ! minizip.o: /usr/include/bits/errno.h /usr/include/linux/errno.h ! minizip.o: /usr/include/asm/errno.h /usr/include/asm-i386/errno.h ! minizip.o: /usr/include/asm-generic/errno.h ! minizip.o: /usr/include/asm-generic/errno-base.h /usr/include/fcntl.h ! minizip.o: /usr/include/bits/fcntl.h zip.h zlib.h zconf.h ioapi.h ! mztools.o: /usr/include/stdio.h /usr/include/features.h ! mztools.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! mztools.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! mztools.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! mztools.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h ! mztools.o: /usr/include/bits/wchar.h /usr/include/gconv.h ! mztools.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h ! mztools.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h ! mztools.o: /usr/include/endian.h /usr/include/bits/endian.h ! mztools.o: /usr/include/sys/select.h /usr/include/bits/select.h ! mztools.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! mztools.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! mztools.o: /usr/include/alloca.h /usr/include/string.h zlib.h zconf.h unzip.h ! mztools.o: ioapi.h ! mztools.o: zlib.h zconf.h unzip.h ioapi.h ! trees.o: deflate.h zutil.h zlib.h zconf.h /usr/include/string.h ! trees.o: /usr/include/features.h /usr/include/sys/cdefs.h ! trees.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h ! trees.o: /usr/include/gnu/stubs-32.h /usr/include/stdlib.h ! trees.o: /usr/include/sys/types.h /usr/include/bits/types.h ! trees.o: /usr/include/bits/typesizes.h /usr/include/time.h ! trees.o: /usr/include/endian.h /usr/include/bits/endian.h ! trees.o: /usr/include/sys/select.h /usr/include/bits/select.h ! trees.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! trees.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! trees.o: /usr/include/alloca.h /usr/include/errno.h /usr/include/bits/errno.h ! trees.o: /usr/include/linux/errno.h /usr/include/asm/errno.h ! trees.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h ! trees.o: /usr/include/asm-generic/errno-base.h trees.h uncompr.o: zlib.h zconf.h ! unzip.o: /usr/include/stdio.h /usr/include/features.h ! unzip.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! unzip.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! unzip.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! unzip.o: /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h ! unzip.o: /usr/include/bits/wchar.h /usr/include/gconv.h ! unzip.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h ! unzip.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h ! unzip.o: /usr/include/endian.h /usr/include/bits/endian.h ! unzip.o: /usr/include/sys/select.h /usr/include/bits/select.h ! unzip.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! unzip.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! unzip.o: /usr/include/alloca.h /usr/include/string.h zlib.h zconf.h unzip.h ! unzip.o: ioapi.h /usr/include/errno.h /usr/include/bits/errno.h ! unzip.o: /usr/include/linux/errno.h /usr/include/asm/errno.h ! unzip.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h ! unzip.o: /usr/include/asm-generic/errno-base.h crypt.h ! unzip.o: zlib.h zconf.h ioapi.h ! zip.o: /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h ! zip.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h ! zip.o: /usr/include/gnu/stubs-32.h /usr/include/bits/types.h ! zip.o: /usr/include/bits/typesizes.h /usr/include/libio.h ! zip.o: /usr/include/_G_config.h /usr/include/wchar.h ! zip.o: /usr/include/bits/wchar.h /usr/include/gconv.h ! zip.o: /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h ! zip.o: /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h ! zip.o: /usr/include/endian.h /usr/include/bits/endian.h ! zip.o: /usr/include/sys/select.h /usr/include/bits/select.h ! zip.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! zip.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! zip.o: /usr/include/alloca.h /usr/include/string.h zlib.h zconf.h zip.h ! zip.o: ioapi.h /usr/include/errno.h /usr/include/bits/errno.h ! zip.o: /usr/include/linux/errno.h /usr/include/asm/errno.h ! zip.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h ! zip.o: /usr/include/asm-generic/errno-base.h crypt.h ! zip.o: zlib.h zconf.h ioapi.h ! zlib.o: zconf.h ! zutil.o: zutil.h zlib.h zconf.h /usr/include/string.h /usr/include/features.h ! zutil.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! zutil.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! zutil.o: /usr/include/stdlib.h /usr/include/sys/types.h ! zutil.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! zutil.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h ! zutil.o: /usr/include/sys/select.h /usr/include/bits/select.h ! zutil.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! zutil.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! zutil.o: /usr/include/alloca.h /usr/include/errno.h /usr/include/bits/errno.h ! zutil.o: /usr/include/linux/errno.h /usr/include/asm/errno.h ! zutil.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h ! zutil.o: /usr/include/asm-generic/errno-base.h ! zutil.o: zlib.h zconf.h /usr/include/string.h /usr/include/features.h ! zutil.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h ! zutil.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h ! zutil.o: /usr/include/stdlib.h /usr/include/sys/types.h ! zutil.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h ! zutil.o: /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h ! zutil.o: /usr/include/sys/select.h /usr/include/bits/select.h ! zutil.o: /usr/include/bits/sigset.h /usr/include/bits/time.h ! zutil.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h ! zutil.o: /usr/include/alloca.h /usr/include/errno.h /usr/include/bits/errno.h ! zutil.o: /usr/include/linux/errno.h /usr/include/asm/errno.h ! zutil.o: /usr/include/asm-i386/errno.h /usr/include/asm-generic/errno.h ! zutil.o: /usr/include/asm-generic/errno-base.h Index: lvutil.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lvutil.c 17 Sep 2007 16:13:02 -0000 1.1 --- lvutil.c 18 Sep 2007 04:50:19 -0000 1.2 *************** *** 28,31 **** --- 28,34 ---- static MgErr OSErrToLVErr(OSErr err); #elif Unix + #include <errno.h> + #include <fcntl.h> + #include <dirent.h> #elif Win32 #include "iowin32.h" *************** *** 61,65 **** CToPStr(lstr->str, name); ret = MakeFileSpec(0, 0, name, fss); ! err = OSErrToLVErr(ret); if (err) DEBUGPRINTF(("MakeFileSpec: ret = %d, err = %ld", ret, err)); --- 64,68 ---- CToPStr(lstr->str, name); ret = MakeFileSpec(0, 0, name, fss); ! err = OSErrToLVErr(ret); if (err) DEBUGPRINTF(("MakeFileSpec: ret = %d, err = %ld", ret, err)); *************** *** 242,246 **** err = FPathToText(path, *lstr); if (err) ! DSDisposePtr((UPtr)lstr); } return err; --- 245,249 ---- err = FPathToText(path, *lstr); if (err) ! DSDisposePtr((UPtr)lstr); } return err; *************** *** 291,295 **** static MgErr Win32ToLVFileErr(void) { ! int32 err; err = GetLastError(); --- 294,298 ---- static MgErr Win32ToLVFileErr(void) { ! int32 err; err = GetLastError(); *************** *** 335,339 **** } ! TH_REENTRANT static MgErr UnixToLVFileErr(void) { switch (errno) --- 338,342 ---- } ! static MgErr UnixToLVFileErr(void) { switch (errno) *************** *** 405,409 **** FSSpec dstFSSpec; MgErr err; ! err = MakeMacSpec(srcPath, &srcFSSpec); if (!err) --- 408,412 ---- FSSpec dstFSSpec; MgErr err; ! err = MakeMacSpec(srcPath, &srcFSSpec); if (!err) *************** *** 425,429 **** FSSpec dstFSSpec; MgErr err; ! err = MakeMacSpec(srcPath, &srcFSSpec); if (!err) --- 428,432 ---- FSSpec dstFSSpec; MgErr err; ! err = MakeMacSpec(srcPath, &srcFSSpec); if (!err) *************** *** 451,460 **** #elif Win32 LStrPtr lstr; ! DWORD shareAcc, openAcc; ! DWORD createMode = OPEN_EXISTING; ! int32 attempts; #elif Unix LStrPtr lstr; uChar theMode[3]; #endif *refnum = 0; --- 454,464 ---- #elif Win32 LStrPtr lstr; ! DWORD shareAcc, openAcc; ! DWORD createMode = OPEN_EXISTING; ! int32 attempts; #elif Unix LStrPtr lstr; uChar theMode[3]; + struct stat statbuf; #endif *refnum = 0; *************** *** 469,473 **** return err; } ! switch (openMode) { --- 473,477 ---- return err; } ! switch (openMode) { *************** *** 514,520 **** pb.accessParam.ioDenyModes = perm; if (rsrc) ! ret = PBHOpenRFDenySync(&pb); else ! ret = PBHOpenDenySync(&pb); } else --- 518,524 ---- pb.accessParam.ioDenyModes = perm; if (rsrc) ! ret = PBHOpenRFDenySync(&pb); else ! ret = PBHOpenDenySync(&pb); } else *************** *** 522,526 **** pb.ioParam.ioPermssn = perm; if (rsrc) ! ret = PBHOpenRFSync(&pb); else ret = PBHOpenSync(&pb); --- 526,530 ---- pb.ioParam.ioPermssn = perm; if (rsrc) ! ret = PBHOpenRFSync(&pb); else ret = PBHOpenSync(&pb); *************** *** 532,536 **** if (openMode == openWriteOnlyTruncate) err = OSErrToLVErr(SetEOF(ioRefNum, 0L)); ! } #elif Win32 if (FDepth(path) == 1L) --- 536,540 ---- if (openMode == openWriteOnlyTruncate) err = OSErrToLVErr(SetEOF(ioRefNum, 0L)); ! } #elif Win32 if (FDepth(path) == 1L) *************** *** 538,542 **** if (rsrc) ! return mgNotSupported; switch (openMode) --- 542,546 ---- if (rsrc) ! return mgNotSupported; switch (openMode) *************** *** 547,551 **** case openWriteOnlyTruncate: createMode = TRUNCATE_EXISTING; ! /* Intentionally falling through */ case openWriteOnly: openAcc = GENERIC_WRITE; --- 551,555 ---- case openWriteOnlyTruncate: createMode = TRUNCATE_EXISTING; ! /* Intentionally falling through */ case openWriteOnly: openAcc = GENERIC_WRITE; *************** *** 596,600 **** #elif Unix if (rsrc) ! return mgNotSupported; switch (openMode) --- 600,604 ---- #elif Unix if (rsrc) ! return mgNotSupported; switch (openMode) *************** *** 605,617 **** case openReadWrite: StrCpy(theMode, (uChar *)"r+"); ! break; case openReadOnly: ! StrCpy(theMode, (uChar *)"r"); ! break; case openWriteOnlyTruncate: ! StrCpy(theMode, (uChar *)"w"); ! break; default: ! return mgArgErr; } --- 609,621 ---- case openReadWrite: StrCpy(theMode, (uChar *)"r+"); ! break; case openReadOnly: ! StrCpy(theMode, (uChar *)"r"); ! break; case openWriteOnlyTruncate: ! StrCpy(theMode, (uChar *)"w"); ! break; default: ! return mgArgErr; } *************** *** 653,658 **** if (fcntl(fileno((FILE *)ioRefNum), F_SETLK, (int32) &lockInfo) == -1) { ! err = UnixToLVFileErr(); ! fclose((FILE *)ioRefNum); } } --- 657,662 ---- if (fcntl(fileno((FILE *)ioRefNum), F_SETLK, (int32) &lockInfo) == -1) { ! err = UnixToLVFileErr(); ! fclose((FILE *)ioRefNum); } } *************** *** 670,674 **** extern MgErr ZEXPORT LVPath_UtilFileInfo(Path path, uInt8 write, ! uInt8 *isDirectory, LVFileInfo *fileInfo, LStrHandle comment) --- 674,678 ---- extern MgErr ZEXPORT LVPath_UtilFileInfo(Path path, uInt8 write, ! uInt8 *isDirectory, LVFileInfo *fileInfo, LStrHandle comment) *************** *** 720,724 **** if (!err) { ! dtpb.ioNamePtr = fss.name; dtpb.ioDirID = fss.parID; *isDirectory = (MacIsDir(cpb) != 0); --- 724,728 ---- if (!err) { ! dtpb.ioNamePtr = fss.name; dtpb.ioDirID = fss.parID; *isDirectory = (MacIsDir(cpb) != 0); *************** *** 757,761 **** dtpb.ioDTBuffer = LStrBuf(*comment); dtpb.ioDTReqCount = LStrLen(*comment); ! /* Ignore error for setting Desktop comments as this is not supported on OSX */ PBDTSetCommentSync(&dtpb); } --- 761,765 ---- dtpb.ioDTBuffer = LStrBuf(*comment); dtpb.ioDTReqCount = LStrLen(*comment); ! /* Ignore error for setting Desktop comments as this is not supported on OSX */ PBDTSetCommentSync(&dtpb); } *************** *** 765,769 **** if (*isDirectory) { ! fileInfo->type = kUnknownType; fileInfo->creator = kUnknownType; fileInfo->flags = cpb.dirInfo.ioDrUsrWds.frFlags; --- 769,773 ---- if (*isDirectory) { ! fileInfo->type = kUnknownType; fileInfo->creator = kUnknownType; fileInfo->flags = cpb.dirInfo.ioDrUsrWds.frFlags; *************** *** 794,811 **** } ! if (comment) ! { ! err = DSSetHandleSize((UHandle)comment, 255); ! if (!err) ! { ! dtpb.ioDTBuffer = LStrBuf(*comment); dtpb.ioDTReqCount = LStrLen(*comment) = 255; dtpb.ioDTActCount = 0; err = OSErrToLVErr(PBDTGetCommentSync(&dtpb)); ! LStrLen(*comment) = err ? 0 : dtpb.ioDTActCount; ! /* Ignore error for getting Desktop comments as this is not supported on OSX */ ! err = mgNoErr; ! } ! } } } --- 798,815 ---- } ! if (comment) ! { ! err = DSSetHandleSize((UHandle)comment, 255); ! if (!err) ! { ! dtpb.ioDTBuffer = LStrBuf(*comment); dtpb.ioDTReqCount = LStrLen(*comment) = 255; dtpb.ioDTActCount = 0; err = OSErrToLVErr(PBDTGetCommentSync(&dtpb)); ! LStrLen(*comment) = err ? 0 : dtpb.ioDTActCount; ! /* Ignore error for getting Desktop comments as this is not supported on OSX */ ! err = mgNoErr; ! } ! } } } *************** *** 826,835 **** handle = FindFirstFileA(lstr->str, &fi); if (handle == INVALID_HANDLE_VALUE) ! err = Win32ToLVFileErr(); else { *isDirectory = ((fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0); ! if (!FindClose(handle)) ! err = Win32ToLVFileErr(); } } --- 830,839 ---- handle = FindFirstFileA(lstr->str, &fi); if (handle == INVALID_HANDLE_VALUE) ! err = Win32ToLVFileErr(); else { *isDirectory = ((fi.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0); ! if (!FindClose(handle)) ! err = Win32ToLVFileErr(); } } *************** *** 843,855 **** if (!SetFileTime(handle, &fi.ftCreationTime, &fi.ftLastAccessTime, &fi.ftLastWriteTime)) err = Win32ToLVFileErr(); ! fi.dwFileAttributes = GetFileAttributesA(lstr->str); ! if (fi.dwFileAttributes != INVALID_FILE_ATTRIBUTES) ! { ! if (fileInfo->flags & 0x4000) fi.dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN; else fi.dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN; ! SetFileAttributesA(lstr->str, fi.dwFileAttributes); ! } } else --- 847,859 ---- if (!SetFileTime(handle, &fi.ftCreationTime, &fi.ftLastAccessTime, &fi.ftLastWriteTime)) err = Win32ToLVFileErr(); ! fi.dwFileAttributes = GetFileAttributesA(lstr->str); ! if (fi.dwFileAttributes != INVALID_FILE_ATTRIBUTES) ! { ! if (fileInfo->flags & 0x4000) fi.dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN; else fi.dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN; ! SetFileAttributesA(lstr->str, fi.dwFileAttributes); ! } } else *************** *** 862,904 **** fileInfo->flags = (fi.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? 0x4000 : 0; if (*isDirectory) ! { ! Path temp = path; ! ! count = 1; DSDisposePtr((UPtr)lstr); ! err = FPathToPath(&temp); ! if (!err) ! err = FAppendName(temp, "\003*.*"); err = MakePathDSString(temp, &lstr); FDisposePath(temp); ! if (!err) ! { handle = FindFirstFileA(lstr->str, &fi); ! if (handle == INVALID_HANDLE_VALUE) ! count = 0; ! else ! for (;FindNextFile(handle, &fi);) ! count++; ! FindClose(handle); ! if (FDepth(path) == 1) ! fileInfo->size = count; ! else ! fileInfo->size = count - 2; ! } ! } else ! { fileInfo->size = fi.nFileSizeLow; ! } } } DSDisposePtr((UPtr)lstr); #elif Unix - MgErr - if (err = MakePathDSString(path, &lstr)) return err; --- 866,906 ---- fileInfo->flags = (fi.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) ? 0x4000 : 0; if (*isDirectory) ! { ! Path temp = path; ! ! count = 1; DSDisposePtr((UPtr)lstr); ! err = FPathToPath(&temp); ! if (!err) ! err = FAppendName(temp, "\003*.*"); err = MakePathDSString(temp, &lstr); FDisposePath(temp); ! if (!err) ! { handle = FindFirstFileA(lstr->str, &fi); ! if (handle == INVALID_HANDLE_VALUE) ! count = 0; ! else ! for (;FindNextFile(handle, &fi);) ! count++; ! FindClose(handle); ! if (FDepth(path) == 1) ! fileInfo->size = count; ! else ! fileInfo->size = count - 2; ! } ! } else ! { fileInfo->size = fi.nFileSizeLow; ! } } } DSDisposePtr((UPtr)lstr); #elif Unix if (err = MakePathDSString(path, &lstr)) return err; *************** *** 924,949 **** else { ! fileInfo->type = kUnknownType; ! fileInfo->creator = kUnknownCreator; ! UnixConvertToLVTime(statbuf.st_ctime, &fileInfo->cDate); UnixConvertToLVTime(statbuf.st_mtime, &fileInfo->mDate); fileInfo->rfSize = 0; if (*isDirectory) ! { DIR *dirp; struct dirent *dp; ! if (!(dirp = opendir( thePath))) ! return UnixToLVFileErr(); ! for (dp = readdir(dirp); dp; dp = readdir(dirp)) ! count++; ! closedir(dirp); ! fileInfo->size = count - 2; ! } ! else ! { ! fileInfo->size = statbuf.st_size; ! } } } --- 926,951 ---- else { ! fileInfo->type = kUnknownFileType; ! fileInfo->creator = kUnknownCreator; ! UnixConvertToLVTime(statbuf.st_ctime, &fileInfo->cDate); UnixConvertToLVTime(statbuf.st_mtime, &fileInfo->mDate); fileInfo->rfSize = 0; if (*isDirectory) ! { DIR *dirp; struct dirent *dp; ! if (!(dirp = opendir(lstr->str))) ! return UnixToLVFileErr(); ! for (dp = readdir(dirp); dp; dp = readdir(dirp)) ! count++; ! closedir(dirp); ! fileInfo->size = count - 2; ! } ! else ! { ! fileInfo->size = statbuf.st_size; ! } } } *************** *** 959,967 **** { if (memory) ! { fill_mem_filefunc(pzlib_filefunc_def, memory); ! } ! else ! { #if Win32 fill_win32_filefunc(pzlib_filefunc_def); --- 961,969 ---- { if (memory) ! { fill_mem_filefunc(pzlib_filefunc_def, memory); ! } ! else ! { #if Win32 fill_win32_filefunc(pzlib_filefunc_def); *************** *** 987,991 **** if (!len) return mgArgErr; ! fileRef = CFStringCreateWithCString(NULL, hfsPath, enc); if (fileRef) --- 989,993 ---- if (!len) return mgArgErr; ! fileRef = CFStringCreateWithCString(NULL, hfsPath, enc); if (fileRef) *************** *** 1024,1028 **** if (!len) return mgArgErr; - err = FPathToText(path, (LStrPtr)&pathLen); if (!err) --- 1026,1029 ---- |
|
From: Rolf K. <lab...@us...> - 2007-09-17 17:22:04
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30694 Modified Files: iomem.c Log Message: Fixed a potential compiler warning with pointer creation on typecasted variable Index: iomem.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** iomem.c 17 Sep 2007 16:13:02 -0000 1.6 --- iomem.c 17 Sep 2007 17:22:06 -0000 1.7 *************** *** 104,108 **** return err; ! if (err = NumericArrayResize(uB, 1, &(UHandle)handle, Max(10000, (offset + size) << 1))) return err; } --- 104,108 ---- return err; ! if (err = NumericArrayResize(uB, 1, (UHandle*)&handle, Max(10000, (offset + size) << 1))) return err; } |
|
From: Jim K. <jk...@us...> - 2007-09-17 16:32:02
|
Update of /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21902/c_source/lvzip.xcodeproj Modified Files: jameskring.pbxuser project.pbxproj Log Message: added iomem.c ands iomem.h to the xcode project Index: project.pbxproj =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj/project.pbxproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** project.pbxproj 15 Sep 2007 21:21:44 -0000 1.1 --- project.pbxproj 17 Sep 2007 15:39:52 -0000 1.2 *************** *** 49,52 **** --- 49,54 ---- C77CC6BF0C9C7D3200886AB2 /* liblvexports.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */; }; C77CC6C20C9C7D6500886AB2 /* liblabviewcin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */; }; + C79368AC0C9ED687006083BF /* iomem.c in Sources */ = {isa = PBXBuildFile; fileRef = C79368AA0C9ED687006083BF /* iomem.c */; }; + C79368AD0C9ED687006083BF /* iomem.h in Headers */ = {isa = PBXBuildFile; fileRef = C79368AB0C9ED687006083BF /* iomem.h */; }; /* End PBXBuildFile section */ *************** *** 94,97 **** --- 96,101 ---- C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblvexports.a; path = "/Applications/National Instruments/LabVIEW 8.2/cintools/Mach-O/liblvexports.a"; sourceTree = "<absolute>"; }; C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblabviewcin.a; path = "/Applications/National Instruments/LabVIEW 8.2/cintools/Mach-O/liblabviewcin.a"; sourceTree = "<absolute>"; }; + C79368AA0C9ED687006083BF /* iomem.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = iomem.c; sourceTree = "<group>"; }; + C79368AB0C9ED687006083BF /* iomem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = iomem.h; sourceTree = "<group>"; }; /* End PBXFileReference section */ *************** *** 114,117 **** --- 118,123 ---- isa = PBXGroup; children = ( + C79368AA0C9ED687006083BF /* iomem.c */, + C79368AB0C9ED687006083BF /* iomem.h */, C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */, C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */, *************** *** 216,219 **** --- 222,226 ---- 839542E80894F2490020C3E2 /* mztools.h in Headers */, 839542EC0894F2490020C3E2 /* inffixed.h in Headers */, + C79368AD0C9ED687006083BF /* iomem.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 290,293 **** --- 297,301 ---- 839542EF0894F2490020C3E2 /* gvmat32c.c in Sources */, 839542F10894F2490020C3E2 /* adler32.c in Sources */, + C79368AC0C9ED687006083BF /* iomem.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; Index: jameskring.pbxuser =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj/jameskring.pbxuser,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jameskring.pbxuser 15 Sep 2007 21:21:44 -0000 1.1 --- jameskring.pbxuser 17 Sep 2007 15:39:52 -0000 1.2 *************** *** 9,12 **** --- 9,27 ---- }; }; + 839542B70894F2490020C3E2 /* gzio.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {975, 14378}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 0}, {975, 205}}"; + sepNavWindowFrame = "{{15, 615}, {750, 558}}"; + }; + }; + 839542BA0894F2490020C3E2 /* adler32.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {975, 2100}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 0}, {975, 205}}"; + }; + }; 83D3E190080D116E00DE332C /* Project object */ = { activeBuildConfigurationName = Development; *************** *** 22,28 **** PBXFileTableDataSourceColumnWidthsKey = ( 20, ! 341, 20, ! 48.1626, 43, 43, --- 37,43 ---- PBXFileTableDataSourceColumnWidthsKey = ( 20, ! 416, 20, ! 48, 43, 43, *************** *** 39,44 **** ); }; ! PBXPerProjectTemplateStateSaveDate = 211582023; ! PBXWorkspaceStateSaveDate = 211582023; }; sourceControlManager = C77CC6BC0C9C7C6500886AB2 /* Source Control */; --- 54,59 ---- ); }; ! PBXPerProjectTemplateStateSaveDate = 211735256; ! PBXWorkspaceStateSaveDate = 211735256; }; sourceControlManager = C77CC6BC0C9C7C6500886AB2 /* Source Control */; |
|
From: Rolf K. <lab...@us...> - 2007-09-17 16:18:25
|
Update of /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5495 Modified Files: jameskring.pbxuser Log Message: Set project build to Deployment to avoid popup of debug windows in tests Index: jameskring.pbxuser =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj/jameskring.pbxuser,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jameskring.pbxuser 17 Sep 2007 15:39:52 -0000 1.2 --- jameskring.pbxuser 17 Sep 2007 16:18:27 -0000 1.3 *************** *** 25,29 **** }; 83D3E190080D116E00DE332C /* Project object */ = { ! activeBuildConfigurationName = Development; activeTarget = 83D3E1AE080D116E00DE332C /* OSX DLL */; addToTargets = ( --- 25,29 ---- }; 83D3E190080D116E00DE332C /* Project object */ = { ! activeBuildConfigurationName = Deployment; activeTarget = 83D3E1AE080D116E00DE332C /* OSX DLL */; addToTargets = ( |
|
From: Rolf K. <lab...@us...> - 2007-09-17 16:13:03
|
Update of /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3040/c_source/lvzip.xcodeproj Modified Files: project.pbxproj Log Message: changed filename macbin.x to lvutil.x Index: project.pbxproj =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcodeproj/project.pbxproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** project.pbxproj 17 Sep 2007 15:39:52 -0000 1.2 --- project.pbxproj 17 Sep 2007 16:13:02 -0000 1.3 *************** *** 9,14 **** /* Begin PBXBuildFile section */ 836583B4088D13980083EC20 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 836583A3088D034C0083EC20 /* System.framework */; }; ! 839542C00894F2490020C3E2 /* macbin.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542890894F2480020C3E2 /* macbin.h */; }; ! 839542C10894F2490020C3E2 /* macbin.c in Sources */ = {isa = PBXBuildFile; fileRef = 8395428A0894F2480020C3E2 /* macbin.c */; }; 839542C30894F2490020C3E2 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 8395428C0894F2480020C3E2 /* mztools.c */; }; 839542C60894F2490020C3E2 /* inffast.h in Headers */ = {isa = PBXBuildFile; fileRef = 8395428F0894F2480020C3E2 /* inffast.h */; }; --- 9,14 ---- /* Begin PBXBuildFile section */ 836583B4088D13980083EC20 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 836583A3088D034C0083EC20 /* System.framework */; }; ! 839542C00894F2490020C3E2 /* lvutil.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542890894F2480020C3E2 /* lvutil.h */; }; ! 839542C10894F2490020C3E2 /* lvutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 8395428A0894F2480020C3E2 /* lvutil.c */; }; 839542C30894F2490020C3E2 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 8395428C0894F2480020C3E2 /* mztools.c */; }; 839542C60894F2490020C3E2 /* inffast.h in Headers */ = {isa = PBXBuildFile; fileRef = 8395428F0894F2480020C3E2 /* inffast.h */; }; *************** *** 55,60 **** /* Begin PBXFileReference section */ 836583A3088D034C0083EC20 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = "<absolute>"; }; ! 839542890894F2480020C3E2 /* macbin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = macbin.h; sourceTree = "<group>"; }; ! 8395428A0894F2480020C3E2 /* macbin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = macbin.c; sourceTree = "<group>"; }; 8395428C0894F2480020C3E2 /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = mztools.c; sourceTree = "<group>"; }; 8395428F0894F2480020C3E2 /* inffast.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = inffast.h; sourceTree = "<group>"; }; --- 55,60 ---- /* Begin PBXFileReference section */ 836583A3088D034C0083EC20 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = "<absolute>"; }; ! 839542890894F2480020C3E2 /* lvutil.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lvutil.h; sourceTree = "<group>"; }; ! 8395428A0894F2480020C3E2 /* lvutil.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = lvutil.c; sourceTree = "<group>"; }; 8395428C0894F2480020C3E2 /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = mztools.c; sourceTree = "<group>"; }; 8395428F0894F2480020C3E2 /* inffast.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = inffast.h; sourceTree = "<group>"; }; *************** *** 149,154 **** isa = PBXGroup; children = ( ! 839542890894F2480020C3E2 /* macbin.h */, ! 8395428A0894F2480020C3E2 /* macbin.c */, 8395428C0894F2480020C3E2 /* mztools.c */, 8395428F0894F2480020C3E2 /* inffast.h */, --- 149,154 ---- isa = PBXGroup; children = ( ! 839542890894F2480020C3E2 /* lvutil.h */, ! 8395428A0894F2480020C3E2 /* lvutil.c */, 8395428C0894F2480020C3E2 /* mztools.c */, 8395428F0894F2480020C3E2 /* inffast.h */, *************** *** 205,209 **** files = ( 83D3E21F080D117200DE332C /* MacBinaryIII.h in Headers */, ! 839542C00894F2490020C3E2 /* macbin.h in Headers */, 839542C60894F2490020C3E2 /* inffast.h in Headers */, 839542C90894F2490020C3E2 /* crc32.h in Headers */, --- 205,209 ---- files = ( 83D3E21F080D117200DE332C /* MacBinaryIII.h in Headers */, ! 839542C00894F2490020C3E2 /* lvutil.h in Headers */, 839542C60894F2490020C3E2 /* inffast.h in Headers */, 839542C90894F2490020C3E2 /* crc32.h in Headers */, *************** *** 279,283 **** files = ( 83D3E21E080D117200DE332C /* MacBinaryIII.c in Sources */, ! 839542C10894F2490020C3E2 /* macbin.c in Sources */, 839542C30894F2490020C3E2 /* mztools.c in Sources */, 839542C70894F2490020C3E2 /* inffast.c in Sources */, --- 279,283 ---- files = ( 83D3E21E080D117200DE332C /* MacBinaryIII.c in Sources */, ! 839542C10894F2490020C3E2 /* lvutil.c in Sources */, 839542C30894F2490020C3E2 /* mztools.c in Sources */, 839542C70894F2490020C3E2 /* inffast.c in Sources */, |
|
From: Rolf K. <lab...@us...> - 2007-09-17 16:13:03
|
Update of /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcode In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3040/c_source/lvzip.xcode Modified Files: project.pbxproj Log Message: changed filename macbin.x to lvutil.x Index: project.pbxproj =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.xcode/project.pbxproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** project.pbxproj 2 Apr 2007 21:11:48 -0000 1.6 --- project.pbxproj 17 Sep 2007 16:13:02 -0000 1.7 *************** *** 62,66 **** isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; ! path = macbin.h; refType = 4; sourceTree = "<group>"; --- 62,66 ---- isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; ! path = lvutil.h; refType = 4; sourceTree = "<group>"; *************** *** 70,74 **** isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; ! path = macbin.c; refType = 4; sourceTree = "<group>"; --- 70,74 ---- isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; ! path = lvutil.c; refType = 4; sourceTree = "<group>"; *************** *** 194,197 **** --- 194,213 ---- sourceTree = "<group>"; }; + 839542A20894F2480020C3E2 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = iomem.h; + refType = 4; + sourceTree = "<group>"; + }; + 839542A30894F2480020C3E2 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = iomem.c; + refType = 4; + sourceTree = "<group>"; + }; 839542A40894F2480020C3E2 = { fileEncoding = 30; *************** *** 226,237 **** sourceTree = "<group>"; }; - 839542AA0894F2490020C3E2 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - path = zconf.in.h; - refType = 4; - sourceTree = "<group>"; - }; 839542AB0894F2490020C3E2 = { fileEncoding = 30; --- 242,245 ---- |
|
From: Rolf K. <lab...@us...> - 2007-09-17 16:13:03
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3040/c_source Modified Files: Makefile iomem.c zlibvc.dsp Added Files: lvutil.c lvutil.h Removed Files: macbin.c macbin.h Log Message: changed filename macbin.x to lvutil.x --- macbin.c DELETED --- --- NEW FILE: lvutil.h --- /* lvutil.h -- support functions for macbinary Version 1.9, Sept 17th, 2007 Copyright (C) 2002-2007 Rolf Kalbermatter */ #ifndef _lvUtil_H #define _lvUtil_H #ifdef __cplusplus extern "C" { #endif #if defined(macintosh) || defined(__PPCC__) || defined(THINK_C) || defined(__SC__) || defined(__MWERKS__) || defined(__APPLE_CC__) #define Mac 1 #ifdef __MACH__ #define MacOSX 1 #endif #if defined(__i386__) #define BigEndian 0 #else #define BigEndian 1 #endif #elif defined(__GNUC__) || defined(linux) #define Unix 1 #define BigEndian 0 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN32_WCE) #define Win32 1 #ifdef _DEBUG #define DEBUG 1 #endif #define BigEndian 0 #endif #if defined(DEBUG) #if Win32 #define DoDebugger() {__asm int 3} #elif Mac #define DoDebugger() Debugger() #else #define DoDebugger() #endif #define DEBUGPRINTF(args) DbgPrintf args #else #define DoDebugger() #define DEBUGPRINTF(args) /* long DebugPrintf(char* fmt, ...); long DebugPrintf(char* fmt, ...) { return 0; } */ #endif typedef char int8; typedef unsigned char uInt8; typedef uInt8 uChar; typedef short int16; typedef unsigned short uInt16; typedef long int32; typedef unsigned long uInt32; typedef float float32; typedef double float64; #define Private(T) typedef struct T##_t { void *p; } *T #define PrivateH(T) struct T##_t; typedef struct T##_t **T Private(File); PrivateH(Path); Private(LVRefNum); typedef enum { iB=1, iW, iL, iQ, uB, uW, uL, uQ, fS, fD, fX, cS, cD, cX } NumType; typedef int32 MgErr; typedef int16 McErr; typedef int32 Bool32; #define Cat4Chrs(c1,c2,c3,c4) (((int32)(uInt8)(c1)<<24)|((int32)(uInt8)(c2)<<16)|((int32)(uInt8)(c3)<<8)|((int32)(uInt8)(c4))) #define Cat2Chrs(c1,c2) (((int16)(uInt8)(c1)<<8)|((int16)(uInt8)(c2))) #if BigEndian #define RTToL(c1,c2,c3,c4) Cat4Chrs(c1,c2,c3,c4) #define RTToW(c1,c2) Cat2Chrs(c1,c2) #else #define RTToL(c1,c2,c3,c4) Cat4Chrs(c4,c3,c2,c1) #define RTToW(c1,c2) Cat2Chrs(c2,c1) #endif enum { /* Manager Error Codes */ mgNoErr=0, #if !Mac && !QTMLIncl noErr = mgNoErr, #endif mgArgErr=1, mFullErr, /* Memory Mgr 2-3 */ mZoneErr, fEOF, /* File Mgr 4-12 */ fIsOpen, fIOErr, fNotFound, fNoPerm, fDiskFull, fDupPath, fTMFOpen, fNotEnabled, rFNotFound, /* Resource Mgr 13-15 */ rAddFailed, rNotFound, iNotFound, /* Image Mgr 16-17 */ iMemoryErr, dPenNotExist, /* Draw Mgr 18 */ cfgBadType, /* Config Mgr 19-22 */ cfgTokenNotFound, cfgParseError, cfgAllocError, ecLVSBFormatError, /* extCode Mgr 23 */ ecLVSBOffsetError, /* extCode Mgr 24 */ ecLVSBNoCodeError, /* extCode Mgr 25 */ wNullWindow, /* Window Mgr 26-27 */ wDestroyMixup, menuNullMenu, /* Menu Mgr 28 */ pAbortJob, /* Print Mgr 29-35 */ pBadPrintRecord, pDriverError, pWindowsError, pMemoryError, pDialogError, pMiscError, dvInvalidRefnum, /* Device Mgr 36-41 */ dvDeviceNotFound, dvParamErr, dvUnitErr, dvOpenErr, dvAbortErr, bogusError, /* generic error 42 */ cancelError, /* cancelled by user 43 */ OMObjLowErr, /* object message dispatcher errors 44-52 */ OMObjHiErr, OMObjNotInHeapErr, OMOHeapNotKnownErr, OMBadDPIdErr, OMNoDPinTabErr, OMMsgOutOfRangeErr, OMMethodNullErr, OMUnknownMsgErr, mgNotSupported, ncBadAddressErr, /* Net Connection errors 54-66 */ ncInProgress, ncTimeOutErr, ncBusyErr, ncNotSupportedErr, ncNetErr, ncAddrInUseErr, ncSysOutOfMem, ncSysConnAbortedErr, /* 62 */ ncConnRefusedErr, ncNotConnectedErr, ncAlreadyConnectedErr, ncConnClosedErr, /* 66 */ }; typedef struct { int16 v; int16 h; } LVPoint; typedef uChar Str255[256], *PStr, *CStr, *UPtr, **UHandle; typedef const uChar *ConstCStr, *ConstPStr, ConstStr255[256]; #define PStrBuf(b) (&((PStr)(b))[1]) #define PStrLen(b) (((PStr)(b))[0]) /* # of chars in string */ #define PStrSize(b) (PStrLen(b)+1) /* # of bytes including length */ int32 CToPStr(ConstCStr src, PStr dest); int32 PStrCpy(PStr d, ConstPStr s); int32 StrCpy(CStr t, const CStr s); int32 StrNCpy(CStr t, const CStr s, int32 l); typedef struct { int32 cnt; uChar str[1]; } LStr, *LStrPtr, **LStrHandle; #define LStrLen(p) ((p)->cnt) #define LStrBuf(p) ((p)->str) typedef struct { int32 cnt; uChar str[256]; } LStr256; /* Typedefs */ typedef struct { uInt32 type; /* handled by LabVIEW Type & Creator */ uInt32 creator; /* handled by LabVIEW Type & Creator */ uInt32 size; /* not modified, use EOF */ uInt32 rfSize; /* Mac only, not modified, use EOF */ uInt32 cDate; uInt32 mDate; uInt16 flags; LVPoint location; /* Mac only */ uInt16 fId; /* Mac only */ uInt8 sId; /* Mac only */ uInt8 xFlags; /* Mac only */ } LVFileInfo; #define kUnknownFileType RTToL('?','?','?','?') #define kUnknownCreator RTToL('?','?','?','?') enum { openReadWrite, openReadOnly, openWriteOnly, openWriteOnlyTruncate }; /* open modes */ enum { denyReadWrite, denyWriteOnly, denyNeither}; /* deny modes */ enum { fAbsPath, fRelPath, fNotAPath, fUNCPath, nPathTypes}; /* path type codes */ /* LabVIEW exported functions */ MgErr FPathToText(Path path, LStrPtr lstr); MgErr FPathToPath(Path *p); MgErr FAppendName(Path path, PStr name); Bool32 FIsAPathOfType(Path path, int32 ofType); int32 FDepth(Path path); MgErr FDisposePath(Path p); MgErr FNewRefNum(Path path, File fd, LVRefNum* refnum); int32 DbgPrintf(CStr fmt, ...); UPtr DSNewPClr(int32); MgErr DSDisposePtr(UPtr); UHandle DSNewHClr(int32 size); MgErr DSSetHandleSize(UHandle, int32); int32 DSGetHandleSize(UHandle); MgErr DSDisposeHandle(UHandle); MgErr NumericArrayResize(int32, int32, UHandle*, int32); #define Min(a, b) ((a) < (b)) ? (a) : (b) #define Max(a, b) ((a) > (b)) ? (a) : (b) /* Our exported functions */ extern void ZEXPORT DLLVersion OF((uChar* Version)); extern MgErr ZEXPORT LVPath_ToText OF((Path path, CStr str, int32 *len)); extern MgErr ZEXPORT LVPath_HasResourceFork OF((Path path, int32 *hasResFork)); extern MgErr ZEXPORT LVPath_EncodeMacbinary OF((Path srcFileName, Path dstFileName)); extern MgErr ZEXPORT LVPath_DecodeMacbinary OF((Path srcFileName, Path dstFileName)); extern MgErr ZEXPORT LVPath_UtilFileInfo OF((Path path, uInt8 write, uInt8 *isDirectory, LVFileInfo *finderInfo, LStrHandle comment)); extern MgErr ZEXPORT LVPath_OpenFile OF((LVRefNum *refnum, Path path, uInt8 rsrc, uInt32 openMode, uInt32 denyMode)); extern long ZEXPORT InitializeFileFuncs OF((zlib_filefunc_def* pzlib_filefunc_def, LStrHandle *memory)); #ifdef __cplusplus } #endif #endif /* _lvUtil_H */ --- macbin.h DELETED --- Index: Makefile =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 10 Jan 2006 22:51:31 -0000 1.7 --- Makefile 17 Sep 2007 16:13:02 -0000 1.8 *************** *** 48,52 **** OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infback.o inftrees.o inffast.o \ ! ioapi.o macbin.o zip.o unzip.o OBJA = --- 48,52 ---- OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infback.o inftrees.o inffast.o \ ! ioapi.o iomem.o lvutil.o zip.o unzip.o OBJA = *************** *** 146,150 **** infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inftrees.o: zutil.h zlib.h zconf.h inftrees.h ! macbin.o: zlib.h macbin.h minigzip.o: zlib.h zconf.h trees.o: deflate.h zutil.h zlib.h zconf.h trees.h --- 146,150 ---- infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inftrees.o: zutil.h zlib.h zconf.h inftrees.h ! lvutil.o: zlib.h zconf.h ioapi.h iomem.h lvutil.h minigzip.o: zlib.h zconf.h trees.o: deflate.h zutil.h zlib.h zconf.h trees.h *************** *** 152,155 **** --- 152,156 ---- zutil.o: zutil.h zlib.h zconf.h ioapi.o: zlib.h zconf.h ioapi.h + iomem.o: zlib.h zconf.h zutil.h ioapi.h lvutil.h zip.o: zlib.h zconf.h ioapi.h zip.h unzip.o: zlib.h zconf.h ioapi.h unzip.h Index: iomem.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** iomem.c 17 Sep 2007 15:17:25 -0000 1.5 --- iomem.c 17 Sep 2007 16:13:02 -0000 1.6 *************** *** 7,11 **** #include "zutil.h" #include "ioapi.h" ! #include "macbin.h" #include "iomem.h" --- 7,11 ---- #include "zutil.h" #include "ioapi.h" ! #include "lvutil.h" #include "iomem.h" --- NEW FILE: lvutil.c --- /* lvutil.c -- support functions for LabVIEW ZIP library Version 1.9, Sept 17th, 2007 Copyright (C) 2002-2007 Rolf Kalbermatter */ #include <stdio.h> #include <string.h> #include "zlib.h" #include "ioapi.h" #include "lvutil.h" #include "iomem.h" #if Mac #include <CoreServices/CoreServices.h> /* instead of #include <Resources.h> */ #include "MacBinaryIII.h" #define MacIsInvisible(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible) [...1015 lines suppressed...] #if MacOSX if (!err) err = ConvertToPosixPath(lstr->str, NULL, &pathLen); #endif if (!err) { if (str && (*len > pathLen)) { #if MacOSX err = ConvertToPosixPath(lstr->str, str, len); #else StrNCpy(str, lstr->str, *len); #endif } } DSDisposePtr((UPtr)lstr); *len = pathLen + 1; } return err; } Index: zlibvc.dsp =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlibvc.dsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** zlibvc.dsp 16 Sep 2007 14:26:17 -0000 1.10 --- zlibvc.dsp 17 Sep 2007 16:13:02 -0000 1.11 *************** *** 254,258 **** # Begin Source File ! SOURCE=.\macbin.c # End Source File # Begin Source File --- 254,258 ---- # Begin Source File ! SOURCE=.\lvutil.c # End Source File # Begin Source File *************** *** 335,339 **** # Begin Source File ! SOURCE=.\macbin.h # End Source File # Begin Source File --- 335,339 ---- # Begin Source File ! SOURCE=.\lvutil.h # End Source File # Begin Source File |
|
From: Rolf K. <lab...@us...> - 2007-09-17 16:13:03
|
Update of /cvsroot/opengtoolkit/lvzip/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3040/source Modified Files: lvzlib.dll Log Message: changed filename macbin.x to lvutil.x Index: lvzlib.dll =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.dll,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 Binary files /tmp/cvsnpMQlX and /tmp/cvsVB1OEN differ |
|
From: Rolf K. <lab...@us...> - 2007-09-17 15:18:17
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13214/c_source Modified Files: iomem.c iomem.h macbin.c macbin.h zlib.rc Log Message: Fix some compile errors on Mac OS X Index: macbin.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/macbin.c,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** macbin.c 17 Sep 2007 12:29:41 -0000 1.30 --- macbin.c 17 Sep 2007 15:17:25 -0000 1.31 *************** *** 10,15 **** #include "zlib.h" #include "ioapi.h" - #include "iomem.h" #include "macbin.h" #if Mac --- 10,15 ---- #include "zlib.h" #include "ioapi.h" #include "macbin.h" + #include "iomem.h" #if Mac *************** *** 83,87 **** { /* fileNotFound is expected and normal. */ ! err = noErr; } else if (bdNamErr == err) --- 83,87 ---- { /* fileNotFound is expected and normal. */ ! err = mgNoErr; } else if (bdNamErr == err) *************** *** 121,129 **** /* root directory by passing a full pathname in MakeFSSpec's */ /* fileName parameter. */ ! if ((err == noErr) && (fss->parID == 0)) { fss->parID = fsRtParID; } ! return noErr; } --- 121,129 ---- /* root directory by passing a full pathname in MakeFSSpec's */ /* fileName parameter. */ ! if ((err == mgNoErr) && (fss->parID == 0)) { fss->parID = fsRtParID; } ! return mgNoErr; } *************** *** 189,194 **** switch(err) { ! case noErr: ! return noErr; case rfNumErr: case paramErr: --- 189,194 ---- switch(err) { ! case mgNoErr: ! return mgNoErr; case rfNumErr: case paramErr: *************** *** 339,343 **** switch (errno) { ! case 0: return noErr; case ESPIPE: return fEOF; case EINVAL: --- 339,343 ---- switch (errno) { ! case 0: return mgNoErr; case ESPIPE: return fEOF; case EINVAL: *************** *** 378,382 **** #if Mac FSSpec theFSSpec; ! MgErr err = noErr; *hasResFork = 0; --- 378,382 ---- #if Mac FSSpec theFSSpec; ! MgErr err = mgNoErr; *hasResFork = 0; *************** *** 386,390 **** { int theRefNum = FSpOpenResFile(&theFSSpec, fsRdPerm); ! if (ResError() == noErr) //we've got a resource file { CloseResFile(theRefNum); --- 386,390 ---- { int theRefNum = FSpOpenResFile(&theFSSpec, fsRdPerm); ! if (ResError() == mgNoErr) //we've got a resource file { CloseResFile(theRefNum); *************** *** 395,399 **** #else *hasResFork = 0; ! return noErr; #endif } --- 395,399 ---- #else *hasResFork = 0; ! return mgNoErr; #endif } *************** *** 674,678 **** LStrHandle comment) { ! MgErr err = noErr; int32 count = 0; #if Mac --- 674,678 ---- LStrHandle comment) { ! MgErr err = mgNoErr; int32 count = 0; #if Mac *************** *** 805,809 **** LStrLen(*comment) = err ? 0 : dtpb.ioDTActCount; /* Ignore error for getting Desktop comments as this is not supported on OSX */ ! err = noErr; } } --- 805,809 ---- LStrLen(*comment) = err ? 0 : dtpb.ioDTActCount; /* Ignore error for getting Desktop comments as this is not supported on OSX */ ! err = mgNoErr; } } *************** *** 970,974 **** #endif } ! return noErr; } else --- 970,974 ---- #endif } ! return mgNoErr; } else *************** *** 1003,1007 **** if (posixRef) { ! err = noErr; if (posixPath && (*len > CFStringGetLength(posixRef))) { --- 1003,1007 ---- if (posixRef) { ! err = mgNoErr; if (posixPath && (*len > CFStringGetLength(posixRef))) { Index: macbin.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/macbin.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** macbin.h 17 Sep 2007 12:29:41 -0000 1.23 --- macbin.h 17 Sep 2007 15:17:25 -0000 1.24 *************** *** 89,94 **** enum { /* Manager Error Codes */ #if !Mac && !QTMLIncl ! noErr, #endif mgArgErr=1, --- 89,95 ---- enum { /* Manager Error Codes */ + mgNoErr=0, #if !Mac && !QTMLIncl ! noErr = mgNoErr, #endif mgArgErr=1, Index: zlib.rc =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlib.rc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** zlib.rc 2 Apr 2007 21:11:48 -0000 1.5 --- zlib.rc 17 Sep 2007 15:17:25 -0000 1.6 *************** *** 3,8 **** #define IDR_VERSION1 1 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE ! FILEVERSION 1,2,3,1 ! PRODUCTVERSION 1,2,3,1 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 --- 3,8 ---- #define IDR_VERSION1 1 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE ! FILEVERSION 2,4,1 ! PRODUCTVERSION 2,4,1 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 *************** *** 18,26 **** BEGIN VALUE "FileDescription", "LabVIEW zlib data compression library\0" ! VALUE "FileVersion", "1.2.3.1.LV6\0" VALUE "InternalName", "lvzlib\0" VALUE "OriginalFilename", "lvzlib.dll\0" VALUE "ProductName", "LVZLib.DLL\0" ! VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant, ZIP support by Gilles Vollant, LabVIEW support by Rolf Kalbermatter\0" VALUE "LegalCopyright", "(C) 1995-2005 Jean-loup Gailly & Mark Adler\0" END --- 18,26 ---- BEGIN VALUE "FileDescription", "LabVIEW zlib data compression library\0" ! VALUE "FileVersion", "2.4.1.LV6\0" VALUE "InternalName", "lvzlib\0" VALUE "OriginalFilename", "lvzlib.dll\0" VALUE "ProductName", "LVZLib.DLL\0" ! VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\r\nZIP support by Gilles Vollant\r\nLabVIEW support by Rolf Kalbermatter\r\nBased on zlib 1.2.3 and minizip 1.01e\0" VALUE "LegalCopyright", "(C) 1995-2005 Jean-loup Gailly & Mark Adler\0" END Index: iomem.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** iomem.h 16 Sep 2007 14:27:09 -0000 1.1 --- iomem.h 17 Sep 2007 15:17:25 -0000 1.2 *************** *** 15,19 **** #endif ! void fill_mem_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def, voidpf memory)); #ifdef __cplusplus --- 15,19 ---- #endif ! void fill_mem_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def, LStrHandle *memory)); #ifdef __cplusplus Index: iomem.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** iomem.c 17 Sep 2007 12:29:41 -0000 1.4 --- iomem.c 17 Sep 2007 15:17:25 -0000 1.5 *************** *** 7,12 **** #include "zutil.h" #include "ioapi.h" - #include "iomem.h" #include "macbin.h" voidpf ZCALLBACK mem_open_file_func OF(( --- 7,12 ---- #include "zutil.h" #include "ioapi.h" #include "macbin.h" + #include "iomem.h" voidpf ZCALLBACK mem_open_file_func OF(( *************** *** 120,124 **** return fEOF; ! return noErr; } --- 120,124 ---- return fEOF; ! return mgNoErr; } *************** *** 242,246 **** void fill_mem_filefunc (pzlib_filefunc_def, memory) zlib_filefunc_def* pzlib_filefunc_def; ! UHandle *memory; { pzlib_filefunc_def->zopen_file = mem_open_file_func; --- 242,246 ---- void fill_mem_filefunc (pzlib_filefunc_def, memory) zlib_filefunc_def* pzlib_filefunc_def; ! LStrHandle *memory; { pzlib_filefunc_def->zopen_file = mem_open_file_func; *************** *** 254,258 **** { pzlib_filefunc_def->opaque = *memory; ! *memory = DSNewHClr(sizeof(int32)); } else --- 254,258 ---- { pzlib_filefunc_def->opaque = *memory; ! *memory = (LStrHandle)DSNewHClr(sizeof(int32)); } else |
|
From: Rolf K. <lab...@us...> - 2007-09-17 15:18:15
|
Update of /cvsroot/opengtoolkit/lvzip/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13214/source Modified Files: lvzlib.dll Log Message: Fix some compile errors on Mac OS X Index: lvzlib.dll =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.dll,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 Binary files /tmp/cvsgnqlRT and /tmp/cvs9SGtzM differ |
|
From: Rolf K. <lab...@us...> - 2007-09-17 12:32:43
|
Update of /cvsroot/opengtoolkit/lvzip In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12004 Modified Files: build lvzip.vi lvzip.ogpb lvzip.spec Log Message: Changed comments for version 2.4 to reflect the new functionality. Index: build lvzip.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/build lvzip.vi,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvs1Hp2o5 and /tmp/cvsKQlF47 differ Index: lvzip.spec =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/lvzip.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** lvzip.spec 16 Sep 2007 15:11:58 -0000 1.23 --- lvzip.spec 17 Sep 2007 12:32:45 -0000 1.24 *************** *** 5,9 **** [Description] ! Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files.\0D\0A\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.4 adds support for direct extracting into memory and storing from memory." Summary="OpenG Zip Tools" License=LGPL --- 5,9 ---- [Description] ! Description="The lvzip package contains several routines for operating on zip files.\0D\0A\0D\0AVersion 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files.\0D\0A\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.4 adds support for direct memory stream handling." Summary="OpenG Zip Tools" License=LGPL Index: lvzip.ogpb =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/lvzip.ogpb,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lvzip.ogpb 16 Sep 2007 15:11:58 -0000 1.3 --- lvzip.ogpb 17 Sep 2007 12:32:45 -0000 1.4 *************** *** 5,9 **** [Description] ! Description="The lvzip package contains several routines for operating on zip files.\0D\0AThe new version 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files.\0D\0A\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.4 adds support for direct extracting into memory and storing from memory." Summary="OpenG Zip Tools" License=LGPL --- 5,9 ---- [Description] ! Description="The lvzip package contains several routines for operating on zip files.\0D\0AThe new version 2.2 adds support for appending files to an existing archive, deleting files from an archive and password support for adding and extracting files.\0D\0A\0D\0AVersion 2.3 adds support for transparent Mac Resource file handling through MacBinary encoding.\0D\0AVersion 2.4 adds support for direct memory stream handling." Summary="OpenG Zip Tools" License=LGPL |
|
From: Rolf K. <lab...@us...> - 2007-09-17 12:32:43
|
Update of /cvsroot/opengtoolkit/lvzip/build_support In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12004/build_support Modified Files: lvzip.rev Log Message: Changed comments for version 2.4 to reflect the new functionality. Index: lvzip.rev =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/build_support/lvzip.rev,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** lvzip.rev 23 Sep 2006 21:06:20 -0000 1.7 --- lvzip.rev 17 Sep 2007 12:32:45 -0000 1.8 *************** *** 1,16 **** [lvzip.ogbld] ! Version=2.3 Build_Number=17 Build_Date="9/23/2006 11:46:05 AM" Status=OK Warnings=1 ! Log_File=/D/Projects/OpenG/opengtoolkit/CVS_Folders/lvzip/built/lvzip.log ! ! [lvzip.ogbld] ! Version=0.0.0 ! Build_Number=1 ! Build_Date="4/12/2005 8:35:40 PM" ! Status=OK ! Warnings=1 ! Log_File=/D/Projects/OpenG/opengtoolkit/CVS_Folders/lvzip/built/lvzip.log ! --- 1,7 ---- [lvzip.ogbld] ! Version=2.4 Build_Number=17 Build_Date="9/23/2006 11:46:05 AM" Status=OK Warnings=1 ! Log_File=/D/Projects/OpenG/opengtoolkit/lvzip/built/lvzip.log |
|
From: Rolf K. <lab...@us...> - 2007-09-17 12:29:58
|
Update of /cvsroot/opengtoolkit/lvzip/source/lvzip.llb In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10791 Modified Files: ZLIB Extract Stream.vi ZLIB Initialize Stream Functions.vi ZLIB Open Unzip Stream.vi ZLIB Open Zip Stream.vi Log Message: Improved memory stream performance on compression and fixed several small bugs for memory streams. Index: ZLIB Initialize Stream Functions.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsN9Zhq5 and /tmp/cvsPfw2KT differ Index: ZLIB Open Zip Stream.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Open Zip Stream.vi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsGlYNJ6 and /tmp/cvsROEc7U differ Index: ZLIB Extract Stream.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Extract Stream.vi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsVJsT75 and /tmp/cvsjE7YxU differ Index: ZLIB Open Unzip Stream.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Open Unzip Stream.vi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsXJDXaa and /tmp/cvswE4rDY differ |
|
From: Rolf K. <lab...@us...> - 2007-09-17 12:29:42
|
Update of /cvsroot/opengtoolkit/lvzip/tests In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10755/tests Modified Files: lvzip-test-memory stream.vi Log Message: Improved memory stream performance on compression and fixed several small bugs for memory streams. Index: lvzip-test-memory stream.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/tests/lvzip-test-memory stream.vi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsbgd2Uw and /tmp/cvsldIcFJ differ |
|
From: Rolf K. <lab...@us...> - 2007-09-17 12:29:39
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10755/c_source Modified Files: iomem.c macbin.c macbin.h unzip.c zip.c Log Message: Improved memory stream performance on compression and fixed several small bugs for memory streams. Index: unzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** unzip.c 17 Sep 2007 05:07:16 -0000 1.7 --- unzip.c 17 Sep 2007 12:29:41 -0000 1.8 *************** *** 416,422 **** int err=UNZ_OK; - if (unz_copyright[0]!=' ') - return NULL; - if (pzlib_filefunc_def==NULL) fill_fopen_filefunc(&us.z_filefunc); --- 416,419 ---- Index: macbin.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/macbin.c,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** macbin.c 17 Sep 2007 05:07:16 -0000 1.29 --- macbin.c 17 Sep 2007 12:29:41 -0000 1.30 *************** *** 812,816 **** } #elif Win32 - DoDebugger(); if (err = MakePathDSString(path, &lstr)) return err; --- 812,815 ---- *************** *** 962,966 **** { fill_mem_filefunc(pzlib_filefunc_def, memory); - *memory = NULL; } else --- 961,964 ---- Index: macbin.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/macbin.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** macbin.h 17 Sep 2007 05:07:16 -0000 1.22 --- macbin.h 17 Sep 2007 12:29:41 -0000 1.23 *************** *** 241,245 **** --- 241,247 ---- UPtr DSNewPClr(int32); MgErr DSDisposePtr(UPtr); + UHandle DSNewHClr(int32 size); MgErr DSSetHandleSize(UHandle, int32); + int32 DSGetHandleSize(UHandle); MgErr DSDisposeHandle(UHandle); *************** *** 247,250 **** --- 249,253 ---- #define Min(a, b) ((a) < (b)) ? (a) : (b) + #define Max(a, b) ((a) > (b)) ? (a) : (b) /* Our exported functions */ Index: zip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** zip.c 17 Sep 2007 05:07:16 -0000 1.9 --- zip.c 17 Sep 2007 12:29:41 -0000 1.10 *************** *** 29,34 **** #endif - #include "macbin.h" - #ifndef local # define local static --- 29,32 ---- *************** *** 726,731 **** #endif - DoDebugger(); - if (file == NULL) return ZIP_PARAMERROR; --- 724,727 ---- Index: iomem.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** iomem.c 17 Sep 2007 05:07:16 -0000 1.3 --- iomem.c 17 Sep 2007 12:29:41 -0000 1.4 *************** *** 58,77 **** int mode; { ! voidpf ret = NULL; ! ! if (opaque != NULL) { ! MEMORY_IO memio; ! memio.mode = mode; ! if (mode & ZLIB_FILEFUNC_MODE_CREATE) ! memio.pos = 0; ! else ! memio.pos = LStrLen(**(LStrHandle*)opaque); ! memio.error = 0; ! ret = malloc(sizeof(MEMORY_IO)); ! if (ret) ! *((MEMORY_IO*)ret) = memio; } ! return ret; } --- 58,72 ---- int mode; { ! MEMORY_IO *memio = malloc(sizeof(MEMORY_IO)); ! if (memio) { ! memio->pos = 0; ! memio->mode = mode; ! memio->error = 0; ! ! // if (opaque && !(mode & ZLIB_FILEFUNC_MODE_CREATE)) ! // memio->pos = LStrLen(*(LStrHandle)opaque); } ! return memio; } *************** *** 83,100 **** uLong size; { ! uLong ret = 0; ! ! if (stream != NULL) { MEMORY_IO* mem = (MEMORY_IO*)stream; - uLong pos = mem->pos; - ret = LStrLen(**(LStrHandle*)opaque) - pos; - if (size < ret) - ret = size; ! zmemcpy(buf, LStrBuf(**(LStrHandle*)opaque) + pos, ret); ! mem->pos += ret; } ! return ret; } --- 78,124 ---- uLong size; { ! if (stream && opaque) { MEMORY_IO* mem = (MEMORY_IO*)stream; ! if (mem->pos + size > (uLong)LStrLen(*(LStrHandle)opaque)) ! size = LStrLen(*(LStrHandle)opaque) - mem->pos; ! ! zmemcpy(buf, LStrBuf(*(LStrHandle)opaque) + mem->pos, size); ! mem->pos += size; ! return size; } ! return 0; ! } ! ! static MgErr ResizeStringHandle(LStrHandle handle, int32 offset, const void *buf, int32 size, int32 mode) ! { ! if (!handle) ! return mgArgErr; ! ! if (DSGetHandleSize((UHandle)handle) < (offset + size + (int32)sizeof(int32))) ! { ! MgErr err = fEOF; ! ! if (!(mode & ZLIB_FILEFUNC_MODE_WRITE)) ! return err; ! ! if (err = NumericArrayResize(uB, 1, &(UHandle)handle, Max(10000, (offset + size) << 1))) ! return err; ! } ! ! if (mode & ZLIB_FILEFUNC_MODE_WRITE) ! { ! if (buf) ! zmemcpy(LStrBuf(*handle) + offset, buf, size); ! ! /* only grow the memory stream */ ! if (offset + size > LStrLen(*handle)) ! LStrLen(*handle) = offset + size; ! } ! else if (offset + size > LStrLen(*handle)) ! return fEOF; ! ! return noErr; } *************** *** 107,133 **** { MEMORY_IO* mem = (MEMORY_IO*)stream; - uLong pos = 0; ! DoDebugger(); ! if (stream != NULL && (mem->mode & ZLIB_FILEFUNC_MODE_WRITE)) { ! pos = mem->pos; ! if ((*(LStrHandle*)opaque) || ! ((uLong)LStrLen(**(LStrHandle*)opaque) < (pos + size))) { ! int err; ! ! if (err = NumericArrayResize(uB, 1, (UHandle*)opaque, pos + size)) ! { ! mem->error = err; ! return 0; ! } } - zmemcpy(LStrBuf(**(LStrHandle*)opaque) + pos, buf, size); - LStrLen(**(LStrHandle*)opaque) = size; mem->pos += size; ! pos = size; } ! return pos; } --- 131,147 ---- { MEMORY_IO* mem = (MEMORY_IO*)stream; ! if (mem != NULL && (mem->mode & ZLIB_FILEFUNC_MODE_WRITE)) { ! MgErr err = ResizeStringHandle((LStrHandle)opaque, mem->pos, buf, size, mem->mode); ! if (err) { ! mem->error = err; ! return 0; } mem->pos += size; ! return size; } ! return 0; } *************** *** 136,146 **** voidpf stream; { - long ret = -1; - if (stream != NULL) { ! ret = (long)((MEMORY_IO*)stream)->pos; } ! return ret; } --- 150,158 ---- voidpf stream; { if (stream != NULL) { ! return (long)((MEMORY_IO*)stream)->pos; } ! return -1; } *************** *** 154,169 **** { MEMORY_IO* mem = (MEMORY_IO*)stream; ! uLong pos; switch (origin) { case ZLIB_FILEFUNC_SEEK_CUR : ! pos = mem->pos + offset; break; case ZLIB_FILEFUNC_SEEK_END : ! pos = LStrLen(**(LStrHandle*)opaque) + offset; ! break; case ZLIB_FILEFUNC_SEEK_SET : ! pos = offset; break; default: --- 166,183 ---- { MEMORY_IO* mem = (MEMORY_IO*)stream; ! uLong size = 0; ! MgErr err; switch (origin) { case ZLIB_FILEFUNC_SEEK_CUR : ! size = mem->pos + offset; break; case ZLIB_FILEFUNC_SEEK_END : ! if (opaque) ! size = LStrLen(*(LStrHandle)opaque); ! /* fall through */ case ZLIB_FILEFUNC_SEEK_SET : ! size += offset; break; default: *************** *** 171,191 **** } ! if (!(*(LStrHandle*)opaque) || (pos > LStrLen(**(LStrHandle*)opaque))) { ! if (mem->mode & ZLIB_FILEFUNC_MODE_WRITE) ! { ! MgErr err; ! if (err = NumericArrayResize(uB, 1, (UHandle*)opaque, pos)) ! { ! mem->error = err; ! return -1; ! } ! LStrLen(**(LStrHandle*)opaque) = pos; ! } ! else ! return -1; } ! mem->pos = pos; ! return 0; } return -1; --- 185,194 ---- } ! if (!(err = ResizeStringHandle((LStrHandle)opaque, 0, NULL, size, mem->mode))) { ! mem->pos = size; ! return 0; } ! mem->error = err; } return -1; *************** *** 198,211 **** { int ret = -1; if (output) { ! UHandle *p = (UHandle*)output; ! if (*p) ! DSDisposeHandle(*p); ! *p = *(UHandle*)opaque; } ! else ! DSDisposeHandle(*(UHandle*)opaque); if (stream != NULL) --- 201,222 ---- { int ret = -1; + UHandle s = (UHandle)opaque; if (output) { ! UHandle *o = (UHandle*)output; ! if (*o) ! DSDisposeHandle(*o); ! if (s) ! { ! /* Make sure the handle is not ridiculously oversized */ ! int32 size = LStrLen(*(LStrHandle)s) + (int32)sizeof(int32); ! if (DSGetHandleSize(s) > size) ! DSSetHandleSize(s, size); ! } ! *o = s; } ! else if (s) ! DSDisposeHandle(s); if (stream != NULL) *************** *** 231,235 **** void fill_mem_filefunc (pzlib_filefunc_def, memory) zlib_filefunc_def* pzlib_filefunc_def; ! voidpf memory; { pzlib_filefunc_def->zopen_file = mem_open_file_func; --- 242,246 ---- void fill_mem_filefunc (pzlib_filefunc_def, memory) zlib_filefunc_def* pzlib_filefunc_def; ! UHandle *memory; { pzlib_filefunc_def->zopen_file = mem_open_file_func; *************** *** 240,243 **** pzlib_filefunc_def->zclose_file = mem_close_file_func; pzlib_filefunc_def->zerror_file = mem_error_file_func; ! pzlib_filefunc_def->opaque = memory; } --- 251,262 ---- pzlib_filefunc_def->zclose_file = mem_close_file_func; pzlib_filefunc_def->zerror_file = mem_error_file_func; ! if (*memory) ! { ! pzlib_filefunc_def->opaque = *memory; ! *memory = DSNewHClr(sizeof(int32)); ! } ! else ! { ! pzlib_filefunc_def->opaque = DSNewHClr(sizeof(int32)); ! } } |
|
From: Rolf K. <lab...@us...> - 2007-09-17 12:29:39
|
Update of /cvsroot/opengtoolkit/lvzip/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10755/source Modified Files: lvzlib.dll Log Message: Improved memory stream performance on compression and fixed several small bugs for memory streams. Index: lvzlib.dll =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.dll,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 Binary files /tmp/cvst1xVep and /tmp/cvsvVgqNB differ |
|
From: Rolf K. <lab...@us...> - 2007-09-17 05:08:04
|
Update of /cvsroot/opengtoolkit/lvzip/source/lvzip.llb In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31408 Modified Files: ZLIB Close Zip Archive.vi ZLIB Compress Directory.vi ZLIB Compress Files.vi ZLIB Delete Files From Archive.vi ZLIB Initialize Stream Functions.vi ZLIB Open Write File.vi ZLIB VI Tree.vi Log Message: Addition of memory stream for ZIP file Index: ZLIB Compress Directory.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Compress Directory.vi,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 Binary files /tmp/cvsUUTJ1S and /tmp/cvslYcUOq differ Index: ZLIB Compress Files.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Compress Files.vi,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 Binary files /tmp/cvsSOvdnZ and /tmp/cvs72oKox differ Index: ZLIB Initialize Stream Functions.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Initialize Stream Functions.vi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvst9kCd1 and /tmp/cvsgxtxhz differ Index: ZLIB VI Tree.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB VI Tree.vi,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 Binary files /tmp/cvsLiZLO4 and /tmp/cvsjW6eXC differ Index: ZLIB Close Zip Archive.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Close Zip Archive.vi,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 Binary files /tmp/cvsvWV957 and /tmp/cvssJ6ChG differ Index: ZLIB Delete Files From Archive.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Delete Files From Archive.vi,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 Binary files /tmp/cvsJz1sB9 and /tmp/cvsDMgVPH differ Index: ZLIB Open Write File.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzip.llb/ZLIB Open Write File.vi,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 Binary files /tmp/cvsSNKaZ8 and /tmp/cvs5yQSgH differ |
