docu patch

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi all,

- enhance various messages and explanations
- structure README file in a better way, some additions

Andreas Mohr

Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/Makefile.in,v
retrieving revision 1.143
diff -u -r1.143 Makefile.in
--- Makefile.in	23 Mar 2003 20:00:04 -0000	1.143
+++ Makefile.in	1 Apr 2003 20:28:27 -0000
@@ -89,7 +89,7 @@
 		echo "*************************************************" ; \
 		echo "The installed Wine libraries will not be found!" ; \
 		echo "You can either:" ; 				\
-		echo "   Add the line '$(libdir)' to /etc/ld.so.conf" ;	\
+		echo "   Add the line '$(libdir)' to /etc/ld.so.conf and rerun /sbin/ldconfig" ;	\
 		echo '   export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(libdir)' ; \
 		echo "*************************************************" ; \
 		echo "*************************************************" ; \
Index: README
===================================================================
RCS file: /home/wine/wine/README,v
retrieving revision 1.40
diff -u -r1.40 README
--- README	31 Mar 2003 19:34:53 -0000	1.40
+++ README	1 Apr 2003 20:28:27 -0000
@@ -28,19 +28,20 @@
 
 To compile and run Wine, you must have one of the following:
 
-	Linux version 2.0.36 or above
-	FreeBSD 4.x or FreeBSD 5-CURRENT
-	Solaris x86 2.5 or later
-	NetBSD-current
+  Linux version 2.0.36 or above
+  FreeBSD 4.x or FreeBSD 5-CURRENT or later
+  Solaris x86 2.5 or later
+  NetBSD-current
+
+As Wine requires kernel-level thread support to run, only the operating
+systems mentioned above are supported.
+Other operating systems which support kernel threads may be supported
+in the future.
 
 Linux info:
-  Although Linux version 2.0.x will mostly work, certain features
-  (specifically LDT sharing) required for properly supporting Win32
-  threads were not implemented until kernel version 2.2.  If you get
-  consistent thread-related crashes, you may want to upgrade to at least 2.2.
-  Also, some bugs were fixed and additional features were added
-  late in the Linux 2.0.x series, so if you have a very old Linux kernel,
-  you may want to upgrade to at least the latest 2.0.x release.
+  While Linux 2.2.x should still work and Linux 2.0.x may still work
+  (older 2.0.x versions had thread-related crashes),
+  it's best to have a current kernel such as 2.4.x.
 
 FreeBSD info:
   Make sure you have the USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG
@@ -57,7 +58,9 @@
   Make sure you have the USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG options
   turned on in your kernel.
 
-File systems info:
+
+
+Supported file systems:
   Wine should run on most file systems. However, Wine will fail to start
   if umsdos is used for the /tmp directory. A few compatibility problems have
   also been reported using files accessed through Samba. Also, as NTFS
@@ -65,33 +68,29 @@
   using NTFS, as Windows programs need write access almost everywhere.
   In case of NTFS files, copy over to a writable location.
 
-Wine requires kernel-level threads to run. Currently, only Linux
-version 2.0 or later, FreeBSD 4.x or later, Solaris x86 version 2.5
-or later, and NetBSD-current are supported.
-Other operating systems which support kernel threads may be supported
-in the future.
-
-You need to have the X11 development include files installed
-(called xlib6g-dev in Debian and XFree86-devel in RedHat).
-To use Wine's support for multi-threaded applications, your X libraries
-must be reentrant, which is probably the default by now.
-If you have libc6 (glibc2), or you compiled the X libraries yourself,
-they were probably compiled with the reentrant option enabled.
-
-On x86 Systems gcc >= 2.7.2 is required.
-Versions earlier than 2.7.2.3 may have problems when certain files
-are compiled with optimization, often due to problems with header file
-management. pgcc currently doesn't work with Wine. The cause of this problem
-is unknown.
-
-Of course you also need "make" (most likely GNU make).
-
-You also need flex version 2.5 or later and yacc.
-Bison will work as a replacement for yacc. If you are
-using RedHat or Debian, install the flex and bison packages.
+Basic requirements:
+  You need to have the X11 development include files installed
+  (called xlib6g-dev in Debian and XFree86-devel in RedHat).
+
+Build tool requirements:
+  On x86 Systems gcc >= 2.7.2 is required.
+  Versions earlier than 2.7.2.3 may have problems when certain files
+  are compiled with optimization, often due to problems with header file
+  management. pgcc currently doesn't work with Wine. The cause of this problem
+  is unknown.
+
+  Of course you also need "make" (most likely GNU make).
+
+  You also need flex version 2.5 or later and yacc.
+  Bison will work as a replacement for yacc. If you are
+  using RedHat or Debian, install the flex and bison packages.
+
+Optional support libraries:
+  If you want CUPS printing support, please install both cups and cups-devel
+  packages.
 
-For the automatic processing of the test suite scripts, you also need
-libperl development header support (libperl-dev package on Debian).
+  For the automatic processing of the test suite scripts, you also need
+  libperl development header support (libperl-dev package on Debian).
 
 For requirements in case you intend to build the documentation yourself,
 see "DOCUMENTATION" section.
@@ -122,16 +121,21 @@
 Wine-yymmdd.diff.gz). You can then re-run "./configure", and then
 run "make depend && make".
 
+If you compile Wine very frequently, consider using ccache.
+
 5. SETUP
 
+In case a previous Wine installation is already on your PC, don't forget
+to uninstall it before installing this Wine version (unless the previous
+Wine version is an "isolated" install which doesn't conflict with the
+new install).
+Try either "dpkg -r wine" or "rpm -e wine" or "make uninstall"
+to do so.
+
 Once Wine has been built correctly, you can do "make install"; this
 will install the wine executable, the Wine man page, and a few other
 needed files.
 
-Don't forget to uninstall any conflicting previous Wine installation
-first.  Try either "dpkg -r wine" or "rpm -e wine" or "make uninstall"
-before installing.
-
 If you want to read the documentation supplied with the Wine source,
 see the "DOCUMENTATION" section.
 
@@ -141,10 +145,10 @@
 The file documentation/samples/config contains an example configuration file
 which has to be adapted and copied to the location mentioned above.
 
-Don't forget to add vital registry entries by applying winedefault.reg
-with programs/regedit/. See documentation/ directory for details.
+DO NOT FORGET to add vital registry entries by applying winedefault.reg
+with the programs/regedit/ tool. See documentation/ directory for details.
 
-See http://www.winehq.com/support/ for further configuration hints.
+See the Support area at http://www.winehq.com/ for further configuration hints.
 
 In case of library loading errors
 (e.g. "Error while loading shared libraries: libntdll.so"), make sure
@@ -156,7 +160,8 @@
 As this program is alpha, it doesn't run a truly thorough test yet, though,
 so it should be taken as a first verification step only.
 
-See wine.conf man page on how to switch to text mode only support if desired.
+Also, don't forget to read the wine and wine.conf man pages for various
+hints: e.g. how to switch to text mode only support (no X11 output) !
 
 6. RUNNING PROGRAMS
 
@@ -165,12 +170,15 @@
 
 For example: to run Solitaire:
 
-	wine sol		   (using the searchpath to locate the file)
-	wine sol.exe
+	wine sol		   (using the search Path as specified in
+	wine sol.exe		    the config file to locate the file)
+
+	wine c:\\windows\\sol.exe  (using DOS filename syntax)
 
-	wine c:\\windows\\sol.exe  (using a DOS filename)
+	wine /usr/windows/sol.exe  (using Unix filename syntax)
 
-	wine /usr/windows/sol.exe  (using a Unix filename)
+        wine -- sol.exe /parameter1 -parameter2 parameter3
+				   (calling program with parameters)
 
 Note: the path of the file will also be added to the path when
       a full name is supplied on the commandline.
@@ -213,21 +221,20 @@
 Usenet:	You can discuss Wine-related issues and get help
 	on comp.emulators.ms-windows.wine.
 
-Bugs:	Report bugs to Wine Bugzilla at http://bugs.winehq.com/.
+Bugs:	Report bugs to Wine Bugzilla at http://bugs.winehq.com
 	Please search the bugzilla database to check whether your
-	problem is already found before posting a bug report.  You can
-	also post bug reports to comp.emulators.ms-windows.wine.
+	problem is already found before posting a bug report.
 	Please read the file documentation/bugs.sgml to see what
 	information is required.
 
 IRC:	Online help is available at channel #WineHQ on irc.freenode.net.
 
 CVS:	The current Wine development tree is available through CVS.
-	Go to http://www.winehq.com/development/ for more information.
+	Read the Wine Developers Guide for more information.
 
 Mailing lists:
-	There are several mailing lists for Wine developers; see
-	http://www.winehq.com/development/#ml for more information.
+	There are several mailing lists for Wine support; see
+	http://www.winehq.com/?page=forums for more information.
 
 If you add something, or fix a bug, please send a patch (in 'diff -u'
 format) to wine-patches@winehq.com list for inclusion in the next
Determining best CVS host...
Using CVSROOT :pserver:cvs@rhlx01.fht-esslingen.de:/home/wine
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.4
diff -u -r1.4 virtual.c
--- dlls/ntdll/virtual.c	7 Jan 2003 20:36:28 -0000	1.4
+++ dlls/ntdll/virtual.c	1 Apr 2003 20:29:15 -0000
@@ -690,7 +690,7 @@
         if (!relocs->VirtualAddress || !relocs->Size)
         {
             if (nt->OptionalHeader.ImageBase == 0x400000)
-                ERR("Standard load address for a Win32 program (0x00400000) not available - security-patched kernel ?\n");
+                ERR("Standard load address for a Win32 program (0x00400000) not available - security-patched kernel or HUGE exe file ?\n");
             else
                 ERR( "FATAL: Need to relocate module from addr %lx, but there are no relocation records\n",
                      nt->OptionalHeader.ImageBase );
Index: dlls/oleaut32/olepicture.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/olepicture.c,v
retrieving revision 1.24
diff -u -r1.24 olepicture.c
--- dlls/oleaut32/olepicture.c	9 Jan 2003 06:04:33 -0000	1.24
+++ dlls/oleaut32/olepicture.c	1 Apr 2003 20:29:16 -0000
@@ -1060,7 +1060,7 @@
     hr = S_OK;
     HeapFree(GetProcessHeap(),0,bits);
 #else
-    ERR("Trying to load JPEG picture, but JPEG supported not compiled in.\n");
+    ERR("Trying to load JPEG picture, but JPEG (libjpeg-dev) support not compiled in.\n");
     hr = E_FAIL;
 #endif
     break;
Index: files/directory.c
===================================================================
RCS file: /home/wine/wine/files/directory.c,v
retrieving revision 1.60
diff -u -r1.60 directory.c
--- files/directory.c	25 Mar 2003 00:33:12 -0000	1.60
+++ files/directory.c	1 Apr 2003 20:29:17 -0000
@@ -130,9 +130,11 @@
     cwd = path;
     if ((drive = DRIVE_FindDriveRoot( &cwd )) == -1)
     {
-        MESSAGE("Warning: could not find wine config [Drive x] entry "
-            "for current working directory %s; "
-	    "starting in windows directory.\n", cwd );
+        MESSAGE("ERROR: could not find any matching '[Drive x]' definition"
+		"in the Wine configuration file that can be used as a base"
+		"to access the current directory %s,"
+		"please adapt your configuration!!"
+		" Trying to start in windows directory instead.\n", cwd );
     }
     else
     {
Index: server/trace.c
===================================================================
RCS file: /home/wine/wine/server/trace.c,v
retrieving revision 1.160
diff -u -r1.160 trace.c
--- server/trace.c	26 Mar 2003 23:41:43 -0000	1.160
+++ server/trace.c	1 Apr 2003 20:29:19 -0000
@@ -16,6 +16,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *
+ * Automatically built trace functions to be found here get called
+ * by trace_request() which gets called by wineserver's request handling.
  */
 
 #include "config.h"
Index: tools/winecheck
===================================================================
RCS file: /home/wine/wine/tools/winecheck,v
retrieving revision 1.12
diff -u -r1.12 winecheck
--- tools/winecheck	31 Mar 2003 19:34:53 -0000	1.12
+++ tools/winecheck	1 Apr 2003 20:29:20 -0000
@@ -633,7 +633,7 @@
   }
   else
   {
-    Do_PrintResult($is_notice, "entry \"Default Taskbar\" not found", "A Windows registry does not seem to have been added to Wine as this typical Windows registry entry does not exist in Wine's registry.  A complete original Windows registry entry set will *not* be available with a no-windows install. Usually this will present no problem in running applications although this can affect newer programs");
+    Do_PrintResult($is_notice, "entry \"Default Taskbar\" not found", "A Windows registry does not seem to have been added to Wine as this typical Windows registry entry does not exist in Wine's registry.  A complete original Windows registry entry set will *not* be available with a no-windows install. Usually this will present no problem in running applications although this can affect newer programs. Feel free to ignore this message in case you do use a Windows registry, but have the SaveOnlyUpdatedKeys config setting set to N.");
   }
   @entries = ();
 }

-- 
Andreas Mohr                        Stauferstr. 6, D-71272 Renningen, Germany


[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux