Copyright: Copyright (C) C.Sitte Softwaretechnik 1993-1995


INDEX
WDiff (tm)
 Windows File/Directory/ZIP Difference Viewer

WDiff displays the differences between two text files or between two directories or ZIP archives. The two text files (or directories) are displayed side by side. See the differences between two versions of a text file or to show the differences between two sets of files, where one or both sets can reside in a ZIP archive. It also allows you to select an area of lines on the right side file and merge it into the left side file.

Pick an index!

Introduction
Packing List
Installation
Usage
ZIP Archives
Order Information
Association of shareware professionals
Technical Support
License and Warranty agreement
Future Releases


INTRODUCTION

WDiff displays the differences between two text files or between two directories or ZIP archives. The two text files (or directories) are displayed side by side. Common and different sections are clearly marked with separator lines and different colors. The display window is scrollable in all directions. The middle line which separates the two sides can be moved in either direction to see more of the left or right side. It is also possible to jump between common and different sections. See the differences between two versions of a text file or to show the differences between two sets of files, where one or both sets can reside in a ZIP archive. It is also possible to mark areas of lines at one or both sides and to copy this texts into the clipboard for further processing. A marked area at the right side file can be copied into the corresponding area of the left side file. It is possible with this feature to selectively undo modifications if the previous version of the file is available. There are various formatting and comparison options available.

WDiff can show the differences between:
- two text files
- a text file and a text file inside of a ZIP archive
- two text files inside of ZIP archives
- two directories
- a directory and a ZIP archive directory
- two ZIP archive directories

WDiff is especially useful for programmers who wants to see the differences between two versions of a source text file or to show the differences between two sets of files, where one or both sets can reside in a ZIP archive.
There are various formatting and comparison options available.


EDITION

May 1995
(C) Copyright 1993-1995 by C.Sitte Softwaretechnik
All rights reserved


SHORTDESCRIPTION
WDiff is a Windows application which displays two text files or two directories side by side. Common and different sections are clearly marked. The display window is scrollable in all directions. Jump between common and different sections. This utility is especially useful to see the differences between two versions of a source text file or to show the differences between two sets of files, where one or both sets can reside in a ZIP archive.


NOTICE

This documentation is based on the software revision 1.30 of May 1995. The information in this document is subject to change without notice. C.Sitte Softwaretechnik assumes no responsibility for any errors that may appear in supplied materials or programs.


TRADEMARKS

WDiff and the WDiff icon are trademarks of C.Sitte Softwaretechnik.
ASP and the ASP logo are registered trademarks of the Association of Shareware Professionals.
PKZIP and PKUNZIP are registered trademarks of PKWARE, Inc.
Windows is a trademark of Microsoft Corporation.


REQUIRED HARDWARE

The WDiff File Difference Viewer can be installed on any computer which is capable of running Windows 3.x.


LICENSE AND WARRANTY AGREEMENT

This software is protected by both copyright laws and international treaty provisions. This means you must treat this software just like a book. Like a book, this software may be freely moved from machine to machine, so long as there is NO POSSIBILITY of the software being used at two different places at the same time. This software is NOT SHAREWARE, and may not be distributed by bulletin boards or other forms which violate the copyright of C.Sitte Softwaretechnik. The single exception for duplicating this software is for the sole purpose of backing up this software and protecting your investment from loss.

Limited Warranty
Limitation of remedies


LIMITED WARRANTY

C.Sitte Softwaretechnik warrants the diskettes on which the program is furnished to be free from defects in materials and workmanship under normal use, for a period of thirty (30) days from the date of delivery to you as evidenced by a copy of your packing list. In the event of notification within the warranty period of failure to meet any advertised claims at the date of sale, you may return the program and all associated manuals in good condition to your place of purchase for a refund. IF YOU NEED TO EXCHANGE OR RETURN A PRODUCT TO C.SITTE SOFTWARETECHNIK CONTACT US TO OBTAIN A RETURN AUTHORIZATION NUMBER. The sole remedy for breach of this warranty shall be limited to replacement or refund and shall not encompass any other damages, including but not limited to loss of profit, and incidental, consequential, or other similar claims. Refunds do not include any portion of shipping and handling, or special shipping fees.

License and warranty agreement


LIMITATION OF REMEDIES

C.SITTE SOFTWARETECHNIK SPECIFICALLY DISCLAIMS ALL OTHER WARRANTIES, EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE WITH RESPECTS TO DEFECTS IN THE DISKETTE OR DOCUMENTATION, AND THE PROGRAM LICENSE GRANTED HEREIN IN PARTICULAR, AND WITHOUT LIMITING OPERATION OF THE PROGRAM LICENSE WITH RESPECT TO ANY PARTICULAR APPLICATION, USE, OR PURPOSE. IN NO EVENT SHALL C.SITTE SOFTWARETECHNIK BE LIABLE FOR ANY LOSS OF PROFIT OR ANY OTHER DAMAGES, INCLUDING BUT NOT LIMITED TO INCIDENTAL, CONSEQUENTIAL, OR OTHER DAMAGES.

License and warranty agreement


PACKING LIST

If you have bought a registered version, the following files should be on your diskette:

READ.ME         	General Info and Last Minute Information
DESCRIBE.DOC 	Product Description & Author Info
LICENSE.TXT  	License Agreement
WDIFF.EXE    	Windows File Difference Viewer Program v1.30
WDIFF.HLP    	Windows Online Help File
WDUNZIP.PIF  	Windows configuration file for PKUNZIP
CSDIFF.EXE   	DOS File Difference Program v1.30
CSDIFF.DOC   	Documentation for CSDiff
WDIFF130.EXE 	Shareware Version of WDiff
CSDIF130.EXE 	Shareware Version of CSDiff

The files WDIFF130.EXE and CSDIF130.EXE are self-extracting archives of the shareware versions of WDiff and CSDiff. Please use these files when you want to give WDiff or CSDiff away to anyone for evaluation purposes.

Shareware copy


Shareware Copy
Shareware Copy from BBS or Disk Vendor

If you've downloaded an unregistered copy of WDiff from a bulletin board (BBS) or an on-line service, or obtained a copy on diskette or CDROM from a disk vendor, you may try it for four weeks as specified in the shareware license agreement. After four weeks you must either register WDiff or stop using it. This method of marketing, known as "Shareware", permits you to try WDiff before you pay for it. The four week evaluation period is a legal requirement based on the license agreement, NOT a time bomb inserted in the program! WDiff will not stop working or cause any damage to itself or your system at the end of the four week evaluation period.

WDiff (Shareware version)
CSDiff (Shareware version)
Shareware Distribution

Packing List of registered version


WDiff (Shareware version)
WDiff - Shareware version

Shareware copies of WDiff may be "packaged" in a variety of ways depending on who distributed them. Regardless of packaging, the following files should be included:

WDIFF.EXE     	Windows File Difference Viewer Program
WDIFF.HLP     	Windows Online Help File
WDUNZIP.PIF   	Windows configuration file for PKUNZIP
WDIFF.WRI     	Documentation (Windows Write Document)
ORDER.FRM     	Order Form
DESCRIBE.DOC  	Product Description & Author Info
VENDOR.DOC    	Vendor/Distributor Information
FILE_ID.DIZ     	Program Description for BBS's
READ.ME       	General Info and Last Minute Information

Shareware Copy


CSDiff (Shareware version)
CSDiff - Shareware version

Shareware copies of CSDiff may be "packaged" in a variety of ways depending on who distributed them. Regardless of packaging, the following files should be included:

CSDIFF.EXE      	DOS File Difference Utility
CSDIFF.DOC      	Documentation
ORDER.FRM       	Order Form
DESCRIBE.DOC    	Product Description & Author Info
VENDOR.DOC      	Vendor/Distributor Information
FILE_ID.DIZ     	Program Description for BBS's
READ.ME         	General Info and Last Minute Information

Shareware Copy


Shareware Distribution

You are encouraged to freely copy and distribute shareware of C.Sitte Softwaretechnik provided that (see VENDOR.DOC for more information):

1. No fee beyond normal media, duplication, and shipping costs may be charged.

2. It must be copied in unaltered form complete with this license and copyright information.

3. It is advertised as "shareware" and not as "free" or "public domain" software.

Shareware Copy


INSTALLATION

Once you have copied the WDiff files in any convenient directory on your hard disk, you can create a program item for WDiff with the Windows Program Manager by using the "New" menu item in the "File" popup menu.

At the DOS Prompt:

* At the DOS prompt, make a directory for WDiff, i.e., C:> MD \WDIFF
* Copy the distribution files into the newly created directory, i.e.,
 C:> COPY *.* \WDIFF

In Windows:

* Go into the Program Manager and select the group you wish to add WDiff to.
* Select File, then New from the upper left corner of Program Manager.
* Make sure 'Program Item' is checked, then click on OK.
* In the Command line, type "C:\WDIFF\WDIFF.EXE"
* Click on OK. The New WDiff icon should appear in the designated group. Double click on it to start WDiff.

If WDiff finds a WDIFF.INI file in the actual working directory, then this file is used for the configuration settings instead of the WDIFF.INI file in the standard windows directory.

It is also possible to define two path-/filenames as command line options. This arguments takes precedence over the configuration file settings.


USAGE

File Menu
Edit Menu
View Menu
Split Menu
Options Menu


FILE MENU

The "File" popup menu has the following items:

Select Files/Directories... (F3)
Save Modifications... (F2)
Refresh
Swap sides
Directory Comparison (ESC)
Next Files (Ctrl+PgDn)
Previous Files (Ctrl+PgUp)
Close
Exit...Alt+X


SELECT FILES

After the start of the program, you have to select the two textfiles (left and right) or the two directories (or ZIP archives) which should be displayed side by side. After a restart of the program, the file selections are set to the same settings as they were at the end of the previous session. Also if you have started WDiff with command line arguments, this arguments takes precedence over the configuration file settings. Press F3 or select the "Select Files..." item in the "File" popup menu to get the file selection dialog box.

When you press the ".BAK" pushbutton inside of this dialog box, then the right side filename is set to the currently selected left side filename with the file extension of ".BAK". Also when you press the "R = L" pushbutton, the right side selection is set to the same path as the left side with a file selection mask of "*.*". After you have selected the filenames (directories), this files (directories) are read, compared and displayed. If one of the selections has wildcard characters in it, a directory listing is displayed instead.

File Menu


SAVE MODIFICATIONS

If you have marked and copied areas of the right side file to the left side file (identified by a '+' sign at the beginning of the lines) than this command allows you to save the modifications into the left side file. The original file is renamed to a file with a .BAK extension.

File Menu


REFRESH

This command allows you to reread the file or directory information from the disk and refresh the display.

File Menu


SWAP SIDES

The left and right side display are exchanged and reread from the disk.

File Menu


DIRECTORY COMPARISON

If you are in the file comparison mode, pressing the ESC key or double clicking with the right mouse button anywhere in the window returns you to the directory comparison mode.

File Menu
Directory Listing


NEXT FILES

If you are in the file comparison mode, pressing the Ctrl-PgDn key selects the next pair of different files from the previously displayed directory comparison listing. To use this feature you must have selected the files from a directory comparison listing (by double clicking on them or pressing the return key).

File Menu
Directory Listing


Prev Files
PREVIOUS FILES

If you are in the file comparison mode, pressing the Ctrl-PgUp key selects the previous pair of different files from the previously displayed directory comparison listing. To use this feature you must have selected the files from a directory comparison listing (by double clicking on them or pressing the return key).

File Menu
Directory Listing


CLOSE

The display window is empty after this command. Use the F3 (Select Files) command to specify a new selection or use the Refresh command to reread the previous selection.

File Menu


EXIT

To exit the program, select the "Exit" menu item in the "File" popup menu or press the 'Alt+X' key combination. The selected options, fonts, colors and the file selection settings are automatically saved at the end of the session.

File Menu


EDIT MENU

The "Edit" popup menu has only one item:

Copy...Ctrl+Ins


Copy to clipboard
COPY

If you have marked one or more lines at one or both sides of the difference display than this command copies the marked textlines into the windows clipboard. If the linenumber option is enabled, the linenumbers are also added at the beginning of the lines. If you have marked both sides, than a special separator character ('|') is displayed in the middle between the texts of the two sides.

Edit Menu


VIEW MENU

The "View" popup menu has the following items:

Next Difference (Tab)
Previous Difference (BkSp)
Left Scroll (->)
Right Scroll (<-)
Start of Line (Home)
End of Line (End)
Hide matching areas (F7)

Each menu item can be directly executed by pressing the corresponding key. The PgDn and PgUp keys can also be used to page forward and backward. All modes can be directly selected by using the given function keys. The last menu item "Hide matching areas" has a checkmark at the left side which identifies the current state. This checkmark can be toggled on and off by executing this menu item.

Usage


SPLIT MENU

There are two major display modes available: split screen mode and full screen mode.

In split screen mode, the two text files or directories are displayed side by side separated by a vertical separator line. Click on this line with the mouse and drag it into either direction to see more of the left or right side.

In full screen mode, only the left or the right side file is displayed.

The line numbers at the left side of each side can be toggled on and off. This display modes are selectable from the "Split" popup menu, which has the following menu items:

Split screen 	F4
Left file 	F5
Right file 	F6
Center separator
Line Numbers 	F8

The "Center separator" item can also be executed by double- clicking on the middle line.

Pressing the right mouse button and dragging the mouse cursor up or down scrolls the whole window contents up and down.

The last menu item "Line Numbers" has a checkmark at the left side which identifies the current status. All modes can be directly selected by using the given function keys.

Directory Listing
Usage


DIRECTORY LISTING

If you are displaying a directory listing on one or both sides, double clicking on a specific line (or pressing RETURN if the cursor line is active) selects the filenames on this line for comparison and viewing. The cursor keys can be used to select a specific line if the cursor line is active. If the cursor mode is off (no cursor line is visible), the cursor keys can be used to scroll the directory listing up and down.

Pressing the ESC key or double clicking with the right mouse button anywhere in the window returns you to the previous selection.

If you are displaying a ZIP archive directory, double clicking on a specific line extracts the file(s) from the ZIP archive(s) into a temporary file. Temporary files are deleted after the comparison. To extract files from ZIP archives it is necessary that the PKUNZIP utility is present on your system. The WDUNZIP.PIF file can be modified with the windows PIF editor to adapt it to specific needs (different name of UNZIPPER...).

Split Menu


OPTIONS

The "Options" popup menu has the following items:

Directory
Comparison...
Fonts...
Colors


DIRECTORY SORTING

Four different directory sorting options can be selected in the "Directory" submenu of the "Options" popup menu. The four options are:

Sort by Date/Time
Sort by Name
Sort by Type
Sort by Size

Ignore Size

Only one of the four sort-items can be selected and is identified with a checkmark at the left side. The selected sort mode is applied to the sorting of the left side directory. The right side directory is sorted depending on the left side directory. This means that files with equal filenames are displayed in the same line and files which are not available at the other side are inserted at appropriate positions, according to the selected sort mode.

The "Ignore Size" item in this menu can be used to ignore the size of files in the comparison.

Options


SORT BY DATE/TIME

This is the standard directory sorting option. Files are sorted by file date and file time (in that order). Newest files are at the beginning of the listing.

Directory Sorting


SORT BY NAME

The files are alphabetically sorted by filename. Files with equal filenames are further sorted by its filetype.

Directory Sorting


SORT BY TYPE

The files are alphabetically sorted by filetype. Files with equal filetypes are further sorted by its filename.

Directory Sorting


SORT BY SIZE

The files are sorted by filesize. Files with equal filesize are further sorted by its filedate/time. Bigger files are at the beginning of the listing.

Directory Sorting


Ignore size on directory comparisons
IGNORE SIZE

This option can be used to ignore the size of files in the comparison of directories. That means that only the modification date/time is used to identify different files.

Directory Sorting


COMPARISON OPTIONS

The following text file comparison options are available:

Ignore spaces on comparison
Ignore trailing blanks
Expand tabs before comparison
Case insensitive compare
Tabsize

The dialog box for displaying and changing this options can be displayed by selecting the "Comparison..." menu item from the "Options" popup menu. If any of the options is modified, then the two files are reread and compared again. The "Tabsize" option also influences the display of the text files, because tabs are expanded to the proper number of spaces according to the given tabsize parameter.

Options


IGNORE SPACES ON COMPARISON

Tab characters and spaces will be ignored on comparison.

Comparison Options


IGNORE TRAILING BLANKS

One or more blanks at the end of a line are ignored during the comparison.

Comparison Options


EXPAND TABS BEFORE COMPARISON

Tab characters (hex 09) in the text are expanded to the number of spaces which are neccessary to reach the next tab stop. The number of spaces between tab stops is specified in the "Tabsize" parameter. The "expand tabs before comparison" option will be ignored, if the "Ignore spaces on comparison" option is selected at the same time.

Comparison Options


CASE INSENSITIVE COMPARE

Upper- and lowercase is ignored during comparison of text files.

Comparison Options


TABSIZE

The tabsize (number of spaces between tab stops) is selectable between 1 and 19 spaces. The default size is 8 spaces. This option influences the file comparison, if the "expand tabs before comparison" options is also set.

Tabs are always expanded to the given number of spaces in the difference display window.

Comparison Options


FONTS

The dialog box for displaying and changing the font selection can be displayed by selecting the "Fonts..." menu item from the "Options" popup menu. This opens the standard windows font selection dialog.

Options


COLORS

The foreground and background colors of the common and different sections can be changed by selecting a color selection item from the "Colors" submenu. This opens a standard windows color selection dialog.

Normal Foreground...
Normal Background...
Difference Foreground...
Difference Background...

These selections are saved between sessions, so that you continue with the same colors when you start the program again.

Options


ZIP ARCHIVES

WDiff can read directory listings of ZIP archives without the help of the PKUNZIP utility. But if you want to compare files which are inside of ZIP archives, the PKUNZIP utility must be accessible on your system. It is called from within WDiff by means of the WDUNZIP.PIF configuration file.


ORDER INFORMATION

The registration fee for a single copy of WDiff (tm) is US$ 20.-.
Payment of this fee entitles you to:

* Disk with the latest version of WDiff which does not display the shareware notices and registration reminders.
* Free support by electronic mail or by mail for the first six month after payment.
* Additional disk labels for the number of ordered copy licenses.
* Notification of the next major upgrade.
* DOS Command line version (CSDiff) as a free bonus utility.

An additional shipping & handling charge of US$ 5.- must be added to the total amount.

Payments can be made by credit card (MC/Visa/AmEx/JCB), cash, international postal money order or eurocheque. If you use an check which is not drawn on an austrian bank, please add another US$ 5.- for bank charges.

The accompanying file ORDER.FRM includes a detailed order form.

Order Form
Site License


SITE LICENSE

It is also possible to obtain an additional site license (copy license). This includes one disk with documentation. The licensee is responsible for duplicating the diskette and documentation as needed, and for ensuring that the number of installed copies is not exceeded. Additional disk labels for the number of ordered copy licences will be delivered. If you order a site license, you are entitled to one free upgrade.

5   User  	US$ 50.-
10  User  	US$ 75.-
15  User  	US$ 100.-
25  User  	US$ 150.-
50  User  	US$ 250.-
100 User  	US$ 400.-
100+      	(negotiable)

Order Form
Order Information


ORDER FORM
 WDiff (tm) Windows Difference Utility

C.Sitte Softwaretechnik
Hof 320
A-5322 Hof/Salzburg, Austria

Please send:

1) 	WDIFF Diskette (current version)

(Quantity) _________	   x    US$ 20.-          =    	US$ _________

2) 	WDIFF Site License (Copy License)
(Includes one disk and disk labels for the number of users).

5   User 	US$ 50.- 	_______ User =    	US$ _________
10  User 	US$ 75.-
15  User 	US$ 100.-
25  User 	US$ 150.-
50  User 	US$ 250.-
100 User 	US$ 400.-
100+          	(negotiable)

Subtotal 	US$ ________

Shipping and Handling (Airmail where appropriate) 	US$ 	5.--

Check handling fee (for non austrian bank checks) 5.-- 	US$ ________

Total 	US$ ________

PAYMENT BY:

[    ] 	Visa 	: Card Number: __________________________
:
[    ] 	MasterCard 	: Expiration Date (MM/YY) 	______ /______
: Exact name on card
[    ] 	American Express 	:
: ______________________________________
[    ] 	JCB 	: Signature
:
: ______________________________________

[    ] 	Cash (please use registered mail)

[    ] 	Eurocheque in ATS (austrian schillings)
(please apply the current conversion rate)

[    ] 	non-austrian bank check (please add US$ 5.-- handling fee
to the total amount)

[    ] 	International postal money order. (Please include a copy
of the receipt of the postal service, if possible)

Shipping address:

Company 	_________________________________________________________

Name 	_________________________________________________________

Address 	_________________________________________________________

_________________________________________________________

Source of evaluation copy (V1.30 #510B663):	_______________________________

______________________________________________________________________

Ordering WDIFF via Electronic Mail:

CompuServe 	: Chris Sitte 73030,1070
Internet   	: 73030.1070@compuserve.com

Please include ALL necessary information on your order message,
preferably in the same format as this order form.


ASSOCIATION OF SHAREWARE PROFESSIONALS

C.Sitte Softwaretechnik is an author member of the Association of Shareware Professionals (ASP), an organization formed to strengthen the future of shareware. Its members, all of whom are programmers who subscribe to a code of ethics, are committed to the concept of shareware as a method of marketing.

The ASP sets standards for its members and their shareware products which provide that programs produced by ASP members must be fully documented, non-crippled, and offered with at least a minimum level of support. It also sets standards for shareware disk vendors and provides information to the public about shareware.


ASP OMBUDSMAN STATEMENT

This program is produced by a member of the Association of Shareware Professionals (ASP). ASP wants to make sure that the shareware principle works for you. If you are unable to resolve a shareware-related problem with an ASP member by contacting the member directly, ASP may be able to help. The ASP Ombudsman can help you resolve a dispute or problem with an ASP member, but does not provide technical support for members' products. Please write to the ASP Ombudsman at 545 Grover Road, Muskegon, MI 49442-9427, USA or send a CompuServe message via CompuServe Mail to ASP Ombudsman 70007,3536.

The  Ombudsman may be contacted by FAX by sending to the ASP FAX number: (616) 788-2765. In communication with the Ombudsman please include a telephone number and/or FAX if available.

Association of shareware professionals


Technical Support
To help you - help us!

If you have questions about the WDiff File Difference Viewer or the CSDiff File Difference Utility please describe your problem as detailed as possible, so that we are able to simulate it according to your information.

Send this information to us via mail or electronic mail:

C.Sitte Softwaretechnik
Hof 320
A-5322 Hof/Salzburg, Austria

Electronic Mail:

* CompuServe	Chris Sitte 73030,1070
* Internet 	73030.1070@compuserve.com
* Uunet    	uunet!compuserve.com!73030.1070

* X400:  	Country	= us
ADMD	= CompuServe
PRMD	= csmail
DDA Type	= id
DDA Value	= 73030.1070

* MCI users should enter these values at the following prompts:
To	: Chris Sitte (ems)
EMS	: CompuServe
MBX	: p=csmail
MBX	: d=id=73030.1070


FUTURE RELEASES

The following features are planned in the future (if you have any suggestions please let us know about it):

* Search functions
* File management functions (copy, move, mark...)
* Additional textfile formats
* ...

Revision history


REVISION HISTORY

WDiff 	v1.01 	May/93 	Initial release of WDiff
WDiff 	v1.10 	Nov/93 	also show directory differences
show ZIP archive differences
color/font selection
WDiff 	v1.11 	Dec/93 	Online help added
WDiff 	v1.20 	Sep/94 	Bug fixes
command line arguments
unix text file format
WDiff 	v1.21 	Oct/94 	Bug fix
WDiff 	v1.30 	May/95 	Merge selected areas into left file
Copy marked areas to clipboard
Improved comparison algorithm

DIFF 	v1.01 	May/93 	Initial release of DIFF
DIFF 	v1.10 	Nov/93 	also show directory differences
show ZIP archive differences
DIFF 	v1.20 	Sep/94 	console output with paging
additional directory comparison options
DIFF 	v1.21 	Oct/94 	Bug fix
CSDiff	v1.30 	May/95 	Bug fix, Name change
Improved comparison algorithm

Future Releases