From 7bed696aa35924bd13854095fc352d68b37694d6 Mon Sep 17 00:00:00 2001 From: Andreas Mohr Date: Wed, 19 Sep 2001 22:34:38 +0000 Subject: [PATCH] Updates and error message improvements. --- DEVELOPERS-HINTS | 4 +- README | 12 +-- documentation/architecture.sgml | 8 +- documentation/configuring.sgml | 81 ++++++++++--------- .../installation-und-konfiguration.german | 2 +- documentation/wine.conf.man.in | 30 ++++--- files/dos_fs.c | 2 +- libtest/volinfo.c | 2 +- msdos/int25.c | 2 +- msdos/int26.c | 2 +- tools/winecheck | 3 +- winedefault.reg | 4 +- 12 files changed, 85 insertions(+), 67 deletions(-) diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index c9614c4bc84..76d517f33b8 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -58,7 +58,7 @@ Other DLLs: msnet/ msvcrt/ - C runtime library msvideo/ - 16 bit video manager - ole32/ - 32 bit OLE 2.0 librairies + ole32/ - 32 bit OLE 2.0 libraries oleaut32/ - 32 bit OLE 2.0 automation olecli/ - 16 bit OLE client oledlg/ - OLE 2.0 user interface support @@ -270,7 +270,7 @@ Debug channels If you need to create a new debug channel, just add the DECLARE_DEBUG_CHANNEL to your .c file(s) and rerun tools/make_debug. When sending out your patch, you don't need to -provide nor ./configure nor the ./include/debugdefs.h diffs. Just +provide neither ./configure nor the ./include/debugdefs.h diffs. Just indicate that those files need to be regenerated. Resources diff --git a/README b/README index 4802e10ab3e..17e6072451e 100644 --- a/README +++ b/README @@ -125,10 +125,10 @@ If you want to build the documentation, you can run "make" in the documentation directory. Wine requires a configuration file named named "config" in your -~/.wine directory. The format of this file is explained in the man -page. The file documentation/samples/config contains an example -configuration file which has to be adapted and copied to the location -mentioned above. +~/.wine directory. The format of this file is explained in the config file +man page (documentation/wine.conf.man). +The file documentation/samples/config contains an example configuration file +which has to be adapted and copied to the location mentioned above. See http://www.winehq.com/support.shtml for further configuration hints. @@ -164,7 +164,9 @@ You should backup all your important files that you give Wine access to, or use a special Wine copy of them, as there have been some cases of users reporting file corruption. Do NOT run Explorer, for instance, if you don't have a proper backup, as it renames/cripples several -directories sometimes. +directories sometimes. Not even other MS apps such as e.g. Messenger are safe, +as they launch Explorer somehow. This particular corruption (!$!$!$!$.pfr) +can be fixed with http://home.nexgo.de/andi.mohr/download/decorrupt_explorer 7. GETTING MORE INFORMATION diff --git a/documentation/architecture.sgml b/documentation/architecture.sgml index 70badd38fde..9fa83943660 100644 --- a/documentation/architecture.sgml +++ b/documentation/architecture.sgml @@ -76,9 +76,9 @@ - The Wineserver + The Wine server - The Wineserver is among the most confusing concepts in Wine. + The Wine server is among the most confusing concepts in Wine. What is its function in Wine? Well, to be brief, it provides Inter-Process Communication (IPC), synchronization, and process/thread management. When the wineserver launches, it @@ -125,13 +125,13 @@ wineserver duplicates the file descriptor, transmits it to the client, and leaves to the client to close the duplicate when it's done with it). - + The Service Thread - The Wineserver cannot do everything that needs to be done + The Wine server cannot do everything that needs to be done behind the application's back, considering that it's not threaded (so cannot do anything that would block or take any significant amount of time), nor does it share the address diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml index 923b995b80d..f3b4345c05c 100644 --- a/documentation/configuring.sgml +++ b/documentation/configuring.sgml @@ -93,11 +93,6 @@ recmd Overides defaults for DLL loading - - [options] - no - No one seems to know - [fonts] yes @@ -292,9 +287,9 @@ And here is a setup for Drive X, a generic floppy drive: The [wine] Section - The [wine] section of the configuration file contains - information wine uses for directories. When specifying the - directories for the settings, make them as they would + The [wine] section of the configuration file contains all kinds + of general settings for Wine. When specifying the directories + for the directory related settings, make them as they would appear in wine. If your drive C has a path of /dos, and your windows directory is located in @@ -336,22 +331,49 @@ And here is a setup for Drive X, a generic floppy drive: system directory (For this setup, it must have "c:\\windows;c:\\windows\\system"). + + "GraphicsDriver" = "x11drv|ttydrv" + Sets the graphics driver to use for Wine output. + x11drv is for X11 output, ttydrv is for text console output. + WARNING: if you use ttydrv here, then you won't be able to run + any Windows GUI programs. Thus this option is mainly interesting + for e.g. embedded use of Wine in web server scripts. + + + "Printer" = "off|on" Tells wine + whether to allow printing via printer drivers to work. + This option isn't needed for our builtin psdrv printer driver + at all. + Using these things are pretty alpha, so you might want to + watch out. Some people might find it useful, however. If + you're not planning on working on printing via windows printer + drivers, don't even add this to your wine config file + (It probably isn't already in it). + Check out the [spooler] and [parallelports] sections too. + + + "ShellLinker" = "wineshelllink" + This setting specifies the shell linker script to use for setting + up Windows icons in e.g. KDE or Gnome that are given by programs + making use of appropriate shell32.dll functionality to create + icons on the desktop/start menu during installation. + + + "ShowDirSymlinks" = "1" + Wine doesn't pass directory symlinks to Windows programs by + default, as doing so may crash some programs that do + recursive lookups of whole subdirectory trees + whenever a directory symlink points back to itself or one of its + parent directories. + That's why we disallowed the use of directory symlinks + and added this setting to reenable ("1") this functionality. + "SymbolTableFile" = "wine.sym" Sets up the symbol table file for the wine debugger. You probably don't need to fiddle with this. May be useful if your wine is stripped. - - "printer" = "off|on" Tells wine - whether to allow printer drivers and printing to work. - Using these things are pretty alpha, so you might want to - watch out. Some people might find it useful, however. If - you're not planning on working on printing, don't even add - this to your ~/.wine/config (It probably - isn't already in it). Check out the [spooler] and - [parallelports] sections too. - @@ -475,10 +497,10 @@ And here is a setup for Drive X, a generic floppy drive: "DefaultLoadOrder" =" native, so, builtin" - This setting is a comma-delimited list of which order to - attempt loading DLL's. If the first option fails, it will - try the second, and so on. The order specified above is - probably the best in most conditions. + This setting is a comma-delimited list of the order in + which to attempt loading DLLs. If the first option fails, + it will try the second, and so on. The order specified + above is probably the best in most conditions. @@ -576,19 +598,6 @@ And here is a setup for Drive X, a generic floppy drive: - - The [options] Section - - No one seems to know what this section is... - - - -"AllocSystemColors" = "100" - - System colors to allocate? Just leave it at 100. - - - The [fonts] Section @@ -1274,7 +1283,7 @@ OPTIONAL: ISO9660 cdrom - reads labels only + reads labels and serial numbers (not mixed-mode CDs yet !) diff --git a/documentation/installation-und-konfiguration.german b/documentation/installation-und-konfiguration.german index 1d9554f79fc..93a5b400975 100644 --- a/documentation/installation-und-konfiguration.german +++ b/documentation/installation-und-konfiguration.german @@ -1822,7 +1822,7 @@ die folgenden Programme und Dateien installiert sein: erstellen, falls dies noch nicht geschehen ist. Danach können die erforderlichen Daten mit dem folgenden Befehl importiert werden: - ./regapi setValue ../../winedefault.reg + ./regapi setValue < ../../winedefault.reg 8 Aufruf von WINE und Kommandozeilenoptionen diff --git a/documentation/wine.conf.man.in b/documentation/wine.conf.man.in index 3455d0e6728..a890450f7a6 100644 --- a/documentation/wine.conf.man.in +++ b/documentation/wine.conf.man.in @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.TH WINE.CONF 5 "August 5, 2001" "Version 20010731" "Wine Configuration File" +.TH WINE.CONF 5 "September 1, 2001" "Version 20010824" "Wine Configuration File" .SH NAME wine.conf \- Wine configuration file .SH DESCRIPTION @@ -31,11 +31,13 @@ are listed below. .PP .B [Drive X] .br -This section is used to specify the root directory and type of each +This section is used to specify the root directory and type of each emulated .B DOS drive, since most Windows applications require a DOS/MS-Windows based -disk drive & directory scheme. There is one such section for every -drive you want to configure. +disk drive & directory scheme, which is either provided by a real +DOS partition mounted somewhere or by some carefully crafted directory layout +on a Unix file system ("no-windows fake installation"). +There is one such section for every drive you want to configure. .PP .I format: """Path""=""""" .br @@ -44,11 +46,11 @@ default: none If you mounted your dos partition as .I /dos and installed Microsoft Windows in -C:\\WINDOWS then you should specify +C:\\WINDOWS (thus it shows up as /dos/WINDOWS), then you should specify .I """Path""=""/dos""" in the .I [Drive C] -section. +section in order to configure /dos as the drive root of drive C:. .PP .I format: """Type""=""""" .br @@ -82,12 +84,12 @@ Supported types are "msdos" (or "fat"), "win95" (or "vfat"), "unix". .br Recommended: .br - "win95" for ext2fs, VFAT and FAT32 + "win95" for ext2fs, ReiserFS, ..., VFAT and FAT32 .br - "msdos" for FAT16 (ugly) + "msdos" for FAT16 file systems (ugly, 8.3 naming) .br You definitely do not want to use "unix" unless you intend to port -programs using Winelib. Always try to avoid using FAT16. Use the +programs using Winelib. Always try to avoid using a FAT16 FS. Use the VFAT/FAT32 OS file system driver instead. .PP .I format: """FailReadOnly""=""""" @@ -104,13 +106,16 @@ default: "C:\\\\WINDOWS" .br Used to specify a different Windows directory; make sure to double the backslashes. +So if you previously configured drive C: to be at /dos, this now means that +the windows directory should be at /dos/WINDOWS. .PP .I format: """system""=""""" .br -default: "C:\\\\WINDOWS\\\\SYSTEM" +default: "C:\\\\WINDOWS\\\\System" .br Used to specify a different system directory; make sure to double the backslashes. +Again, given a drive C: at /dos, this would be at /dos/WINDOWS/System. .PP .I format: """temp""=""""" .br @@ -133,14 +138,14 @@ a native NT or a native win95 directory with per-user settings. default: "C:\\\\WINDOWS;C:\\\\WINDOWS\\\\SYSTEM" .br Used to specify the path which will be used to find executables and -dlls. Make sure to double all the backslashes. +dlls. Make sure to double the backslashes. .PP .B [DllOverrides] .br .I format: """modulename""=""native,so,builtin""" .br .I modulename -can be any valid module name, without extension. The specified value +can be any valid DLL module name, without extension. The specified value is a comma separated list of module-types to try to load in that specific order. Case is not important and only the first letter of each type is enough to identify the type n[ative], s[o], @@ -171,6 +176,7 @@ use native versions for these libraries. Always make sure that you have some kind of strategy in mind when you start fiddling with the current defaults and needless to say that you must know what you are doing. +--debugmsg +loaddll might come in handy for experimenting with that stuff. .PP .B [serialports] .br diff --git a/files/dos_fs.c b/files/dos_fs.c index 3c3e702fa5d..07163601ea8 100644 --- a/files/dos_fs.c +++ b/files/dos_fs.c @@ -820,7 +820,7 @@ static int DOSFS_GetPathDrive( const char **name ) { if ((drive = DRIVE_FindDriveRoot( name )) == -1) { - MESSAGE("Warning: %s not accessible from a DOS drive\n", *name ); + MESSAGE("Warning: %s not accessible from a configured DOS drive\n", *name ); /* Assume it really was a DOS name */ drive = DRIVE_GetCurrentDrive(); } diff --git a/libtest/volinfo.c b/libtest/volinfo.c index 26d112a2f1e..bc639d1fdd5 100644 --- a/libtest/volinfo.c +++ b/libtest/volinfo.c @@ -1,5 +1,5 @@ /* - * This test program was copied from documentation/cdrom-label + * This test program was copied from the former file documentation/cdrom-label */ #include #include diff --git a/msdos/int25.c b/msdos/int25.c index a60cc2b746c..6e99073c82c 100644 --- a/msdos/int25.c +++ b/msdos/int25.c @@ -47,7 +47,7 @@ void WINAPI INT_Int25Handler( CONTEXT86 *context ) "count %ld, buffer %p\n", LOBYTE(context->Eax), begin, length, dataptr); - DRIVE_RawRead(LOBYTE(context->Eax), begin, length, dataptr, TRUE); + DRIVE_RawRead(LOBYTE(context->Eax), begin, length, dataptr, TRUE); RESET_CFLAG(context); } diff --git a/msdos/int26.c b/msdos/int26.c index df5be2647cc..1643276668a 100644 --- a/msdos/int26.c +++ b/msdos/int26.c @@ -46,6 +46,6 @@ void WINAPI INT_Int26Handler( CONTEXT86 *context ) "count %ld, buffer %p\n", AL_reg(context), begin, length, dataptr ); - DRIVE_RawWrite(LOBYTE(context->Eax), begin, length, dataptr, TRUE); + DRIVE_RawWrite(LOBYTE(context->Eax), begin, length, dataptr, TRUE); RESET_CFLAG(context); } diff --git a/tools/winecheck b/tools/winecheck index fc80ed1b23a..89918e74cb5 100755 --- a/tools/winecheck +++ b/tools/winecheck @@ -46,7 +46,8 @@ my $indent = 0; my ($level, $reason, $advice); -my $advice_chmod = "Use chmod as root to fix it (\"man chmod\")"; +my $advice_chmod = "If your user account is supposed to be able to access +it properly, use chmod as root to fix it (\"man chmod\")"; my $advice_fs = "The Filesystem option indicates the filesystem behaviour Wine is supposed to *emulate*, not the filesystem which is there"; my $dev_read = 1; diff --git a/winedefault.reg b/winedefault.reg index 15974254c46..46ba9b1d416 100644 --- a/winedefault.reg +++ b/winedefault.reg @@ -44,8 +44,8 @@ "DragFullWindows"="0" # -# Overwrite default load address of BDE -# (Borland database engine) +# Override default load address of BDE (Borland database engine), +# since it's not available on Linux # [HKEY_LOCAL_MACHINE\Software\Borland\Database Engine\Settings\SYSTEM\INIT]