Menu
▾
▴
roadmap-commit — track CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(92) |
Dec
(141) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(126) |
Feb
(72) |
Mar
(31) |
Apr
(200) |
May
(81) |
Jun
(130) |
Jul
(112) |
Aug
(134) |
Sep
(76) |
Oct
(89) |
Nov
(153) |
Dec
(9) |
| 2007 |
Jan
(59) |
Feb
(82) |
Mar
(50) |
Apr
(20) |
May
(9) |
Jun
(81) |
Jul
(41) |
Aug
(109) |
Sep
(91) |
Oct
(87) |
Nov
(33) |
Dec
(60) |
| 2008 |
Jan
(21) |
Feb
(15) |
Mar
(38) |
Apr
(75) |
May
(59) |
Jun
(46) |
Jul
(30) |
Aug
(20) |
Sep
(35) |
Oct
(32) |
Nov
(34) |
Dec
(19) |
| 2009 |
Jan
(29) |
Feb
(71) |
Mar
(54) |
Apr
(17) |
May
(4) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
(58) |
Sep
(7) |
Oct
(7) |
Nov
(12) |
Dec
(18) |
| 2011 |
Jan
(17) |
Feb
(29) |
Mar
(11) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
(11) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(87) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(44) |
Jun
(79) |
Jul
(16) |
Aug
(31) |
Sep
|
Oct
(51) |
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Paul F. <pg...@us...> - 2006-08-20 16:14:34
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10584 Modified Files: config.mk Log Message: mention GTK2 and 16bpp restrictions of current agg support. Index: config.mk =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/config.mk,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** config.mk 20 Jul 2006 03:13:25 -0000 1.9 --- config.mk 20 Aug 2006 16:14:30 -0000 1.10 *************** *** 66,70 **** # nice. (for more information on AGG, see http://antigrain.com) # RoadMap requires version 2.4 of agg. ! # [ Note -- currently, only GTK2 supports AGG builds. ] # AGG = YES AGG = NO --- 66,71 ---- # nice. (for more information on AGG, see http://antigrain.com) # RoadMap requires version 2.4 of agg. ! # [ Note -- currently, AGG is only available with GTK2 builds. AGG ! # also only supports a 16bpp display. ] # AGG = YES AGG = NO |
|
From: Paul F. <pg...@us...> - 2006-08-20 16:12:34
|
Update of /cvsroot/roadmap/roadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9400 Modified Files: README Log Message: mention GTK2 and 16bpp restrictions of current agg support. Index: README =================================================================== RCS file: /cvsroot/roadmap/roadmap/README,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** README 16 Aug 2006 15:38:15 -0000 1.99 --- README 20 Aug 2006 16:12:15 -0000 1.100 *************** *** 137,142 **** incompatible. If your linux distribution includes 2.3, make sure that if you install 2.4 as well, that RoadMap finds both headers and ! libraries from 2.4. ! * WINDOWS SPECIFIC DEPENDENCIES AND LIMITATIONS --- 137,143 ---- incompatible. If your linux distribution includes 2.3, make sure that if you install 2.4 as well, that RoadMap finds both headers and ! libraries from 2.4. Note: currently (as of August, 2006) the ! agg support is only aavailable if you're using the GTK2 build ! of roadmap. It also currently requires a 16bpp display. * WINDOWS SPECIFIC DEPENDENCIES AND LIMITATIONS *************** *** 1401,1408 **** File suffix doesn't matter. ! Note that although tracks and routes are conceptually ! separate, either type can be selected at this point, and ! any of the operations under the "Routes" menu can be ! applied to either. One of the buttons in this "Manage Routes" dialog is "None", which is a --- 1402,1408 ---- File suffix doesn't matter. ! Note that although tracks and routes are conceptually separate, either ! type can be selected at this point, and any of the operations under the ! "Routes" menu can be applied to either. One of the buttons in this "Manage Routes" dialog is "None", which is a |
|
From: Pascal F M. <pas...@us...> - 2006-08-19 17:14:43
|
Update of /cvsroot/roadmap/roadmap/src/agg_support In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20220 Modified Files: roadmap_canvas.cpp Log Message: Allow using a system font. This is an ugly patch: we should create an interface for the native font chooser. Index: roadmap_canvas.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/agg_support/roadmap_canvas.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** roadmap_canvas.cpp 12 Aug 2006 17:15:59 -0000 1.5 --- roadmap_canvas.cpp 19 Aug 2006 17:14:37 -0000 1.6 *************** *** 709,714 **** char font_file[255]; ! snprintf(font_file, sizeof(font_file), "%s/%s", roadmap_path_user(), ! roadmap_config_get (&RoadMapConfigFont)); if (!RoadMapCanvasFontLoaded) { --- 709,719 ---- char font_file[255]; ! strncpy (font_file, ! roadmap_config_get (&RoadMapConfigFont), ! sizeof(font_file)); ! if (! roadmap_path_is_full_path (font_file)) { ! snprintf(font_file, sizeof(font_file), "%s/%s", roadmap_path_user(), ! roadmap_config_get (&RoadMapConfigFont)); ! } if (!RoadMapCanvasFontLoaded) { |
|
From: Pascal F M. <pas...@us...> - 2006-08-19 16:01:39
|
Update of /cvsroot/roadmap/roadmap/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22047 Modified Files: buildmap_tiger.c Log Message: Fix by Allyn Tennant for the 2005 editions Index: buildmap_tiger.c =================================================================== RCS file: /cvsroot/roadmap/roadmap/src/buildmap_tiger.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** buildmap_tiger.c 10 Aug 2006 14:04:03 -0000 1.13 --- buildmap_tiger.c 19 Aug 2006 16:01:31 -0000 1.14 *************** *** 755,763 **** fips = tiger2int (cursor, 15, 19); ! if (cursor[10] == 'E' || cursor[10] == 'C') { ! year = 2002; ! } else { ! year = tiger2int (cursor, 11, 14); ! } if (fips > 0) { --- 755,765 ---- fips = tiger2int (cursor, 15, 19); ! if (cursor[10] == 'C') { ! year = 2000; ! } else if (cursor[10] == 'E') { ! year = 2002; ! } else { ! year = tiger2int (cursor, 11, 14); ! } if (fips > 0) { |
Update of /cvsroot/roadmap/roadmap_editor/src/zlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15762 Added Files: adler32.c algorithm.txt ChangeLog compress.c configure crc32.c deflate.c deflate.h descrip.mms example.c FAQ gzio.c INDEX infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h inffixed.h inflate.c inftrees.c inftrees.h infutil.c infutil.h Makefile Makefile.in Makefile.riscos maketree.c Make_vms.com minigzip.c README trees.c trees.h uncompr.c zconf.h zlib.3 zlib.h zlib.html zutil.c zutil.h Log Message: Import zlib for wince. --- NEW FILE: inffast.h --- /* inffast.h -- header to use inffast.c * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ /* WARNING: this file should *not* be used by applications. It is part of the implementation of the compression library and is subject to change. Applications should only use zlib.h. */ extern int inflate_fast OF(( uInt, uInt, inflate_huft *, inflate_huft *, inflate_blocks_statef *, z_streamp )); --- NEW FILE: INDEX --- ChangeLog history of changes INDEX this file FAQ Frequently Asked Questions about zlib Make_vms.com script for Vax/VMS Makefile makefile for Unix (generated by configure) Makefile.in makefile for Unix (template for configure) Makefile.riscos makefile for RISCOS README guess what algorithm.txt description of the (de)compression algorithm configure configure script for Unix descrip.mms makefile for Vax/VMS zlib.3 mini man page for zlib (volunteers to write full man pages from zlib.h welcome. write to jl...@gz...) amiga/Makefile.sas makefile for Amiga SAS/C amiga/Makefile.pup makefile for Amiga powerUP SAS/C PPC msdos/Makefile.w32 makefile for Microsoft Visual C++ 32-bit msdos/Makefile.b32 makefile for Borland C++ 32-bit msdos/Makefile.bor makefile for Borland C/C++ 16-bit msdos/Makefile.dj2 makefile for DJGPP 2.x msdos/Makefile.emx makefile for EMX 0.9c (32-bit DOS/OS2) msdos/Makefile.msc makefile for Microsoft C 16-bit msdos/Makefile.tc makefile for Turbo C msdos/Makefile.wat makefile for Watcom C msdos/zlib.def definition file for Windows DLL msdos/zlib.rc definition file for Windows DLL nt/Makefile.nt makefile for Windows NT nt/zlib.dnt definition file for Windows NT DLL nt/Makefile.emx makefile for EMX 0.9c/RSXNT 1.41 (Win32 Intel) nt/Makefile.gcc makefile for Windows NT using GCC (mingw32) zlib public header files (must be kept): zconf.h zlib.h private source files used to build the zlib library: adler32.c compress.c crc32.c deflate.c deflate.h gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h inflate.c inftrees.c inftrees.h infutil.c infutil.h maketree.c trees.c uncompr.c zutil.c zutil.h source files for sample programs: example.c minigzip.c unsupported contribution by third parties contrib/asm386/ by Gilles Vollant <in...@wi...> 386 asm code replacing longest_match(). contrib/minizip/ by Gilles Vollant <in...@wi...> Mini zip and unzip based on zlib See http://www.winimage.com/zLibDll/unzip.html contrib/iostream/ by Kevin Ruland <ke...@ro...> A C++ I/O streams interface to the zlib gz* functions contrib/iostream2/ by Tyge Løvset <Tyg...@cm...> Another C++ I/O streams interface contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <pa...@ti...> A very simple tar.gz extractor using zlib contrib/visual-basic.txt by Carlos Rios <c_...@so...> How to use compress(), uncompress() and the gz* functions from VB. --- NEW FILE: trees.h --- /* header created automatically with -DGEN_TREES_H */ local const ct_data static_ltree[L_CODES+2] = { {{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, {{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, {{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, {{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, {{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, {{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, {{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, {{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, {{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, {{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, {{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, {{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, {{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, {{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, {{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, {{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, {{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, {{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, {{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, {{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, {{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, {{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, {{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, {{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, {{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, {{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, {{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, {{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, {{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, {{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, {{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, {{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, {{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, {{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, {{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, {{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, {{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, {{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, {{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, {{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, {{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, {{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, {{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, {{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, {{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, {{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, {{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, {{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, {{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, {{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, {{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, {{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, {{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, {{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, {{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, {{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, {{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, {{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} }; local const ct_data static_dtree[D_CODES] = { {{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, {{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, {{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, {{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, {{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} }; const uch _dist_code[DIST_CODE_LEN] = { 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, 18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 }; const uch _length_code[MAX_MATCH-MIN_MATCH+1]= { 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 }; local const int base_length[LENGTH_CODES] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 0 }; local const int base_dist[D_CODES] = { 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 }; --- NEW FILE: inftrees.h --- /* inftrees.h -- header to use inftrees.c * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ /* WARNING: this file should *not* be used by applications. It is part of the implementation of the compression library and is subject to change. Applications should only use zlib.h. */ /* Huffman code lookup table entry--this entry is four bytes for machines that have 16-bit pointers (e.g. PC's in the small or medium model). */ typedef struct inflate_huft_s FAR inflate_huft; struct inflate_huft_s { union { struct { Byte Exop; /* number of extra bits or operation */ Byte Bits; /* number of bits in this code or subcode */ } what; uInt pad; /* pad structure to a power of 2 (4 bytes for */ } word; /* 16-bit, 8 bytes for 32-bit int's) */ uInt base; /* literal, length base, distance base, or table offset */ }; /* Maximum size of dynamic tree. The maximum found in a long but non- exhaustive search was 1004 huft structures (850 for length/literals and 154 for distances, the latter actually the result of an exhaustive search). The actual maximum is not known, but the value below is more than safe. */ #define MANY 1440 extern int inflate_trees_bits OF(( uIntf *, /* 19 code lengths */ uIntf *, /* bits tree desired/actual depth */ inflate_huft * FAR *, /* bits tree result */ inflate_huft *, /* space for trees */ z_streamp)); /* for messages */ extern int inflate_trees_dynamic OF(( uInt, /* number of literal/length codes */ uInt, /* number of distance codes */ uIntf *, /* that many (total) code lengths */ uIntf *, /* literal desired/actual bit depth */ uIntf *, /* distance desired/actual bit depth */ inflate_huft * FAR *, /* literal/length tree result */ inflate_huft * FAR *, /* distance tree result */ inflate_huft *, /* space for trees */ z_streamp)); /* for messages */ extern int inflate_trees_fixed OF(( uIntf *, /* literal desired/actual bit depth */ uIntf *, /* distance desired/actual bit depth */ inflate_huft * FAR *, /* literal/length tree result */ inflate_huft * FAR *, /* distance tree result */ z_streamp)); /* for memory allocation */ --- NEW FILE: infcodes.h --- /* infcodes.h -- header to use infcodes.c * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ /* WARNING: this file should *not* be used by applications. It is part of the implementation of the compression library and is subject to change. Applications should only use zlib.h. */ struct inflate_codes_state; typedef struct inflate_codes_state FAR inflate_codes_statef; extern inflate_codes_statef *inflate_codes_new OF(( uInt, uInt, inflate_huft *, inflate_huft *, z_streamp )); extern int inflate_codes OF(( inflate_blocks_statef *, z_streamp , int)); extern void inflate_codes_free OF(( inflate_codes_statef *, z_streamp )); --- NEW FILE: Makefile.in --- # Makefile for zlib # Copyright (C) 1995-2002 Jean-loup Gailly. # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: # ./configure; make test # The call of configure is optional if you don't have special requirements # If you wish to build zlib as a shared library, use: ./configure -s # To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: # make install # To install in $HOME instead of /usr/local, use: # make install prefix=$HOME CC=cc CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ # -Wstrict-prototypes -Wmissing-prototypes LDFLAGS=-L. -lz LDSHARED=$(CC) CPP=$(CC) -E VER=1.1.4 LIBS=libz.a SHAREDLIB=libz.so AR=ar rc RANLIB=ranlib TAR=tar SHELL=/bin/sh prefix = /usr/local exec_prefix = ${prefix} libdir = ${exec_prefix}/lib includedir = ${prefix}/include OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o OBJA = # to use the asm code: make OBJA=match.o TEST_OBJS = example.o minigzip.o DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] *.mms \ algorithm.txt zlib.3 zlib.html \ msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \ nt/Make*[a-z0-9] nt/zlib.dnt amiga/Make*.??? os2/M*.os2 os2/zlib.def \ contrib/RE*.contrib contrib/*.txt contrib/asm386/*.asm contrib/asm386/*.c \ contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/asm[56]86/*.?86 \ contrib/asm[56]86/*.S contrib/iostream/*.cpp \ contrib/iostream/*.h contrib/iostream2/*.h contrib/iostream2/*.cpp \ contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32 \ contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]?? \ contrib/delphi*/*.??? all: example minigzip test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ echo hello world | ./minigzip | ./minigzip -d || \ echo ' *** minigzip test FAILED ***' ; \ if ./example; then \ echo ' *** zlib test OK ***'; \ else \ echo ' *** zlib test FAILED ***'; \ fi libz.a: $(OBJS) $(OBJA) $(AR) $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 match.o: match.S $(CPP) match.S > _match.s $(CC) -c _match.s mv _match.o match.o rm -f _match.s $(SHAREDLIB).$(VER): $(OBJS) $(LDSHARED) -o $@ $(OBJS) rm -f $(SHAREDLIB) $(SHAREDLIB).1 ln -s $@ $(SHAREDLIB) ln -s $@ $(SHAREDLIB).1 example: example.o $(LIBS) $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) minigzip: minigzip.o $(LIBS) $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) install: $(LIBS) -@if [ ! -d $(includedir) ]; then mkdir $(includedir); fi -@if [ ! -d $(libdir) ]; then mkdir $(libdir); fi cp zlib.h zconf.h $(includedir) chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h cp $(LIBS) $(libdir) cd $(libdir); chmod 755 $(LIBS) -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 cd $(libdir); if test -f $(SHAREDLIB).$(VER); then \ rm -f $(SHAREDLIB) $(SHAREDLIB).1; \ ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \ ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \ (ldconfig || true) >/dev/null 2>&1; \ fi # The ranlib in install is needed on NeXTSTEP which checks file times # ldconfig is for Linux uninstall: cd $(includedir); \ v=$(VER); \ if test -f zlib.h; then \ v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \ rm -f zlib.h zconf.h; \ fi; \ cd $(libdir); rm -f libz.a; \ if test -f $(SHAREDLIB).$$v; then \ rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \ fi clean: rm -f *.o *~ example minigzip libz.a libz.so* foo.gz so_locations \ _match.s maketree distclean: clean zip: mv Makefile Makefile~; cp -p Makefile.in Makefile rm -f test.c ztest*.c contrib/minizip/test.zip v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ zip -ul9 zlib$$v $(DISTFILES) mv Makefile~ Makefile dist: mv Makefile Makefile~; cp -p Makefile.in Makefile rm -f test.c ztest*.c contrib/minizip/test.zip d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ rm -f $$d.tar.gz; \ if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \ files=""; \ for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \ cd ..; \ GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \ if test ! -d $$d; then rm -f $$d; fi mv Makefile~ Makefile tags: etags *.[ch] depend: makedepend -- $(CFLAGS) -- *.[ch] # DO NOT DELETE THIS LINE -- make depend depends on it. adler32.o: zlib.h zconf.h compress.o: zlib.h zconf.h crc32.o: zlib.h zconf.h deflate.o: deflate.h zutil.h zlib.h zconf.h example.o: zlib.h zconf.h gzio.o: zutil.h zlib.h zconf.h infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h infcodes.o: zutil.h zlib.h zconf.h infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h inffast.o: zutil.h zlib.h zconf.h inftrees.h inffast.o: infblock.h infcodes.h infutil.h inffast.h inflate.o: zutil.h zlib.h zconf.h infblock.h inftrees.o: zutil.h zlib.h zconf.h inftrees.h infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h minigzip.o: zlib.h zconf.h trees.o: deflate.h zutil.h zlib.h zconf.h trees.h uncompr.o: zlib.h zconf.h zutil.o: zutil.h zlib.h zconf.h --- NEW FILE: zconf.h --- /* zconf.h -- configuration of the zlib compression library * Copyright (C) 1995-2002 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ /* @(#) $Id: zconf.h,v 1.1 2006/08/18 18:11:56 eshabtai Exp $ */ #ifndef _ZCONF_H #define _ZCONF_H /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. */ #ifdef Z_PREFIX # define deflateInit_ z_deflateInit_ # define deflate z_deflate # define deflateEnd z_deflateEnd # define inflateInit_ z_inflateInit_ # define inflate z_inflate # define inflateEnd z_inflateEnd # define deflateInit2_ z_deflateInit2_ # define deflateSetDictionary z_deflateSetDictionary # define deflateCopy z_deflateCopy # define deflateReset z_deflateReset # define deflateParams z_deflateParams # define inflateInit2_ z_inflateInit2_ # define inflateSetDictionary z_inflateSetDictionary # define inflateSync z_inflateSync # define inflateSyncPoint z_inflateSyncPoint # define inflateReset z_inflateReset # define compress z_compress # define compress2 z_compress2 # define uncompress z_uncompress # define adler32 z_adler32 # define crc32 z_crc32 # define get_crc_table z_get_crc_table # define Byte z_Byte # define uInt z_uInt # define uLong z_uLong # define Bytef z_Bytef # define charf z_charf # define intf z_intf # define uIntf z_uIntf # define uLongf z_uLongf # define voidpf z_voidpf # define voidp z_voidp #endif #if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) # define WIN32 #endif #if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386) # ifndef __32BIT__ # define __32BIT__ # endif #endif #if defined(__MSDOS__) && !defined(MSDOS) # define MSDOS #endif /* * Compile with -DMAXSEG_64K if the alloc function cannot allocate more * than 64k bytes at a time (needed on systems with 16-bit int). */ #if defined(MSDOS) && !defined(__32BIT__) # define MAXSEG_64K #endif #ifdef MSDOS # define UNALIGNED_OK #endif #if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32)) && !defined(STDC) # define STDC #endif #if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__) # ifndef STDC # define STDC # endif #endif #ifndef STDC # ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ # define const # endif #endif /* Some Mac compilers merge all .h files incorrectly: */ #if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__) # define NO_DUMMY_DECL #endif /* Old Borland C incorrectly complains about missing returns: */ #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500) # define NEED_DUMMY_RETURN #endif /* Windows CE is not have errno.h file: */ #if defined(_WIN32_WCE) && !defined(NO_ERRNO_H) # define NO_ERRNO_H #endif /* Maximum value for memLevel in deflateInit2 */ #ifndef MAX_MEM_LEVEL # ifdef MAXSEG_64K # define MAX_MEM_LEVEL 8 # else # define MAX_MEM_LEVEL 9 # endif #endif /* Maximum value for windowBits in deflateInit2 and inflateInit2. * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files * created by gzip. (Files created by minigzip can still be extracted by * gzip.) */ #ifndef MAX_WBITS # define MAX_WBITS 15 /* 32K LZ77 window */ #endif /* The memory requirements for deflate are (in bytes): (1 << (windowBits+2)) + (1 << (memLevel+9)) that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) plus a few kilobytes for small objects. For example, if you want to reduce the default memory requirements from 256K to 128K, compile with make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" Of course this will generally degrade compression (there's no free lunch). The memory requirements for inflate are (in bytes) 1 << windowBits that is, 32K for windowBits=15 (default value) plus a few kilobytes for small objects. */ /* Type declarations */ #ifndef OF /* function prototypes */ # ifdef STDC # define OF(args) args # else # define OF(args) () # endif #endif /* The following definitions for FAR are needed only for MSDOS mixed * model programming (small or medium model with some far allocations). * This was tested only with MSC; for other MSDOS compilers you may have * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, * just define FAR to be empty. */ #if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__) /* MSC small or medium model */ # define SMALL_MEDIUM # ifdef _MSC_VER # define FAR _far # else # define FAR far # endif #endif #if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__)) # ifndef __32BIT__ # define SMALL_MEDIUM # define FAR _far # endif #endif /* Compile with -DZLIB_DLL for Windows DLL support */ #if defined(ZLIB_DLL) # if defined(_WINDOWS) || defined(WINDOWS) || defined(_WIN32_WCE) # ifdef FAR # undef FAR # endif # include <windows.h> # define ZEXPORT WINAPI # ifdef WIN32 # define ZEXPORTVA WINAPIV # else # define ZEXPORTVA FAR _cdecl _export # endif # endif # if defined (__BORLANDC__) # if (__BORLANDC__ >= 0x0500) && defined (WIN32) # include <windows.h> # define ZEXPORT __declspec(dllexport) WINAPI # define ZEXPORTRVA __declspec(dllexport) WINAPIV # else # if defined (_Windows) && defined (__DLL__) # define ZEXPORT _export # define ZEXPORTVA _export # endif # endif # endif #endif #if defined (__BEOS__) # if defined (ZLIB_DLL) # define ZEXTERN extern __declspec(dllexport) # else # define ZEXTERN extern __declspec(dllimport) # endif #endif #ifndef ZEXPORT # define ZEXPORT #endif #ifndef ZEXPORTVA # define ZEXPORTVA #endif #ifndef ZEXTERN # define ZEXTERN extern #endif #ifndef FAR # define FAR #endif #if !defined(MACOS) && !defined(TARGET_OS_MAC) typedef unsigned char Byte; /* 8 bits */ #endif typedef unsigned int uInt; /* 16 bits or more */ typedef unsigned long uLong; /* 32 bits or more */ #ifdef SMALL_MEDIUM /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ # define Bytef Byte FAR #else typedef Byte FAR Bytef; #endif typedef char FAR charf; typedef int FAR intf; typedef uInt FAR uIntf; typedef uLong FAR uLongf; #ifdef STDC typedef void FAR *voidpf; typedef void *voidp; #else typedef Byte FAR *voidpf; typedef Byte *voidp; #endif #ifdef HAVE_UNISTD_H # include <sys/types.h> /* for off_t */ # include <unistd.h> /* for SEEK_* and off_t */ # define z_off_t off_t #endif #ifndef SEEK_SET # define SEEK_SET 0 /* Seek from beginning of file. */ # define SEEK_CUR 1 /* Seek from current position. */ # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ #endif #ifndef z_off_t # define z_off_t long #endif /* MVS linker does not support external names larger than 8 bytes */ #if defined(__MVS__) # pragma map(deflateInit_,"DEIN") # pragma map(deflateInit2_,"DEIN2") # pragma map(deflateEnd,"DEEND") # pragma map(inflateInit_,"ININ") # pragma map(inflateInit2_,"ININ2") # pragma map(inflateEnd,"INEND") # pragma map(inflateSync,"INSY") # pragma map(inflateSetDictionary,"INSEDI") # pragma map(inflate_blocks,"INBL") # pragma map(inflate_blocks_new,"INBLNE") # pragma map(inflate_blocks_free,"INBLFR") # pragma map(inflate_blocks_reset,"INBLRE") # pragma map(inflate_codes_free,"INCOFR") # pragma map(inflate_codes,"INCO") # pragma map(inflate_fast,"INFA") # pragma map(inflate_flush,"INFLU") # pragma map(inflate_mask,"INMA") # pragma map(inflate_set_dictionary,"INSEDI2") # pragma map(inflate_copyright,"INCOPY") # pragma map(inflate_trees_bits,"INTRBI") # pragma map(inflate_trees_dynamic,"INTRDY") # pragma map(inflate_trees_fixed,"INTRFI") # pragma map(inflate_trees_free,"INTRFR") #endif #endif /* _ZCONF_H */ --- NEW FILE: inffast.c --- /* inffast.c -- process literals and length/distance pairs fast * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ #include "zutil.h" #include "inftrees.h" #include "infblock.h" #include "infcodes.h" #include "infutil.h" #include "inffast.h" struct inflate_codes_state {int dummy;}; /* for buggy compilers */ /* simplify the use of the inflate_huft type with some defines */ #define exop word.what.Exop #define bits word.what.Bits /* macros for bit input with no checking and for returning unused bytes */ #define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}} #define UNGRAB {c=z->avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;} /* Called with number of bytes left to write in window at least 258 (the maximum string length) and number of input bytes available at least ten. The ten bytes are six bytes for the longest length/ distance pair plus four bytes for overloading the bit buffer. */ int inflate_fast(bl, bd, tl, td, s, z) uInt bl, bd; inflate_huft *tl; inflate_huft *td; /* need separate declaration for Borland C++ */ inflate_blocks_statef *s; z_streamp z; { inflate_huft *t; /* temporary pointer */ uInt e; /* extra bits or operation */ uLong b; /* bit buffer */ uInt k; /* bits in bit buffer */ Bytef *p; /* input data pointer */ uInt n; /* bytes available there */ Bytef *q; /* output window write pointer */ uInt m; /* bytes to end of window or read pointer */ uInt ml; /* mask for literal/length tree */ uInt md; /* mask for distance tree */ uInt c; /* bytes to copy */ uInt d; /* distance back to copy from */ Bytef *r; /* copy source pointer */ /* load input, output, bit values */ LOAD /* initialize masks */ ml = inflate_mask[bl]; md = inflate_mask[bd]; /* do until not enough input or output space for fast loop */ do { /* assume called with m >= 258 && n >= 10 */ /* get literal/length code */ GRABBITS(20) /* max bits for literal/length code */ if ((e = (t = tl + ((uInt)b & ml))->exop) == 0) { DUMPBITS(t->bits) Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ? "inflate: * literal '%c'\n" : "inflate: * literal 0x%02x\n", t->base)); *q++ = (Byte)t->base; m--; continue; } do { DUMPBITS(t->bits) if (e & 16) { /* get extra bits for length */ e &= 15; c = t->base + ((uInt)b & inflate_mask[e]); DUMPBITS(e) Tracevv((stderr, "inflate: * length %u\n", c)); /* decode distance base of block to copy */ GRABBITS(15); /* max bits for distance code */ e = (t = td + ((uInt)b & md))->exop; do { DUMPBITS(t->bits) if (e & 16) { /* get extra bits to add to distance base */ e &= 15; GRABBITS(e) /* get extra bits (up to 13) */ d = t->base + ((uInt)b & inflate_mask[e]); DUMPBITS(e) Tracevv((stderr, "inflate: * distance %u\n", d)); /* do the copy */ m -= c; r = q - d; if (r < s->window) /* wrap if needed */ { do { r += s->end - s->window; /* force pointer in window */ } while (r < s->window); /* covers invalid distances */ e = s->end - r; if (c > e) { c -= e; /* wrapped copy */ do { *q++ = *r++; } while (--e); r = s->window; do { *q++ = *r++; } while (--c); } else /* normal copy */ { *q++ = *r++; c--; *q++ = *r++; c--; do { *q++ = *r++; } while (--c); } } else /* normal copy */ { *q++ = *r++; c--; *q++ = *r++; c--; do { *q++ = *r++; } while (--c); } break; } else if ((e & 64) == 0) { t += t->base; e = (t += ((uInt)b & inflate_mask[e]))->exop; } else { z->msg = (char*)"invalid distance code"; UNGRAB UPDATE return Z_DATA_ERROR; } } while (1); break; } if ((e & 64) == 0) { t += t->base; if ((e = (t += ((uInt)b & inflate_mask[e]))->exop) == 0) { DUMPBITS(t->bits) Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ? "inflate: * literal '%c'\n" : "inflate: * literal 0x%02x\n", t->base)); *q++ = (Byte)t->base; m--; break; } } else if (e & 32) { Tracevv((stderr, "inflate: * end of block\n")); UNGRAB UPDATE return Z_STREAM_END; } else { z->msg = (char*)"invalid literal/length code"; UNGRAB UPDATE return Z_DATA_ERROR; } } while (1); } while (m >= 258 && n >= 10); /* not enough input or output--restore pointers and return */ UNGRAB UPDATE return Z_OK; } --- NEW FILE: Makefile --- # Makefile for zlib # Copyright (C) 1995-2002 Jean-loup Gailly. # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: # ./configure; make test # The call of configure is optional if you don't have special requirements # If you wish to build zlib as a shared library, use: ./configure -s # To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: # make install # To install in $HOME instead of /usr/local, use: # make install prefix=$HOME CC=cc CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ # -Wstrict-prototypes -Wmissing-prototypes LDFLAGS=-L. -lz LDSHARED=$(CC) CPP=$(CC) -E VER=1.1.4 LIBS=libz.a SHAREDLIB=libz.so AR=ar rc RANLIB=ranlib TAR=tar SHELL=/bin/sh prefix = /usr/local exec_prefix = ${prefix} libdir = ${exec_prefix}/lib includedir = ${prefix}/include OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o OBJA = # to use the asm code: make OBJA=match.o TEST_OBJS = example.o minigzip.o DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] *.mms \ algorithm.txt zlib.3 zlib.html \ msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \ nt/Make*[a-z0-9] nt/zlib.dnt amiga/Make*.??? os2/M*.os2 os2/zlib.def \ contrib/RE*.contrib contrib/*.txt contrib/asm386/*.asm contrib/asm386/*.c \ contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/asm[56]86/*.?86 \ contrib/asm[56]86/*.S contrib/iostream/*.cpp \ contrib/iostream/*.h contrib/iostream2/*.h contrib/iostream2/*.cpp \ contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32 \ contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]?? \ contrib/delphi*/*.??? all: example minigzip test: all @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ echo hello world | ./minigzip | ./minigzip -d || \ echo ' *** minigzip test FAILED ***' ; \ if ./example; then \ echo ' *** zlib test OK ***'; \ else \ echo ' *** zlib test FAILED ***'; \ fi libz.a: $(OBJS) $(OBJA) $(AR) $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 match.o: match.S $(CPP) match.S > _match.s $(CC) -c _match.s mv _match.o match.o rm -f _match.s $(SHAREDLIB).$(VER): $(OBJS) $(LDSHARED) -o $@ $(OBJS) rm -f $(SHAREDLIB) $(SHAREDLIB).1 ln -s $@ $(SHAREDLIB) ln -s $@ $(SHAREDLIB).1 example: example.o $(LIBS) $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) minigzip: minigzip.o $(LIBS) $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) install: $(LIBS) -@if [ ! -d $(includedir) ]; then mkdir $(includedir); fi -@if [ ! -d $(libdir) ]; then mkdir $(libdir); fi cp zlib.h zconf.h $(includedir) chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h cp $(LIBS) $(libdir) cd $(libdir); chmod 755 $(LIBS) -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 cd $(libdir); if test -f $(SHAREDLIB).$(VER); then \ rm -f $(SHAREDLIB) $(SHAREDLIB).1; \ ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB); \ ln -s $(SHAREDLIB).$(VER) $(SHAREDLIB).1; \ (ldconfig || true) >/dev/null 2>&1; \ fi # The ranlib in install is needed on NeXTSTEP which checks file times # ldconfig is for Linux uninstall: cd $(includedir); \ v=$(VER); \ if test -f zlib.h; then \ v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \ rm -f zlib.h zconf.h; \ fi; \ cd $(libdir); rm -f libz.a; \ if test -f $(SHAREDLIB).$$v; then \ rm -f $(SHAREDLIB).$$v $(SHAREDLIB) $(SHAREDLIB).1; \ fi clean: rm -f *.o *~ example minigzip libz.a libz.so* foo.gz so_locations \ _match.s maketree distclean: clean zip: mv Makefile Makefile~; cp -p Makefile.in Makefile rm -f test.c ztest*.c contrib/minizip/test.zip v=`sed -n -e 's/\.//g' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ zip -ul9 zlib$$v $(DISTFILES) mv Makefile~ Makefile dist: mv Makefile Makefile~; cp -p Makefile.in Makefile rm -f test.c ztest*.c contrib/minizip/test.zip d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\ rm -f $$d.tar.gz; \ if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \ files=""; \ for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \ cd ..; \ GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \ if test ! -d $$d; then rm -f $$d; fi mv Makefile~ Makefile tags: etags *.[ch] depend: makedepend -- $(CFLAGS) -- *.[ch] # DO NOT DELETE THIS LINE -- make depend depends on it. adler32.o: zlib.h zconf.h compress.o: zlib.h zconf.h crc32.o: zlib.h zconf.h deflate.o: deflate.h zutil.h zlib.h zconf.h example.o: zlib.h zconf.h gzio.o: zutil.h zlib.h zconf.h infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h infcodes.o: zutil.h zlib.h zconf.h infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h inffast.o: zutil.h zlib.h zconf.h inftrees.h inffast.o: infblock.h infcodes.h infutil.h inffast.h inflate.o: zutil.h zlib.h zconf.h infblock.h inftrees.o: zutil.h zlib.h zconf.h inftrees.h infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h minigzip.o: zlib.h zconf.h trees.o: deflate.h zutil.h zlib.h zconf.h trees.h uncompr.o: zlib.h zconf.h zutil.o: zutil.h zlib.h zconf.h --- NEW FILE: infcodes.c --- /* infcodes.c -- process literals and length/distance pairs * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ #include "zutil.h" #include "inftrees.h" #include "infblock.h" #include "infcodes.h" #include "infutil.h" #include "inffast.h" /* simplify the use of the inflate_huft type with some defines */ #define exop word.what.Exop #define bits word.what.Bits typedef enum { /* waiting for "i:"=input, "o:"=output, "x:"=nothing */ START, /* x: set up for LEN */ LEN, /* i: get length/literal/eob next */ LENEXT, /* i: getting length extra (have base) */ DIST, /* i: get distance next */ DISTEXT, /* i: getting distance extra */ COPY, /* o: copying bytes in window, waiting for space */ LIT, /* o: got literal, waiting for output space */ WASH, /* o: got eob, possibly still output waiting */ END, /* x: got eob and all data flushed */ BADCODE} /* x: got error */ inflate_codes_mode; /* inflate codes private state */ struct inflate_codes_state { /* mode */ inflate_codes_mode mode; /* current inflate_codes mode */ /* mode dependent information */ uInt len; union { struct { inflate_huft *tree; /* pointer into tree */ uInt need; /* bits needed */ } code; /* if LEN or DIST, where in tree */ uInt lit; /* if LIT, literal */ struct { uInt get; /* bits to get for extra */ uInt dist; /* distance back to copy from */ } copy; /* if EXT or COPY, where and how much */ } sub; /* submode */ /* mode independent information */ Byte lbits; /* ltree bits decoded per branch */ Byte dbits; /* dtree bits decoder per branch */ inflate_huft *ltree; /* literal/length/eob tree */ inflate_huft *dtree; /* distance tree */ }; inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z) uInt bl, bd; inflate_huft *tl; inflate_huft *td; /* need separate declaration for Borland C++ */ z_streamp z; { inflate_codes_statef *c; if ((c = (inflate_codes_statef *) ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL) { c->mode = START; c->lbits = (Byte)bl; c->dbits = (Byte)bd; c->ltree = tl; c->dtree = td; Tracev((stderr, "inflate: codes new\n")); } return c; } int inflate_codes(s, z, r) inflate_blocks_statef *s; z_streamp z; int r; { uInt j; /* temporary storage */ inflate_huft *t; /* temporary pointer */ uInt e; /* extra bits or operation */ uLong b; /* bit buffer */ uInt k; /* bits in bit buffer */ Bytef *p; /* input data pointer */ uInt n; /* bytes available there */ Bytef *q; /* output window write pointer */ uInt m; /* bytes to end of window or read pointer */ Bytef *f; /* pointer to copy strings from */ inflate_codes_statef *c = s->sub.decode.codes; /* codes state */ /* copy input/output information to locals (UPDATE macro restores) */ LOAD /* process input and output based on current state */ while (1) switch (c->mode) { /* waiting for "i:"=input, "o:"=output, "x:"=nothing */ case START: /* x: set up for LEN */ #ifndef SLOW if (m >= 258 && n >= 10) { UPDATE r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z); LOAD if (r != Z_OK) { c->mode = r == Z_STREAM_END ? WASH : BADCODE; break; } } #endif /* !SLOW */ c->sub.code.need = c->lbits; c->sub.code.tree = c->ltree; c->mode = LEN; case LEN: /* i: get length/literal/eob next */ j = c->sub.code.need; NEEDBITS(j) t = c->sub.code.tree + ((uInt)b & inflate_mask[j]); DUMPBITS(t->bits) e = (uInt)(t->exop); if (e == 0) /* literal */ { c->sub.lit = t->base; Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ? "inflate: literal '%c'\n" : "inflate: literal 0x%02x\n", t->base)); c->mode = LIT; break; } if (e & 16) /* length */ { c->sub.copy.get = e & 15; c->len = t->base; c->mode = LENEXT; break; } if ((e & 64) == 0) /* next table */ { c->sub.code.need = e; c->sub.code.tree = t + t->base; break; } if (e & 32) /* end of block */ { Tracevv((stderr, "inflate: end of block\n")); c->mode = WASH; break; } c->mode = BADCODE; /* invalid code */ z->msg = (char*)"invalid literal/length code"; r = Z_DATA_ERROR; LEAVE case LENEXT: /* i: getting length extra (have base) */ j = c->sub.copy.get; NEEDBITS(j) c->len += (uInt)b & inflate_mask[j]; DUMPBITS(j) c->sub.code.need = c->dbits; c->sub.code.tree = c->dtree; Tracevv((stderr, "inflate: length %u\n", c->len)); c->mode = DIST; case DIST: /* i: get distance next */ j = c->sub.code.need; NEEDBITS(j) t = c->sub.code.tree + ((uInt)b & inflate_mask[j]); DUMPBITS(t->bits) e = (uInt)(t->exop); if (e & 16) /* distance */ { c->sub.copy.get = e & 15; c->sub.copy.dist = t->base; c->mode = DISTEXT; break; } if ((e & 64) == 0) /* next table */ { c->sub.code.need = e; c->sub.code.tree = t + t->base; break; } c->mode = BADCODE; /* invalid code */ z->msg = (char*)"invalid distance code"; r = Z_DATA_ERROR; LEAVE case DISTEXT: /* i: getting distance extra */ j = c->sub.copy.get; NEEDBITS(j) c->sub.copy.dist += (uInt)b & inflate_mask[j]; DUMPBITS(j) Tracevv((stderr, "inflate: distance %u\n", c->sub.copy.dist)); c->mode = COPY; case COPY: /* o: copying bytes in window, waiting for space */ f = q - c->sub.copy.dist; while (f < s->window) /* modulo window size-"while" instead */ f += s->end - s->window; /* of "if" handles invalid distances */ while (c->len) { NEEDOUT OUTBYTE(*f++) if (f == s->end) f = s->window; c->len--; } c->mode = START; break; case LIT: /* o: got literal, waiting for output space */ NEEDOUT OUTBYTE(c->sub.lit) c->mode = START; break; case WASH: /* o: got eob, possibly more output */ if (k > 7) /* return unused byte, if any */ { Assert(k < 16, "inflate_codes grabbed too many bytes") k -= 8; n++; p--; /* can always return one */ } FLUSH if (s->read != s->write) LEAVE c->mode = END; case END: r = Z_STREAM_END; LEAVE case BADCODE: /* x: got error */ r = Z_DATA_ERROR; LEAVE default: r = Z_STREAM_ERROR; LEAVE } #ifdef NEED_DUMMY_RETURN return Z_STREAM_ERROR; /* Some dumb compilers complain without this */ #endif } void inflate_codes_free(c, z) inflate_codes_statef *c; z_streamp z; { ZFREE(z, c); Tracev((stderr, "inflate: codes free\n")); } --- NEW FILE: inftrees.c --- /* inftrees.c -- generate Huffman trees for efficient decoding * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ #include "zutil.h" #include "inftrees.h" #if !defined(BUILDFIXED) && !defined(STDC) # define BUILDFIXED /* non ANSI compilers may not accept inffixed.h */ #endif const char inflate_copyright[] = " inflate 1.1.4 Copyright 1995-2002 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot include such an acknowledgment, I would appreciate that you keep this copyright string in the executable of your product. */ struct internal_state {int dummy;}; /* for buggy compilers */ /* simplify the use of the inflate_huft type with some defines */ #define exop word.what.Exop #define bits word.what.Bits local int huft_build OF(( uIntf *, /* code lengths in bits */ uInt, /* number of codes */ uInt, /* number of "simple" codes */ const uIntf *, /* list of base values for non-simple codes */ const uIntf *, /* list of extra bits for non-simple codes */ inflate_huft * FAR*,/* result: starting table */ uIntf *, /* maximum lookup bits (returns actual) */ inflate_huft *, /* space for trees */ uInt *, /* hufts used in space */ uIntf * )); /* space for values */ /* Tables for deflate from PKZIP's appnote.txt. */ local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; /* see note #13 above about 258 */ local const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */ local const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577}; local const uInt cpdext[30] = { /* Extra bits for distance codes */ 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13}; /* Huffman code decoding is performed using a multi-level table lookup. The fastest way to decode is to simply build a lookup table whose size is determined by the longest code. However, the time it takes to build this table can also be a factor if the data being decoded is not very long. The most common codes are necessarily the shortest codes, so those codes dominate the decoding time, and hence the speed. The idea is you can have a shorter table that decodes the shorter, more probable codes, and then point to subsidiary tables for the longer codes. The time it costs to decode the longer codes is then traded against the time it takes to make longer tables. This results of this trade are in the variables lbits and dbits below. lbits is the number of bits the first level table for literal/ length codes can decode in one step, and dbits is the same thing for the distance codes. Subsequent tables are also less than or equal to those sizes. These values may be adjusted either when all of the codes are shorter than that, in which case the longest code length in bits is used, or when the shortest code is *longer* than the requested table size, in which case the length of the shortest code in bits is used. There are two different values for the two tables, since they code a different number of possibilities each. The literal/length table codes 286 possible values, or in a flat code, a little over eight bits. The distance table codes 30 possible values, or a little less than five bits, flat. The optimum values for speed end up being about one bit more than those, so lbits is 8+1 and dbits is 5+1. The optimum values may differ though from machine to machine, and possibly even between compilers. Your mileage may vary. */ /* If BMAX needs to be larger than 16, then h and x[] should be uLong. */ #define BMAX 15 /* maximum bit length of any code */ local int huft_build(b, n, s, d, e, t, m, hp, hn, v) uIntf *b; /* code lengths in bits (all assumed <= BMAX) */ uInt n; /* number of codes (assumed <= 288) */ uInt s; /* number of simple-valued codes (0..s-1) */ const uIntf *d; /* list of base values for non-simple codes */ const uIntf *e; /* list of extra bits for non-simple codes */ inflate_huft * FAR *t; /* result: starting table */ uIntf *m; /* maximum lookup bits, returns actual */ inflate_huft *hp; /* space for trees */ uInt *hn; /* hufts used in space */ uIntf *v; /* working area: values in order of bit length */ /* Given a list of code lengths and a maximum table size, make a set of tables to decode that set of codes. Return Z_OK on success, Z_BUF_ERROR if the given code set is incomplete (the tables are still built in this case), or Z_DATA_ERROR if the input is invalid. */ { uInt a; /* counter for codes of length k */ uInt c[BMAX+1]; /* bit length count table */ uInt f; /* i repeats in table every f entries */ int g; /* maximum code length */ int h; /* table level */ register uInt i; /* counter, current code */ register uInt j; /* counter */ register int k; /* number of bits in current code */ int l; /* bits per table (returned in m) */ uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */ register uIntf *p; /* pointer into c[], b[], or v[] */ inflate_huft *q; /* points to current table */ struct inflate_huft_s r; /* table entry for structure assignment */ inflate_huft *u[BMAX]; /* table stack */ register int w; /* bits before this table == (l * h) */ uInt x[BMAX+1]; /* bit offsets, then code stack */ uIntf *xp; /* pointer into x */ int y; /* number of dummy codes added */ uInt z; /* number of entries in current table */ /* Generate counts for each bit length */ p = c; #define C0 *p++ = 0; #define C2 C0 C0 C0 C0 #define C4 C2 C2 C2 C2 C4 /* clear c[]--assume BMAX+1 is 16 */ p = b; i = n; do { c[*p++]++; /* assume all entries <= BMAX */ } while (--i); if (c[0] == n) /* null input--all zero length codes */ { *t = (inflate_huft *)Z_NULL; *m = 0; return Z_OK; } /* Find minimum and maximum length, bound *m by those */ l = *m; for (j = 1; j <= BMAX; j++) if (c[j]) break; k = j; /* minimum code length */ if ((uInt)l < j) l = j; for (i = BMAX; i; i--) if (c[i]) break; g = i; /* maximum code length */ if ((uInt)l > i) l = i; *m = l; /* Adjust last length count to fill out codes, if needed */ for (y = 1 << j; j < i; j++, y <<= 1) if ((y -= c[j]) < 0) return Z_DATA_ERROR; if ((y -= c[i]) < 0) return Z_DATA_ERROR; c[i] += y; /* Generate starting offsets into the value table for each length */ x[1] = j = 0; p = c + 1; xp = x + 2; while (--i) { /* note that i == g from above */ *xp++ = (j += *p++); } /* Make a table of values in order of bit lengths */ p = b; i = 0; do { if ((j = *p++) != 0) v[x[j]++] = i; } while (++i < n); n = x[g]; /* set n to length of v */ /* Generate the Huffman codes and for each, make the table entries */ x[0] = i = 0; /* first Huffman code is zero */ p = v; /* grab values in bit order */ h = -1; /* no tables yet--level -1 */ w = -l; /* bits decoded == (l * h) */ u[0] = (inflate_huft *)Z_NULL; /* just to keep compilers happy */ q = (inflate_huft *)Z_NULL; /* ditto */ z = 0; /* ditto */ /* go through the bit lengths (k already is bits in shortest code) */ for (; k <= g; k++) { a = c[k]; while (a--) { /* here i is the Huffman code of length k bits for value *p */ /* make tables up to required level */ while (k > w + l) { h++; w += l; /* previous table always l bits */ /* compute minimum size table less than or equal to l bits */ z = g - w; z = z > (uInt)l ? l : z; /* table size upper limit */ if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ { /* too few codes for k-w bit table */ f -= a + 1; /* deduct codes from patterns left */ xp = c + k; if (j < z) while (++j < z) /* try smaller tables up to z bits */ { if ((f <<= 1) <= *++xp) break; /* enough codes to use up j bits */ f -= *xp; /* else deduct codes from patterns */ } } z = 1 << j; /* table entries for j-bit table */ /* allocate new table */ if (*hn + z > MANY) /* (note: doesn't matter for fixed) */ return Z_DATA_ERROR; /* overflow of MANY */ u[h] = q = hp + *hn; *hn += z; /* connect to last table, if there is one */ if (h) { x[h] = i; /* save pattern for backing up */ r.bits = (Byte)l; /* bits to dump before this table */ r.exop = (Byte)j; /* bits in this table */ j = i >> (w - l); r.base = (uInt)(q - u[h-1] - j); /* offset to this table */ u[h-1][j] = r; /* connect to last table */ } else *t = q; /* first table is returned result */ } /* set up table entry in r */ r.bits = (Byte)(k - w); if (p >= v + n) r.exop = 128 + 64; /* out of values--invalid code */ else if (*p < s) { r.exop = (Byte)(*p < 256 ? 0 : 32 + 64); /* 256 is end-of-block */ r.base = *p++; /* simple code is just the value */ } else { r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */ r.base = d[*p++ - s]; } /* fill code-like entries with r */ f = 1 << (k - w); for (j = i >> w; j < z; j += f) q[j] = r; /* backwards increment the k-bit code i */ for (j = 1 << (k - 1); i & j; j >>= 1) i ^= j; i ^= j; /* backup over finished tables */ mask = (1 << w) - 1; /* needed on HP, cc -O bug */ while ((i & mask) != x[h]) { h--; /* don't need to update q */ w -= l; mask = (1 << w) - 1; } } } /* Return Z_BUF_ERROR if we were given an incomplete table */ return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK; } int inflate_trees_bits(c, bb, tb, hp, z) uIntf *c; /* 19 code lengths */ uIntf *bb; /* bits tree desired/actual depth */ inflate_huft * FAR *tb; /* bits tree result */ inflate_huft *hp; /* space for trees */ z_streamp z; /* for messages */ { int r; uInt hn = 0; /* hufts used in space */ uIntf *v; /* work area for huft_build */ if ((v = (uIntf*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL) return Z_MEM_ERROR; r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL, tb, bb, hp, &hn, v); if (r == Z_DATA_ERROR) z->msg = (char*)"oversubscribed dynamic bit lengths tree"; else if (r == Z_BUF_ERROR || *bb == 0) { z->msg = (char*)"incomplete dynamic bit lengths tree"; r = Z_DATA_ERROR; } ZFREE(z, v); return r; } int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, hp, z) uInt nl; /* number of literal/length codes */ uInt nd; /* number of distance codes */ uIntf *c; /* that many (total) code lengths */ uIntf *bl; /* literal desired/actual bit depth */ uIntf *bd; /* distance desired/actual bit depth */ inflate_huft * FAR *tl; /* literal/length tree result */ inflate_huft * FAR *td; /* distance tree result */ inflate_huft *hp; /* space for trees */ z_streamp z; /* for messages */ { int r; uInt hn = 0; /* hufts used in space */ uIntf *v; /* work area for huft_build */ /* allocate work area */ if ((v = (uIntf*)Z... [truncated message content] |
|
From: Ehud S. <esh...@us...> - 2006-08-18 18:10:45
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15305/libroadmap Modified Files: libroadmap.vcp Log Message: Update evc environment files. Index: libroadmap.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/libroadmap/libroadmap.vcp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** libroadmap.vcp 10 Aug 2006 20:55:35 -0000 1.16 --- libroadmap.vcp 18 Aug 2006 18:10:41 -0000 1.17 *************** *** 451,454 **** --- 451,455 ---- "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_trip.h"\ *************** *** 1177,1180 **** --- 1178,1182 ---- "..\..\..\editor\db\editor_dictionary.h"\ "..\..\..\editor\db\editor_line.h"\ + "..\..\..\editor\db\editor_marker.h"\ "..\..\..\editor\db\editor_override.h"\ "..\..\..\editor\db\editor_point.h"\ *************** *** 1611,1614 **** --- 1613,1617 ---- "..\..\..\editor\export\editor_sync.h"\ "..\..\..\editor\export\editor_upload.h"\ + "..\..\..\editor\static\notes.h"\ "..\..\..\editor\static\update_range.h"\ "..\..\..\editor\track\editor_track_main.h"\ *************** *** 1750,1753 **** --- 1753,1757 ---- "..\..\..\roadmap_db.h"\ "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_path.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ *************** *** 4874,4877 **** --- 4878,5087 ---- # Begin Source File + SOURCE=..\..\..\editor\static\notes.c + + !IF "$(CFG)" == "libroadmap - Win32 (WCE ARM) Release" + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARM) Debug" + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE x86) Release" + + DEP_CPP_NOTES=\ + "..\..\..\editor\db\editor_db.h"\ + "..\..\..\editor\db\editor_dictionary.h"\ + "..\..\..\editor\db\editor_marker.h"\ + "..\..\..\editor\editor_log.h"\ + "..\..\..\editor\editor_main.h"\ + "..\..\..\editor\static\edit_marker.h"\ + "..\..\..\editor\static\notes.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_county.h"\ + "..\..\..\roadmap_db.h"\ + "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_fuzzy.h"\ + "..\..\..\roadmap_gps.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_messagebox.h"\ + "..\..\..\roadmap_navigate.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_plugin.h"\ + "..\..\..\roadmap_screen.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_street.h"\ + "..\..\..\roadmap_trip.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE x86) Debug" + + DEP_CPP_NOTES=\ + "..\..\..\editor\db\editor_db.h"\ + "..\..\..\editor\db\editor_dictionary.h"\ + "..\..\..\editor\db\editor_marker.h"\ + "..\..\..\editor\editor_log.h"\ + "..\..\..\editor\editor_main.h"\ + "..\..\..\editor\static\edit_marker.h"\ + "..\..\..\editor\static\notes.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_county.h"\ + "..\..\..\roadmap_db.h"\ + "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_fuzzy.h"\ + "..\..\..\roadmap_gps.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_messagebox.h"\ + "..\..\..\roadmap_navigate.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_plugin.h"\ + "..\..\..\roadmap_screen.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_street.h"\ + "..\..\..\roadmap_trip.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Debug" + + DEP_CPP_NOTES=\ + "..\..\..\editor\db\editor_db.h"\ + "..\..\..\editor\db\editor_dictionary.h"\ + "..\..\..\editor\db\editor_marker.h"\ + "..\..\..\editor\editor_log.h"\ + "..\..\..\editor\editor_main.h"\ + "..\..\..\editor\static\edit_marker.h"\ + "..\..\..\editor\static\notes.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_county.h"\ + "..\..\..\roadmap_db.h"\ + "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_fuzzy.h"\ + "..\..\..\roadmap_gps.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_messagebox.h"\ + "..\..\..\roadmap_navigate.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_plugin.h"\ + "..\..\..\roadmap_screen.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_street.h"\ + "..\..\..\roadmap_trip.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Release" + + DEP_CPP_NOTES=\ + "..\..\..\editor\db\editor_db.h"\ + "..\..\..\editor\db\editor_dictionary.h"\ + "..\..\..\editor\db\editor_marker.h"\ + "..\..\..\editor\editor_log.h"\ + "..\..\..\editor\editor_main.h"\ + "..\..\..\editor\static\edit_marker.h"\ + "..\..\..\editor\static\notes.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_county.h"\ + "..\..\..\roadmap_db.h"\ + "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_fuzzy.h"\ + "..\..\..\roadmap_gps.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_messagebox.h"\ + "..\..\..\roadmap_navigate.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_plugin.h"\ + "..\..\..\roadmap_screen.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_street.h"\ + "..\..\..\roadmap_trip.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ELSEIF "$(CFG)" == "libroadmap - Win32 (WCE ARMV4) Profiler" + + DEP_CPP_NOTES=\ + "..\..\..\editor\db\editor_db.h"\ + "..\..\..\editor\db\editor_dictionary.h"\ + "..\..\..\editor\db\editor_marker.h"\ + "..\..\..\editor\editor_log.h"\ + "..\..\..\editor\editor_main.h"\ + "..\..\..\editor\static\edit_marker.h"\ + "..\..\..\editor\static\notes.h"\ + "..\..\..\roadmap.h"\ + "..\..\..\roadmap_canvas.h"\ + "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_county.h"\ + "..\..\..\roadmap_db.h"\ + "..\..\..\roadmap_dbread.h"\ + "..\..\..\roadmap_dictionary.h"\ + "..\..\..\roadmap_file.h"\ + "..\..\..\roadmap_fuzzy.h"\ + "..\..\..\roadmap_gps.h"\ + "..\..\..\roadmap_gui.h"\ + "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_list.h"\ + "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_messagebox.h"\ + "..\..\..\roadmap_navigate.h"\ + "..\..\..\roadmap_net.h"\ + "..\..\..\roadmap_plugin.h"\ + "..\..\..\roadmap_screen.h"\ + "..\..\..\roadmap_serial.h"\ + "..\..\..\roadmap_sound.h"\ + "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_street.h"\ + "..\..\..\roadmap_trip.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ + "..\..\win32_serial.h"\ + + + !ENDIF + + # End Source File + # Begin Source File + SOURCE=..\..\..\roadmap_adjust.c *************** *** 6330,6333 **** --- 6540,6544 ---- DEP_CPP_ROADMAP_IO=\ + "..\..\..\roadmap.h"\ "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_io.h"\ *************** *** 6336,6339 **** --- 6547,6552 ---- "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ *************** *** 6342,6345 **** --- 6555,6559 ---- DEP_CPP_ROADMAP_IO=\ + "..\..\..\roadmap.h"\ "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_io.h"\ *************** *** 6348,6351 **** --- 6562,6567 ---- "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ + "..\..\..\roadmap_types.h"\ + "..\..\roadmap_win32.h"\ "..\..\win32_serial.h"\ *************** *** 8840,8843 **** --- 9056,9060 ---- "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_locator.h"\ + "..\..\..\roadmap_math.h"\ "..\..\..\roadmap_messagebox.h"\ "..\..\..\roadmap_navigate.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-08-18 18:10:45
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/RoadGPS In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15305/RoadGPS Modified Files: RoadGPS.vcp Log Message: Update evc environment files. Index: RoadGPS.vcp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/RoadGPS/RoadGPS.vcp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RoadGPS.vcp 23 Apr 2006 13:32:24 -0000 1.2 --- RoadGPS.vcp 18 Aug 2006 18:10:41 -0000 1.3 *************** *** 51,69 **** # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" - RSC=rc.exe - # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r - # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c - # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_ROADGPS" /YX /Oxs /M$(CECrtMT) /c - MTL=midl.exe - # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 - # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE ARM) Debug" --- 51,69 ---- # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + MTL=midl.exe + # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 + CPP=clarm.exe + # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /Oxs /M$(CECrtMT) /c + # ADD CPP /nologo /W3 /I "./wince_os" /I "../../" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_ROADGPS" /YX /Oxs /M$(CECrtMT) /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r + # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE ARM) Debug" *************** *** 84,102 **** # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" - RSC=rc.exe - # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r - # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r - CPP=clarm.exe - # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c - # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_ROADGPS" /YX /M$(CECrtMTDebug) /c - MTL=midl.exe - # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 - # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 - BSC32=bscmake.exe - # ADD BASE BSC32 /nologo - # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE x86) Release" --- 84,102 ---- # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # ADD LINK32 commctrl.lib coredll.lib aygshell.lib winsock.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM + BSC32=bscmake.exe + # ADD BASE BSC32 /nologo + # ADD BSC32 /nologo + MTL=midl.exe + # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 + CPP=clarm.exe + # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /YX /M$(CECrtMTDebug) /c + # ADD CPP /nologo /W3 /Zi /Od /I "../../" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "_ROADGPS" /YX /M$(CECrtMTDebug) /c + RSC=rc.exe + # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r + # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE x86) Release" *************** *** 222,226 **** # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /YX /O2 /M$(CECrtMT) /c # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_ROADGPS" /YX /O2 /M$(CECrtMT) /c - # SUBTRACT CPP /O<none> MTL=midl.exe # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 --- 222,225 ---- *************** *** 248,251 **** --- 247,320 ---- # Begin Source File + SOURCE=..\..\CEDevice.cpp + + !IF "$(CFG)" == "RoadGPS - Win32 (WCE ARM) Release" + + !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE ARM) Debug" + + !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE x86) Release" + + DEP_CPP_CEDEV=\ + "..\..\CEDevice.h"\ + + + !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE x86) Debug" + + DEP_CPP_CEDEV=\ + "..\..\CEDevice.h"\ + + + !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE ARMV4) Debug" + + DEP_CPP_CEDEV=\ + "..\..\CEDevice.h"\ + + + !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE ARMV4) Release" + + DEP_CPP_CEDEV=\ + "..\..\CEDevice.h"\ + + + !ENDIF + + # End Source File + # Begin Source File + + SOURCE=..\..\CEException.cpp + + !IF "$(CFG)" == "RoadGPS - Win32 (WCE ARM) Release" + + !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE ARM) Debug" + + !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE x86) Release" + + DEP_CPP_CEEXC=\ + "..\..\CEException.h"\ + + + !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE x86) Debug" + + DEP_CPP_CEEXC=\ + "..\..\CEException.h"\ + + + !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE ARMV4) Debug" + + DEP_CPP_CEEXC=\ + "..\..\CEException.h"\ + + + !ELSEIF "$(CFG)" == "RoadGPS - Win32 (WCE ARMV4) Release" + + DEP_CPP_CEEXC=\ + "..\..\CEException.h"\ + + + !ENDIF + + # End Source File + # Begin Source File + SOURCE=..\..\..\win32\roadmap_main.cpp *************** *** 382,409 **** DEP_CPP_ROADM=\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_config.h"\ "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_history.h"\ "..\..\..\roadmap_io.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_path.h"\ "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_start.h"\ "..\..\..\roadmap_types.h"\ "..\..\roadmap_win32.h"\ "..\..\roadmap_wincecanvas.h"\ "..\..\wince_input_mon.h"\ NODEP_CPP_ROADM=\ ! "..\..\..\..\..\..\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ ! ".\inuserm.h"\ ! ".\ipapi.h"\ ! ".\ygshell.h"\ --- 451,490 ---- DEP_CPP_ROADM=\ + "..\..\..\editor\editor_main.h"\ + "..\..\..\editor\export\editor_sync.h"\ "..\..\..\roadmap.h"\ "..\..\..\roadmap_canvas.h"\ "..\..\..\roadmap_config.h"\ + "..\..\..\roadmap_download.h"\ + "..\..\..\roadmap_factory.h"\ "..\..\..\roadmap_file.h"\ "..\..\..\roadmap_gui.h"\ "..\..\..\roadmap_history.h"\ "..\..\..\roadmap_io.h"\ + "..\..\..\roadmap_lang.h"\ "..\..\..\roadmap_list.h"\ "..\..\..\roadmap_main.h"\ + "..\..\..\roadmap_messagebox.h"\ "..\..\..\roadmap_net.h"\ "..\..\..\roadmap_path.h"\ + "..\..\..\roadmap_screen.h"\ "..\..\..\roadmap_serial.h"\ "..\..\..\roadmap_spawn.h"\ "..\..\..\roadmap_start.h"\ "..\..\..\roadmap_types.h"\ + "..\..\CEDevice.h"\ + "..\..\CEException.h"\ "..\..\roadmap_win32.h"\ "..\..\roadmap_wincecanvas.h"\ + "..\..\win32_serial.h"\ "..\..\wince_input_mon.h"\ + "C:\Program Files\Windows CE Tools\Common\Platman\sdk\wce500\include\cecap.h"\ + {$(INCLUDE)}"aygshell.h"\ + {$(INCLUDE)}"notify.h"\ + {$(INCLUDE)}"sipapi.h"\ + {$(INCLUDE)}"winuserm.h"\ NODEP_CPP_ROADM=\ ! "C:\Program Files\Windows CE Tools\wce420\POCKET PC 2003\Include\ARMV4\vibrate.h"\ |
|
From: Ehud S. <esh...@us...> - 2006-08-18 18:10:16
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/setupdll In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15231 Added Files: setupdll.cpp setupdll.def setupdll.h setupdll.vcp StdAfx.cpp StdAfx.h Log Message: Import setup DLL. --- NEW FILE: setupdll.cpp --- // setupdll.cpp : Defines the entry point for the DLL application. // #include <windows.h> #include <notify.h> #include "ce_setup.h" #include "setupdll.h" /////////////////////////////////////////////////////////// //PURPOSE : HANDLES TASKS DONE AT START OF INSTALLATION /////////////////////////////////////////////////////////// codeINSTALL_INIT Install_Init(HWND hwndparent, BOOL ffirstcall,BOOL fpreviouslyinstalled,LPCTSTR pszinstalldir) { //do nothing //return value return codeINSTALL_INIT_CONTINUE; } /////////////////////////////////////////////////////////// //PURPOSE : HANDLES TASKS DONE AT END OF INSTALLATION /////////////////////////////////////////////////////////// codeINSTALL_EXIT Install_Exit( HWND hwndparent,LPCTSTR pszinstalldir, WORD cfaileddirs,WORD cfailedfiles,WORD cfailedregkeys, WORD cfailedregvals, WORD cfailedshortcuts) { WCHAR roadmap_exe[255]; wcscpy(roadmap_exe, pszinstalldir); wcscat(roadmap_exe, L"\\Roadmap.exe"); BOOL res = CeRunAppAtEvent(roadmap_exe, NOTIFICATION_EVENT_NONE); res = CeRunAppAtEvent(roadmap_exe, NOTIFICATION_EVENT_RS232_DETECTED); res = CeRunAppAtEvent(roadmap_exe, NOTIFICATION_EVENT_SYNC_END); PROCESS_INFORMATION pi; STARTUPINFO si; memset(&pi, 0, sizeof(pi)); memset(&si, 0, sizeof(si)); si.cb = sizeof(STARTUPINFO); if (CreateProcess(roadmap_exe, APP_RUN_AT_RS232_DETECT, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { CloseHandle(pi.hThread); } return codeINSTALL_EXIT_DONE; } /////////////////////////////////////////////////////////////// //PURPOSE : HANDLES TASKS DONE AT BEGINNING OF UNINSTALLATION /////////////////////////////////////////////////////////////// codeUNINSTALL_INIT Uninstall_Init( HWND hwndparent,LPCTSTR pszinstalldir) { //local variables WIN32_FIND_DATA findfiledata; HANDLE hfind; TCHAR pszfilepath[50]; WCHAR roadmap_exe[255]; wcscpy(roadmap_exe, pszinstalldir); wcscat(roadmap_exe, L"\\Roadmap.exe"); BOOL res = CeRunAppAtEvent(roadmap_exe, NOTIFICATION_EVENT_NONE); //initialize character array memset(pszfilepath,0,sizeof(pszfilepath)); //copy database path to character array //pszinstalldir variable will contain the //application path (eg : \Program Files\TestApp) wcscpy(pszfilepath,pszinstalldir); wcscat(pszfilepath,TEXT("\\test.sdf")); //trying to find whether database file exists or not hfind = FindFirstFile(pszfilepath,&findfiledata); if(hfind != INVALID_HANDLE_VALUE) //database file exists { //delete database DeleteFile(pszfilepath); } //return value return codeUNINSTALL_INIT_CONTINUE; } /////////////////////////////////////////////////////////// //PURPOSE : HANDLES TASKS DONE AT END OF UNINSTALLATION /////////////////////////////////////////////////////////// codeUNINSTALL_EXIT Uninstall_Exit(HWND hwndparent) { //do nothing //return value return codeUNINSTALL_EXIT_DONE; } --- NEW FILE: setupdll.vcp --- # Microsoft eMbedded Visual Tools Project File - Name="setupdll" - Package Owner=<4> # Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02 # ** DO NOT EDIT ** # TARGTYPE "Win32 (WCE ARMV4) Dynamic-Link Library" 0xa302 CFG=setupdll - Win32 (WCE ARMV4) Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "setupdll.vcn". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "setupdll.vcn" CFG="setupdll - Win32 (WCE ARMV4) Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "setupdll - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Dynamic-Link Library") !MESSAGE "setupdll - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Dynamic-Link Library") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" # PROP ATL_Project 2 CPP=clarm.exe MTL=midl.exe RSC=rc.exe !IF "$(CFG)" == "setupdll - Win32 (WCE ARMV4) Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "ARMV4Rel" # PROP BASE Intermediate_Dir "ARMV4Rel" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "ARMV4Rel" # PROP Intermediate_Dir "ARMV4Rel" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /Yu"stdafx.h" /O2 /M$(CECrtMT) /c # ADD CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /O2 /M$(CECrtMT) /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ELSEIF "$(CFG)" == "setupdll - Win32 (WCE ARMV4) Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "ARMV4Dbg" # PROP BASE Intermediate_Dir "ARMV4Dbg" # PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "ARMV4Dbg" # PROP Intermediate_Dir "ARMV4Dbg" # PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}" # PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}" # PROP Target_Dir "" # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /Yu"stdafx.h" /M$(CECrtMTDebug) /c # ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "SETUPDLL_EXPORTS" /M$(CECrtMTDebug) /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM # ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM !ENDIF # Begin Target # Name "setupdll - Win32 (WCE ARMV4) Release" # Name "setupdll - Win32 (WCE ARMV4) Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=.\setupdll.cpp DEP_CPP_SETUP=\ ".\setupdll.h"\ {$(INCLUDE)}"ce_setup.h"\ {$(INCLUDE)}"notify.h"\ # End Source File # Begin Source File SOURCE=.\setupdll.def # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File SOURCE=.\setupdll.h # End Source File # Begin Source File SOURCE=.\StdAfx.h # End Source File # End Group # Begin Group "Resource Files" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # End Group # Begin Source File SOURCE=.\ReadMe.txt # End Source File # End Target # End Project --- NEW FILE: setupdll.def --- EXPORTS Install_Init Install_Exit Uninstall_Init Uninstall_Exit --- NEW FILE: StdAfx.h --- // stdafx.h : include file for standard system include files, // or project specific include files that are used frequently, but // are changed infrequently // #if !defined(AFX_STDAFX_H__91842746_3291_4031_B9E2_24FA6EC9D6D2__INCLUDED_) #define AFX_STDAFX_H__91842746_3291_4031_B9E2_24FA6EC9D6D2__INCLUDED_ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 // Insert your headers here #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include <windows.h> // TODO: reference additional headers your program requires here //{{AFX_INSERT_LOCATION}} // Microsoft eMbedded Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_STDAFX_H__91842746_3291_4031_B9E2_24FA6EC9D6D2__INCLUDED_) --- NEW FILE: StdAfx.cpp --- // stdafx.cpp : source file that includes just the standard includes // setupdll.pch will be the pre-compiled header // stdafx.obj will contain the pre-compiled type information #include "stdafx.h" // TODO: reference any additional headers you need in STDAFX.H // and not in this file --- NEW FILE: setupdll.h --- // The following ifdef block is the standard way of creating macros which make exporting // from a DLL simpler. All files within this DLL are compiled with the SETUPDLL_EXPORTS // symbol defined on the command line. this symbol should not be defined on any project // that uses this DLL. This way any other project whose source files include this file see // SETUPDLL_API functions as being imported from a DLL, wheras this DLL sees symbols // defined with this macro as being exported. #ifdef SETUPDLL_EXPORTS #define SETUPDLL_API __declspec(dllexport) #else #define SETUPDLL_API __declspec(dllimport) #endif // This class is exported from the setupdll.dll class SETUPDLL_API CSetupdll { public: CSetupdll(void); // TODO: add your methods here. }; extern SETUPDLL_API int nSetupdll; SETUPDLL_API int fnSetupdll(void); |
|
From: Ehud S. <esh...@us...> - 2006-08-18 18:09:14
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/setupdll In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14754/setupdll Log Message: Directory /cvsroot/roadmap/roadmap_editor/src/win32/wince_env/setupdll added to the repository |
|
From: Ehud S. <esh...@us...> - 2006-08-18 18:08:23
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14305 Added Files: install.nsi Log Message: Generic win32 install script. --- NEW FILE: install.nsi --- ; Script generated by the HM NIS Edit Script Wizard. ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "RoadMap" !define PRODUCT_VERSION "0.8 Pre7" !define PRODUCT_PUBLISHER "FreeMap Israel" !define PRODUCT_WEB_SITE "http://www.freemap.co.il" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Roadmap.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" SetCompressor lzma ; MUI 1.67 compatible ------ !include "MUI.nsh" ; MUI Settings !define MUI_ABORTWARNING !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico" !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" ; Language Selection Dialog Settings !define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" !define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" !define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" ; Welcome page !insertmacro MUI_PAGE_WELCOME ; License page !insertmacro MUI_PAGE_LICENSE "l:\shared\roadmap_editor\Installation\license.txt" ; Directory page !insertmacro MUI_PAGE_DIRECTORY ; Instfiles page !insertmacro MUI_PAGE_INSTFILES ; Finish page !define MUI_FINISHPAGE_RUN "$INSTDIR\Roadmap.exe" !insertmacro MUI_PAGE_FINISH ; Uninstaller pages !insertmacro MUI_UNPAGE_INSTFILES ; Language files !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "Hebrew" ; Reserve files !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ; MUI end ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" OutFile "Setup.exe" InstallDir "$PROGRAMFILES\RoadMap" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show Function .onInit !insertmacro MUI_LANGDLL_DISPLAY FunctionEnd Section "MainSection" SEC01 SetOutPath "$INSTDIR" SetOverwrite ifnewer File "L:\shared\roadmap_editor\src\win32\win32_env\roadmap\Release\Roadmap.exe" CreateDirectory "$SMPROGRAMS\RoadMap" CreateShortCut "$SMPROGRAMS\RoadMap\RoadMap.lnk" "$INSTDIR\Roadmap.exe" CreateShortCut "$DESKTOP\RoadMap.lnk" "$INSTDIR\Roadmap.exe" File "L:\shared\roadmap_editor\src\win32\win32_env\roadgps\Release\RoadGPS.exe" SectionEnd Section "Config" SEC02 File "L:\shared\roadmap_editor\src\sprites" File "L:\shared\roadmap_editor\src\schema" File "L:\shared\roadmap_editor\src\objects" File "L:\shared\roadmap_editor\src\lang" File "L:\shared\roadmap_editor\src\drivers" File "L:\shared\roadmap_editor\src\font.ttf" File "L:\shared\roadmap_editor\src\win32\session" File "L:\shared\roadmap_editor\src\win32\preferences" File "L:\shared\roadmap_editor\src\win32\roadmap.toolbar" File "L:\shared\roadmap_editor\manual\manual.html" File "L:\shared\roadmap_editor\manual\apt_toc.gif" SectionEnd Section "Maps" SEC03 SetOutPath "$INSTDIR\maps" File "L:\shared\roadmap_editor\maps\usc77001.rdm" File "L:\shared\roadmap_editor\maps\usdir.rdm" SectionEnd Section "Icons" SEC04 SetOutPath "$INSTDIR\icons" File "L:\shared\roadmap_editor\src\icons\bmp\nav_approaching.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\sync.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_zoomout.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_zoomin.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_zoom1.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_stop.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_record.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_quit.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_menu.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_location.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_hold.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_gps.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_full.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_destination.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_counterclockwise.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_clockwise.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_3d.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\rm_2d.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\nav_u_turn.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\nav_turn_right.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\nav_turn_left.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\nav_panel_wide.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\nav_panel.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\nav_keep_right.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\nav_keep_left.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\nav_continue.bmp" File "L:\shared\roadmap_editor\src\icons\bmp\welcome.bmp" SectionEnd Section "Sound" SEC05 SetOutPath "$INSTDIR\sound" File "L:\shared\roadmap_editor\src\sound\within.wav" File "L:\shared\roadmap_editor\src\sound\TurnRight.wav" File "L:\shared\roadmap_editor\src\sound\TurnLeft.wav" File "L:\shared\roadmap_editor\src\sound\Straight.wav" File "L:\shared\roadmap_editor\src\sound\rec_start.wav" File "L:\shared\roadmap_editor\src\sound\rec_end.wav" File "L:\shared\roadmap_editor\src\sound\m.wav" File "L:\shared\roadmap_editor\src\sound\KeepRight.wav" File "L:\shared\roadmap_editor\src\sound\KeepLeft.wav" File "L:\shared\roadmap_editor\src\sound\Arrive.wav" File "L:\shared\roadmap_editor\src\sound\800.wav" File "L:\shared\roadmap_editor\src\sound\200.wav" SectionEnd Section -AdditionalIcons SetOutPath $INSTDIR WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}" CreateShortCut "$SMPROGRAMS\RoadMap\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" CreateShortCut "$SMPROGRAMS\RoadMap\Uninstall.lnk" "$INSTDIR\uninst.exe" SectionEnd Section -Post WriteUninstaller "$INSTDIR\uninst.exe" WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Roadmap.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Roadmap.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" SectionEnd Function un.onUninstSuccess HideWindow MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." FunctionEnd Function un.onInit !insertmacro MUI_UNGETLANGUAGE MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2 Abort FunctionEnd Section Uninstall Delete "$INSTDIR\${PRODUCT_NAME}.url" Delete "$INSTDIR\uninst.exe" Delete "$INSTDIR\sound\200.wav" Delete "$INSTDIR\sound\800.wav" Delete "$INSTDIR\sound\Arrive.wav" Delete "$INSTDIR\sound\KeepLeft.wav" Delete "$INSTDIR\sound\KeepRight.wav" Delete "$INSTDIR\sound\m.wav" Delete "$INSTDIR\sound\rec_end.wav" Delete "$INSTDIR\sound\rec_start.wav" Delete "$INSTDIR\sound\Straight.wav" Delete "$INSTDIR\sound\TurnLeft.wav" Delete "$INSTDIR\sound\TurnRight.wav" Delete "$INSTDIR\sound\within.wav" Delete "$INSTDIR\icons\welcome.bmp" Delete "$INSTDIR\icons\nav_continue.bmp" Delete "$INSTDIR\icons\nav_keep_left.bmp" Delete "$INSTDIR\icons\nav_keep_right.bmp" Delete "$INSTDIR\icons\nav_panel.bmp" Delete "$INSTDIR\icons\nav_panel_wide.bmp" Delete "$INSTDIR\icons\nav_turn_left.bmp" Delete "$INSTDIR\icons\nav_turn_right.bmp" Delete "$INSTDIR\icons\nav_u_turn.bmp" Delete "$INSTDIR\icons\rm_2d.bmp" Delete "$INSTDIR\icons\rm_3d.bmp" Delete "$INSTDIR\icons\rm_clockwise.bmp" Delete "$INSTDIR\icons\rm_counterclockwise.bmp" Delete "$INSTDIR\icons\rm_destination.bmp" Delete "$INSTDIR\icons\rm_full.bmp" Delete "$INSTDIR\icons\rm_gps.bmp" Delete "$INSTDIR\icons\rm_hold.bmp" Delete "$INSTDIR\icons\rm_location.bmp" Delete "$INSTDIR\icons\rm_menu.bmp" Delete "$INSTDIR\icons\rm_quit.bmp" Delete "$INSTDIR\icons\rm_record.bmp" Delete "$INSTDIR\icons\rm_stop.bmp" Delete "$INSTDIR\icons\rm_zoom1.bmp" Delete "$INSTDIR\icons\rm_zoomin.bmp" Delete "$INSTDIR\icons\rm_zoomout.bmp" Delete "$INSTDIR\icons\sync.bmp" Delete "$INSTDIR\icons\nav_approaching.bmp" Delete "$INSTDIR\maps\usdir.rdm" Delete "$INSTDIR\maps\usc77001.rdm" Delete "$INSTDIR\apt_toc.gif" Delete "$INSTDIR\manual.html" Delete "$INSTDIR\roadmap.toolbar" Delete "$INSTDIR\preferences" Delete "$INSTDIR\session" Delete "$INSTDIR\font.ttf" Delete "$INSTDIR\drivers" Delete "$INSTDIR\lang" Delete "$INSTDIR\objects" Delete "$INSTDIR\schema" Delete "$INSTDIR\sprites" Delete "$INSTDIR\RoadGPS.exe" Delete "$INSTDIR\Roadmap.exe" Delete "$SMPROGRAMS\RoadMap\Uninstall.lnk" Delete "$SMPROGRAMS\RoadMap\Website.lnk" Delete "$DESKTOP\RoadMap.lnk" Delete "$SMPROGRAMS\RoadMap\RoadMap.lnk" RMDir "$SMPROGRAMS\RoadMap" RMDir "$INSTDIR\sound" RMDir "$INSTDIR\maps" RMDir "$INSTDIR\icons" RMDir "$INSTDIR" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" SetAutoClose true SectionEnd |
|
From: Ehud S. <esh...@us...> - 2006-08-18 18:07:23
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13839 Modified Files: roadmap_main.cpp Log Message: Catch exceptions. Allow assigning actions to hardware buttons. Splash screen. Disable kill focus handler (must be fixed). Index: roadmap_main.cpp =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_main.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** roadmap_main.cpp 27 Jul 2006 14:25:39 -0000 1.15 --- roadmap_main.cpp 18 Aug 2006 18:07:17 -0000 1.16 *************** *** 31,36 **** #include <winsock.h> #ifdef UNDER_CE ! #include <aygshell.h> #include <notify.h> #endif --- 31,38 ---- #include <winsock.h> #ifdef UNDER_CE ! #include <aygshell.h> [...1033 lines suppressed...] ! { ! UpdateWindow(GetFocus()); } --- 1248,1262 ---- void roadmap_main_flush (void) ! { ! HWND w = GetFocus(); ! MSG msg; ! ! while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) ! { ! TranslateMessage(&msg); ! DispatchMessage(&msg); ! } ! ! //UpdateWindow(w); } |
|
From: Ehud S. <esh...@us...> - 2006-08-18 18:03:19
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12015 Modified Files: roadmap_dialog.c Log Message: Disable full size dialogs if only few frames are needed. Fix SIP handling. Index: roadmap_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_dialog.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** roadmap_dialog.c 10 Aug 2006 20:55:02 -0000 1.13 --- roadmap_dialog.c 18 Aug 2006 18:03:10 -0000 1.14 *************** *** 38,42 **** #include "../roadmap_types.h" #include "../roadmap_start.h" ! #include "../roadmap_lang.h" #define ROADMAP_DIALOG_NO_LANG --- 38,43 ---- #include "../roadmap_types.h" #include "../roadmap_start.h" ! #include "../roadmap_lang.h" ! #include "../roadmap_canvas.h" #define ROADMAP_DIALOG_NO_LANG *************** *** 276,279 **** --- 277,291 ---- } + + static void show_sip_button (HWND parent) { + + HWND hWndSipButton; + + hWndSipButton = FindWindow(TEXT("MS_SIPBUTTON"), NULL); + + if (hWndSipButton) { + SetWindowPos(hWndSipButton, parent, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE|SWP_SHOWWINDOW); + } + } int roadmap_dialog_activate (const char *name, void *context) *************** *** 289,293 **** RoadMapDialogCurrent = dialog; ! ShowWindow(dialog->w, SW_SHOW); #ifdef UNDER_CE --- 301,306 ---- RoadMapDialogCurrent = dialog; ! ShowWindow(dialog->w, SW_SHOW); ! show_sip_button (dialog->w); #ifdef UNDER_CE *************** *** 581,584 **** --- 594,599 ---- SetWindowText(dialog->w, str); free(str); + + show_sip_button (dialog->w); if (count == 1) { *************** *** 664,667 **** --- 679,696 ---- } + + void roadmap_dialog_set_focus (const char *frame, const char *name) + { + RoadMapDialogItem this_frame; + RoadMapDialogItem this_item; + + this_frame = roadmap_dialog_get (RoadMapDialogCurrent, frame); + this_item = roadmap_dialog_get (this_frame, name); + + if (this_item->w) { + SetFocus (this_item->w); + } + } + void *roadmap_dialog_get_data (const char *frame, const char *name) *************** *** 678,681 **** --- 707,711 ---- case ROADMAP_WIDGET_PASSWORD: case ROADMAP_WIDGET_ENTRY: + case ROADMAP_WIDGET_LABEL: case ROADMAP_WIDGET_MUL_ENTRY: GetWindowText(this_item->w, str, sizeof(str)/sizeof(str[0])); *************** *** 830,834 **** 0, L"STATIC", // Class name ! name_unicode, // Window name dwStyle, // Window style 0, // x-coordinate of the upper-left corner --- 860,864 ---- 0, L"STATIC", // Class name ! name_unicode, // Window name dwStyle, // Window style 0, // x-coordinate of the upper-left corner *************** *** 841,845 **** NULL); // Specify NULL for this parameter when you ! dwStyle |= WS_BORDER|ES_AUTOHSCROLL; if (item->widget_type == ROADMAP_WIDGET_PASSWORD) { --- 871,875 ---- NULL); // Specify NULL for this parameter when you ! dwStyle |= WS_BORDER|ES_AUTOHSCROLL; if (item->widget_type == ROADMAP_WIDGET_PASSWORD) { *************** *** 847,850 **** --- 877,882 ---- } else if (item->widget_type == ROADMAP_WIDGET_MUL_ENTRY) { dwStyle |= WS_VSCROLL | ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL; + + if (roadmap_lang_rtl ()) dwStyle |= ES_RIGHT; } *************** *** 997,1001 **** 0, L"BUTTON", // Class name ! name_unicode, // Window name dwStyle, // Window style 0, // x-coordinate of the upper-left corner --- 1029,1033 ---- 0, L"BUTTON", // Class name ! name_unicode, // Window name dwStyle, // Window style 0, // x-coordinate of the upper-left corner *************** *** 1015,1019 **** 0, L"STATIC", // Class name ! name_unicode, // Window name dwStyle, // Window style 0, // x-coordinate of the upper-left corner --- 1047,1051 ---- 0, L"STATIC", // Class name ! name_unicode, // Window name dwStyle, // Window style 0, // x-coordinate of the upper-left corner *************** *** 1030,1034 **** 0, L"LISTBOX", // Class name ! NULL, // Window name dwStyle, // Window style 0, // x-coordinate of the upper-left corner --- 1062,1066 ---- 0, L"LISTBOX", // Class name ! NULL, // Window name dwStyle, // Window style 0, // x-coordinate of the upper-left corner *************** *** 1059,1064 **** --- 1091,1098 ---- } + #ifdef UNDER_CE CreateWindow (WC_SIPPREF, TEXT(""), WS_CHILD, -10, -10, 5, 5, hDlg, (HMENU) NULL, g_hInst, NULL); + #endif } *************** *** 1103,1110 **** unsigned int second_column_width; int curr_y; ! int label_y_add; if (frame == NULL) return; ! dc = GetDC(hDlg); for (item = frame->children; item != NULL; item = item->next) { --- 1137,1147 ---- unsigned int second_column_width; int curr_y; ! int label_y_add; ! RECT rc; if (frame == NULL) return; ! ! GetWindowRect(hDlg, &rc); ! dc = GetDC(hDlg); for (item = frame->children; item != NULL; item = item->next) { *************** *** 1202,1207 **** unsigned int widget_height = row_height; ! if (item->widget_type == ROADMAP_WIDGET_CHOICE) { ! widget_height = height - curr_y - 2; if (widget_height > MAX_LIST_HEIGHT*2) { widget_height = MAX_LIST_HEIGHT*2; --- 1239,1246 ---- unsigned int widget_height = row_height; ! if (item->widget_type == ROADMAP_WIDGET_CHOICE) { ! ! widget_height = roadmap_canvas_height () - rc.top - curr_y - 2; ! if (widget_height > MAX_LIST_HEIGHT*2) { widget_height = MAX_LIST_HEIGHT*2; *************** *** 1278,1291 **** int num_buttons; int num_containers = 0; ! int min_height = 0; #ifdef UNDER_CE SHINITDLGINFO shidi; - - SetWindowLong(hDlg, GWL_STYLE, - GetWindowLong(hDlg, GWL_STYLE) | WS_NONAVDONEBUTTON); - SHDoneButton(hDlg, SHDB_HIDE); #else SetWindowLong(hDlg, GWL_STYLE, ! GetWindowLong(hDlg, GWL_STYLE) | WS_OVERLAPPEDWINDOW); #endif --- 1317,1327 ---- int num_buttons; int num_containers = 0; ! int min_height = 0; ! int has_cancel_button = 0; #ifdef UNDER_CE SHINITDLGINFO shidi; #else SetWindowLong(hDlg, GWL_STYLE, ! GetWindowLong(hDlg, GWL_STYLE) | WS_OVERLAPPEDWINDOW); #endif *************** *** 1296,1300 **** for (frame = dialog->children; frame != NULL; frame = frame->next) { if (frame->widget_type != ROADMAP_WIDGET_CONTAINER) { ! create_item(frame, hDlg); num_buttons++; } else { --- 1332,1341 ---- for (frame = dialog->children; frame != NULL; frame = frame->next) { if (frame->widget_type != ROADMAP_WIDGET_CONTAINER) { ! create_item(frame, hDlg); ! ! if (!strcmp(frame->name, roadmap_lang_get ("Cancel"))) { ! has_cancel_button = 1; ! } ! num_buttons++; } else { *************** *** 1306,1309 **** --- 1347,1359 ---- } } + + #ifdef UNDER_CE + if (has_cancel_button) { + SetWindowLong(hDlg, GWL_STYLE, + GetWindowLong(hDlg, GWL_STYLE) | WS_NONAVDONEBUTTON); + + SHDoneButton(hDlg, SHDB_HIDE); + } + #endif if (num_containers == 1) { *************** *** 1314,1321 **** if (min_height < 120) min_height = 120; - if (!dialog->use_keyboard) { - SetWindowPos(hDlg, HWND_TOP, 10, 30, 220, min_height+30, SWP_DRAWFRAME); - } - #ifdef UNDER_CE --- 1364,1367 ---- *************** *** 1324,1328 **** shidi.dwFlags = SHIDIF_FULLSCREENNOMENUBAR; } else { ! shidi.dwFlags = 0; } --- 1370,1375 ---- shidi.dwFlags = SHIDIF_FULLSCREENNOMENUBAR; } else { ! shidi.dwFlags = 0; ! SetWindowPos(hDlg, HWND_TOP, 10, 30, 220, min_height+30, SWP_DRAWFRAME); } *************** *** 1414,1418 **** break; ! case WM_COMMAND: if ((HIWORD(wParam) == BN_CLICKED) || (HIWORD(wParam) == LBN_SELCHANGE) || --- 1461,1473 ---- break; ! case WM_COMMAND: ! ! if (((HWND)lParam == hDlg) && (LOWORD(wParam) == IDOK)) { ! ! roadmap_dialog_hide_window ! ((RoadMapDialogItem)GetWindowLong((HWND)lParam, GWL_USERDATA)); ! return TRUE; ! } ! if ((HIWORD(wParam) == BN_CLICKED) || (HIWORD(wParam) == LBN_SELCHANGE) || *************** *** 1441,1449 **** return TRUE; ! } case WM_CLOSE: EndDialog(hDlg, message); ! return TRUE; } --- 1496,1521 ---- return TRUE; ! } ! ! return FALSE; case WM_CLOSE: EndDialog(hDlg, message); ! return TRUE; ! ! /* ! case WM_ERASEBKGND: ! { ! HDC hdc = (HDC)wParam; ! HBRUSH brush = CreateSolidBrush (RGB(255,255,224)); ! RECT rc; ! ! GetClientRect(hDlg, &rc); ! FillRect(hdc, &rc, brush); ! ! DeleteObject(brush); ! return TRUE; ! } ! */ } |
|
From: Ehud S. <esh...@us...> - 2006-08-18 18:00:13
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10708 Modified Files: preferences Log Message: Set keyboard to no. Index: preferences =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/preferences,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** preferences 9 Aug 2006 07:37:39 -0000 1.9 --- preferences 18 Aug 2006 18:00:07 -0000 1.10 *************** *** 64,67 **** General.Toolbar: no Geometry.Main: 800x600 ! General.Keyboard: yes General.Unit: metric --- 64,67 ---- General.Toolbar: no Geometry.Main: 800x600 ! General.Keyboard: no General.Unit: metric |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:59:24
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10296 Modified Files: install.inf Log Message: Update install script. Index: install.inf =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/install.inf,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** install.inf 9 Aug 2006 07:38:00 -0000 1.10 --- install.inf 18 Aug 2006 17:59:18 -0000 1.11 *************** *** 84,87 **** --- 84,89 ---- TurnRight.wav = 10 within.wav = 10 + rec_start.wav = 10 + rec_end.wav = 10 [SourceDisksFiles.ARM] *************** *** 158,161 **** --- 160,165 ---- TurnRight.wav,,,0x00000010 within.wav,,,0x00000010 + rec_start.wav,,,0x00000010 + rec_end.wav,,,0x00000010 [Files.Maps] |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:58:32
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9888 Modified Files: roadmap_path.c roadmap_win32.h Log Message: Generic win32 support. Index: roadmap_win32.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_win32.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** roadmap_win32.h 11 Aug 2006 18:16:20 -0000 1.7 --- roadmap_win32.h 18 Aug 2006 17:58:25 -0000 1.8 *************** *** 3,8 **** #include <windows.h> ! #define inline _inline #define MENU_ID_START WM_USER #define MAX_MENU_ITEMS 100 --- 3,14 ---- #include <windows.h> ! ! #if defined(__GNUC__) ! #define __try try ! #define __except(x) catch (...) ! #else #define inline _inline + #endif + #define MENU_ID_START WM_USER #define MAX_MENU_ITEMS 100 *************** *** 10,14 **** #define MAX_TOOL_ITEMS 100 #define WM_USER_DUMMY (WM_USER + TOOL_ID_START + MAX_TOOL_ITEMS + 1) ! #define WM_USER_READ (WM_USER_DUMMY + 1) #define WM_USER_SYNC (WM_USER_READ + 1) --- 16,20 ---- #define MAX_TOOL_ITEMS 100 #define WM_USER_DUMMY (WM_USER + TOOL_ID_START + MAX_TOOL_ITEMS + 1) ! #define WM_USER_READ (WM_USER_DUMMY + 1) #define WM_USER_SYNC (WM_USER_READ + 1) Index: roadmap_path.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_path.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** roadmap_path.c 21 Apr 2006 17:26:24 -0000 1.4 --- roadmap_path.c 18 Aug 2006 17:58:25 -0000 1.5 *************** *** 486,490 **** --- 486,494 ---- int roadmap_path_is_full_path (const char *name) { + #ifdef UNDER_CE return name[0] == '\\'; + #else + return name[1] == ':'; + #endif } |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:57:56
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9503 Modified Files: roadmap_sound.c Log Message: Sound recording. Index: roadmap_sound.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap_sound.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** roadmap_sound.c 9 Aug 2006 07:36:42 -0000 1.2 --- roadmap_sound.c 18 Aug 2006 17:57:52 -0000 1.3 *************** *** 37,43 **** static RoadMapSoundList sound_lists[MAX_LISTS]; static CRITICAL_SECTION SoundCriticalSection; ! static HANDLE SoundEvent; static HANDLE SoundRecEvent; ! static HANDLE sound_thread; static HANDLE sound_rec_thread; static int current_list = -1; --- 37,43 ---- static RoadMapSoundList sound_lists[MAX_LISTS]; static CRITICAL_SECTION SoundCriticalSection; ! static HANDLE SoundEvent; static HANDLE SoundRecEvent; ! static HANDLE sound_thread; static HANDLE sound_rec_thread; static int current_list = -1; *************** *** 46,50 **** static WAVEHDR WaveHeader; static WAVEFORMATEX PCMfmt; ! static HWAVEIN hWaveIn; static char *RoadMapSoundRecName; --- 46,50 ---- static WAVEHDR WaveHeader; static WAVEFORMATEX PCMfmt; ! static HWAVEIN hWaveIn; static char *RoadMapSoundRecName; *************** *** 78,83 **** DWORD dwDataSize; }; ! ! static int save_wav_file (void *data, unsigned int size); DWORD WINAPI SoundThread (LPVOID lpParam) { --- 78,83 ---- DWORD dwDataSize; }; ! ! static int save_wav_file (void *data, unsigned int size); DWORD WINAPI SoundThread (LPVOID lpParam) { *************** *** 88,93 **** int i; ! if (WaitForSingleObject(SoundEvent, INFINITE) == WAIT_FAILED) { ! return 0; } --- 88,93 ---- int i; ! if (WaitForSingleObject(SoundEvent, INFINITE) == WAIT_FAILED) { ! return 0; } *************** *** 123,151 **** } ! ! DWORD WINAPI SoundRecThread (LPVOID lpParam) { ! ! while (1) { ! ! DWORD res; ! ! if (WaitForSingleObject(SoundRecEvent, INFINITE) == WAIT_FAILED) { ! return 0; ! } ! ! res = waveInUnprepareHeader(hWaveIn, &WaveHeader, sizeof(WAVEHDR)); ! ! res = save_wav_file (WaveHeader.lpData, WaveHeader.dwBytesRecorded); ! ! free(WaveHeader.lpData); ! WaveHeader.lpData = NULL; ! ! res = waveInReset(hWaveIn); res = waveInClose(hWaveIn); ! roadmap_sound_play ("rec_end.wav"); ! res = res; ! } ! } ! int roadmap_sound_play (const char *file_name) { --- 123,152 ---- } ! ! DWORD WINAPI SoundRecThread (LPVOID lpParam) { ! ! while (1) { ! ! DWORD res; ! ! if (WaitForSingleObject(SoundRecEvent, INFINITE) == WAIT_FAILED) { ! return 0; ! } ! ! res = waveInUnprepareHeader(hWaveIn, &WaveHeader, sizeof(WAVEHDR)); ! ! res = save_wav_file (WaveHeader.lpData, WaveHeader.dwBytesRecorded); ! ! free(WaveHeader.lpData); ! WaveHeader.lpData = NULL; ! ! res = waveInReset(hWaveIn); res = waveInClose(hWaveIn); ! hWaveIn = NULL; ! roadmap_sound_play ("rec_end.wav"); ! res = res; ! } ! } ! int roadmap_sound_play (const char *file_name) { *************** *** 155,162 **** BOOL res; ! snprintf (full_name, sizeof(full_name), "%s\\sound\\%s", ! roadmap_path_user (), file_name); ! file_name_unicode = ConvertToWideChar(full_name, CP_UTF8); res = PlaySound(file_name_unicode, NULL, SND_SYNC | SND_FILENAME); --- 156,168 ---- BOOL res; ! if (roadmap_path_is_full_path (file_name)) { ! file_name_unicode = ConvertToWideChar(file_name, CP_UTF8); ! } else { ! snprintf (full_name, sizeof(full_name), "%s\\sound\\%s", ! roadmap_path_user (), file_name); ! ! file_name_unicode = ConvertToWideChar(full_name, CP_UTF8); ! } res = PlaySound(file_name_unicode, NULL, SND_SYNC | SND_FILENAME); *************** *** 236,240 **** void roadmap_sound_initialize (void) { ! SoundEvent = CreateEvent (NULL, FALSE, FALSE, NULL); SoundRecEvent = CreateEvent (NULL, FALSE, FALSE, NULL); InitializeCriticalSection (&SoundCriticalSection); --- 242,246 ---- void roadmap_sound_initialize (void) { ! SoundEvent = CreateEvent (NULL, FALSE, FALSE, NULL); SoundRecEvent = CreateEvent (NULL, FALSE, FALSE, NULL); InitializeCriticalSection (&SoundCriticalSection); *************** *** 255,270 **** void roadmap_sound_shutdown (void) { ! ! DWORD res; ! ! CloseHandle (SoundEvent); if (SoundRecEvent) CloseHandle (SoundRecEvent); ! DeleteCriticalSection (&SoundCriticalSection); ! ! if (hWaveIn != NULL) { ! res = waveInReset(hWaveIn); ! res = waveInClose(hWaveIn); ! hWaveIn = NULL; ! } } --- 261,276 ---- void roadmap_sound_shutdown (void) { ! ! DWORD res; ! ! CloseHandle (SoundEvent); if (SoundRecEvent) CloseHandle (SoundRecEvent); ! DeleteCriticalSection (&SoundCriticalSection); ! ! if (hWaveIn != NULL) { ! res = waveInReset(hWaveIn); ! res = waveInClose(hWaveIn); ! hWaveIn = NULL; ! } } *************** *** 310,314 **** fb.wavFormat.wBitsPerSample = PCMfmt.wBitsPerSample; ! file = roadmap_file_fopen (NULL, "\\test.wav", "w"); if (!file) return -1; --- 316,320 ---- fb.wavFormat.wBitsPerSample = PCMfmt.wBitsPerSample; ! file = roadmap_file_fopen (NULL, RoadMapSoundRecName, "w"); if (!file) return -1; *************** *** 323,328 **** fwrite(data, size, 1, file); ! fclose (file); ! return 0; } --- 329,334 ---- fwrite(data, size, 1, file); ! fclose (file); ! return 0; } *************** *** 334,347 **** if (hWaveIn != NULL) return -1; ! ! if (sound_rec_thread == NULL) { ! sound_rec_thread = CreateThread(NULL, 0, SoundRecThread, NULL, 0, NULL); } ! ! if (RoadMapSoundRecName != NULL) { ! free(RoadMapSoundRecName); ! } ! RoadMapSoundRecName = strdup(file_name); ! res = waveInOpen(&hWaveIn, (UINT) WAVE_MAPPER, &PCMfmt, (DWORD) SoundRecEvent, (DWORD) 0, CALLBACK_EVENT); --- 340,353 ---- if (hWaveIn != NULL) return -1; ! ! if (sound_rec_thread == NULL) { ! sound_rec_thread = CreateThread(NULL, 0, SoundRecThread, NULL, 0, NULL); } ! ! if (RoadMapSoundRecName != NULL) { ! free(RoadMapSoundRecName); ! } ! RoadMapSoundRecName = strdup(file_name); ! res = waveInOpen(&hWaveIn, (UINT) WAVE_MAPPER, &PCMfmt, (DWORD) SoundRecEvent, (DWORD) 0, CALLBACK_EVENT); *************** *** 352,357 **** res = waveInAddBuffer(hWaveIn, &WaveHeader, sizeof(WAVEHDR)); ! ! roadmap_sound_play ("rec_start.wav"); res = waveInStart(hWaveIn); --- 358,363 ---- res = waveInAddBuffer(hWaveIn, &WaveHeader, sizeof(WAVEHDR)); ! ! roadmap_sound_play ("rec_start.wav"); res = waveInStart(hWaveIn); |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:56:57
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9095 Modified Files: roadmap.rc Log Message: Generic win32 support. Index: roadmap.rc =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/roadmap.rc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** roadmap.rc 9 Aug 2006 07:36:25 -0000 1.3 --- roadmap.rc 18 Aug 2006 17:56:53 -0000 1.4 *************** *** 68,72 **** IDM_MENU, 1, I_IMAGENONE, IDM_MAIN_COMMAND1, TBSTATE_ENABLED, ! TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_HELP, 0, 0, END --- 68,72 ---- IDM_MENU, 1, I_IMAGENONE, IDM_MAIN_COMMAND1, TBSTATE_ENABLED, ! TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_HELP, 0, 0 END |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:56:37
|
Update of /cvsroot/roadmap/roadmap_editor/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9081 Modified Files: Makefile Makefile.os Log Message: Generic win32 support. Index: Makefile.os =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/Makefile.os,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.os 13 Jul 2006 06:49:03 -0000 1.1 --- Makefile.os 18 Aug 2006 17:56:34 -0000 1.2 *************** *** 23,26 **** --- 23,27 ---- roadmap_time.c \ roadmap_win32.c \ + roadmap_sound.c \ listports.c \ wince_input_mon.c \ Index: Makefile =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/win32/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 13 Jul 2006 06:49:03 -0000 1.1 --- Makefile 18 Aug 2006 17:56:34 -0000 1.2 *************** *** 53,57 **** RMLIBOBJS=$(RMLIBSRCS:.c=.o) roadmap_canvas_agg.o ../agg/roadmap_canvas.o ../agg/font_freetype/agg_font_freetype.o ! RUNTIME=gtkroadgps gtkroadmap --- 53,57 ---- RMLIBOBJS=$(RMLIBSRCS:.c=.o) roadmap_canvas_agg.o ../agg/roadmap_canvas.o ../agg/font_freetype/agg_font_freetype.o ! RUNTIME=gtkroadmap |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:55:44
|
Update of /cvsroot/roadmap/roadmap_editor/src/unix In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8672 Modified Files: roadmap_sound.c Log Message: Sound record stub. Index: roadmap_sound.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/unix/roadmap_sound.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roadmap_sound.c 27 Jul 2006 14:28:20 -0000 1.1 --- roadmap_sound.c 18 Aug 2006 17:55:40 -0000 1.2 *************** *** 81,84 **** --- 81,90 ---- + int roadmap_sound_record (const char *file_name, int seconds) { + + return 0; + } + + void roadmap_sound_initialize (void) {} void roadmap_sound_shutdown (void) {} |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:54:53
|
Update of /cvsroot/roadmap/roadmap_editor/src/sound In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8212 Added Files: 200.wav 800.wav Arrive.wav KeepLeft.wav KeepRight.wav m.wav rec_end.wav rec_start.wav Straight.wav TurnLeft.wav TurnRight.wav within.wav Log Message: Import voice instructions. --- NEW FILE: TurnRight.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Arrive.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rec_start.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: KeepRight.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: KeepLeft.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 200.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: within.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: TurnLeft.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: 800.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: m.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Straight.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rec_end.wav --- (This appears to be a binary file; contents omitted.) |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:52:56
|
Update of /cvsroot/roadmap/roadmap_editor/src/navigate In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7481 Modified Files: navigate_dglib.c navigate_graph.h navigate_main.c navigate_main.h Log Message: Ignore turn restrictions if no valid route is available. Index: navigate_main.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_main.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** navigate_main.c 9 Aug 2006 07:34:30 -0000 1.12 --- navigate_main.c 18 Aug 2006 17:52:50 -0000 1.13 *************** *** 52,57 **** --- 52,61 ---- #include "roadmap_adjust.h" #include "roadmap_lang.h" + #include "roadmap_address.h" #include "roadmap_sound.h" + //FIXME remove when navigation will support plugin lines + #include "editor/editor_plugin.h" + #include "navigate_plugin.h" #include "navigate_graph.h" *************** *** 67,70 **** --- 71,75 ---- static int NavigateTrackFollowGPS = 0; static RoadMapPen NavigatePen; + static RoadMapPen NavigatePenEst; static void navigate_update (RoadMapPosition *position, PluginLine *current); *************** *** 78,81 **** --- 83,87 ---- static int NavigateDistanceToTurn; static int NavigateETAToTurn; + static int NavigateFlags; RoadMapNavigateRouteCB NavigateCallbacks = { *************** *** 111,118 **** --- 117,128 ---- *from_point = -1; + if (NavigateTrackFollowGPS) { RoadMapGpsPosition pos; + //FIXME remove when navigation will support plugin lines + editor_plugin_set_override (0); + if (roadmap_navigate_get_current (&pos, &line, &direction) != -1) { *************** *** 134,137 **** --- 144,150 ---- } + //FIXME remove when navigation will support plugin lines + editor_plugin_set_override (1); + } else { *************** *** 144,151 **** --- 157,170 ---- if (!position) return -1; + //FIXME remove when navigation will support plugin lines + editor_plugin_set_override (0); + if ((roadmap_navigate_retrieve_line (position, 20, &line, &distance, LAYER_ALL_ROADS) == -1) || (roadmap_plugin_get_id (&line) != ROADMAP_PLUGIN_ID)) { + //FIXME remove when navigation will support plugin lines + editor_plugin_set_override (1); + roadmap_messagebox ("Error", "Can't find a road near departure point."); *************** *** 154,157 **** --- 173,179 ---- } + //FIXME remove when navigation will support plugin lines + editor_plugin_set_override (1); + } *************** *** 196,199 **** --- 218,224 ---- NavigateDestPos = *position; + //FIXME remove when navigation will support plugin lines + editor_plugin_set_override (0); + if ((roadmap_navigate_retrieve_line (position, 20, &line, &distance, LAYER_ALL_ROADS) == -1) || *************** *** 201,207 **** --- 226,237 ---- roadmap_messagebox ("Error", "Can't find a road near destination point."); + //FIXME remove when navigation will support plugin lines + editor_plugin_set_override (1); + return -1; } + //FIXME remove when navigation will support plugin lines + editor_plugin_set_override (1); *to_line = line; *************** *** 239,242 **** --- 269,273 ---- PluginLine from_line; int from_point; + int result_flags; NavigateNumSegments = MAX_NAV_SEGEMENTS; *************** *** 256,260 **** navigate_get_route_segments (&from_line, from_point, &NavigateDestination, NavigateDestPoint, ! NavigateSegments, &NavigateNumSegments); if (track_time <= 0) { --- 287,291 ---- navigate_get_route_segments (&from_line, from_point, &NavigateDestination, NavigateDestPoint, ! NavigateSegments, &NavigateNumSegments, &result_flags); if (track_time <= 0) { *************** *** 262,265 **** --- 293,298 ---- } + NavigateFlags = result_flags; + navigate_instr_prepare_segments (NavigateSegments, NavigateNumSegments, &NavigateSrcPos, &NavigateDestPos); *************** *** 305,308 **** --- 338,351 ---- + static int navigate_address_cb (const RoadMapPosition *point, + const PluginLine *line, + int direction) { + + roadmap_trip_set_point ("Destination", point); + + return navigate_main_calc_route (); + } + + void navigate_update (RoadMapPosition *position, PluginLine *current) { *************** *** 418,421 **** --- 461,465 ---- if (NavigateDistanceToTurn > ANNOUNCES[i]) { NavigateNextAnnounce = ANNOUNCES[i]; + break; } } *************** *** 593,601 **** roadmap_canvas_set_thickness (ROUTE_PEN_WIDTH); navigate_bar_initialize (); navigate_main_set (1); ! NextMessageUpdate = ! roadmap_message_register (navigate_main_format_messages); NavigatePluginID = navigate_plugin_register (); --- 637,652 ---- roadmap_canvas_set_thickness (ROUTE_PEN_WIDTH); + NavigatePenEst = roadmap_canvas_create_pen ("NavigatePen2"); + roadmap_canvas_set_foreground ("red"); + roadmap_canvas_set_opacity (160); + roadmap_canvas_set_thickness (ROUTE_PEN_WIDTH); + navigate_bar_initialize (); navigate_main_set (1); ! NextMessageUpdate = ! roadmap_message_register (navigate_main_format_messages); ! ! roadmap_address_register_nav (navigate_address_cb); NavigatePluginID = navigate_plugin_register (); *************** *** 615,626 **** ! void navigate_main_calc_route () { int track_time; PluginLine from_line; int from_point; ! NavigateTrackFollowGPS = ! (strcmp (roadmap_trip_get_focus_name (), "GPS") == 0); NavigateDestination.plugin_id = INVALID_PLUGIN_ID; --- 666,689 ---- ! int navigate_main_calc_route () { int track_time; PluginLine from_line; int from_point; + int result_flags; ! const char *focus = roadmap_trip_get_focus_name (); ! ! NavigateTrackFollowGPS = focus && !strcmp (focus, "GPS"); ! ! if (NavigateTrackFollowGPS) { ! if (roadmap_trip_get_position ("Departure")) { ! roadmap_trip_remove_point ("Departure"); ! } ! } ! ! if (!NavigateTrackFollowGPS && !roadmap_trip_get_position ("Departure")) { ! NavigateTrackFollowGPS = 1; ! } NavigateDestination.plugin_id = INVALID_PLUGIN_ID; *************** *** 630,639 **** NavigateNumSegments = MAX_NAV_SEGEMENTS; ! if (navigate_load_data () < 0) return; if (navigate_find_track_points (&from_line, &from_point, &NavigateDestination, &NavigateDestPoint)) { ! return; } --- 693,706 ---- NavigateNumSegments = MAX_NAV_SEGEMENTS; ! if (navigate_load_data () < 0) { ! ! roadmap_messagebox("Error", "Error loading navigation data."); ! return -1; ! } if (navigate_find_track_points (&from_line, &from_point, &NavigateDestination, &NavigateDestPoint)) { ! return -1; } *************** *** 641,645 **** navigate_get_route_segments (&from_line, from_point, &NavigateDestination, NavigateDestPoint, ! NavigateSegments, &NavigateNumSegments); if (track_time <= 0) { --- 708,712 ---- navigate_get_route_segments (&from_line, from_point, &NavigateDestination, NavigateDestPoint, ! NavigateSegments, &NavigateNumSegments, &result_flags); if (track_time <= 0) { *************** *** 651,656 **** roadmap_messagebox("Error", "Can't find a route."); } } else { ! char msg[200]; int i; int length = 0; --- 718,725 ---- roadmap_messagebox("Error", "Can't find a route."); } + + return -1; } else { ! char msg[200] = {0}; int i; int length = 0; *************** *** 663,667 **** } ! snprintf(msg, sizeof(msg), "%s: %.1f %s\n%s: %.1f %s", roadmap_lang_get ("Length"), length/1000.0, --- 732,744 ---- } ! NavigateFlags = result_flags; ! ! if (result_flags & GRAPH_IGNORE_TURNS) { ! snprintf(msg, sizeof(msg), "%s\n", ! roadmap_lang_get ("The calculated route may have incorrect turn instructions.")); ! } ! ! snprintf(msg + strlen(msg), sizeof(msg) - strlen(msg), ! "%s: %.1f %s\n%s: %.1f %s", roadmap_lang_get ("Length"), length/1000.0, *************** *** 684,687 **** --- 761,766 ---- roadmap_messagebox ("Route found", msg); } + + return 0; } *************** *** 691,697 **** --- 770,783 ---- int current_width = -1; int last_cfcc = -1; + RoadMapPen pen; if (!NavigateTrackEnabled) return; + if (NavigateFlags & GRAPH_IGNORE_TURNS) { + pen = NavigatePenEst; + } else { + pen = NavigatePen; + } + if (!NavigateTrackFollowGPS && !strcmp (roadmap_trip_get_focus_name (), "GPS")) { *************** *** 700,703 **** --- 786,793 ---- roadmap_trip_stop (); + + if (roadmap_trip_get_position ("Departure")) { + roadmap_trip_remove_point ("Departure"); + } roadmap_navigate_route (NavigateCallbacks); } *************** *** 708,713 **** if (segment->line.cfcc != last_cfcc) { ! RoadMapPen pen = roadmap_layer_get_pen (segment->line.cfcc, 0); ! int width = roadmap_canvas_get_thickness (pen); if (width < ROUTE_PEN_WIDTH) { --- 798,803 ---- if (segment->line.cfcc != last_cfcc) { ! RoadMapPen layer_pen = roadmap_layer_get_pen (segment->line.cfcc, 0); ! int width = roadmap_canvas_get_thickness (layer_pen); if (width < ROUTE_PEN_WIDTH) { *************** *** 718,722 **** RoadMapPen previous_pen; ! previous_pen = roadmap_canvas_select_pen (NavigatePen); roadmap_canvas_set_thickness (width); current_width = width; --- 808,812 ---- RoadMapPen previous_pen; ! previous_pen = roadmap_canvas_select_pen (pen); roadmap_canvas_set_thickness (width); current_width = width; *************** *** 737,741 **** segment->last_shape, segment->shape_itr, ! NavigatePen, NULL, NULL, --- 827,831 ---- segment->last_shape, segment->shape_itr, ! pen, NULL, NULL, Index: navigate_main.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_main.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** navigate_main.h 9 Aug 2006 07:35:56 -0000 1.6 --- navigate_main.h 18 Aug 2006 17:52:50 -0000 1.7 *************** *** 61,65 **** int navigate_main_reload_data (void); void navigate_main_set (int status); ! void navigate_main_calc_route (void); void navigate_main_screen_repaint (int max_pen); --- 61,65 ---- int navigate_main_reload_data (void); void navigate_main_set (int status); ! int navigate_main_calc_route (void); void navigate_main_screen_repaint (int max_pen); Index: navigate_graph.h =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_graph.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** navigate_graph.h 9 Aug 2006 07:35:56 -0000 1.3 --- navigate_graph.h 18 Aug 2006 17:52:50 -0000 1.4 *************** *** 28,31 **** --- 28,33 ---- #include "navigate_main.h" + #define GRAPH_IGNORE_TURNS 1 + int navigate_reload_data (void); int navigate_load_data (void); *************** *** 36,40 **** int to_point, NavigateSegment *segments, ! int *size); #endif /* _NAVIGATE_GRAPH_H_ */ --- 38,43 ---- int to_point, NavigateSegment *segments, ! int *size, ! int *result); #endif /* _NAVIGATE_GRAPH_H_ */ Index: navigate_dglib.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/navigate/navigate_dglib.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** navigate_dglib.c 9 Aug 2006 07:35:56 -0000 1.5 --- navigate_dglib.c 18 Aug 2006 17:52:50 -0000 1.6 *************** *** 47,50 **** --- 47,57 ---- static dglSPCache_s spCache; + typedef struct { + PluginLine from_line; + int turn_restrictions; + } NavigateClip; + + NavigateClip NavigateClipData; + static int clipper ( dglGraph_s * pgraph , *************** *** 54,57 **** --- 61,80 ---- ) { + NavigateClip *info = (NavigateClip *)pvarg; + int to_line = dglEdgeGet_Id(pgraph, pIn->pnEdge); + int from_line; + + if (pIn->pnPrevEdge != NULL) { + + from_line = dglEdgeGet_Id(pgraph, pIn->pnPrevEdge); + } else { + from_line = roadmap_plugin_get_line_id (&info->from_line); + } + + /* no U turns */ + if (from_line == -to_line) return 1; + + if (!info->turn_restrictions) return 0; + if ( roadmap_turns_find_restriction ( dglNodeGet_Id(pgraph, pIn->pnNodeFrom), *************** *** 141,145 **** int to_point, NavigateSegment *segments, ! int *size) { int i; --- 164,169 ---- int to_point, NavigateSegment *segments, ! int *size, ! int *result) { int i; *************** *** 150,159 **** if (fips_data_loaded != roadmap_locator_active ()) return -1; /* save places for start & end lines */ *size -= 2; nret = dglShortestPath (&graph, &pReport, from_point, to_point, ! clipper, (void *)from_line->line_id, NULL); ! if (nret <= 0) return nret; if (pReport->cArc > *size) return -1; --- 174,198 ---- if (fips_data_loaded != roadmap_locator_active ()) return -1; + *result = 0; + /* save places for start & end lines */ *size -= 2; + NavigateClipData.from_line = *from_line; + NavigateClipData.turn_restrictions = 1; + nret = dglShortestPath (&graph, &pReport, from_point, to_point, ! clipper, &NavigateClipData, NULL); ! if (nret <= 0) { ! ! *result = GRAPH_IGNORE_TURNS; ! ! NavigateClipData.turn_restrictions = 0; ! nret = dglShortestPath (&graph, &pReport, from_point, to_point, ! clipper, &NavigateClipData, NULL); ! if (nret <= 0) { ! return nret; ! } ! } if (pReport->cArc > *size) return -1; |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:51:27
|
Update of /cvsroot/roadmap/roadmap_editor/src/icons/bmp In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6685 Added Files: nav_exit_left.bmp nav_exit_right.bmp rm_menu.bmp sync.bmp welcome.bmp Log Message: Import new bitmaps. --- NEW FILE: welcome.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_exit_right.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nav_exit_left.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: sync.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rm_menu.bmp --- (This appears to be a binary file; contents omitted.) |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:49:37
|
Update of /cvsroot/roadmap/roadmap_editor/src/gtk2 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6220 Modified Files: roadmap_dialog.c Log Message: Allow setting a focus on a specific field. Index: roadmap_dialog.c =================================================================== RCS file: /cvsroot/roadmap/roadmap_editor/src/gtk2/roadmap_dialog.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** roadmap_dialog.c 10 Aug 2006 20:54:39 -0000 1.6 --- roadmap_dialog.c 18 Aug 2006 17:49:34 -0000 1.7 *************** *** 411,418 **** child->callback = callback; child->widget_type = ROADMAP_WIDGET_MUL_ENTRY; - - g_signal_connect (w, "activate", - (GCallback) roadmap_dialog_action, child); - } --- 411,414 ---- *************** *** 420,425 **** void roadmap_dialog_new_progress (const char *frame, const char *name) { - GtkWidget *w = gtk_entry_new (); name = "Progress"; RoadMapDialogItem child = roadmap_dialog_new_item (frame, name, w, 0); child->widget_type = ROADMAP_WIDGET_LABEL; --- 416,421 ---- void roadmap_dialog_new_progress (const char *frame, const char *name) { name = "Progress"; + GtkWidget *w = gtk_label_new (name); RoadMapDialogItem child = roadmap_dialog_new_item (frame, name, w, 0); child->widget_type = ROADMAP_WIDGET_LABEL; *************** *** 781,784 **** --- 777,784 ---- + void roadmap_dialog_set_focus (const char *frame, const char *name) { + } + + void *roadmap_dialog_get_data (const char *frame, const char *name) { *************** *** 797,807 **** return (void *)gtk_entry_get_text (GTK_ENTRY(this_item->w)); case ROADMAP_WIDGET_MUL_ENTRY: { GtkTextIter start, end; gtk_text_buffer_get_bounds ! (gtk_text_view_get_buffer (GTK_ENTRY(this_item->w)), &start, &end ); return gtk_text_buffer_get_text ! (gtk_text_view_get_buffer (GTK_ENTRY(this_item->w)), &start, &end, TRUE); } --- 797,812 ---- return (void *)gtk_entry_get_text (GTK_ENTRY(this_item->w)); + case ROADMAP_WIDGET_LABEL: + + return (void *)gtk_label_get_text (GTK_LABEL(this_item->w)); + case ROADMAP_WIDGET_MUL_ENTRY: { GtkTextIter start, end; gtk_text_buffer_get_bounds ! (gtk_text_view_get_buffer (GTK_TEXT_VIEW(this_item->w)), ! &start, &end ); return gtk_text_buffer_get_text ! (gtk_text_view_get_buffer (GTK_TEXT_VIEW(this_item->w)), &start, &end, TRUE); } *************** *** 836,840 **** GtkTextBuffer *buffer = gtk_text_buffer_new (NULL); gtk_text_buffer_set_text (buffer, (const char *)data, strlen(data)); ! gtk_text_view_set_buffer (GTK_ENTRY(this_item->w), buffer); g_object_unref (buffer); } --- 841,845 ---- GtkTextBuffer *buffer = gtk_text_buffer_new (NULL); gtk_text_buffer_set_text (buffer, (const char *)data, strlen(data)); ! gtk_text_view_set_buffer (GTK_TEXT_VIEW(this_item->w), buffer); g_object_unref (buffer); } *************** *** 924,932 **** this_item = roadmap_dialog_get (this_frame, name); ! if (this_item->widget_type != ROADMAP_WIDGET_ENTRY) return; snprintf(data, sizeof(data), "%d", progress); ! gtk_entry_set_text (GTK_ENTRY(this_item->w), (const char *)data); } --- 929,937 ---- this_item = roadmap_dialog_get (this_frame, name); ! if (this_item->widget_type != ROADMAP_WIDGET_LABEL) return; snprintf(data, sizeof(data), "%d", progress); ! gtk_label_set_text (GTK_LABEL(this_item->w), (const char *)data); } |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:48:31
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/static In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5807 Added Files: notes.c notes.h Log Message: Edit notes dialog. --- NEW FILE: notes.c --- /* notes.c - Add notes as markers on map. * * LICENSE: * * Copyright 2006 Ehud Shabtai * * This file is part of RoadMap. * * RoadMap is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * RoadMap is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * SYNOPSYS: * * See notes.h */ #include <string.h> #include <stdlib.h> #include "roadmap.h" #include "roadmap_gps.h" #include "roadmap_locator.h" #include "roadmap_county.h" #include "roadmap_navigate.h" #include "roadmap_sound.h" #include "roadmap_config.h" #include "roadmap_trip.h" #include "roadmap_lang.h" #include "roadmap_math.h" #include "roadmap_adjust.h" #include "roadmap_layer.h" #include "roadmap_dialog.h" #include "roadmap_messagebox.h" #include "../db/editor_db.h" #include "../db/editor_marker.h" #include "../editor_main.h" #include "../editor_log.h" #include "edit_marker.h" #include "notes.h" #define NOTES_MODE_QUICK 1 #define NOTES_MODE_VOICE 2 #define NOTES_MODE_EDIT 3 static const char *yesno[2]; static RoadMapConfigDescriptor ConfigVoiceLength = ROADMAP_CONFIG_ITEM("Notes", "Recording length"); static int update_range_export(int marker, const char **description, const char *keys[MAX_ATTR], char *values[MAX_ATTR], int *count) { *count = 0; *description = editor_marker_note (marker); return 0; } static int update_range_verify(int marker, unsigned char *flags, const char **note) { return 0; } static int NotesMarkerType; static EditorMarkerType NotesMarker = { "User note", update_range_export, update_range_verify }; static void notes_dialog_cancel (const char *name, void *context) { roadmap_trip_remove_point ("New note"); free(context); roadmap_dialog_hide (name); } static void notes_dialog_save (const char *name, void *context) { RoadMapGpsPosition *pos = (RoadMapGpsPosition *)context; const char *update_server = roadmap_dialog_get_data ("Notes", "Send to server"); const char *note = roadmap_dialog_get_data ("Notes", "Note"); int flags = 0; if (!strcmp(update_server, yesno[0])) { flags = ED_MARKER_UPLOAD; } if (editor_marker_add (pos->longitude, pos->latitude, pos->steering, time(NULL), NotesMarkerType, flags, note) == -1) { roadmap_messagebox ("Error", "Can't save note."); } roadmap_trip_remove_point ("New note"); free(context); roadmap_dialog_hide (name); } static void notes_add_dialog (const RoadMapGpsPosition *pos) { RoadMapGpsPosition *note_pos; RoadMapPosition position; RoadMapGuiPoint point; if (!yesno[0]) { yesno[0] = roadmap_lang_get ("Yes"); yesno[1] = roadmap_lang_get ("No"); } note_pos = malloc(sizeof(*note_pos)); roadmap_check_allocated(note_pos); *note_pos = *pos; if (roadmap_dialog_activate ("Add note", note_pos)) { roadmap_dialog_new_label ("Notes", "Type"); roadmap_dialog_new_choice ("Notes", "Send to server", 2, (const char **)yesno, (void**)yesno, NULL); roadmap_dialog_new_mul_entry ("Notes", "Note", NULL); roadmap_dialog_add_button ("Cancel", notes_dialog_cancel); roadmap_dialog_add_button ("Save", notes_dialog_save); roadmap_dialog_complete (0); roadmap_dialog_set_data ("Notes", "Type", roadmap_lang_get (NotesMarker.name)); } roadmap_dialog_set_data ("Notes", "Send to server", yesno[0]); /* Move screen to show the new note location */ /* Set zoom to 1:1 */ roadmap_math_zoom_reset (); roadmap_layer_adjust (); roadmap_adjust_position (pos, &position); roadmap_trip_set_point ("New note", &position); roadmap_math_coordinate (&position, &point); point.y -= roadmap_canvas_height () / 2 - 15; roadmap_math_rotate_coordinates (1, &point); roadmap_math_to_position (&point, &position, 1); roadmap_trip_set_point ("Selection", &position); roadmap_trip_set_focus ("Selection"); roadmap_screen_refresh (); } static void notes_add(int mode, RoadMapPosition *point) { RoadMapGpsPosition pos; PluginLine line; int direction; int valid_street = 0; int fips; char file_name[256]; int marker; if (point) { pos.longitude = point->longitude; pos.latitude = point->latitude; } else { const char *focus = roadmap_trip_get_focus_name (); if (focus && !strcmp(focus, "GPS") && (roadmap_navigate_get_current (&pos, &line, &direction) != -1)) { valid_street = 1; } else { memset (&pos, 0, sizeof(pos)); roadmap_screen_get_center ((RoadMapPosition *) &pos); } } if (roadmap_county_by_position ((RoadMapPosition *)&pos, &fips, 1) < 1) { roadmap_messagebox ("Error", "Can't locate county"); return; } if (editor_db_activate (fips) == -1) { editor_db_create (fips); if (editor_db_activate (fips) == -1) { roadmap_messagebox ("Error", "Can't add note"); return; } } if (mode == NOTES_MODE_EDIT) { notes_add_dialog (&pos); return; } if ((marker = editor_marker_add (pos.longitude, pos.latitude, pos.steering, time(NULL), NotesMarkerType, ED_MARKER_UPLOAD, "")) == -1) { roadmap_messagebox ("Error", "Can't save marker."); return; } switch (mode) { case NOTES_MODE_QUICK: roadmap_sound_play ("rec_end.wav"); break; case NOTES_MODE_VOICE: editor_marker_voice_file (marker, file_name, sizeof(file_name)); roadmap_sound_record (file_name, roadmap_config_get_integer (&ConfigVoiceLength)); break; default: roadmap_log (ROADMAP_FATAL, "Invalid note mode: %d", mode); break; } } void editor_notes_initialize(void) { NotesMarkerType = editor_marker_reg_type (&NotesMarker); roadmap_config_declare ("preferences", &ConfigVoiceLength, "10"); } void editor_notes_add_quick (void) { notes_add (NOTES_MODE_QUICK, NULL); } void editor_notes_add_edit (void) { notes_add (NOTES_MODE_EDIT, NULL); } void editor_notes_add_voice (void) { notes_add (NOTES_MODE_VOICE, NULL); } --- NEW FILE: notes.h --- /* notes.h - Add notes as markers on map. * * LICENSE: * * Copyright 2006 Ehud Shabtai * * This file is part of RoadMap. * * RoadMap is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * RoadMap is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef INCLUDE__NOTES__H #define INCLUDE__NOTES__H void editor_notes_initialize (void); void editor_notes_add_quick (void); void editor_notes_add_edit (void); void editor_notes_add_voice (void); #endif // INCLUDE__NOTES__H |
|
From: Ehud S. <esh...@us...> - 2006-08-18 17:47:38
|
Update of /cvsroot/roadmap/roadmap_editor/src/editor/static In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5430 Added Files: edit_marker.c edit_marker.h Log Message: Edit markers dialog. --- NEW FILE: edit_marker.c --- /* edit_marker.c - Edit / View markers * * LICENSE: * * Copyright 2006 Ehud Shabtai * * This file is part of RoadMap. * * RoadMap is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * RoadMap is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * SYNOPSYS: * * See edit_marker.h */ #include <string.h> #include "roadmap.h" #include "roadmap_dialog.h" #include "roadmap_locator.h" #include "roadmap_trip.h" #include "roadmap_screen.h" #include "roadmap_math.h" #include "roadmap_layer.h" #include "roadmap_sound.h" #include "roadmap_file.h" #include "roadmap_messagebox.h" #include "../db/editor_db.h" #include "../db/editor_marker.h" #include "../editor_log.h" #include "edit_marker.h" static const char *yesno[2]; static int fill_dialog (int marker) { const char *value; RoadMapPosition pos; RoadMapGuiPoint point; roadmap_dialog_set_data ("Marker", "Type", roadmap_lang_get (editor_marker_type (marker))); if (editor_marker_flags (marker) & ED_MARKER_UPLOAD) { value = yesno[0]; } else { value = yesno[1]; } roadmap_dialog_set_data ("Marker", "Send to server", value); roadmap_dialog_set_data ("Marker", "Note", editor_marker_note (marker)); editor_marker_position (marker, &pos, NULL); /* Set zoom to 1:1 */ roadmap_math_zoom_reset (); roadmap_layer_adjust (); roadmap_math_coordinate (&pos, &point); point.y -= roadmap_canvas_height () / 2 - 15; roadmap_math_rotate_coordinates (1, &point); roadmap_math_to_position (&point, &pos, 1); roadmap_trip_set_point ("Selection", &pos); roadmap_trip_set_focus ("Selection"); roadmap_screen_refresh (); return 0; } static int edit_marker_update (const char *name, void *context) { int *marker = (int *)context; const char *update_server = roadmap_dialog_get_data ("Marker", "Send to server"); const char *new_note = roadmap_dialog_get_data ("Marker", "Note"); unsigned char new_flags = editor_marker_flags (*marker); if (!strcmp(update_server, yesno[0])) { new_flags |= ED_MARKER_UPLOAD; } else { new_flags &= ~ED_MARKER_UPLOAD; } if (editor_marker_verify (*marker, &new_flags, &new_note) == -1) return -1; editor_marker_update (*marker, new_flags, new_note); return 0; } static void edit_marker_prev (const char *name, void *context) { int *marker = (int *)context; if (*marker > 0) { if (edit_marker_update (name, context) == -1) return; (*marker)--; fill_dialog (*marker); } } static void edit_marker_next (const char *name, void *context) { int *marker = (int *)context; if (*marker < (editor_marker_count () - 1)) { if (edit_marker_update (name, context) == -1) return; (*marker)++; fill_dialog (*marker); } } static void edit_marker_play (const char *name, void *context) { char file[256]; int *marker = (int *)context; editor_marker_voice_file (*marker, file, sizeof(file)); if (!roadmap_file_exists (NULL, file)) { roadmap_messagebox ("Error", "There is no recording associated with this note."); return; } else { roadmap_sound_play (file); } } static void edit_marker_close (const char *name, void *context) { if (edit_marker_update (name, context) == -1) return; roadmap_dialog_hide (name); } void edit_marker_dialog (int marker) { static int context; int fips = roadmap_locator_active (); if (!yesno[0]) { yesno[0] = roadmap_lang_get ("Yes"); yesno[1] = roadmap_lang_get ("No"); } if ((editor_db_activate(fips) == -1) || !editor_marker_count ()) { roadmap_messagebox ("Info", "There are no markers."); return; } context = marker; if (roadmap_dialog_activate ("View markers", &context)) { roadmap_dialog_new_label ("Marker", "Type"); roadmap_dialog_new_choice ("Marker", "Send to server", 2, (const char **)yesno, (void**)yesno, NULL); roadmap_dialog_new_mul_entry ("Marker", "Note", NULL); roadmap_dialog_add_button ("Back", edit_marker_prev); roadmap_dialog_add_button ("Next", edit_marker_next); roadmap_dialog_add_button ("Play", edit_marker_play); roadmap_dialog_add_button ("Close", edit_marker_close); roadmap_dialog_complete (0); } fill_dialog (marker); } void edit_markers_dialog (void) { edit_marker_dialog (editor_marker_count () - 1); } --- NEW FILE: edit_marker.h --- /* edit_marker.h - Edit / View markers * * LICENSE: * * Copyright 2006 Ehud Shabtai * * This file is part of RoadMap. * * RoadMap is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * RoadMap is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with RoadMap; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef INCLUDE__EDIT_MARKER__H #define INCLUDE__EDIT_MARKER__H void edit_marker_dialog (int marker); void edit_markers_dialog (void); #endif // INCLUDE__EDIT_MARKER__H |
