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-12-14 21:48:21
|
Update of /cvsroot/opengtoolkit/lvzip/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19863 Modified Files: lvzlib.dll lvzlib.so Log Message: Recompilation of Windows and Linux shared library Index: lvzlib.dll =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.dll,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 Binary files /tmp/cvspkGsa0 and /tmp/cvsCuJaSP differ Index: lvzlib.so =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.so,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 Binary files /tmp/cvsh50ED3 and /tmp/cvspZbNuT differ |
|
From: Rolf K. <lab...@us...> - 2007-12-14 21:36:28
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15252 Modified Files: lvutil.c lvzip.cws Log Message: Hopefully successful bugfix for long path names in MacOS Index: lvzip.cws =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.cws,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lvzip.cws 10 Dec 2007 13:47:36 -0000 1.2 --- lvzip.cws 14 Dec 2007 21:36:20 -0000 1.3 *************** *** 9,16 **** Project 0001 = "lvzip.prj" Drag Bar Left = 160 ! Window Top = 53 ! Window Left = 1331 ! Window Bottom = 1039 ! Window Right = 2867 Maximized = False Maximized Children = False --- 9,16 ---- Project 0001 = "lvzip.prj" Drag Bar Left = 160 ! Window Top = 59 ! Window Left = 29 ! Window Bottom = 1045 ! Window Right = 1565 Maximized = False Maximized Children = False *************** *** 26,30 **** Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 0 Window Confinement Region Enabled = True MainColumnWidth = 141 --- 26,30 ---- Break At First Statement = False Sort Type = "File Name" ! Number of Opened Files = 1 Window Confinement Region Enabled = True MainColumnWidth = 141 *************** *** 44,47 **** --- 44,57 ---- [File 0001] + Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" + File Type = "CSource" + Disk Date = 3280430225 + In Projects = "1," + Window Top = 25 + Window Left = 6 + Window Z-Order = 1 + Source Window State = "1,0,0,0,0,0,0,0,0,80,0,0,0,0,0,25,0,0,0,0,349,676,1,0," + + [File 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/adler32.c" File Type = "CSource" *************** *** 52,56 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" File Type = "CSource" --- 62,66 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0003] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" File Type = "CSource" *************** *** 61,65 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,282,838,1,0," ! [File 0003] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" File Type = "CSource" --- 71,75 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,282,838,1,0," ! [File 0004] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" File Type = "CSource" *************** *** 70,74 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,27,60,283,794,1,0," ! [File 0004] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" File Type = "Include" --- 80,84 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,27,60,283,794,1,0," ! [File 0005] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" File Type = "Include" *************** *** 77,81 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0005] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" File Type = "Include" --- 87,91 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0006] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" File Type = "Include" *************** *** 86,90 **** Source Window State = "1,88,88,88,34,35,34,0,0,0,0,0,0,0,0,0,77,0,86,21,517,1234,1,0," ! [File 0006] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" --- 96,100 ---- Source Window State = "1,88,88,88,34,35,34,0,0,0,0,0,0,0,0,0,77,0,86,21,517,1234,1,0," ! [File 0007] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" *************** *** 95,99 **** Source Window State = "1,98,99,98,0,0,0,0,0,0,0,0,0,0,0,0,27,0,91,22,847,917,1,0," ! [File 0007] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" File Type = "Include" --- 105,109 ---- Source Window State = "1,98,99,98,0,0,0,0,0,0,0,0,0,0,0,0,27,0,91,22,847,917,1,0," ! [File 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" File Type = "Include" *************** *** 104,108 **** Source Window State = "1,298,298,298,0,11,11,0,0,0,0,0,0,0,0,0,270,0,298,0,530,1049,1,0," ! [File 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/gzio.c" File Type = "CSource" --- 114,118 ---- Source Window State = "1,298,298,298,0,11,11,0,0,0,0,0,0,0,0,0,270,0,298,0,530,1049,1,0," ! [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/gzio.c" File Type = "CSource" *************** *** 113,117 **** Source Window State = "1,11,12,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,399,871,1,0," ! [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" --- 123,127 ---- Source Window State = "1,11,12,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,399,871,1,0," ! [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" *************** *** 122,126 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" --- 132,136 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" *************** *** 131,135 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," ! [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" --- 141,145 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," ! [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" *************** *** 138,142 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" --- 148,152 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" *************** *** 145,149 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" --- 155,159 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" *************** *** 154,158 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" --- 164,168 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" *************** *** 163,167 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," ! [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" --- 173,177 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," ! [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" *************** *** 170,176 **** Window Top = 23 Window Left = 176 ! Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,3,0,38,0,570,975,1,0," ! [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" --- 180,186 ---- Window Top = 23 Window Left = 176 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,38,0,570,975,1,0," ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" *************** *** 181,185 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,499,1052,1,0," ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" --- 191,195 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,499,1052,1,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" *************** *** 190,194 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" --- 200,204 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" *************** *** 197,201 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" --- 207,211 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" *************** *** 206,210 **** Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," ! [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" --- 216,220 ---- Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," ! [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" *************** *** 215,219 **** Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," ! [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" --- 225,229 ---- Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" *************** *** 222,228 **** Window Top = 26 Window Left = 66 ! Source Window State = "1,70,71,70,0,0,0,0,0,123,0,60,0,0,0,38,60,0,70,0,528,1016,1,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" --- 232,238 ---- Window Top = 26 Window Left = 66 ! Source Window State = "1,70,71,70,0,0,0,0,0,0,0,60,0,0,0,0,60,0,70,0,528,1016,1,0," ! [File 0023] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" *************** *** 231,235 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0023] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" --- 241,245 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0024] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" *************** *** 237,253 **** In Projects = "1," - [File 0024] - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" - File Type = "CSource" - Disk Date = 3280138995 - In Projects = "1," - Window Top = 25 - Window Left = 10 - Source Window State = "1,821,821,821,8,43,8,0,0,0,0,0,0,0,0,0,359,0,378,19,518,1094,1,0," - [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" File Type = "Include" ! Disk Date = 3280138886 In Projects = "1," Window Top = 48 --- 247,254 ---- In Projects = "1," [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" File Type = "Include" ! Disk Date = 3280141347 In Projects = "1," Window Top = 48 *************** *** 307,311 **** Window Top = 25 Window Left = 5 ! Source Window State = "1,1538,1539,1538,0,0,0,0,0,141,0,0,0,0,0,41,1527,0,1538,0,568,1163,1,0," [File 0032] --- 308,312 ---- Window Top = 25 Window Left = 5 ! Source Window State = "1,1538,1539,1538,0,0,0,0,0,0,0,0,0,0,0,0,1527,0,1538,0,568,1163,1,0," [File 0032] Index: lvutil.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lvutil.c 10 Dec 2007 13:47:36 -0000 1.4 --- lvutil.c 14 Dec 2007 21:36:20 -0000 1.5 *************** *** 42,78 **** { MgErr err; - OSErr ret; - LStrPtr lstr; - Str255 name; int32 pathLen = -1; err = FPathToText(path, (LStrPtr)&pathLen); if (err) - DEBUGPRINTF(("FPathToText1: err = %ld", err)); - if (!err) { ! if (pathLen <= 255) ! { ! lstr = (LStrPtr)DSNewPClr(sizeof(int32) + pathLen + 1); ! if (!lstr) ! return mFullErr; ! lstr->cnt = pathLen; ! err = FPathToText(path, lstr); ! lstr->str[lstr->cnt] = 0; ! if (err) ! DEBUGPRINTF(("FPathToText2: err = %ld", err)); ! if (!err) ! { ! CToPStr(lstr->str, name); ! ret = MakeFileSpec(0, 0, name, fss); ! err = OSErrToLVErr(ret); ! if (err) ! DEBUGPRINTF(("MakeFileSpec: ret = %d, err = %ld", ret, err)); ! DEBUGPRINTF(("MakeFileSpec: len = %ld, len2 = %d, path = %s", lstr->cnt, (int16)name[0], lstr->str)); ! } } else ! err = mgArgErr; } return err; --- 42,83 ---- { MgErr err; int32 pathLen = -1; + DEBUGPRINTF(("FPathToText1: path = %z", path)); err = FPathToText(path, (LStrPtr)&pathLen); if (err) { ! DEBUGPRINTF(("FPathToText2: err = %ld", err)); ! } ! else ! { ! OSErr ret; ! LStrPtr lstr; ! Str255 name; ! if (pathLen > 255) ! return mgArgErr; ! ! lstr = (LStrPtr)DSNewPClr(sizeof(int32) + pathLen + 1); ! if (!lstr) ! return mFullErr; ! ! lstr->cnt = pathLen; ! err = FPathToText(path, lstr); ! lstr->str[lstr->cnt] = 0; ! if (err) ! { ! DEBUGPRINTF(("FPathToText3: err = %ld", err)); } else ! { ! CToPStr(lstr->str, name); ! ret = MakeFileSpec(0, 0, name, fss); ! err = OSErrToLVErr(ret); ! if (err) ! DEBUGPRINTF(("MakeFileSpec: ret = %d, err = %ld, len = %ld, len2 = %d, path = %s", ! ret, err, lstr->cnt, (int16)name[0], lstr->str)); ! } ! DSDisposePtr(lstr); } return err; *************** *** 82,89 **** { OSErr err = FSMakeFSSpec(vol, dirID, path, fss); - if (err) { ! DEBUGPRINTF(("MakeFSSpec: err = %ld", err)); if (fnfErr == err) { --- 87,93 ---- { OSErr err = FSMakeFSSpec(vol, dirID, path, fss); if (err) { ! DEBUGPRINTF(("FSMakeFSSpec: err = %ld", err)); if (fnfErr == err) { *************** *** 98,118 **** Str255 temp; uChar *p; ! int32 i; DEBUGPRINTF(("MakeFileSpec: trying with subpaths")); /* remove the last elt of the path and see if we have success */ PStrCpy(temp, path); ! for (i = 0, p = (uChar*)&temp[PStrLen(path)]; p > temp; p--, i++) ! if (*p == ':') break; ! if (p <= temp) ! return err; ! PStrLen(temp) = PStrLen(path) - i; ! err = MakeFileSpec(vol, dirID, temp, &fst); ! DEBUGPRINTF(("MakeFileSpec: err2 = %ld", err)); if (!err || (fnfErr == err)) { PStrLen(p) = i; ! err = FSMakeFSSpec(vol, fst.parID, p, fss); ! DEBUGPRINTF(("MakeFSSpec: err3 = %ld", err)); } } --- 102,130 ---- Str255 temp; uChar *p; ! int32 i = 0; DEBUGPRINTF(("MakeFileSpec: trying with subpaths")); /* remove the last elt of the path and see if we have success */ PStrCpy(temp, path); ! p = (uChar*)&temp[PStrLen(path)]; ! ! do ! { ! for (; p > temp; p--, i++) ! if (*p == ':') break; ! if (p <= temp) ! return err; ! PStrLen(temp) = PStrLen(path) - (i + 1); ! err = FSMakeFSSpec(vol, dirID, temp, &fst); ! if (err) ! DEBUGPRINTF(("FSMakeFSSpec: err2 = %ld, path = %p", err, temp)); ! } while (bdNamErr == err); ! if (!err || (fnfErr == err)) { PStrLen(p) = i; ! err = MakeFileSpec(fst.vRefNum, fst.parID, p, fss); ! if (err) ! DEBUGPRINTF(("MakeFileSpec: err = %ld, path = %p", err, p)); } } *************** *** 121,135 **** } ! /* Workaround adapted from Apple Developer Support sample code in */ ! /* MoreFiles 1.2.1:FSpCompat.c... (DH) */ ! /* Fix a bug in Macintosh PC Exchange's MakeFSSpec code where 0 is */ ! /* returned in the parID field when making an FSSpec to the volume's */ ! /* root directory by passing a full pathname in MakeFSSpec's */ ! /* fileName parameter. */ if ((err == mgNoErr) && (fss->parID == 0)) { fss->parID = fsRtParID; } ! return mgNoErr; } --- 133,146 ---- } ! /* Workaround adapted from Apple Developer Support sample code in ! MoreFiles 1.2.1:FSpCompat.c. ! Fix a bug in Macintosh PC Exchange's MakeFSSpec code where 0 is ! returned in the parID field when making an FSSpec to the volume's root ! directory by passing a full pathname in MakeFSSpec's fileName parameter. */ if ((err == mgNoErr) && (fss->parID == 0)) { fss->parID = fsRtParID; } ! return err; } *************** *** 248,252 **** err = FPathToText(path, *lstr); if (err) ! DSDisposePtr((UPtr)lstr); } return err; --- 259,263 ---- err = FPathToText(path, *lstr); if (err) ! DSDisposePtr((UPtr)*lstr); } return err; |
|
From: Rolf K. <lab...@us...> - 2007-12-13 00:56:59
|
Update of /cvsroot/opengtoolkit/lvzip In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7603 Modified Files: Change-Log.txt Log Message: Documentation updates Index: Change-Log.txt =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/Change-Log.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Change-Log.txt 16 Sep 2007 15:11:58 -0000 1.7 --- Change-Log.txt 12 Dec 2007 16:13:37 -0000 1.8 *************** *** 49,50 **** --- 49,57 ---- 2007-09-16 rk Added support for ZIP streams itself instead of disk based ZIP files. + + 2007-12-8 rk + Minor modifications to try to get it to compile in LabWindows/CVI + + 2007-12-10 rk + created vxWorks .out shared libraries for LabVIEW RT 8.2 and 8.5. + |
|
From: Rolf K. <lab...@us...> - 2007-12-12 23:00:14
|
Update of /cvsroot/opengtoolkit/lvzip/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7603/source Modified Files: lvzlib.dll readme.txt Log Message: Documentation updates Index: lvzlib.dll =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.dll,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 Binary files /tmp/cvsPfH4Rz and /tmp/cvsqfh7hd differ Index: readme.txt =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/readme.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** readme.txt 23 Sep 2006 05:02:22 -0000 1.1 --- readme.txt 12 Dec 2007 16:13:37 -0000 1.2 *************** *** 1,6 **** ! LabVIEW ZIP library, version 2.3 -------------------------------- ! Copyright 2002-2006 Rolf Kalbermatter --- 1,6 ---- ! LabVIEW ZIP library, version 2.4 -------------------------------- ! Copyright 2002-2007 Rolf Kalbermatter *************** *** 8,17 **** older than 2.2 to this version. ! The new version since 2.2 of LVZIP has some new features and some ! modifications. New features in 2.3: -------------------- ! 1) Transparent MacBinary support on the Macintosh If the compression routine encounters a Macintosh file with a resource fork --- 8,38 ---- older than 2.2 to this version. ! Version 2.2 of LVZIP has some modifications to the VI connector panes ! in comparison to earlier versions which might require you to slightly redo ! your project. ! ! ! New features in 2.4: ! -------------------- ! 1) Support for ZIP and UNZIP streams directly located in memory contrary to ! requiring disk based files at all times. ! ! 2) Support for adding to and extracting from an archive directly memory based ! streams without requiring to turn them into files first. ! ! 3) Minor tweaks to support compilation for LabVIEW relatime targets. This is ! still considered an experimental feature as testing of this was not really ! possible due to lack of available hardware. The standard Windows DLL should ! work for all Pharlap based RT systems so far. LabVIEW 7.1, 8.2 and 8.5 were ! checked. Added support for vxWorks based RT targets for LabVIEW 8.2 and 8.5. ! ! Note, that for VxWorks based targets you have to copy the lvzlib.out file manually ! to your RT target into the ni-rt/system folder using some FTP utility. LabVIEW ! will currently not deploy or download that file automatically for those targets. ! New features in 2.3: -------------------- ! 1) Transparent MacBinary support on the Macintosh (experimental feature) If the compression routine encounters a Macintosh file with a resource fork *************** *** 140,144 **** The lvzip package makes use of the error package, the file package and through the last one also of the array package. Some functions in the file package have ! been added in comparison to the latest released package and therefore this version of lvzip will only work with the version 2.5 of the file package. --- 161,165 ---- The lvzip package makes use of the error package, the file package and through the last one also of the array package. Some functions in the file package have ! been added in comparison to earlier released packages and therefore this version of lvzip will only work with the version 2.5 of the file package. |
|
From: Rolf K. <lab...@us...> - 2007-12-12 21:21:38
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7559/c_source Modified Files: Makefile.vxworks Log Message: Support VxWorks targets Index: Makefile.vxworks =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile.vxworks,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.vxworks 10 Dec 2007 14:24:54 -0000 1.1 --- Makefile.vxworks 12 Dec 2007 16:13:07 -0000 1.2 *************** *** 25,29 **** # This is the name of the output shared library. ! PROJECT_TARGETS := $(OBJ_DIR)/lvzip.out # If you have other VxWorks .a files to reference, list them here. --- 25,29 ---- # This is the name of the output shared library. ! PROJECT_TARGETS := $(OBJ_DIR)/lvzlib.out # If you have other VxWorks .a files to reference, list them here. |
|
From: Rolf K. <lab...@us...> - 2007-12-12 16:52:57
|
Update of /cvsroot/opengtoolkit/lvzip/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9807 Modified Files: opengdoc.txt readme.txt Log Message: Documentation updates Index: opengdoc.txt =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/opengdoc.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** opengdoc.txt 23 Sep 2006 05:02:22 -0000 1.3 --- opengdoc.txt 12 Dec 2007 16:19:05 -0000 1.4 *************** *** 25,30 **** The core of this libray is an external shared library consisting basically of the version 1.2.3 release of zlib and the version 1.0.1e of the zip library from Gilles Vollant. ! The current version supports most types of ZIP files with exception of the newest proprietary format created by the latest version of Winzip. It also supports ! adding files with password, and extracting password protected files. One specific point to watch for, if you start to work on the Advanced level of things is that the file reference created by the two Open functions are very different. So you can't open a file with ZLIB Open ZIP Archive and pass this refnum to any of the decompress functions and vice-versa. --- 25,29 ---- The core of this libray is an external shared library consisting basically of the version 1.2.3 release of zlib and the version 1.0.1e of the zip library from Gilles Vollant. ! The current version supports most types of ZIP files with exception of the newest proprietary format created by the latest version of Winzip. It also supports adding files with password, and extracting password protected files. One specific point to watch for, if you start to work on the Advanced level of things is that the file reference created by the two Open functions are very different. So you can't open a file with ZLIB Open ZIP Archive and pass this refnum to any of the decompress functions and vice-versa. *************** *** 42,44 **** Copyright (C) 1995-2004 Mark Adler, Jean-loup Gailly Copyright (C) 1998-2004 Gilles Vollant ! Copyright (C) 2002-2006 Rolf Kalbermatter, Jim Kring, Christoph Salzmann --- 41,43 ---- Copyright (C) 1995-2004 Mark Adler, Jean-loup Gailly Copyright (C) 1998-2004 Gilles Vollant ! Copyright (C) 2002-2007 Rolf Kalbermatter, Jim Kring, Christoph Salzmann Index: readme.txt =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/readme.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme.txt 12 Dec 2007 16:13:37 -0000 1.2 --- readme.txt 12 Dec 2007 16:19:05 -0000 1.3 *************** *** 21,25 **** streams without requiring to turn them into files first. ! 3) Minor tweaks to support compilation for LabVIEW relatime targets. This is still considered an experimental feature as testing of this was not really possible due to lack of available hardware. The standard Windows DLL should --- 21,25 ---- streams without requiring to turn them into files first. ! 3) Minor tweaks to support compilation for LabVIEW realtime targets. This is still considered an experimental feature as testing of this was not really possible due to lack of available hardware. The standard Windows DLL should *************** *** 27,33 **** checked. Added support for vxWorks based RT targets for LabVIEW 8.2 and 8.5. ! Note, that for VxWorks based targets you have to copy the lvzlib.out file manually ! to your RT target into the ni-rt/system folder using some FTP utility. LabVIEW ! will currently not deploy or download that file automatically for those targets. --- 27,34 ---- checked. Added support for vxWorks based RT targets for LabVIEW 8.2 and 8.5. ! Note, that for VxWorks based targets you have to copy the lvzlib.out file found ! typically under "user.lib/_OpenG.lib/lvzipfile" manually to your RT target using ! some FTP utility into the "ni-rt/system" folder. LabVIEW will currently not ! deploy or download that file automatically for those targets. |
|
From: Rolf K. <lab...@us...> - 2007-12-12 16:13:51
|
Update of /cvsroot/opengtoolkit/lvzip/build_support In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7603/build_support Modified Files: lvzip.rev Log Message: Documentation updates Index: lvzip.rev =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/build_support/lvzip.rev,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** lvzip.rev 17 Sep 2007 12:32:45 -0000 1.8 --- lvzip.rev 12 Dec 2007 16:13:37 -0000 1.9 *************** *** 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 --- 1,8 ---- [lvzip.ogbld] Version=2.4 ! Build_Number=18 ! Build_Date="12/12/2007 4:43:33 PM" Status=OK ! Warnings=8 ! Log_File=/C/Work/OpenG/opengtoolkit/lvzip/built/lvzip.log ! |
|
From: Rolf K. <lab...@us...> - 2007-12-12 16:13:17
|
Update of /cvsroot/opengtoolkit/lvzip In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7559 Modified Files: lvzip.ogbld lvzip.ogpb lvzip.spec Log Message: Support VxWorks targets Index: lvzip.spec =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/lvzip.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** lvzip.spec 17 Sep 2007 12:32:45 -0000 1.24 --- lvzip.spec 12 Dec 2007 16:13:08 -0000 1.25 *************** *** 30,34 **** [Files] ! Num File Groups=7 [File Group 0] --- 30,34 ---- [Files] ! Num File Groups=9 [File Group 0] *************** *** 141,144 **** --- 141,158 ---- [File Group 5] + Source Dir=built/lvzip/vxWorks82 + Target Dir=<OpenG.lib>/lvzip + Exclusive_LabVIEW_Version=<8.5 + Num Files=1 + File 0=lvzlib.out + + [File Group 6] + Source Dir=built/lvzip/vxWorks85 + Target Dir=<OpenG.lib>/lvzip + Exclusive_LabVIEW_Version=>=8.5,<8.6 + Num Files=1 + File 0=lvzlib.out + + [File Group 7] Source Dir="Dynamic Palette MNUs" Target Dir="<user.lib>/_dynamicpalette_dirs/file" *************** *** 147,151 **** File 0=oglib_lvzip.mnu ! [File Group 6] Source Dir="Dynamic Palette MNUs" Target Dir="<user.lib>/_dynamicpalette_dirs/OpenG" --- 161,165 ---- File 0=oglib_lvzip.mnu ! [File Group 8] Source Dir="Dynamic Palette MNUs" Target Dir="<user.lib>/_dynamicpalette_dirs/OpenG" Index: lvzip.ogpb =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/lvzip.ogpb,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lvzip.ogpb 17 Sep 2007 12:32:45 -0000 1.4 --- lvzip.ogpb 12 Dec 2007 16:13:08 -0000 1.5 *************** *** 36,40 **** [Files] ! Num File Groups=9 [File Group 0] --- 36,40 ---- [Files] ! Num File Groups=11 [File Group 0] *************** *** 95,98 **** --- 95,112 ---- [File Group 7] + Source Dir=built/lvzip/vxWorks82 + Target Dir=<OpenG.lib>/lvzip + Exclusive_LabVIEW_Version=<8.5 + Num Files=1 + File 0=lvzlib.out + + [File Group 8] + Source Dir=built/lvzip/vxWorks85 + Target Dir=<OpenG.lib>/lvzip + Exclusive_LabVIEW_Version=>=8.5,<8.6 + Num Files=1 + File 0=lvzlib.out + + [File Group 9] Source Dir="Dynamic Palette MNUs" Target Dir=<user.lib>/_dynamicpalette_dirs/file *************** *** 101,105 **** File 0=oglib_lvzip.mnu ! [File Group 8] Source Dir="Dynamic Palette MNUs" Target Dir=<user.lib>/_dynamicpalette_dirs/OpenG --- 115,119 ---- File 0=oglib_lvzip.mnu ! [File Group 10] Source Dir="Dynamic Palette MNUs" Target Dir=<user.lib>/_dynamicpalette_dirs/OpenG Index: lvzip.ogbld =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/lvzip.ogbld,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** lvzip.ogbld 16 Sep 2007 15:11:58 -0000 1.7 --- lvzip.ogbld 12 Dec 2007 16:13:08 -0000 1.8 *************** *** 101,102 **** --- 101,117 ---- SourceFile 4=PreInstall.vi + [SupportFiles 2] + TargetDir="vxWorks82" + OverwriteExisting=TRUE + FollowVIDirHierarchy=FALSE + Recursive=FALSE + Exclude=FALSE + SourceFile 1="vxWorks LV8.2/lvzlib.*" + + [SupportFiles 3] + TargetDir="vxWorks85" + OverwriteExisting=TRUE + FollowVIDirHierarchy=FALSE + Recursive=FALSE + Exclude=FALSE + SourceFile 1="vxWorks LV8.5/lvzlib.*" |
|
From: Rolf K. <lab...@us...> - 2007-12-12 15:36:46
|
Update of /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.5 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25340/vxWorks LV8.5 Added Files: lvzlib.out Removed Files: lvzip.out Log Message: --- lvzip.out DELETED --- --- NEW FILE: lvzlib.out --- (This appears to be a binary file; contents omitted.) |
|
From: Rolf K. <lab...@us...> - 2007-12-12 15:36:44
|
Update of /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.2 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25340/vxWorks LV8.2 Added Files: lvzlib.out Removed Files: lvzip.out Log Message: --- lvzip.out DELETED --- --- NEW FILE: lvzlib.out --- (This appears to be a binary file; contents omitted.) |
|
From: Rolf K. <lab...@us...> - 2007-12-12 15:28:01
|
Update of /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.2 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21736/vxWorks LV8.2 Added Files: lvzip.out Log Message: Support VxWorks targets --- NEW FILE: lvzip.out --- (This appears to be a binary file; contents omitted.) |
|
From: Rolf K. <lab...@us...> - 2007-12-12 15:27:59
|
Update of /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.5 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21736/vxWorks LV8.5 Added Files: lvzip.out Log Message: Support VxWorks targets --- NEW FILE: lvzip.out --- (This appears to be a binary file; contents omitted.) |
|
From: Rolf K. <lab...@us...> - 2007-12-12 15:26:30
|
Update of /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.2 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21273/vxWorks LV8.2 Log Message: Directory /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.2 added to the repository |
|
From: Rolf K. <lab...@us...> - 2007-12-12 15:26:29
|
Update of /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.5 In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21273/vxWorks LV8.5 Log Message: Directory /cvsroot/opengtoolkit/lvzip/source/vxWorks LV8.5 added to the repository |
|
From: Rolf K. <lab...@us...> - 2007-12-10 14:24:51
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32177 Modified Files: lvutil.h Added Files: Makefile.vxworks Log Message: Small header file changes to support VxWorks target compilation Index: lvutil.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lvutil.h 10 Dec 2007 13:47:36 -0000 1.3 --- lvutil.h 10 Dec 2007 14:24:54 -0000 1.4 *************** *** 32,41 **** #define BigEndian 0 #define HAVE_FCNTL ! #elif defined(VXWORKS_PPC) ! #define Unix 1 ! #define BigEndian 1 ! #elif defined(VXWORKS_X86) #define Unix 1 ! #define BigEndian 0 #endif --- 32,44 ---- #define BigEndian 0 #define HAVE_FCNTL ! #elif defined(__VXWORKS__) #define Unix 1 ! #if defined (__ppc) ! #define BigEndian 1 ! #else ! #define BigEndian 0 ! #endif ! #else ! #error No target defined #endif --- NEW FILE: Makefile.vxworks --- # These variables control the compiler and linker flags. Change them as # appropriate. DEBUG_MODE = 0 ADDED_CFLAGS = ifeq ($(DEBUG_MODE),1) OBJ_DIR := PPC603gnu_DEBUG CFLAGS = -g -mlongcall else OBJ_DIR := PPC603gnu CFLAGS = -Os -fstrength-reduce -fno-builtin -fno-strict-aliasing -mlongcall endif LINKFLAGS = $(CFLAGS) LIBPATH = # List all the *compiled* object files here, under the OBJ_DIR # directory. Make will automatically locate the source file and # compile it. OBJECTS := $(OBJ_DIR)/adler32.o $(OBJ_DIR)/compress.o $(OBJ_DIR)/crc32.o $(OBJ_DIR)/gzio.o $(OBJ_DIR)/uncompr.o \ $(OBJ_DIR)/deflate.o $(OBJ_DIR)/trees.o $(OBJ_DIR)/zutil.o $(OBJ_DIR)/inflate.o $(OBJ_DIR)/infback.o \ $(OBJ_DIR)/inftrees.o $(OBJ_DIR)/inffast.o $(OBJ_DIR)/ioapi.o $(OBJ_DIR)/iomem.o $(OBJ_DIR)/lvutil.o \ $(OBJ_DIR)/zip.o $(OBJ_DIR)/unzip.o # This is the name of the output shared library. PROJECT_TARGETS := $(OBJ_DIR)/lvzip.out # If you have other VxWorks .a files to reference, list them here. LIBS = LIBPATH = # Everything after this line should not need to be modified for # basic compilation. However, significant changes to the build structure # will probably involve modifying these lines. WIND_BASE := $(subst \,/,$(WIND_BASE)) CPU = PPC603 TOOL_FAMILY = gnu TOOL = gnu CC_ARCH_SPEC = -mcpu=603 -mstrict-align -mno-implicit-fp IDE_INCLUDES = -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip # This basic rule compiles a .c file into a .o file. It can be adapted to # all other source files that gcc can compile, including assembly (.s) and # C++ (.cpp, .cc, .C, .cxx) files. To enable support for those extensions, # copy this rule and modify its extension and compile flags for the # required source file type. $(OBJ_DIR)/%.o : %.c ccppc $(CFLAGS) $(CC_ARCH_SPEC) -ansi -Wall -MD -MP $(ADDED_CFLAGS) $(IDE_INCLUDES) $(ADDED_INCLUDES) -DCPU=$(CPU) -DTOOL_FAMILY=$(TOOL_FAMILY) -DTOOL=$(TOOL) -D_WRS_KERNEL $(DEFINES) -o "$@" -c "$<" # Adapted rule for .cpp files $(OBJ_DIR)/%.o : %.cpp c++ppc $(CFLAGS) $(CC_ARCH_SPEC) -ansi -Wall -MD -MP $(ADDED_CFLAGS) $(IDE_INCLUDES) $(ADDED_INCLUDES) -DCPU=$(CPU) -DTOOL_FAMILY=$(TOOL_FAMILY) -DTOOL=$(TOOL) -D_WRS_KERNEL $(DEFINES) -o "$@" -c "$<" all : check_objectdir $(PROJECT_TARGETS) $(PROJECT_TARGETS) : $(OBJECTS) rm -f "$@" ctdt.c;nmppc $(OBJECTS) | tclsh $(WIND_BASE)/host/resource/hutils/tcl/munch.tcl -c ppc > ctdt.c ccppc $(LINKFLAGS) $(CC_ARCH_SPEC) -fdollars-in-identifiers -Wall $(ADDED_CFLAGS) $(IDE_INCLUDES) $(ADDED_INCLUDES) -DCPU=$(CPU) -DTOOL_FAMILY=$(TOOL_FAMILY) -DTOOL=$(TOOL) -D_WRS_KERNEL $(DEFINES) -o ctdt.o -c ctdt.c ccppc -r -nostdlib -Wl,-X -T $(WIND_BASE)/target/h/tool/gnu/ldscripts/link.OUT -o "$@" $(OBJECTS) $(LIBPATH) $(LIBS) $(ADDED_LIBPATH) $(ADDED_LIBS) ctdt.o rm -f ctdt.c ctdt.o check_objectdir : @if [ ! -d "$(OBJ_DIR)" ]; then\ mkdir -p $(OBJ_DIR);\ fi clean : rm -f $(OBJECTS) $(PROJECT_TARGETS) $(wildcard $(OBJ_DIR)/*.unstripped) .DUMMY: check_objectdir clean |
|
From: Rolf K. <lab...@us...> - 2007-12-10 13:47:39
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19502 Modified Files: iomem.c iowin32.c lvutil.c lvutil.h lvzip.cws lvzip.prj unzip.c Log Message: Small header file changes to support VxWorks target compilation Index: lvzip.prj =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.prj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lvzip.prj 6 Dec 2007 23:05:25 -0000 1.1 --- lvzip.prj 10 Dec 2007 13:47:36 -0000 1.2 *************** *** 6,10 **** IVI Standard Root Dir = "/C/Program Files/IVI" VXIplug&play Framework Dir = "/C/VXIPNP/winnt" ! Number of Files = 40 Target Type = "Dynamic Link Library" Flags = 2064 --- 6,10 ---- IVI Standard Root Dir = "/C/Program Files/IVI" VXIplug&play Framework Dir = "/C/VXIPNP/winnt" ! Number of Files = 38 Target Type = "Dynamic Link Library" Flags = 2064 *************** *** 299,315 **** [File 0026] - File Type = "Include" - Res Id = 26 - Path Is Rel = True - Path Rel To = "Project" - Path Rel Path = "MacBinaryIII.h" - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/MacBinaryIII.h" - Exclude = False - Project Flags = 0 - Folder = "Headers" - - [File 0027] File Type = "CSource" ! Res Id = 27 Path Is Rel = True Path Rel To = "Project" --- 299,304 ---- [File 0026] File Type = "CSource" ! Res Id = 26 Path Is Rel = True Path Rel To = "Project" *************** *** 321,327 **** Folder = "Source Files" ! [File 0028] File Type = "Include" ! Res Id = 28 Path Is Rel = True Path Rel To = "Project" --- 310,316 ---- Folder = "Source Files" ! [File 0027] File Type = "Include" ! Res Id = 27 Path Is Rel = True Path Rel To = "Project" *************** *** 332,338 **** Folder = "Headers" ! [File 0029] File Type = "CSource" ! Res Id = 29 Path Is Rel = True Path Rel To = "Project" --- 321,327 ---- Folder = "Headers" ! [File 0028] File Type = "CSource" ! Res Id = 28 Path Is Rel = True Path Rel To = "Project" *************** *** 344,350 **** Folder = "Source Files" ! [File 0030] File Type = "Include" ! Res Id = 30 Path Is Rel = True Path Rel To = "Project" --- 333,339 ---- Folder = "Source Files" ! [File 0029] File Type = "Include" ! Res Id = 29 Path Is Rel = True Path Rel To = "Project" *************** *** 355,361 **** Folder = "Headers" ! [File 0031] File Type = "CSource" ! Res Id = 31 Path Is Rel = True Path Rel To = "Project" --- 344,350 ---- Folder = "Headers" ! [File 0030] File Type = "CSource" ! Res Id = 30 Path Is Rel = True Path Rel To = "Project" *************** *** 367,373 **** Folder = "Source Files" ! [File 0032] File Type = "CSource" ! Res Id = 32 Path Is Rel = True Path Rel To = "Project" --- 356,362 ---- Folder = "Source Files" ! [File 0031] File Type = "CSource" ! Res Id = 31 Path Is Rel = True Path Rel To = "Project" *************** *** 379,385 **** Folder = "Source Files" ! [File 0033] File Type = "Include" ! Res Id = 33 Path Is Rel = True Path Rel To = "Project" --- 368,374 ---- Folder = "Source Files" ! [File 0032] File Type = "Include" ! Res Id = 32 Path Is Rel = True Path Rel To = "Project" *************** *** 390,396 **** Folder = "Headers" ! [File 0034] File Type = "Include" ! Res Id = 34 Path Is Rel = True Path Rel To = "Project" --- 379,385 ---- Folder = "Headers" ! [File 0033] File Type = "Include" ! Res Id = 33 Path Is Rel = True Path Rel To = "Project" *************** *** 401,418 **** Folder = "Headers" ! [File 0035] ! File Type = "Include" ! Res Id = 35 ! Path Is Rel = True ! Path Rel To = "Project" ! Path Rel Path = "zconf.in.h" ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.in.h" ! Exclude = False ! Project Flags = 0 ! Folder = "Headers" ! ! [File 0036] File Type = "CSource" ! Res Id = 36 Path Is Rel = True Path Rel To = "Project" --- 390,396 ---- Folder = "Headers" ! [File 0034] File Type = "CSource" ! Res Id = 34 Path Is Rel = True Path Rel To = "Project" *************** *** 424,430 **** Folder = "Source Files" ! [File 0037] File Type = "Include" ! Res Id = 37 Path Is Rel = True Path Rel To = "Project" --- 402,408 ---- Folder = "Source Files" ! [File 0035] File Type = "Include" ! Res Id = 35 Path Is Rel = True Path Rel To = "Project" *************** *** 435,441 **** Folder = "Headers" ! [File 0038] File Type = "Include" ! Res Id = 38 Path Is Rel = True Path Rel To = "Project" --- 413,419 ---- Folder = "Headers" ! [File 0036] File Type = "Include" ! Res Id = 36 Path Is Rel = True Path Rel To = "Project" *************** *** 446,452 **** Folder = "Headers" ! [File 0039] File Type = "CSource" ! Res Id = 39 Path Is Rel = True Path Rel To = "Project" --- 424,430 ---- Folder = "Headers" ! [File 0037] File Type = "CSource" ! Res Id = 37 Path Is Rel = True Path Rel To = "Project" *************** *** 458,464 **** Folder = "Source Files" ! [File 0040] File Type = "Include" ! Res Id = 40 Path Is Rel = True Path Rel To = "Project" --- 436,442 ---- Folder = "Source Files" ! [File 0038] File Type = "Include" ! Res Id = 38 Path Is Rel = True Path Rel To = "Project" Index: lvutil.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lvutil.h 6 Dec 2007 18:55:01 -0000 1.2 --- lvutil.h 10 Dec 2007 13:47:36 -0000 1.3 *************** *** 22,28 **** #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 --- 22,25 ---- *************** *** 31,34 **** --- 28,41 ---- #endif #define BigEndian 0 + #elif defined(linux) + #define Unix 1 + #define BigEndian 0 + #define HAVE_FCNTL + #elif defined(VXWORKS_PPC) + #define Unix 1 + #define BigEndian 1 + #elif defined(VXWORKS_X86) + #define Unix 1 + #define BigEndian 0 #endif Index: lvzip.cws =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvzip.cws,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lvzip.cws 6 Dec 2007 23:05:25 -0000 1.1 --- lvzip.cws 10 Dec 2007 13:47:36 -0000 1.2 *************** *** 9,16 **** Project 0001 = "lvzip.prj" Drag Bar Left = 160 ! Window Top = 610 ! Window Left = 1414 ! Window Bottom = 1546 ! Window Right = 2625 Maximized = False Maximized Children = False --- 9,16 ---- Project 0001 = "lvzip.prj" Drag Bar Left = 160 ! Window Top = 53 ! Window Left = 1331 ! Window Bottom = 1039 ! Window Right = 2867 Maximized = False Maximized Children = False *************** *** 44,56 **** [File 0001] - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" - File Type = "CSource" - Disk Date = 3279791993 - In Projects = "1," - Window Top = 25 - Window Left = 10 - Source Window State = "1,821,821,821,8,43,8,0,0,133,0,0,0,0,0,38,359,0,378,19,518,1094,1,0," - - [File 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/adler32.c" File Type = "CSource" --- 44,47 ---- *************** *** 61,65 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0003] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" File Type = "CSource" --- 52,56 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" File Type = "CSource" *************** *** 70,74 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,282,838,1,0," ! [File 0004] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" File Type = "CSource" --- 61,65 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,282,838,1,0," ! [File 0003] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" File Type = "CSource" *************** *** 79,83 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,27,60,283,794,1,0," ! [File 0005] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" File Type = "Include" --- 70,74 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,27,60,283,794,1,0," ! [File 0004] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" File Type = "Include" *************** *** 86,90 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0006] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" File Type = "Include" --- 77,81 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0005] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" File Type = "Include" *************** *** 93,117 **** Window Top = 46 Window Left = 42 ! Source Window State = "1,88,88,88,34,35,34,0,0,150,0,0,0,0,0,37,77,0,86,21,517,1234,1,0," ! [File 0007] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" Disk Date = 3279800147 In Projects = "1," ! Window Top = 28 ! Window Left = 44 ! Source Window State = "1,98,99,98,0,0,0,0,0,133,0,0,0,0,0,40,78,0,91,22,546,1097,1,0," ! [File 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" File Type = "Include" ! Disk Date = 3279799477 In Projects = "1," ! Window Top = 34 Window Left = 320 ! Source Window State = "1,298,298,298,0,11,11,0,0,127,0,0,0,0,0,38,273,0,298,0,528,1050,1,0," ! [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/gzio.c" File Type = "CSource" --- 84,108 ---- Window Top = 46 Window Left = 42 ! Source Window State = "1,88,88,88,34,35,34,0,0,0,0,0,0,0,0,0,77,0,86,21,517,1234,1,0," ! [File 0006] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" Disk Date = 3279800147 In Projects = "1," ! Window Top = 23 ! Window Left = 208 ! Source Window State = "1,98,99,98,0,0,0,0,0,0,0,0,0,0,0,0,27,0,91,22,847,917,1,0," ! [File 0007] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" File Type = "Include" ! Disk Date = 3279812177 In Projects = "1," ! Window Top = 32 Window Left = 320 ! Source Window State = "1,298,298,298,0,11,11,0,0,0,0,0,0,0,0,0,270,0,298,0,530,1049,1,0," ! [File 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/gzio.c" File Type = "CSource" *************** *** 122,126 **** Source Window State = "1,11,12,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,399,871,1,0," ! [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" --- 113,117 ---- Source Window State = "1,11,12,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,399,871,1,0," ! [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" *************** *** 131,135 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" --- 122,126 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" *************** *** 140,144 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," ! [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" --- 131,135 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," ! [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" *************** *** 147,151 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" --- 138,142 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" *************** *** 154,158 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" --- 145,149 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" *************** *** 163,167 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" --- 154,158 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" *************** *** 172,176 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," ! [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" --- 163,167 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," ! [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" *************** *** 179,185 **** Window Top = 23 Window Left = 176 ! Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,0,0,38,0,570,975,1,0," ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" --- 170,176 ---- Window Top = 23 Window Left = 176 ! Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,3,0,38,0,570,975,1,0," ! [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" *************** *** 188,194 **** Window Top = 26 Window Left = 162 ! Source Window State = "1,0,0,0,0,0,0,0,0,127,0,0,0,0,0,36,21,0,0,0,499,1052,1,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" --- 179,185 ---- Window Top = 26 Window Left = 162 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,499,1052,1,0," ! [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" *************** *** 199,203 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" --- 190,194 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" *************** *** 206,213 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" ! Disk Date = 3279791904 In Projects = "1," Window Top = 68 --- 197,204 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" ! Disk Date = 3280134838 In Projects = "1," Window Top = 68 *************** *** 215,219 **** Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," ! [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" --- 206,210 ---- Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," ! [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" *************** *** 224,237 **** Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" ! Disk Date = 3272812294 In Projects = "1," Window Top = 26 Window Left = 66 ! Source Window State = "1,0,0,0,0,0,0,0,0,123,0,60,0,0,0,38,60,0,70,14,528,1016,1,0," ! [File 0023] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" --- 215,228 ---- Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," ! [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" ! Disk Date = 3280139067 In Projects = "1," Window Top = 26 Window Left = 66 ! Source Window State = "1,70,71,70,0,0,0,0,0,123,0,60,0,0,0,38,60,0,70,0,528,1016,1,0," ! [File 0022] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" *************** *** 240,244 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0024] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" --- 231,235 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0023] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" *************** *** 246,253 **** In Projects = "1," [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" File Type = "Include" ! Disk Date = 3279799954 In Projects = "1," Window Top = 48 --- 237,253 ---- In Projects = "1," + [File 0024] + Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" + File Type = "CSource" + Disk Date = 3280138995 + In Projects = "1," + Window Top = 25 + Window Left = 10 + Source Window State = "1,821,821,821,8,43,8,0,0,0,0,0,0,0,0,0,359,0,378,19,518,1094,1,0," + [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" File Type = "Include" ! Disk Date = 3280138886 In Projects = "1," Window Top = 48 *************** *** 256,268 **** [File 0026] - Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/MacBinaryIII.h" - File Type = "Include" - Disk Date = 3219509490 - In Projects = "1," - Window Top = 94 - Window Left = 42 - Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,9,276,630,1,0," - - [File 0027] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.c" File Type = "CSource" --- 256,259 ---- *************** *** 271,286 **** Window Top = 31 Window Left = 24 ! Source Window State = "1,12,12,12,10,15,10,0,0,130,0,0,0,0,0,38,0,0,16,19,522,1074,1,0," ! [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" File Type = "Include" ! Disk Date = 3186836984 In Projects = "1," Window Top = 25 Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,113,0,0,0,0,0,34,7,0,0,0,471,939,1,0," ! [File 0029] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" --- 262,277 ---- Window Top = 31 Window Left = 24 ! Source Window State = "1,12,12,12,10,15,10,0,0,0,0,0,0,0,0,0,0,0,16,19,522,1074,1,0," ! [File 0027] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" File Type = "Include" ! Disk Date = 3279800545 In Projects = "1," Window Top = 25 Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,471,939,1,0," ! [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" *************** *** 289,295 **** Window Top = 60 Window Left = 608 ! Source Window State = "1,33,33,33,11,22,11,0,0,80,0,0,0,0,0,33,30,0,50,41,457,670,1,0," ! [File 0030] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" File Type = "Include" --- 280,286 ---- Window Top = 60 Window Left = 608 ! Source Window State = "1,33,33,33,11,22,11,0,0,0,0,0,0,0,0,0,15,0,50,41,536,717,1,0," ! [File 0029] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" File Type = "Include" *************** *** 298,304 **** Window Top = 48 Window Left = 18 ! Source Window State = "1,0,0,0,0,0,0,0,0,79,0,0,0,0,0,39,0,0,0,0,540,666,1,0," ! [File 0031] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" File Type = "CSource" --- 289,295 ---- Window Top = 48 Window Left = 18 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,540,666,1,0," ! [File 0030] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" File Type = "CSource" *************** *** 309,322 **** Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0032] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" File Type = "CSource" ! Disk Date = 3279797865 In Projects = "1," Window Top = 25 Window Left = 5 ! Source Window State = "1,0,0,0,0,0,0,0,0,141,0,0,0,0,0,41,1518,0,1538,8,568,1163,1,0," ! [File 0033] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" --- 300,313 ---- Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," ! [File 0031] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" File Type = "CSource" ! Disk Date = 3280139072 In Projects = "1," Window Top = 25 Window Left = 5 ! Source Window State = "1,1538,1539,1538,0,0,0,0,0,141,0,0,0,0,0,41,1527,0,1538,0,568,1163,1,0," ! [File 0032] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" *************** *** 327,347 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,316,825,1,0," ! [File 0034] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" File Type = "Include" ! Disk Date = 3279800025 In Projects = "1," Window Top = 23 Window Left = 27 ! Source Window State = "1,235,235,235,11,24,11,0,0,99,0,0,0,0,0,40,190,0,200,39,545,823,1,0," ! ! [File 0035] ! Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.in.h" ! File Type = "Include" ! Disk Date = 3219509183 ! In Projects = "1," ! Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0036] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" --- 318,331 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,316,825,1,0," ! [File 0033] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" File Type = "Include" ! Disk Date = 3279812177 In Projects = "1," Window Top = 23 Window Left = 27 ! Source Window State = "1,235,235,235,11,24,11,0,0,0,0,0,0,0,0,0,190,0,200,39,545,823,1,0," ! [File 0034] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" *************** *** 350,356 **** Window Top = 48 Window Left = 18 ! Source Window State = "1,196,196,196,4,18,4,0,0,124,0,0,0,0,0,27,180,0,193,0,378,1028,1,0," ! [File 0037] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.h" File Type = "Include" --- 334,340 ---- Window Top = 48 Window Left = 18 ! Source Window State = "1,196,196,196,4,18,4,0,0,0,0,0,0,0,0,0,180,0,193,0,378,1028,1,0," ! [File 0035] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.h" File Type = "Include" *************** *** 359,363 **** Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0038] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zlib.h" File Type = "Include" --- 343,347 ---- Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," ! [File 0036] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zlib.h" File Type = "Include" *************** *** 366,372 **** Window Top = 26 Window Left = 154 ! Source Window State = "1,0,0,0,0,0,0,0,0,138,0,0,0,0,0,38,1330,0,1347,135,526,1136,1,0," ! [File 0039] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.c" File Type = "CSource" --- 350,356 ---- Window Top = 26 Window Left = 154 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1330,0,1347,135,526,1136,1,0," ! [File 0037] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.c" File Type = "CSource" *************** *** 377,381 **** Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0040] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.h" File Type = "Include" --- 361,365 ---- Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," ! [File 0038] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.h" File Type = "Include" *************** *** 384,388 **** Window Top = 25 Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,123,0,0,0,0,0,41,0,0,0,0,568,1016,1,0," [Build Options 0001] --- 368,372 ---- Window Top = 25 Window Left = 6 ! Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,568,1016,1,0," [Build Options 0001] Index: iowin32.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iowin32.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** iowin32.c 17 Sep 2007 05:07:16 -0000 1.6 --- iowin32.c 10 Dec 2007 13:47:36 -0000 1.7 *************** *** 69,73 **** int mode; { - const char* mode_fopen = NULL; DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; HANDLE hFile = 0; --- 69,72 ---- Index: lvutil.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lvutil.c 6 Dec 2007 18:55:01 -0000 1.3 --- lvutil.c 10 Dec 2007 13:47:36 -0000 1.4 *************** *** 235,239 **** } #elif Unix || Win32 ! static MakePathDSString(Path path, LStrPtr *lstr) { int32 pathLen = -1; --- 235,239 ---- } #elif Unix || Win32 ! static int32 MakePathDSString(Path path, LStrPtr *lstr) { int32 pathLen = -1; *************** *** 392,396 **** { int theRefNum = FSpOpenResFile(&theFSSpec, fsRdPerm); ! if (ResError() == mgNoErr) //we've got a resource file { CloseResFile(theRefNum); --- 392,396 ---- { int theRefNum = FSpOpenResFile(&theFSSpec, fsRdPerm); ! if (ResError() == mgNoErr) /* we've got a resource file */ { CloseResFile(theRefNum); *************** *** 634,638 **** } ! if (err = MakePathDSString(path, &lstr)) return err; --- 634,639 ---- } ! err = MakePathDSString(path, &lstr); ! if (err) return err; *************** *** 650,653 **** --- 651,655 ---- return UnixToLVFileErr(); + #ifdef HAVE_FCNTL /* Implement deny mode by range locking whole file */ if (denyMode == denyReadWrite || denyMode == denyWriteOnly) *************** *** 665,668 **** --- 667,671 ---- } } + #endif #else err = mgNotSupported; *************** *** 908,912 **** DSDisposePtr((UPtr)lstr); #elif Unix ! if (err = MakePathDSString(path, &lstr)) return err; --- 911,916 ---- DSDisposePtr((UPtr)lstr); #elif Unix ! err = MakePathDSString(path, &lstr); ! if (err) return err; Index: unzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** unzip.c 6 Dec 2007 18:56:17 -0000 1.9 --- unzip.c 10 Dec 2007 13:47:36 -0000 1.10 *************** *** 1537,1541 **** uLong uSizeBuf; { - int err=UNZ_OK; unz_s* s; uLong uReadThis ; --- 1537,1540 ---- Index: iomem.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** iomem.c 6 Dec 2007 18:55:01 -0000 1.8 --- iomem.c 10 Dec 2007 13:47:36 -0000 1.9 *************** *** 65,70 **** memio->error = 0; ! // if (opaque && !(mode & ZLIB_FILEFUNC_MODE_CREATE)) ! // memio->pos = LStrLen(*(LStrHandle)opaque); } return memio; --- 65,70 ---- memio->error = 0; ! /* if (opaque && !(mode & ZLIB_FILEFUNC_MODE_CREATE)) ! memio->pos = LStrLen(*(LStrHandle)opaque); */ } return memio; |
|
From: Rolf K. <lab...@us...> - 2007-12-07 07:54:46
|
Update of /cvsroot/opengtoolkit/lvzip/source/macbin.llb In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11161 Modified Files: MACBIN VI Tree.vi Added Files: MACBIN Path to Text.vi Log Message: Added VI to convert a LabVIEW path into a low level platform path --- NEW FILE: MACBIN Path to Text.vi --- (This appears to be a binary file; contents omitted.) Index: MACBIN VI Tree.vi =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/macbin.llb/MACBIN VI Tree.vi,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 Binary files /tmp/cvsHZrAJY and /tmp/cvsPNgmIB differ |
|
From: Rolf K. <lab...@us...> - 2007-12-06 23:05:23
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2555 Added Files: lvzip.cws lvzip.prj Log Message: Added CVI project libraries --- NEW FILE: lvzip.prj --- [Project Header] Version = 801 Pathname = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvzip.prj" Project Label = "lvzip" CVI Dir = "/c/program files/national instruments/cvi80" IVI Standard Root Dir = "/C/Program Files/IVI" VXIplug&play Framework Dir = "/C/VXIPNP/winnt" Number of Files = 40 Target Type = "Dynamic Link Library" Flags = 2064 [File 0001] File Type = "CSource" Res Id = 1 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "adler32.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/adler32.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0002] File Type = "CSource" Res Id = 2 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "compress.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0003] File Type = "CSource" Res Id = 3 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "crc32.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0004] File Type = "Include" Res Id = 4 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "crc32.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0005] File Type = "Include" Res Id = 5 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "crypt.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0006] File Type = "CSource" Res Id = 6 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "deflate.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0007] File Type = "Include" Res Id = 7 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "deflate.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0008] File Type = "CSource" Res Id = 8 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "gzio.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/gzio.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0009] File Type = "CSource" Res Id = 9 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "infback.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0010] File Type = "CSource" Res Id = 10 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "inffast.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0011] File Type = "Include" Res Id = 11 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "inffast.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0012] File Type = "Include" Res Id = 12 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "inffixed.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0013] File Type = "CSource" Res Id = 13 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "inflate.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0014] File Type = "Include" Res Id = 14 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "inflate.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0015] File Type = "CSource" Res Id = 15 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "inftrees.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0016] File Type = "Include" Res Id = 16 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "inftrees.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0017] File Type = "CSource" Res Id = 17 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "ioapi.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0018] File Type = "Include" Res Id = 18 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "ioapi.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0019] File Type = "CSource" Res Id = 19 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "iomem.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0020] File Type = "Include" Res Id = 20 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "iomem.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0021] File Type = "CSource" Res Id = 21 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "iowin32.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0022] File Type = "Include" Res Id = 22 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "iowin32.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0023] File Type = "Library" Res Id = 23 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "../../cintools/labview.lib" Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" Exclude = False Project Flags = 0 Folder = "Not In A Folder" [File 0024] File Type = "CSource" Res Id = 24 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "lvutil.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0025] File Type = "Include" Res Id = 25 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "lvutil.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0026] File Type = "Include" Res Id = 26 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "MacBinaryIII.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/MacBinaryIII.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0027] File Type = "CSource" Res Id = 27 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "mztools.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0028] File Type = "Include" Res Id = 28 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "mztools.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0029] File Type = "CSource" Res Id = 29 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "trees.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0030] File Type = "Include" Res Id = 30 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "trees.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0031] File Type = "CSource" Res Id = 31 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "uncompr.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0032] File Type = "CSource" Res Id = 32 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "unzip.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0033] File Type = "Include" Res Id = 33 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "unzip.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0034] File Type = "Include" Res Id = 34 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "zconf.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0035] File Type = "Include" Res Id = 35 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "zconf.in.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.in.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0036] File Type = "CSource" Res Id = 36 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "zip.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0037] File Type = "Include" Res Id = 37 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "zip.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0038] File Type = "Include" Res Id = 38 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "zlib.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zlib.h" Exclude = False Project Flags = 0 Folder = "Headers" [File 0039] File Type = "CSource" Res Id = 39 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "zutil.c" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.c" Exclude = False Compile Into Object File = False Project Flags = 0 Folder = "Source Files" [File 0040] File Type = "Include" Res Id = 40 Path Is Rel = True Path Rel To = "Project" Path Rel Path = "zutil.h" Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.h" Exclude = False Project Flags = 0 Folder = "Headers" [Folders] Include Files Folder Not Added Yet = True User Interface Files Folder Not Added Yet = True Instrument Files Folder Not Added Yet = True Folder 0 = "Source Files" Folder 1 = "Headers" [Compiler Options] Default Calling Convention = "cdecl" Require Prototypes = True Require Return Values = True Enable Pointer Mismatch Warning = True Enable Unreachable Code Warning = True Enable Unreferenced Identifiers Warning = True Enable Assignment In Conditional Warning = True O Option Compatible With 5.0 = False Uninitialized Locals Compile Warning = "Conservative" [Run Options] Stack Size = 250000 Image Base Address = 268435456 [Compiler Defines] Compiler Defines = "/DWIN32_LEAN_AND_MEAN /DNO_vsnprintf" [Create Executable] Executable File_Debug Is Rel = True Executable File_Debug Rel To = "Project" Executable File_Debug Rel Path = "lvzip.dll" Executable File_Debug = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvzip.dll" Executable File_Release Is Rel = True Executable File_Release Rel To = "Project" Executable File_Release Rel Path = "lvzip.dll" Executable File_Release = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvzip.dll" Icon File Is Rel = False Icon File = "" Application Title = "" Numeric File Version = "1,0,0,0" Numeric Prod Version = "1,0,0,0" Comments = "" Company Name = "CIT Engineering" File Version = "1.0" Legal Copyright = "Copyright © CIT Engineering, 2007" Legal Trademarks = "" Private Build = "" Product Version = "1.0" Special Build = "" DLL Exports = "Include File And Marked Symbols" Export File1 = "lvutil.h" Export File2 = "mztools.h" Export File3 = "unzip.h" Export File4 = "zip.h" DLL Import Library Choice = "Gen Lib For Current Mode" Use IVI Subdirectories for Import Libraries = False Use VXIPNP Subdirectories for Import Libraries = False Use Dflt Import Lib Base Name = True Where to Copy DLL = "Do not copy" Add Type Lib To DLL = False Include Type Lib Help Links = False Type Lib FP File Is Rel = False Type Lib FP File = "" Type Lib Guid = "" Runtime Support = "LabVIEW RealTime Support Only" Instrument Driver Support Only = True Embed Project .UIRs = False Generate Map File = False [External Compiler Support] UIR Callbacks File Option = 0 Using LoadExternalModule = False Create Project Symbols File = True UIR Callbacks Obj File Is Rel = False UIR Callbacks Obj File = "" Project Symbols H File Is Rel = False Project Symbols H File = "" Project Symbols Obj File Is Rel = False Project Symbols Obj File = "" [ActiveX Server Options] Specification File Is Rel = False Specification File = "" Source File Is Rel = False Source File = "" Include File Is Rel = False Include File = "" IDL File Is Rel = False IDL File = "" Register ActiveX Server = False [tpcSection] tpcEnabled = 0 tpcOverrideEnvironment = 0 --- NEW FILE: lvzip.cws --- [Workspace Header] Version = 801 Pathname = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvzip.cws" CVI Dir = "/c/program files/national instruments/cvi80" IVI Standard Root Dir = "/C/Program Files/IVI" VXIplug&play Framework Dir = "/C/VXIPNP/winnt" Number of Projects = 1 Active Project = 1 Project 0001 = "lvzip.prj" Drag Bar Left = 160 Window Top = 610 Window Left = 1414 Window Bottom = 1546 Window Right = 2625 Maximized = False Maximized Children = False Max Number Of Errors = 20 Track Include File Dependencies = True Prompt For Missing Includes = True Stop On First Error File = False Bring Up Err Win For Warnings = True Show Build Dialog = False Save Changes Before Running = "Always" Hide Windows = False Global Hot Key = False Break At First Statement = False Sort Type = "File Name" Number of Opened Files = 0 Window Confinement Region Enabled = True MainColumnWidth = 141 FileDateColumnWidth = 70 FileSizeColumnWidth = 70 StatusColumnWidth = 70 [Project Header 0001] Version = 801 Don't Update DistKit = False Platform Code = 4 Build Configuration = "Debug" Warn User If Debugging Release = 1 Batch Build Release = True Batch Build Debug = True Force Rebuild = False [File 0001] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.c" File Type = "CSource" Disk Date = 3279791993 In Projects = "1," Window Top = 25 Window Left = 10 Source Window State = "1,821,821,821,8,43,8,0,0,133,0,0,0,0,0,38,359,0,378,19,518,1094,1,0," [File 0002] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/adler32.c" File Type = "CSource" Disk Date = 3219509182 In Projects = "1," Window Top = 25 Window Left = 6 Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," [File 0003] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/compress.c" File Type = "CSource" Disk Date = 3219509182 In Projects = "1," Window Top = 26 Window Left = 212 Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,282,838,1,0," [File 0004] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.c" File Type = "CSource" Disk Date = 3219509182 In Projects = "1," Window Top = 26 Window Left = 339 Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,0,27,60,283,794,1,0," [File 0005] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crc32.h" File Type = "Include" Disk Date = 3185304770 In Projects = "1," Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," [File 0006] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/crypt.h" File Type = "Include" Disk Date = 3279798552 In Projects = "1," Window Top = 46 Window Left = 42 Source Window State = "1,88,88,88,34,35,34,0,0,150,0,0,0,0,0,37,77,0,86,21,517,1234,1,0," [File 0007] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.c" File Type = "CSource" Disk Date = 3279800147 In Projects = "1," Window Top = 28 Window Left = 44 Source Window State = "1,98,99,98,0,0,0,0,0,133,0,0,0,0,0,40,78,0,91,22,546,1097,1,0," [File 0008] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/deflate.h" File Type = "Include" Disk Date = 3279799477 In Projects = "1," Window Top = 34 Window Left = 320 Source Window State = "1,298,298,298,0,11,11,0,0,127,0,0,0,0,0,38,273,0,298,0,528,1050,1,0," [File 0009] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/gzio.c" File Type = "CSource" Disk Date = 3219509182 In Projects = "1," Window Top = 39 Window Left = 30 Source Window State = "1,11,12,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,0,399,871,1,0," [File 0010] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/infback.c" File Type = "CSource" Disk Date = 3219509182 In Projects = "1," Window Top = 71 Window Left = 30 Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," [File 0011] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.c" File Type = "CSource" Disk Date = 3219509183 In Projects = "1," Window Top = 25 Window Left = 6 Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,852,1,0," [File 0012] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffast.h" File Type = "Include" Disk Date = 3185304770 In Projects = "1," Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," [File 0013] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inffixed.h" File Type = "Include" Disk Date = 3185304770 In Projects = "1," Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," [File 0014] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.c" File Type = "CSource" Disk Date = 3219509183 In Projects = "1," Window Top = 94 Window Left = 42 Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," [File 0015] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inflate.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," Window Top = 48 Window Left = 18 Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,388,779,1,0," [File 0016] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.c" File Type = "CSource" Disk Date = 3219509183 In Projects = "1," Window Top = 23 Window Left = 176 Source Window State = "1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,42,0,0,38,0,570,975,1,0," [File 0017] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/inftrees.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," Window Top = 26 Window Left = 162 Source Window State = "1,0,0,0,0,0,0,0,0,127,0,0,0,0,0,36,21,0,0,0,499,1052,1,0," [File 0018] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.c" File Type = "CSource" Disk Date = 3272811858 In Projects = "1," Window Top = 117 Window Left = 54 Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," [File 0019] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/ioapi.h" File Type = "Include" Disk Date = 3272811834 In Projects = "1," Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," [File 0020] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.c" File Type = "CSource" Disk Date = 3279791904 In Projects = "1," Window Top = 68 Window Left = 337 Source Window State = "1,105,105,105,12,96,12,0,0,0,0,0,0,0,0,0,92,0,105,92,491,939,1,0," [File 0021] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iomem.h" File Type = "Include" Disk Date = 3272882635 In Projects = "1," Window Top = 25 Window Left = 6 Source Window State = "1,9,10,9,0,0,0,0,0,0,0,0,0,0,0,0,0,0,9,0,327,888,1,0," [File 0022] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.c" File Type = "CSource" Disk Date = 3272812294 In Projects = "1," Window Top = 26 Window Left = 66 Source Window State = "1,0,0,0,0,0,0,0,0,123,0,60,0,0,0,38,60,0,70,14,528,1016,1,0," [File 0023] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/iowin32.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," [File 0024] Path = "/c/Work/OpenG/opengtoolkit/cintools/labview.lib" File Type = "Library" Disk Date = 3045336910 In Projects = "1," [File 0025] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/lvutil.h" File Type = "Include" Disk Date = 3279799954 In Projects = "1," Window Top = 48 Window Left = 18 Source Window State = "1,26,32,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,15,371,941,1,0," [File 0026] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/MacBinaryIII.h" File Type = "Include" Disk Date = 3219509490 In Projects = "1," Window Top = 94 Window Left = 42 Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,9,276,630,1,0," [File 0027] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.c" File Type = "CSource" Disk Date = 3279798416 In Projects = "1," Window Top = 31 Window Left = 24 Source Window State = "1,12,12,12,10,15,10,0,0,130,0,0,0,0,0,38,0,0,16,19,522,1074,1,0," [File 0028] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/mztools.h" File Type = "Include" Disk Date = 3186836984 In Projects = "1," Window Top = 25 Window Left = 6 Source Window State = "1,0,0,0,0,0,0,0,0,113,0,0,0,0,0,34,7,0,0,0,471,939,1,0," [File 0029] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.c" File Type = "CSource" Disk Date = 3219509183 In Projects = "1," Window Top = 60 Window Left = 608 Source Window State = "1,33,33,33,11,22,11,0,0,80,0,0,0,0,0,33,30,0,50,41,457,670,1,0," [File 0030] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/trees.h" File Type = "Include" Disk Date = 3116565692 In Projects = "1," Window Top = 48 Window Left = 18 Source Window State = "1,0,0,0,0,0,0,0,0,79,0,0,0,0,0,39,0,0,0,0,540,666,1,0," [File 0031] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/uncompr.c" File Type = "CSource" Disk Date = 3185382555 In Projects = "1," Window Top = 25 Window Left = 6 Source Window State = "1,7,8,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,284,676,1,0," [File 0032] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.c" File Type = "CSource" Disk Date = 3279797865 In Projects = "1," Window Top = 25 Window Left = 5 Source Window State = "1,0,0,0,0,0,0,0,0,141,0,0,0,0,0,41,1518,0,1538,8,568,1163,1,0," [File 0033] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/unzip.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," Window Top = 51 Window Left = 28 Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,129,0,0,0,316,825,1,0," [File 0034] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.h" File Type = "Include" Disk Date = 3279800025 In Projects = "1," Window Top = 23 Window Left = 27 Source Window State = "1,235,235,235,11,24,11,0,0,99,0,0,0,0,0,40,190,0,200,39,545,823,1,0," [File 0035] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zconf.in.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," [File 0036] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.c" File Type = "CSource" Disk Date = 3279788354 In Projects = "1," Window Top = 48 Window Left = 18 Source Window State = "1,196,196,196,4,18,4,0,0,124,0,0,0,0,0,27,180,0,193,0,378,1028,1,0," [File 0037] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zip.h" File Type = "Include" Disk Date = 3272811902 In Projects = "1," Source Window State = "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0," [File 0038] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zlib.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," Window Top = 26 Window Left = 154 Source Window State = "1,0,0,0,0,0,0,0,0,138,0,0,0,0,0,38,1330,0,1347,135,526,1136,1,0," [File 0039] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.c" File Type = "CSource" Disk Date = 3219509183 In Projects = "1," Window Top = 163 Window Left = 78 Source Window State = "1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,284,676,1,0," [File 0040] Path = "/c/Work/OpenG/opengtoolkit/lvzip/c_source/zutil.h" File Type = "Include" Disk Date = 3219509183 In Projects = "1," Window Top = 25 Window Left = 6 Source Window State = "1,0,0,0,0,0,0,0,0,123,0,0,0,0,0,41,0,0,0,0,568,1016,1,0," [Build Options 0001] Generate Browse Info = True Enable Uninitialized Locals Runtime Warning = True Debugging Level = "Standard" Break On Library Errors = True Break On First Chance Exceptions = False Execution Target Address = "Local desktop computer" Execution Target Port = 0 Execution Target Type = 0 [SCC Options 0001] Use global settings = True SCC Provider = "" SCC Project = "" Local Path = "" Auxiliary Path = "" Perform Same Action For .h File As For .uir File = "Ask" Username = "" Comment = "" Use Default Username = False Use Default Comment = False Suppress CVI Error Messages = False [DLL Debugging Support 0001] External Process Path = "" [Command Line Args 0001] Command Line Args = "" |
|
From: Rolf K. <lab...@us...> - 2007-12-06 22:41:54
|
Update of /cvsroot/opengtoolkit/lvzip/source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25370 Modified Files: lvzlib.so Log Message: Updated unix library Index: lvzlib.so =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/source/lvzlib.so,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsU5Ayuk and /tmp/cvsPZcgin differ |
|
From: Rolf K. <lab...@us...> - 2007-12-06 22:40:18
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24961 Modified Files: Makefile Log Message: Some small changes for Linux compilation Index: Makefile =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 18 Sep 2007 04:50:19 -0000 1.9 --- Makefile 6 Dec 2007 22:40:21 -0000 1.10 *************** *** 312,325 **** 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 --- 312,315 ---- |
|
From: Rolf K. <lab...@us...> - 2007-12-06 18:56:14
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30647 Modified Files: crypt.h deflate.h mztools.c mztools.h unzip.c zconf.h zip.c Log Message: Modifications to better support compilation with LabWindows CVI Index: zip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zip.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** zip.c 17 Sep 2007 12:29:41 -0000 1.10 --- zip.c 6 Dec 2007 18:56:17 -0000 1.11 *************** *** 172,175 **** --- 172,176 ---- } + local void free_datablock OF((linkedlist_datablock_internal* ldi)); local void free_datablock(ldi) linkedlist_datablock_internal* ldi; *************** *** 183,186 **** --- 184,188 ---- } + local void init_linkedlist OF((linkedlist_data* ll)); local void init_linkedlist(ll) linkedlist_data* ll; *************** *** 189,192 **** --- 191,195 ---- } + local void free_linkedlist OF((linkedlist_data* ll)); local void free_linkedlist(ll) linkedlist_data* ll; *************** *** 197,200 **** --- 200,204 ---- + local int add_data_in_datablock OF((linkedlist_data* ll, const void* buf, uLong len)); local int add_data_in_datablock(ll,buf,len) linkedlist_data* ll; *************** *** 315,318 **** --- 319,323 ---- + local uLong ziplocal_TmzDateToDosDate OF((const tm_zip* ptm,uLong dosDate)); local uLong ziplocal_TmzDateToDosDate(ptm,dosDate) const tm_zip* ptm; *************** *** 332,339 **** /****************************************************************************/ ! local int ziplocal_getByte OF(( ! const zlib_filefunc_def* pzlib_filefunc_def, ! voidpf filestream, ! int *pi)); local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi) --- 337,342 ---- /****************************************************************************/ ! local int ziplocal_getByte OF((const zlib_filefunc_def* pzlib_filefunc_def, ! voidpf filestream, int *pi)); local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi) *************** *** 944,947 **** --- 947,951 ---- } + local int zipFlushWriteBuffer OF((zip_internal* zi)); local int zipFlushWriteBuffer(zi) zip_internal* zi; *************** *** 1227,1229 **** { return zipClose2(file, global_comment, NULL); ! } \ No newline at end of file --- 1231,1233 ---- { return zipClose2(file, global_comment, NULL); ! } Index: zconf.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zconf.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** zconf.h 7 Jan 2006 20:06:23 -0000 1.6 --- zconf.h 6 Dec 2007 18:56:17 -0000 1.7 *************** *** 73,76 **** --- 73,79 ---- # define WIN32 # endif + # if defined(_DEBUG) || defined(_CVI_DEBUG_) + # define DEBUG 1 + # endif #endif #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) Index: unzip.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/unzip.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** unzip.c 17 Sep 2007 12:29:41 -0000 1.8 --- unzip.c 6 Dec 2007 18:56:17 -0000 1.9 *************** *** 153,156 **** --- 153,190 ---- + local int unzlocal_getByte OF((const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + int *pi)); + + local int unzlocal_getShort OF((const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong *pX)); + + local int unzlocal_getLong OF((const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream, + uLong *pX)); + + local int strcmpcasenosensitive_internal OF((const char* fileName1, const char* fileName2)); + + local uLong unzlocal_SearchCentralDir OF((const zlib_filefunc_def* pzlib_filefunc_def, + voidpf filestream)); + + local void unzlocal_DosDateToTmuDate OF((uLong ulDosDate, tm_unz* ptm)); + + local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file, + unz_file_info *pfile_info, + unz_file_info_internal + *pfile_info_internal, + char *szFileName, + uLong fileNameBufferSize, + void *extraField, + uLong extraFieldBufferSize, + char *szComment, + uLong commentBufferSize)); + + local int unzlocal_CheckCurrentFileCoherencyHeader OF((unz_s* s, uInt* piSizeVar, + uLong *poffset_local_extrafield, + uInt *psize_local_extrafield)); + #ifndef NOUNCRYPT #include "crypt.h" *************** *** 162,172 **** IN assertion: the stream s has been sucessfully opened for reading. */ - - - local int unzlocal_getByte OF(( - const zlib_filefunc_def* pzlib_filefunc_def, - voidpf filestream, - int *pi)); - local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi) const zlib_filefunc_def* pzlib_filefunc_def; --- 196,199 ---- *************** *** 197,205 **** Reads a long in LSB order from the given gz_stream. Sets */ - local int unzlocal_getShort OF(( - const zlib_filefunc_def* pzlib_filefunc_def, - voidpf filestream, - uLong *pX)); - local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX) const zlib_filefunc_def* pzlib_filefunc_def; --- 224,227 ---- *************** *** 225,233 **** } - local int unzlocal_getLong OF(( - const zlib_filefunc_def* pzlib_filefunc_def, - voidpf filestream, - uLong *pX)); - local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX) const zlib_filefunc_def* pzlib_filefunc_def; --- 247,250 ---- *************** *** 328,335 **** the global comment) */ - local uLong unzlocal_SearchCentralDir OF(( - const zlib_filefunc_def* pzlib_filefunc_def, - voidpf filestream)); - local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream) const zlib_filefunc_def* pzlib_filefunc_def; --- 345,348 ---- *************** *** 564,578 **** Get Info about the current file in the zipfile, with internal only info */ - local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file, - unz_file_info *pfile_info, - unz_file_info_internal - *pfile_info_internal, - char *szFileName, - uLong fileNameBufferSize, - void *extraField, - uLong extraFieldBufferSize, - char *szComment, - uLong commentBufferSize)); - local int unzlocal_GetCurrentFileInfoInternal (file, pfile_info, --- 577,580 ---- Index: crypt.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/crypt.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** crypt.h 7 Jan 2006 20:06:22 -0000 1.3 --- crypt.h 6 Dec 2007 18:56:17 -0000 1.4 *************** *** 88,91 **** --- 88,94 ---- # endif + static int crypthead OF((const char *passwd, unsigned char *buf, int bufSize, unsigned long* pkeys, + const unsigned long* pcrc_32_tab, unsigned long crcForCrypting)); + static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting) const char *passwd; /* password string */ Index: mztools.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/mztools.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mztools.c 7 Jan 2006 20:06:23 -0000 1.2 --- mztools.c 6 Dec 2007 18:56:17 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- #include "zlib.h" #include "unzip.h" + #include "mztools.h" #define READ_8(adr) ((unsigned char)*(adr)) Index: mztools.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/mztools.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mztools.h 25 Dec 2004 16:29:44 -0000 1.1 --- mztools.h 6 Dec 2007 18:56:17 -0000 1.2 *************** *** 23,31 **** fileOutTmp: temporary file name used for recovery */ ! extern int ZEXPORT unzRepair(const char* file, ! const char* fileOut, ! const char* fileOutTmp, ! uLong* nRecovered, ! uLong* bytesRecovered); #endif --- 23,31 ---- fileOutTmp: temporary file name used for recovery */ ! extern int ZEXPORT unzRepair OF((const char* file, ! const char* fileOut, ! const char* fileOutTmp, ! uLong* nRecovered, ! uLong* bytesRecovered)); #endif Index: deflate.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/deflate.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** deflate.h 7 Jan 2006 20:06:22 -0000 1.4 --- deflate.h 6 Dec 2007 18:56:17 -0000 1.5 *************** *** 297,301 **** #ifndef DEBUG /* Inline versions of _tr_tally for speed: */ - #if defined(GEN_TREES_H) || !defined(STDC) extern uch _length_code[]; --- 297,300 ---- |
|
From: Rolf K. <lab...@us...> - 2007-12-06 18:55:03
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29871 Modified Files: iomem.c lvutil.c lvutil.h Log Message: Removed some LabWindows CVI warnings Index: lvutil.h =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lvutil.h 17 Sep 2007 16:13:02 -0000 1.1 --- lvutil.h 6 Dec 2007 18:55:01 -0000 1.2 *************** *** 27,31 **** #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN32_WCE) #define Win32 1 ! #ifdef _DEBUG #define DEBUG 1 #endif --- 27,31 ---- #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN32_WCE) #define Win32 1 ! #if defined(_DEBUG) || defined(_CVI_DEBUG_) #define DEBUG 1 #endif Index: iomem.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/iomem.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** iomem.c 17 Sep 2007 17:22:06 -0000 1.7 --- iomem.c 6 Dec 2007 18:55:01 -0000 1.8 *************** *** 104,108 **** return err; ! if (err = NumericArrayResize(uB, 1, (UHandle*)&handle, Max(10000, (offset + size) << 1))) return err; } --- 104,109 ---- return err; ! err = NumericArrayResize(uB, 1, (UHandle*)&handle, Max(10000, (offset + size) << 1)); ! if (err) return err; } Index: lvutil.c =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/lvutil.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** lvutil.c 18 Sep 2007 04:50:19 -0000 1.2 --- lvutil.c 6 Dec 2007 18:55:01 -0000 1.3 *************** *** 33,36 **** --- 33,39 ---- #elif Win32 #include "iowin32.h" + #ifndef INVALID_FILE_ATTRIBUTES + #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) + #endif #endif *************** *** 577,581 **** } ! if (err = MakePathDSString(path, &lstr)) return err; /* Open the specified file. */ --- 580,585 ---- } ! err = MakePathDSString(path, &lstr); ! if (err) return err; /* Open the specified file. */ *************** *** 816,820 **** } #elif Win32 ! if (err = MakePathDSString(path, &lstr)) return err; --- 820,825 ---- } #elif Win32 ! err = MakePathDSString(path, &lstr); ! if (err) return err; *************** *** 874,878 **** err = FPathToPath(&temp); if (!err) ! err = FAppendName(temp, "\003*.*"); err = MakePathDSString(temp, &lstr); --- 879,883 ---- err = FPathToPath(&temp); if (!err) ! err = FAppendName(temp, (PStr)"\003*.*"); err = MakePathDSString(temp, &lstr); |
|
From: Rolf K. <lab...@us...> - 2007-12-06 14:18:06
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15758 Modified Files: zlibvc.dsp Log Message: Added compile definition to avoid use of vsnprintf and project with use of static C runtime library Index: zlibvc.dsp =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/zlibvc.dsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** zlibvc.dsp 17 Sep 2007 16:13:02 -0000 1.11 --- zlibvc.dsp 6 Dec 2007 14:18:00 -0000 1.12 *************** *** 23,26 **** --- 23,28 ---- !MESSAGE "zlibvc - Win32 DLL ASM Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "zlibvc - Win32 DLL ASM Obj Release" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "zlibvc - Win32 static ASM Release" (based on "Win32 (x86) Dynamic-Link Library") + !MESSAGE "zlibvc - Win32 static Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE *************** *** 47,52 **** # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 49,54 ---- # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 59,63 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_Release\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL Debug" --- 61,65 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_Release\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL Debug" *************** *** 75,80 **** # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /FD /c ! # ADD CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 77,82 ---- # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c ! # ADD CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 87,91 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"zlibvc___Win32_DLL_Debug\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Release" --- 89,93 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"zlibvc___Win32_DLL_Debug\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Release" *************** *** 103,114 **** # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MTd /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "WIN32" /d "NDEBUG" ! # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_ASM_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 105,116 ---- # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MTd /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "WIN32" /d "NDEBUG" /d "NO_vsnprintf" ! # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_ASM_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" /d "NO_vsnprintf" BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 116,120 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Release\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Debug" --- 118,122 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Release\lvzlib.dll" !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Debug" *************** *** 132,138 **** # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MDd /W3 /ZI /Od /D "WIN32" /D "_DEBUG" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 --- 134,140 ---- # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MDd /W3 /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MDd /W3 /ZI /Od /D "WIN32" /D "_DEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 *************** *** 145,149 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Debug\lvzlib.dll" # SUBTRACT LINK32 /incremental:no --- 147,151 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 ! # ADD LINK32 user32.lib kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Debug\lvzlib.dll" # SUBTRACT LINK32 /incremental:no *************** *** 162,168 **** # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 --- 164,170 ---- # PROP Ignore_Export_Lib 1 # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 *************** *** 175,179 **** LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 user32.lib gvmat32.obj inffas32.obj /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Obj_Release\lvzlib.dll" !ENDIF --- 177,240 ---- LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 ! # ADD LINK32 gvmat32.obj inffas32.obj user32.lib kernel32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Obj_Release\lvzlib.dll" ! ! !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "zlibvc___Win32_static_ASM_Release" ! # PROP BASE Intermediate_Dir "zlibvc___Win32_static_ASM_Release" ! # PROP BASE Ignore_Export_Lib 1 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "zlibvc___Win32_static_ASM_Release" ! # PROP Intermediate_Dir "zlibvc___Win32_static_ASM_Release" ! # PROP Ignore_Export_Lib 1 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c ! # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MT /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /D "ASMV" /D "ASMINF" /FD /c ! # SUBTRACT CPP /YX /Yc /Yu ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /fo"zlibvc___Win32_DLL_ASM_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" /d "NO_vsnprintf" ! # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_ASM_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" /d "NO_vsnprintf" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_ASM_Release\lvzlib.dll" ! # ADD LINK32 /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_static_ASM_Release\lvzlib.dll" ! ! !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "zlibvc___Win32_static_Release" ! # PROP BASE Intermediate_Dir "zlibvc___Win32_static_Release" ! # PROP BASE Ignore_Export_Lib 1 ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "zlibvc___Win32_static_Release" ! # PROP Intermediate_Dir "zlibvc___Win32_static_Release" ! # PROP Ignore_Export_Lib 1 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c ! # SUBTRACT BASE CPP /YX /Yc /Yu ! # ADD CPP /nologo /MT /W3 /O2 /D "WIN32" /D "NDEBUG" /D "NO_vsnprintf" /FD /c ! # SUBTRACT CPP /YX /Yc /Yu ! # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /fo"zlibvc___Win32_DLL_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" ! # ADD RSC /l 0x409 /fo"zlibvc___Win32_DLL_Release\lvzlib.res" /d "WIN32" /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"zlibvc___Win32_DLL_Release\lvzlib.dll" ! # ADD LINK32 user32.lib /nologo /subsystem:windows /dll /pdb:none /machine:I386 /nodefaultlib:"msvcrt" /out:"zlibvc___Win32_static_Release\lvzlib.dll" ! # SUBTRACT LINK32 /nodefaultlib !ENDIF *************** *** 186,189 **** --- 247,252 ---- # Name "zlibvc - Win32 DLL ASM Debug" # Name "zlibvc - Win32 DLL ASM Obj Release" + # Name "zlibvc - Win32 static ASM Release" + # Name "zlibvc - Win32 static Release" # Begin Group "Source Files" *************** *** 205,208 **** --- 268,278 ---- !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Obj Release" + !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" + + # SUBTRACT BASE CPP /YX /Yc /Yu + # SUBTRACT CPP /YX /Yc /Yu + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" + !ENDIF *************** *** 259,263 **** --- 329,365 ---- SOURCE=.\MacBinaryIII.c + + !IF "$(CFG)" == "zlibvc - Win32 DLL Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL Debug" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Debug" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 DLL ASM Obj Release" + + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" + + # PROP BASE Exclude_From_Build 1 + # PROP Exclude_From_Build 1 + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" + + # PROP BASE Exclude_From_Build 1 # PROP Exclude_From_Build 1 + + !ENDIF + # End Source File # Begin Source File *************** *** 425,428 **** --- 527,547 ---- # PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" + + # Begin Custom Build - Assembling... + IntDir=.\zlibvc___Win32_static_ASM_Release + InputPath=.\gvmat32.asm + InputName=gvmat32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml /nologo /c /Cx /coff /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" + + # PROP BASE Exclude_From_Build 1 + # PROP Exclude_From_Build 1 + !ENDIF *************** *** 452,455 **** --- 571,581 ---- # PROP BASE Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" + + # PROP BASE Exclude_From_Build 1 + # PROP Exclude_From_Build 1 + !ENDIF *************** *** 495,498 **** --- 621,641 ---- # PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "zlibvc - Win32 static ASM Release" + + # Begin Custom Build - Assembling... + IntDir=.\zlibvc___Win32_static_ASM_Release + InputPath=.\inffas32.asm + InputName=inffas32 + + "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + ml /nologo /c /Cx /coff /Zi /Fo"$(IntDir)\$(InputName).obj" "$(InputPath)" + + # End Custom Build + + !ELSEIF "$(CFG)" == "zlibvc - Win32 static Release" + + # PROP BASE Exclude_From_Build 1 + # PROP Exclude_From_Build 1 + !ENDIF |
|
From: Rolf K. <lab...@us...> - 2007-11-20 14:35:29
|
Update of /cvsroot/opengtoolkit/portIO/c_source In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27955 Modified Files: ogportiodll.c Log Message: Index: ogportiodll.c =================================================================== RCS file: /cvsroot/opengtoolkit/portIO/c_source/ogportiodll.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ogportiodll.c 15 Nov 2007 09:12:57 -0000 1.5 --- ogportiodll.c 20 Nov 2007 14:35:26 -0000 1.6 *************** *** 92,100 **** --- 92,104 ---- case ERROR_INVALID_NAME: /* The specified service name is invalid */ + CloseServiceHandle(hSCManager); return err; case ERROR_SERVICE_DOES_NOT_EXIST: err = InstallPortIODriver(hSCManager, autostart); if (err) + { + CloseServiceHandle(hSCManager); return err; + } } } *************** *** 186,190 **** } ! /* Close Handle to Service Control Manager */ CloseServiceHandle(hService); return err; --- 190,194 ---- } ! /* Close Handle to Service */ CloseServiceHandle(hService); return err; *************** *** 208,212 **** SC_MANAGER_ALL_ACCESS); // access required ! /* Open Handle to PortTalk Service Database */ hService = OpenService (hSCManager, "OGPortIO", --- 212,221 ---- SC_MANAGER_ALL_ACCESS); // access required ! if (hSCManager == NULL) ! { ! return GetLastError(); ! } ! ! /* Open Handle to Port IO Service */ hService = OpenService (hSCManager, "OGPortIO", *************** *** 216,219 **** --- 225,229 ---- { /* Seems not installed at all */ + CloseServiceHandle(hSCManager); return ERROR_SERVICE_DOES_NOT_EXIST; } |
|
From: Rolf K. <lab...@us...> - 2007-11-15 10:15:46
|
Update of /cvsroot/opengtoolkit/portIO In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28865 Modified Files: 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.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** portio.spec 15 Nov 2007 09:36:16 -0000 1.6 --- portio.spec 15 Nov 2007 10:15:49 -0000 1.7 *************** *** 58,80 **** Replace Mode=Never ! Num Files=17 File 0=ogportio.dll File 1=ogportio.sys ! File 2=ogportio.llb/PORT IO Disable Range__ogtk.vi ! File 3=ogportio.llb/PORT IO Enable Range__ogtk.vi ! File 4=ogportio.llb/PORT IO Error Translation__ogtk.vi ! File 5=ogportio.llb/PORT IO Get Version__ogtk.vi ! File 6=ogportio.llb/PORT IO Install Driver__ogtk.vi ! File 7=ogportio.llb/PORT IO Read Byte__ogtk.vi ! File 8=ogportio.llb/PORT IO Read Long__ogtk.vi ! File 9=ogportio.llb/PORT IO Read Word__ogtk.vi ! File 10=ogportio.llb/PORT IO Read__ogtk.vi ! File 11=ogportio.llb/PORT IO Uninstall Driver__ogtk.vi ! File 12=ogportio.llb/PORT IO VI Tree__ogtk.vi ! File 13=ogportio.llb/PORT IO Write Byte__ogtk.vi ! File 14=ogportio.llb/PORT IO Write Long__ogtk.vi ! File 15=ogportio.llb/PORT IO Write Word__ogtk.vi ! File 16=ogportio.llb/PORT IO Write__ogtk.vi --- 58,88 ---- Replace Mode=Never ! Num Files=25 File 0=ogportio.dll File 1=ogportio.sys ! File 2=ogportio.llb/MEM IO Read Bytes__ogtk.vi ! File 3=ogportio.llb/MEM IO Read Longs__ogtk.vi ! File 4=ogportio.llb/MEM IO Read Words__ogtk.vi ! File 5=ogportio.llb/MEM IO Read__ogtk.vi ! File 6=ogportio.llb/MEM IO Write Bytes__ogtk.vi ! File 7=ogportio.llb/MEM IO Write Longs__ogtk.vi ! File 8=ogportio.llb/MEM IO Write Words__ogtk.vi ! File 9=ogportio.llb/MEM IO Write__ogtk.vi ! File 10=ogportio.llb/PORT IO Disable Range__ogtk.vi ! File 11=ogportio.llb/PORT IO Enable Range__ogtk.vi ! File 12=ogportio.llb/PORT IO Error Translation__ogtk.vi ! File 13=ogportio.llb/PORT IO Get Version__ogtk.vi ! File 14=ogportio.llb/PORT IO Install Driver__ogtk.vi ! File 15=ogportio.llb/PORT IO Read Byte__ogtk.vi ! File 16=ogportio.llb/PORT IO Read Long__ogtk.vi ! File 17=ogportio.llb/PORT IO Read Word__ogtk.vi ! File 18=ogportio.llb/PORT IO Read__ogtk.vi ! File 19=ogportio.llb/PORT IO Uninstall Driver__ogtk.vi ! File 20=ogportio.llb/PORT IO VI Tree__ogtk.vi ! File 21=ogportio.llb/PORT IO Write Byte__ogtk.vi ! File 22=ogportio.llb/PORT IO Write Long__ogtk.vi ! File 23=ogportio.llb/PORT IO Write Word__ogtk.vi ! File 24=ogportio.llb/PORT IO Write__ogtk.vi |
