From 9a94980190cd2ea952dd4c97640c441db2009b02 Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Thu, 18 Jan 2001 23:03:47 +0000 Subject: [PATCH] Updated for change in config file name. Removed references to obsolete global wine configuration file where appropriate. Updated config option format to match the new syntax. Misc cleanups. --- documentation/configuring.sgml | 303 +++++++++--------- documentation/fonts.sgml | 6 +- .../installation-und-konfiguration.german | 12 +- documentation/installing.sgml | 40 ++- documentation/opengl.sgml | 2 +- documentation/printing.sgml | 24 +- documentation/registry.sgml | 7 +- documentation/running.sgml | 27 +- 8 files changed, 188 insertions(+), 233 deletions(-) diff --git a/documentation/configuring.sgml b/documentation/configuring.sgml index 56a468e3af1..798bdcbab4c 100644 --- a/documentation/configuring.sgml +++ b/documentation/configuring.sgml @@ -50,7 +50,7 @@ This section will guide you through the process of making a config file. Take a look at the file <dirs to - wine>/wine.ini. It is organized by section. + wine>/documentation/samples/config. It is organized by section. @@ -167,7 +167,7 @@ -Type=floppy|hd|cdrom|network <--- the |'s mean Type=<one of the options> +"Type" = "floppy|hd|cdrom|network" <--- the |'s mean "Type = "<one of the options>" @@ -177,20 +177,20 @@ Type=floppy|hd|cdrom|network <--- the |'s mean Type=<one of the options> network. They are self-explanatory. - Label=blah Defines the + "Label" = "blah" Defines the drive label. Generally only needed for programs that look for a special CD-ROM. Info on finding the lable is in <dirs to wine>/documentation/cdrom-labels. The label may be up to 11 characters. - Serial=deadbeef + "Serial" = "deadbeef" Tells Wine the serial number of the drive. A few programs with intense protection for pirating might need this, but otherwise don't use it. Up to 8 characters and hexadecimal. - Filesystem=msdos|win95|unix + "Filesystem" = "msdos|win95|unix" Sets up the way Wine looks at files on the drive. @@ -235,7 +235,7 @@ Type=floppy|hd|cdrom|network <--- the |'s mean Type=<one of the options> - Device=/dev/xx + "Device" = "/dev/xx" Use this ONLY for floppy and cdrom devices. Using it on Extended2 partitions can have dire results (when a windows @@ -256,25 +256,25 @@ Type=floppy|hd|cdrom|network <--- the |'s mean Type=<one of the options> Here is a setup for Drive X, a generic hard drive: [Drive X] -Path=/dos-a -Type=hd -Label=Hard Drive -Filesystem=win95 +"Path" = "/dos-a" +"Type" = "hd" +"Label" = "Hard Drive" +"Filesystem" = "win95" This is a setup for Drive X, a generic CD-ROM drive: [Drive X] -Path=/dos-d -Type=cdrom -Label=Total Annihilation -Filesystem=win95 -Device=/dev/hdc +"Path" = "/dos-d" +"Type" = "cdrom" +"Label" = "Total Annihilation" +"Filesystem" = "win95" +"Device" = "/dev/hdc" And here is a setup for Drive X, a generic floppy drive: [Drive X] -Type=floppy -Path=/mnt/floppy -Label=Floppy Drive -Serial=87654321 -Filesystem=win95 -Device=/dev/fd0 +"Type" = "floppy" +"Path" = "/mnt/floppy" +"Label" = "Floppy Drive" +"Serial" = "87654321" +"Filesystem" = "win95" +"Device" = "/dev/fd0" @@ -289,15 +289,15 @@ Device=/dev/fd0 has a path of /dos, and your windows directory is located in /dos/windows, then use: - Windows=c:\windows + "Windows" = "c:\\windows" This sets up the windows directory. Make one if you don't already have one. NO TRAILING SLASH - (NOT C:\windows\)! + (NOT C:\\windows\)! - System=c:\windows\system + "System" = "c:\\windows\\system" This sets up where the windows system files are. Should reside in the directory used for the Windows setting. If you don't have @@ -305,13 +305,13 @@ Device=/dev/fd0 files will go. Again, NO TRAILING SLASH! - Temp=c:\temp This should + "Temp" = "c:\\temp" This should be the directory you want your temp files stored in. YOU MUST HAVE WRITE ACCESS TO IT. -Path=c:\windows;c:\windows\system;c:\blanco +"Path" = "c:\\windows;c:\\windows\\system;c:\\blanco" @@ -324,21 +324,21 @@ Path=c:\windows;c:\windows\system;c:\blanco current directory, wine will run that one). Make sure it always has your windows directory and system directory (For this setup, it must have - c:\windows;c:\windows\system). + "c:\\windows;c:\\windows\\system"). - SymbolTableFile=wine.sym + "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 + "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.ini (It probably + this to your ~/.wine/config (It probably isn't already in it). Check out the [spooler] and [parallelports] sections too. @@ -462,14 +462,7 @@ Path=c:\windows;c:\windows\system;c:\blanco These settings provide wine's default handling of DLL loading. - EXTRA_LD_LIBRARY_PATH=/dirs - - - The directory specified here is appended to the normal search - path for certain forms of DLL's (elfdll and .so). - - - DefaultLoadOrder = native, elfdll, so, builtin + "DefaultLoadOrder" =" native, so, builtin" This setting is a comma-delimited list of which order to @@ -482,30 +475,15 @@ Path=c:\windows;c:\windows\system;c:\blanco The [DllPairs] Section - This section is optional, but strongly recommended. If you - try to use native SHELL32, but builtin SHELL, you could - have some big problems (native and builtin/so/elfdll do - certain things in different ways). Using different forms - of a pair is a *very*, **very** bad idea. By specifying - DLL pairs here, wine will print out a message if you use - different forms of a pair. You shouldn't need to change - anything in this section, the following should work fine - in all cases: + At one time, there was a section called [DllPairs] in the + default configuration file, but this has been obsoleted + because the pairing information has now been embedded into + Wine itself. (The purpose of this section was merely to be + able to issue warnings if the user attempted to pair + codependent 16-bit/32-bit DLLs of different types.) If you + still have this in your wine.conf or + ~/.wine/config, you may safely delete it. - -[DllPairs] -kernel = kernel32 -gdi = gdi32 -user = user32 -commdlg = comdlg32 -commctrl= comctl32 -ver = version -shell = shell32 -lzexpand= lz32 -winsock = wsock32 - - - The [DllOverrides] Section @@ -518,43 +496,62 @@ winsock = wsock32 For example, to load builtin KERNEL pair (case doesn't matter here): -kernel,kernel32 = builtin +"kernel,kernel32" = "builtin" To load the native COMMDLG pair, but if that doesn't work try builtin: -commdlg,comdlg32 = native,builtin +"commdlg,comdlg32" = "native,builtin" To load the native COMCTL32: -comctl32 = native +"comctl32" = "native" - Here is a good generic setup (As it is defined in wine.ini + Here is a good generic setup (As it is defined in config that was included with your wine package): [DllOverrides] -kernel32, gdi32, user32 = builtin -kernel, gdi, user = builtin -toolhelp = builtin -comdlg32, commdlg = elfdll, builtin, native -version, ver = elfdll, builtin, native -shell32, shell = builtin, native -lz32, lzexpand = builtin, native -commctrl, comctl32 = builtin, native -wsock32, winsock = builtin -advapi32, crtdll, ntdll = builtin, native -mpr, winspool = builtin, native -ddraw, dinput, dsound = builtin, native -winmm, w32skrnl, msvfw32= builtin -wnaspi32, wow32 = builtin -system, display, wprocs = builtin -wineps = builtin +"commdlg" = "builtin, native" +"comdlg32" = "builtin, native" +"ver" = "builtin, native" +"version" = "builtin, native" +"shell" = "builtin, native" +"shell32" = "builtin, native" +"lzexpand" = "builtin, native" +"lz32" = "builtin, native" +"comctl32" = "builtin, native" +"commctrl" = "builtin, native" +"wsock32" = "builtin" +"winsock" = "builtin" +"advapi32" = "builtin, native" +"crtdll" = "builtin, native" +"mpr" = "builtin, native" +"winspool.drv" = "builtin, native" +"ddraw" = "builtin, native" +"dinput" = "builtin, native" +"dsound" = "builtin, native" +"mmsystem" = "builtin" +"winmm" = "builtin" +"msvcrt" = "native, builtin" +"msvideo" = "builtin, native" +"msvfw32" = "builtin, native" +"mcicda.drv" = "builtin, native" +"mciseq.drv" = "builtin, native" +"mciwave.drv" = "builtin, native" +"mciavi.drv" = "native, builtin" +"mcianim.drv" = "native, builtin" +"msacm.drv" = "builtin, native" +"msacm" = "builtin, native" +"msacm32" = "builtin, native" +"midimap.drv" = "builtin, native" +"wnaspi32" = "builtin" +"icmp" = "builtin" @@ -574,7 +571,7 @@ wineps = builtin -AllocSystemColors=100 +"AllocSystemColors" = "100" System colors to allocate? Just leave it at 100. @@ -586,7 +583,7 @@ AllocSystemColors=100 This section sets up wine's font handling. - Resolution = 96 + "Resolution" = "96" Since the way X handles fonts is different from the way @@ -601,7 +598,7 @@ AllocSystemColors=100 working acceptably in wine. - Default = -adobe-times- + "Default" = "-adobe-times-" The default font wine uses. Fool around with it if you'd like. @@ -612,7 +609,7 @@ OPTIONAL: used in wine. This is good for apps that need a special font you don't have, but a good replacement exists. The syntax is like so: -AliasX = [Fake windows name],[Real X name]<,optional "masking" section> +"AliasX" = "[Fake windows name],[Real X name]"<,optional "masking" section> @@ -630,14 +627,14 @@ AliasX = [Fake windows name],[Real X name]<,optional "masking" section> apps as "Google". When defining an alias in a config file, forget about my comment text (The "<-- blah" stuff) -Alias0 = Foo,--google- <-- Note the no spaces after the " = ". Important! +"Alias0" = "Foo,--google-" < Here is an example with masking enabled. The font will show up as "Foo" in windows apps. -Alias1 = Foo,--google-,subst +"Alias1" = "Foo,--google-,subst" @@ -655,7 +652,7 @@ Alias1 = Foo,--google-,subst The [serialports] section tells wine what serial ports it is allowed to use. - ComX=/dev/cuaY + "ComX" = "/dev/cuaY" Replace X with the number of the COM @@ -666,7 +663,7 @@ Alias1 = Foo,--google-,subst (/dev/modem is acceptable). It is not always necessary to define any COM ports (An optional setting). Here is an example: - Com1=/dev/cua0 + "Com1" = "/dev/cua0" Use as many of these as you like in the section to define @@ -675,7 +672,7 @@ Alias1 = Foo,--google-,subst The [parallelports] section sets up any parallel ports that will be allowed access under wine. - LptX=/dev/lpY + "LptX" = "/dev/lpY" Sounds familiar? Syntax is just like the COM port setting. @@ -686,7 +683,7 @@ Alias1 = Foo,--google-,subst to define a parallel port (AKA, it's optional). As with the other section, LptX can equal any device (Maybe /dev/printer). Here is an - example: Lpt1=/dev/lp0 + example: "Lpt1" = "/dev/lp0" The [spooler] section will inform wine where to spool @@ -696,12 +693,12 @@ Alias1 = Foo,--google-,subst setting you use in this section works to map a port (LPT1, for example) to a file or a command. Here is an example, mapping LPT1 to the file out.ps: - LPT1:=out.ps + "LPT1:" = "out.ps" The following command maps printing jobs to LPT1 to the command lpr. Notice the |: - LPT1:=|lpr + "LPT1:" = "|lpr" The [ports] section is usually useful only for people who @@ -709,11 +706,11 @@ Alias1 = Foo,--google-,subst scanners. IF YOU DON'T NEED IT, DON'T USE IT! - read=0x779,0x379,0x280-0x2a0 + "read" = "0x779,0x379,0x280-0x2a0" Gives direct read access to those IO's. - write=0x779,0x379,0x280-0x2a0 + "write" = "0x779,0x379,0x280-0x2a0" Gives direct write access to those IO's. It's probably a good idea to keep the values of the read and write @@ -731,17 +728,17 @@ Alias1 = Foo,--google-,subst REMOVE ANYTHING IN THIS SECTION TO YOUR CONFIG. - File=/blanco + "File" = "/blanco" Sets the logfile for wine. Set to CON to log to standard out. THIS IS RARELY USED. - Exclude=WM_SIZE;WM_TIMER; + "Exclude" = "WM_SIZE;WM_TIMER;" Excludes debug messages about WM_SIZE and WM_TIMER in the logfile. - Include=WM_SIZE;WM_TIMER; + "Include" = "WM_SIZE;WM_TIMER;" Includes debug messages about WM_SIZE and WM_TIMER in the logfile. @@ -752,19 +749,15 @@ Alias1 = Foo,--google-,subst windows installation. - UserFileName=/dirs/to/user.reg + "UserFileName" = "/dirs/to/user.reg" The location of your old user.reg file. - - LocalMachineFileName=/dirs/to/system.reg - The location of your old system.reg file. - [tweak.layout] is devoted to wine's look. There is only one setting for it. - WineLook=win31|win95|win98 + "WineLook" = "win31|win95|win98" Will change the look of wine from Windows 3.1 to Windows 95. The win98 setting behaves just like win95 most of the time. @@ -774,11 +767,11 @@ Alias1 = Foo,--google-,subst special conditions. - Default=/program/to/execute.exe + "Default" = "/program/to/execute.exe" Sets the program to be run if wine is started without specifying a program. - Startup=/program/to/execute.exe + "Startup" = "/program/to/execute.exe" Sets the program to automatically be run at startup every time. @@ -794,11 +787,13 @@ Alias1 = Foo,--google-,subst /usr/local/etc/wine.conf A systemwide config file, used for anyone who doesn't - have their own. + have their own. NOTE: this file is currently unused as a + new global configuration mechanism is not in place at this + time - $HOME/.winerc + $HOME/.wine/config Your own config file, that only is used for your user. @@ -807,7 +802,8 @@ Alias1 = Foo,--google-,subst So copy your version of the wine.conf file to /usr/local/etc/wine.conf or - $HOME/.winerc for wine to recognize it. + $HOME/.wine/config for wine to recognize + it. @@ -817,7 +813,8 @@ Alias1 = Foo,--google-,subst There is always a chance that things will go wrong. If the unthinkable happens, try the newsgroup, comp.emulators.ms-windows.wine, - or the IRCnet channel #WineHQ. + or the IRCnet channel #WineHQ found on + irc.stealth.net:6668, or connected servers. Make sure that you have looked over this document thoroughly, and have also read: @@ -855,30 +852,30 @@ Alias1 = Foo,--google-,subst Instead of compiling Wine for Win3.1 vs. Win95 using #define switches, the code now looks in a special [Tweak.Layout] section of - wine.conf for a - WineLook=Win95 or - WineLook=Win98 entry. + ~/.wine/config for a + "WineLook" = "Win95" or + "WineLook" = "Win98" entry. A few new sections and a number of entries have been added to - the wine.conf file -- these are for + the ~/.wine/config file -- these are for debugging the Win95 tweaks only and may be removed in a future release! These entries/sections are: [Tweak.Fonts] -System.Height=<point size> # Sets the height of the system typeface -System.Bold=[true|false] # Whether the system font should be boldfaced -System.Italic=[true|false] # Whether the system font should be italicized -System.Underline=[true|false] # Whether the system font should be underlined -System.StrikeOut=[true|false] # Whether the system font should be struck out -OEMFixed.xxx # Same parameters for the OEM fixed typeface -AnsiFixed.xxx # Same parameters for the Ansi fixed typeface -AnsiVar.xxx # Same parameters for the Ansi variable typeface -SystemFixed.xxx # Same parameters for the System fixed typeface +"System.Height" = "<point size>" # Sets the height of the system typeface +"System.Bold" = "[true|false]" # Whether the system font should be boldfaced +"System.Italic" = "[true|false]" # Whether the system font should be italicized +"System.Underline" = "[true|false]" # Whether the system font should be underlined +"System.StrikeOut" = "[true|false]" # Whether the system font should be struck out +"OEMFixed.xxx" # Same parameters for the OEM fixed typeface +"AnsiFixed.xxx" # Same parameters for the Ansi fixed typeface +"AnsiVar.xxx" # Same parameters for the Ansi variable typeface +"SystemFixed.xxx" # Same parameters for the System fixed typeface [Tweak.Layout] -WineLook=[Win31|Win95|Win98] # Changes Wine's look and feel +"WineLook" = "[Win31|Win95|Win98]" # Changes Wine's look and feel @@ -901,9 +898,8 @@ WineLook=[Win31|Win95|Win98] # Changes Wine's look and feel ncurses-based ttydrv, which he claims works for displaying calc.exe). The display driver is chosen with the GraphicsDriver option in the [wine] section - of wine.conf or - .winerc, but I will only cover the x11drv - driver in this article. + of ~/.wine/config, but I will only cover the + x11drv driver in this article. @@ -1205,26 +1201,26 @@ WineLook=[Win31|Win95|Win98] # Changes Wine's look and feel Reading labels and serial numbers just works automagically if you specify a Device= line in the - [Drive X] section in your wine.conf. + [Drive X] section in your ~/.wine/config. Note that the device has to exist and must be accessible if you do this, though. If you don't do that, then you should give fixed - Label= or Serial= - entries in wine.conf, as Wine returns + "Label" = or "Serial" = + entries in ~./wine/config, as Wine returns these entries instead if no device is given. If they don't exist, then Wine will return default values (label Drive X and serial 12345678). - If you want to give a Device= entry + If you want to give a "Device" = entry only for drive raw sector accesses, but not for reading the volume info from the device (i.e. you want a fixed, preconfigured label), you need - to specify ReadVolInfo=0 to tell Wine to - skip the volume reading. + to specify "ReadVolInfo" = "0" to tell Wine + to skip the volume reading. @@ -1237,28 +1233,28 @@ WineLook=[Win31|Win95|Win98] # Changes Wine's look and feel [Drive A] -Path=/mnt/floppy -Type=floppy -Device=/dev/fd0 -Filesystem=msdos +"Path" = "/mnt/floppy" +"Type" = "floppy" +"Device" = "/dev/fd0" +"Filesystem" = "msdos" [Drive R] -Path=/mnt/cdrom -Type=cdrom -Device=/dev/hda1 -Filesystem=win95 +"Path" = "/mnt/cdrom" +"Type" = "cdrom" +"Device" = "/dev/hda1" +"Filesystem" = "win95" Here's an example of overriding the CD-ROM label: [Drive J] -Path=/mnt/cdrom -Type=cdrom -Label=X234GCDSE +"Path" = "/mnt/cdrom" +"Type" = "cdrom" +"Label" = "X234GCDSE" ; note that the device isn't really needed here as we have a fixed label -Device=/dev/cdrom -Filesystem=msdos +"Device" = "/dev/cdrom" +"Filesystem" = "msdos" @@ -1361,19 +1357,6 @@ Filesystem=msdos The [DllDefaults] section - - EXTRA_LD_LIBRARY_PATH - - This specifies the location of the Wine's DLL - .so files. Wine will search this - path when trying to locate a DLL of the type - builtin or - elfdll. (This does not apply to - libwine.so, since - libwine.so is not a DLL in this - sense.) - - DefaultLoadOrder @@ -1395,7 +1378,7 @@ Filesystem=msdos able to issue warnings if the user attempted to pair codependent 16-bit/32-bit DLLs of different types.) If you still have this in your wine.conf or - .winerc, you may safely delete it. + ~/.wine/config, you may safely delete it. diff --git a/documentation/fonts.sgml b/documentation/fonts.sgml index 483682dfeb8..20c21ce7f14 100644 --- a/documentation/fonts.sgml +++ b/documentation/fonts.sgml @@ -66,7 +66,7 @@ - Edit the wine.conf file to remove + Edit the ~/.wine/config file to remove aliases for the fonts you've just installed. @@ -112,7 +112,7 @@ STUB: AddFontResource( SOMEFILE.FON ) - How To Add Font Aliases To <filename>wine.conf</filename> + How To Add Font Aliases To <filename>~/.wine/config</filename> Many Windows applications assume that fonts included in original Windows 3.1 distribution are always present. By @@ -331,7 +331,7 @@ Default = -adobe-times- WINE stores detailed information about available fonts in the ~/.wine/.cachedmetrics file. You can copy it elsewhere and add this entry to the [fonts] - section in your wine.conf: + section in your ~/.wine/config: FontMetrics = <file with metrics> diff --git a/documentation/installation-und-konfiguration.german b/documentation/installation-und-konfiguration.german index 44738bfd892..a5e5167b738 100644 --- a/documentation/installation-und-konfiguration.german +++ b/documentation/installation-und-konfiguration.german @@ -361,7 +361,7 @@ die folgenden Programme und Dateien installiert sein: gültige Konfigurationsdatei oder über eine benutzerspezifische Datei im Heimatverzeichnis des betreffenden Benutzers konfiguriert werden. Die benutzerspezifische Konfigurationsdatei trägt den - Namen .winerc. Wenn diese Datei existiert, wird die systemweit + Namen ~/.wine/config. Wenn diese Datei existiert, wird die systemweit gültige Konfigurationsdatei (standardmäßig /usr/local/etc/wine.conf) nicht beachtet und es werden alle Einstellungen aus der Konfigurationsdatei des betreffenden @@ -410,7 +410,7 @@ die folgenden Programme und Dateien installiert sein: diese Vorlage durch den folgenden Befehl an den richtigen Platz kopiert werden: - cp ~/wine/wine.ini ~/.winerc + cp ~/wine/documentation/samples/config ~/.wine/config Die Werte, welche Variablen in der Konfigurationsdatei zugewiesen werden, lassen sich in drei Typen einteilen: Zeichenketten, Zahlen @@ -439,7 +439,7 @@ die folgenden Programme und Dateien installiert sein: Weil Programme, die für DOS oder Windows geschrieben sind, Laufwerksbuchstaben verwenden, um Dateien zu bezeichnen, muss WINE diese Buchstaben auf das UNIX-Dateisystem abbilden. Das Problem ist - auf die folgende Art gelöst: In der Konfigurationsdatei (.winerc + auf die folgende Art gelöst: In der Konfigurationsdatei (~/.wine/config oder /usr/local/etc/wine.conf) wird jedem Laufwerksbuchstaben ein Verzeichnis im UNIX-Dateisystem zugeordnet. Dieses Verzeichnis stellt dann (aus Sicht der Windows-Programme) das Basisverzeichnis @@ -892,8 +892,8 @@ die folgenden Programme und Dateien installiert sein: WINE-Versionen oder den Windows-Versionen dieser Bibliotheken funktioniert. - In der Datei .winerc bzw. wine.conf gibt es zwei Abschnitte mit - denen bestimmt wird, welche Bibliotheken aus einer + In der Datei ~/.wine/config bzw. wine.conf gibt es zwei Abschnitte + mit denen bestimmt wird, welche Bibliotheken aus einer Windows-Installation geladen werden sollen. Darüberhinaus können diese Einstellungen beim Aufruf von WINE an der Kommandozeile überschrieben werden. Im allgemeinen empfiehlt es sich, die @@ -1222,7 +1222,7 @@ die folgenden Programme und Dateien installiert sein: 7.6.3 Font-Einstellungen in der WINEs Konfigurationsdatei - In der Konfigurationsdatei .winerc bzw. wine.conf stehen die + In der Konfigurationsdatei ~/.wine/config bzw. wine.conf stehen die folgenden Variablen zur Verfügung, mit denen WINEs Umgang mit Schriftarten beeinflusst werden kann: diff --git a/documentation/installing.sgml b/documentation/installing.sgml index 48a999811b0..5fd4895b36b 100644 --- a/documentation/installing.sgml +++ b/documentation/installing.sgml @@ -139,15 +139,15 @@ WinNT/2000 directory for common 16-bit DLLs be (tools/wineinstall will even ask you). If you choose, say, /var/wine, as the root of your virtual drive C, - then you'd put this in your wine.conf: + then you'd put this in your ~/.wine/config: [Drive C] -Path=/var/wine -Type=hd -Label=MS-DOS -Filesystem=win95 +"Path" = "/var/wine" +"Type" = "hd" +"Label" = "MS-DOS" +"Filesystem" = "win95" @@ -155,8 +155,8 @@ Filesystem=win95 "c:\windows\system" would map to /var/wine/windows/system in the UNIX filesystem. Note that you need to specify - Filesystem=win95, NOT - Filesystem=unix, to make Wine simulate a + "Filesystem" = "win95", NOT + "Filesystem" = "unix", to make Wine simulate a Windows-compatible (case-insensitive) filesystem, otherwise most apps won't work. @@ -235,11 +235,10 @@ Filesystem=win95 Point [Drive C] in - wine.conf or - .winerc to where you want + ~/.wine/config to where you want C: to be. Refer to the Wine man page for more information. Remember to use - filesystem=win95! + "Filesystem" = "win95"! @@ -286,8 +285,7 @@ Filesystem=win95 Edit the [DllOverrides] section of - wine.conf or - .winerc to specify + ~/.wine/config to specify native before builtin for the Windows DLLs you want to use. For more information about this, see the Wine manpage. @@ -307,7 +305,7 @@ Filesystem=win95 only as pairs to your Wine directory (these DLLs are clean to use). Make sure you have these specified in the [DllPairs] section of - wine.conf or .winerc. + ~/.wine/config. @@ -364,13 +362,13 @@ Filesystem=win95 Wine maps mounted FAT filesystems, such as /c, to driver letters, such as c:, as indicated by the - wine.conf file. The following excerpt - from a wine.conf file does this: + ~/.wine/config file. The following excerpt + from a ~/.wine/config file does this: [Drive C] -Path=/c -Type=hd +"Path" = "/c" +"Type" = "hd" Although VFAT filesystems are preferable to FAT filesystems @@ -682,17 +680,17 @@ THIS MAY TRASH YOUR SYSTEM IF USED CORRECTLY For Win32 software (WNASPI32), Wine has auto-detection in place. For Win16 software (WINASPI), you need to add a SCSI device entry - for your particular scanner to wine.conf. The format is + for your particular scanner to ~/.wine/config. The format is [scsi cCtTdD] where - C=controller, - T=target, D=LUN + "C" = "controller", + "T" = "target", D=LUN For example, I set mine up as controller 0, Target 6, LUN 0. [scsi c0t6d0] -Device=/dev/sgi +"Device" = "/dev/sgi" Yours will vary with your particular SCSI setup. diff --git a/documentation/opengl.sgml b/documentation/opengl.sgml index d098512f485..88dc0836364 100644 --- a/documentation/opengl.sgml +++ b/documentation/opengl.sgml @@ -144,7 +144,7 @@ contexts, if you want to prevent the screen to flicker when using OpenGL applications (all games are using double-buffered contexts), you need to set the following option in your - .winerc / wine.ini + ~/.wine/config file in the [x11drv] section : diff --git a/documentation/printing.sgml b/documentation/printing.sgml index 8f35843af54..971ed5006fe 100644 --- a/documentation/printing.sgml +++ b/documentation/printing.sgml @@ -44,15 +44,15 @@ printer=on to the [wine] section of wine.conf (or - ~/.winerc). This lets + ~/.wine/config). This lets CreateDC proceed if its driver argument is a 16 bit driver. You will probably also need to add -TTEnable=0 TTOnly=0 +"TTEnable" = "0" "TTOnly" = "0" - to the [TrueType] section of win.ini. The code for + to the [TrueType] section of ~/.wine/config. The code for the driver interface is in graphics/win16drv. @@ -76,7 +76,7 @@ TTEnable=0 TTOnly=0 example the following lines -LPT1:=foo.ps LPT2:=|lpr +"LPT1:" = "foo.ps" "LPT2:" = "|lpr" map LPT1: to file foo.ps @@ -116,23 +116,23 @@ LPT1:=foo.ps LPT2:=|lpr To install it add -Wine PostScript Driver=WINEPS,LPT1: +"Wine PostScript Driver" = "WINEPS,LPT1:" to the [devices] section and -Wine PostScript Driver=WINEPS,LPT1:,15,45 +"Wine PostScript Driver" = "WINEPS,LPT1:,15,45" to the [PrinterPorts] section of win.ini and to set it as the default printer also add -device=Wine PostScript Driver,WINEPS,LPT1: +"device" = "Wine PostScript Driver,WINEPS,LPT1:" - to the [windows] section of win.ini and ??? + to the [windows] section of ~/.wine/config and ??? [sic] @@ -161,10 +161,10 @@ device=Wine PostScript Driver,WINEPS,LPT1: Then create a [afmfiles] section in your wine.conf (or - ~/.winerc) and add a line of the form + ~/.wine/config) and add a line of the form -file<n>=/unix/path/name/filename.afm +"file<n>" = "/unix/path/name/filename.afm" for each AFM file that you wish to use. [This might change in the future] @@ -176,10 +176,10 @@ file<n>=/unix/path/name/filename.afm have a look in ftp://ftp.adobe.com/pub/adobe/printerdrivers/win/all/. Create a [psdrv] section in your wine.conf (or - ~/.winerc) and add the following entry: + ~/.wine/config) and add the following entry: -ppdfile=/somewhere/file.ppd +"ppdfile" = "/somewhere/file.ppd" By default, the driver will look for a file named diff --git a/documentation/registry.sgml b/documentation/registry.sgml index a62354ddc96..90143d4d414 100644 --- a/documentation/registry.sgml +++ b/documentation/registry.sgml @@ -81,8 +81,7 @@ If you point Wine at an existing MS Windows installation (by setting the appropriate directories in - wine.conf or - .winerc), then Wine is able to load + ~/.wine/config, then Wine is able to load registry data from it. However, Wine will not save anything to the real Windows registry, but rather to its own registry files (see below). Of course, if a particular registry value @@ -249,8 +248,8 @@ ln -sf /usr/local/etc/wine.userreg wine.userreg The [registry] section - With the above information fresh in mind, let's look at the - wine.conf/.winerc + With the above information fresh in mind, let's look at the + wine.conf/~/.wine/config options for handling the registry. diff --git a/documentation/running.sgml b/documentation/running.sgml index e952d99495c..63344afa227 100644 --- a/documentation/running.sgml +++ b/documentation/running.sgml @@ -26,7 +26,6 @@ Usage: ./wine [options] program_name [arguments] Options: - --config name Specify config file to use --debugmsg name Turn debugging-messages on or off --desktop geom Use a desktop window of the given geometry --display name Use the specified display @@ -49,12 +48,7 @@ Options: up with a sensible set of defaults; in this case, you can run wine without explicitly listing any options. In rare cases, you might want to override certain - parameters on the command line. If you find yourself using - the same long set of command options with certain - applications, you might find it easier to work with multiple - config files, using the --config - parameter to specify a non-default configuration. + parameters on the command line. After the options, you should put the name of the file you @@ -108,25 +102,6 @@ Options: Command-Line Options - --config - - The --config parameter allows you to - specify which configuration file you want to use for the - current invocation of wine. For example, - if you like to run a specific application or set of - applications with a different array of options than your - normal defaults, you might set up a different config file - for them, and use the --config option - to make use of it. - - - The default value of --config is - ~/.winerc. This value is hardwired - into the Wine source code. In future versions of Wine, the - default may change to ~/.wine/conf. - - - --debugmsg [channels]