Le lun 13/10/2003 � 13:08, Ivan Leo Murray-Smith a �crit :
> I don't think winesetup needs big changes; I'm still not sure about what is
> broken. The attached file updates the registry shipped with winesetuptk to the
> current winedefault.reg, and also updates the dlls that are created when making
> a fake windows installation. As I've said, I'm not sure of what is broken, but
> if what has to go isn't determined by winesetuptk while running (Like the
> AppDefaults) then it's just a question of removing whatever has to go from the
> cfg_wine_without_windows.ini and/or cfg_wine_with_windows.ini. If anything else
> has to be changed, then Vincent should tell Alex what exactly has to change, so
> Alex can get on with it. This is presumably the quickest way of getting a
> working winesetuptk again, as he know Tcl/Tk very well. It's not worth wasting
> too much time on it, as were going to trash it soon, it doesn't matter if it
> can't tweak all aspects of the config file, it just has to make a working
> configuration for the user, that will often have to tweak the file by hand anyway
> until winecfg is ready.
Hi Ivan,
In addition to the registry and the default C (although for that
wineinstall should be preferred, or at least both should give the same
set of defaults), there were a couple entries in the template config
file which were absent or obsolete. This patch should take care of them.
Alex, I tried to make winesetuptk keep comments after a key (see first
chunk of CBase.itcl), but I had some problems making sure all calls to
DataAddKey had another arg named aComment. There was at least one call
which would make it crash.
I can revive my attempt at that, or we can just make winesetuptk eat
those comments.
Is an empty string {} or "" in TCL?
If you work on it, could you also look in how the [spooler] section is
read/written, so we don't lose "FILE" in case we edit a file containing
it?
Thanks.
With both patches applied, the default config and registry look pretty
much the same (except for some trivial things like which drive is home,
tmp, etc.) to what wineinstall gives us. Which can lead to the question,
what's the purpose of it if wineinstall can do it?
Vincent
diff -urN winesetuptk-0.6.1b-orig/CBase.itcl winesetuptk-0.6.1b/CBase.itcl
--- winesetuptk-0.6.1b-orig/CBase.itcl 2001-12-16 16:37:00.000000000 -0500
+++ winesetuptk-0.6.1b/CBase.itcl 2003-10-13 12:55:00.000000000 -0400
@@ -307,10 +307,11 @@
continue
}
- if {[regexp {^\"(.+)\"( *)=( *)\"(.*)\"$} $Line garb1 KeyName garb2 garb3 KeyValue] == 1} {
+ if {[regexp {^\"(.+)\"( *)=( *)\"(.*)\"(.*)$} $Line garb1 KeyName garb2 garb3 KeyValue KeyComment] == 1} {
# key-value pair
set KeyName [StrWtoA $KeyName]
set KeyValue [StrWtoA $KeyValue]
+ set KeyComment [StrWtoA $KeyComment]
AccessAnyData $apData ADD_KEY_TO_SECTION $SectionName $KeyName $KeyValue
} else {
lappend ErrorLines $LineNum
@@ -580,7 +581,7 @@
set Drive [list "Drive C"]
lappend Drive [list Path [GetDefaultFakeWinRoot]]
lappend Drive [list Type hd]
- lappend Drive [list Label [GetDefaultFakeWinRoot]]
+ lappend Drive [list Label "MS-DOS"]
lappend Drive [list Filesystem win95]
ReplaceDriveSection $Drive
@@ -599,7 +600,7 @@
# let's add $HOME directory
set Drive [list "Drive Y"]
- lappend Drive [list Path {${HOME}}]
+ lappend Drive [list Path "%HOME%"]
lappend Drive [list Type network]
lappend Drive [list Label "Home"]
lappend Drive [list Filesystem win95]
@@ -608,13 +609,13 @@
# let's add / directory
set Drive [list "Drive Z"]
lappend Drive [list Path /]
- lappend Drive [list Type network]
+ lappend Drive [list Type hd]
lappend Drive [list Label "Root"]
lappend Drive [list Filesystem win95]
ReplaceDriveSection $Drive
# set [wine] section
- AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Path "C:\\Windows\\system;X:\\;Y:\\"
+ AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Path "C:\\Windows;C:\\Windows\\system;X:\\;X:\\test;Y:\\"
AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Windows "C:\\Windows"
AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine System "C:\\Windows\\system"
}
@@ -686,7 +687,7 @@
set NewSortOrder "aFloppy $Device"
set NewPath $Path
set NewType floppy
- set NewLabel $Path
+ set NewLabel Floppy
set NewFS ""
set NewDevice $Device
@@ -735,10 +736,10 @@
}
# let's add $HOME directory
- lappend Result [list dNet Y "" network {${HOME}} Home win95]
+ lappend Result [list dNet Y "" network "%HOME%" Home win95]
# let's add / directory
- lappend Result [list dNet Z "" network / Root win95]
+ lappend Result [list dNet Z "" hd / Root win95]
# sort it - first floppies, then dos, cdrom, network
set Result [lsort -index 0 $Result]
@@ -983,13 +984,13 @@
set Type [lindex $aDrive 3]
set Path [lindex $aDrive 4]
set Label [lindex $aDrive 5]
- set FileSystem [lindex $aDrive 6]
+ set Filesystem [lindex $aDrive 6]
set Section [list "Drive $Letter"]
- lappend Section [list Type $Type]
lappend Section [list Path $Path]
+ lappend Section [list Type $Type]
lappend Section [list Label $Label]
- if {$FileSystem != ""} { lappend Section [list FileSystem $FileSystem] }
+ if {$Filesystem != ""} { lappend Section [list Filesystem $Filesystem] }
if {$Device != ""} { lappend Section [list Device $Device] }
ReplaceDriveSection $Section
}
@@ -1056,7 +1057,7 @@
AccessWineData REMOVE_KEY_BY_NAME Wine Profile
}
AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Temp X:\\
- AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Path "$WinDir;$SystemDir;X:\\;Y:\\"
+ AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Path "$WinDir;$SystemDir;X:\\;X:\\test;Y:\\"
# finally add result and clean up
# set this autodetected windows installation in the global variable
@@ -1069,12 +1070,12 @@
# generate fake windows installation cfg from template
AccessWineData SET_ALL [AccessAnyData WineWithoutWindowsTemplate GET_ALL]
# add C drive
- AutoConf:AddDrive [list bDos C "" hd [GetDefaultFakeWinRoot] [GetDefaultFakeWinRoot] win95]
+ AutoConf:AddDrive [list bDos C "" hd [GetDefaultFakeWinRoot] "MS_DOS" win95]
AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Windows "C:\\Windows"
AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine System "C:\\Windows\\System"
AccessWineData REMOVE_KEY_BY_NAME Wine Profile
AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Temp "X:\\"
- AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Path "C:\\Windows;C:\\Windows\\System;X:\\;Y:\\"
+ AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Path "C:\\Windows;C:\\Windows\\System;X:\\;X:\\test;Y:\\"
# add result and clean up
AccessAnyData Autodetect REPLACE_KEY_VALUE_BY_NAME WinInstall Fake [AccessWineData GET_ALL]
AccessWineData CLEAR_ALL
@@ -1085,7 +1086,7 @@
AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine System "C:\\Windows\\System"
AccessWineData REMOVE_KEY_BY_NAME Wine Profile
AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Temp "X:\\"
- AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Path "C:\\Windows;C:\\Windows\\System;X:\\;Y:\\"
+ AccessWineData REPLACE_KEY_VALUE_BY_NAME Wine Path "C:\\Windows;C:\\Windows\\System;X:\\;X:\\test;Y:\\"
# add result and clean up
# add other entry with no WinVer
AccessAnyData Autodetect APPEND_KEY_VALUE_BY_NAME WinInstall Found [list Other ""]
diff -urN winesetuptk-0.6.1b-orig/CScrMoreLook.itcl winesetuptk-0.6.1b/CScrMoreLook.itcl
--- winesetuptk-0.6.1b-orig/CScrMoreLook.itcl 2001-11-30 16:19:51.000000000 -0500
+++ winesetuptk-0.6.1b/CScrMoreLook.itcl 2003-10-13 11:54:05.000000000 -0400
@@ -27,7 +27,7 @@
LoadSettings General
# set tooltips
- foreach Widget "$pMainFrame.f_cbs.cb_usedga $pMainFrame.f_cbs.cb_usexshm $pMainFrame.f_cbs.cb_dxgrab $pMainFrame.f_cbs.cb_deskdblbuff" TooltipName "CScrMoreLook-DGA-Tooltip CScrMoreLook-Xshm-Tooltip CScrMoreLook-DXgrab-Tooltip CScrMoreLook-DblBuffDesk-Tooltip" {
+ foreach Widget "$pMainFrame.f_cbs.cb_usedga $pMainFrame.f_cbs.cb_usexvidmode $pMainFrame.f_cbs.cb_usetakefocus $pMainFrame.f_cbs.cb_dxgrab $pMainFrame.f_cbs.cb_deskdblbuff" TooltipName "CScrMoreLook-DGA-Tooltip CScrMoreLook-XVidMode-Tooltip CScrMoreLook-TakeFocus-Tooltip CScrMoreLook-DXgrab-Tooltip CScrMoreLook-DblBuffDesk-Tooltip" {
set Msg [ObjHelpMsg GetAsTooltip $TooltipName]
ObjTooltip Add $Widget $Msg
}
@@ -35,7 +35,7 @@
body CScrMoreLook::LoadSettings {aAppProfile} {
set SectionName [AppProfileGetSectionName $aAppProfile]
- foreach Entry {usedga usexshm dxgrab deskdblbuff} WineEntry {UseDGA UseXShm DXGrab DesktopDoubleBuffered} {
+ foreach Entry {usedga usexvidmode usetakefocus dxgrab deskdblbuff} WineEntry {UseDGA UseXVidMode UseTakeFocus DXGrab DesktopDoubleBuffered} {
set Val [$pObjBase AccessWineData GET_KEY_VALUE_BY_NAME $SectionName $WineEntry]
if {$Val == "Y"} {
$pMainFrame.f_cbs.cb_$Entry select
@@ -47,7 +47,7 @@
body CScrMoreLook::SaveSettings {aAppProfile} {
set SectionName [AppProfileGetSectionName $aAppProfile]
- foreach Entry {usedga usexshm dxgrab deskdblbuff} WineEntry {UseDGA UseXShm DXGrab DesktopDoubleBuffered} {
+ foreach Entry {usedga usexvidmode usetakefocus dxgrab deskdblbuff} WineEntry {UseDGA UseXVidMode UseTakeFocus DXGrab DesktopDoubleBuffered} {
eval "set Val \$::cb_$Entry"
set Val [Translate $Val "0 1" "N Y"]
$pObjBase AccessWineData REPLACE_KEY_VALUE_BY_NAME $SectionName $WineEntry $Val
@@ -61,16 +61,18 @@
frame $pMainFrame.f_cbs
label $pMainFrame.f_cbs.l_top -font "Fixed -15 bold" -text "Specialized Wine options:"
checkbutton $pMainFrame.f_cbs.cb_usedga -font "Fixed -13" -text "Use DGA"
- checkbutton $pMainFrame.f_cbs.cb_usexshm -font "Fixed -13" -text "Use X shared memory"
+ checkbutton $pMainFrame.f_cbs.cb_usexvidmode -font "Fixed -13" -text "Use XVidMode"
+ checkbutton $pMainFrame.f_cbs.cb_usetakefocus -font "Fixed -13" -text "Use the take focus protocol"
checkbutton $pMainFrame.f_cbs.cb_dxgrab -font "Fixed -13" -text "DX grab"
checkbutton $pMainFrame.f_cbs.cb_deskdblbuff -font "Fixed -13" -text "Double-buffered desktop"
place $pMainFrame.f_cbs -x 0 -relx 0.59 -rely 0.55 -width 300 -height 150 -anchor center
place $pMainFrame.f_cbs.l_top -x 0 -y 0 -relwidth 1 -height 17 -anchor nw
place $pMainFrame.f_cbs.cb_usedga -x 30 -y 25 -anchor nw
- place $pMainFrame.f_cbs.cb_usexshm -x 30 -y 46 -anchor nw
- place $pMainFrame.f_cbs.cb_dxgrab -x 30 -y 67 -anchor nw
- place $pMainFrame.f_cbs.cb_deskdblbuff -x 30 -y 88 -anchor nw
+ place $pMainFrame.f_cbs.cb_usexvidmode -x 30 -y 46 -anchor nw
+ place $pMainFrame.f_cbs.cb_usetakefocus -x 30 -y 67 -anchor nw
+ place $pMainFrame.f_cbs.cb_dxgrab -x 30 -y 88 -anchor nw
+ place $pMainFrame.f_cbs.cb_deskdblbuff -x 30 -y 109 -anchor nw
CScrMoreLook::SetWidgetsState
}
diff -urN winesetuptk-0.6.1b-orig/data/cfg_wine_without_windows.ini winesetuptk-0.6.1b/data/cfg_wine_without_windows.ini
--- winesetuptk-0.6.1b-orig/data/cfg_wine_without_windows.ini 2001-08-27 12:01:32.000000000 -0400
+++ winesetuptk-0.6.1b/data/cfg_wine_without_windows.ini 2003-10-13 12:23:29.000000000 -0400
@@ -1,6 +1,9 @@
WINE REGISTRY Version 2
;; All keys relative to \\Machine\\Software\\Wine\\Wine\\Config
+;; If you think it is necessary to show others your complete config for a
+;; bug report, filter out empty lines and comments with
+;; grep -v "^;" ~/.wine/config | grep '.'
;;
;; MS-DOS drives configuration
;;
@@ -33,13 +36,41 @@
; Enabling this may crash some programs that do recursive lookups of a whole
; subdir tree in case of a symlink pointing back to itself.
;"ShowDirSymlinks" = "1"
+;"ShowDotFiles" = "1"
"ShellLinker" = "wineshelllink"
-# <wineconf>
+# [wineconf]
+[Version]
+; Windows version to imitate (win95,win98,winme,nt351,nt40,win2k,winxp,win2k3,win20,win30,win31)
+;"Windows" = "win98"
+; DOS version to imitate
+;"DOS" = "6.22"
+
+; Be careful here, wrong DllOverrides settings have the potential
+; to pretty much kill your setup.
[DllOverrides]
+; some dlls you may want to change
+"oleaut32" = "builtin, native"
+"ole32" = "builtin, native"
+"commdlg" = "builtin, native"
+"comdlg32" = "builtin, native"
+"shell" = "builtin, native"
+"shell32" = "builtin, native"
+"shfolder" = "builtin, native"
+"shlwapi" = "builtin, native"
+"shdocvw" = "builtin, native"
+"advapi32" = "builtin, native"
+"msvcrt" = "native, builtin"
+"mciavi.drv" = "native, builtin"
+"mcianim.drv" = "native, builtin"
+; you can specify applications too
+; this one will apply for all notepad.exe
+;"*notepad.exe" = "native, builtin"
+; this one will apply only for a particular file
+;"C:\\windows\\regedit.exe" = "native, builtin"
; default for all other dlls
-"*" = "builtin, native, so"
+"*" = "builtin, native"
[x11drv]
; Number of colors to allocate from the system palette
@@ -55,28 +86,36 @@
; Allow the window manager to manage created windows
"Managed" = "Y"
; Use a desktop window of 640x480 for Wine
-"Desktop" = "N"
+;"Desktop" = "640x480"
; Use XFree86 DGA extension if present
; (make sure /dev/mem is accessible by you !)
"UseDGA" = "Y"
-; Use XShm extension if present
-"UseXShm" = "Y"
+; Use XVidMode extension if present
+"UseXVidMode" = "Y"
+; Use the take focus protocol
+"UseTakeFocus" = "Y"
; Enable DirectX mouse grab
"DXGrab" = "N"
; Create the desktop window with a double-buffered visual
; (useful to play OpenGL games)
"DesktopDoubleBuffered" = "N"
-; Code page used for captions in managed mode
-; 0 means default ANSI code page (CP_ACP == 0)
-"TextCP" = "0"
-; Use this if you have more than one port for video on your setup
-; (Wine uses for now the first 'input image' it finds).
-;; "XVideoPort" = "43"
; Run in synchronous mode (useful for debugging X11 problems)
;;"Synchronous" = "Y"
+;
+; Use the Render extension to render client side fonts (default "Y")
+;;"ClientSideWithRender" = "Y"
+; Fallback on X core requests to render client side fonts (default "Y")
+;;"ClientSideWithCore" = "Y"
+; Set both of the previous two to "N" in order to force X11 server side fonts
+;
+; Anti-alias fonts if using the Render extension (default "Y")
+;;"ClientSideAntiAliasWithRender" = "Y"
+; Anti-alias fonts if using core requests fallback (default "Y")
+;;"ClientSideAntiAliasWithCore" = "Y"
+;
[fonts]
-;Read documentation/fonts before adding aliases
+;Read the Fonts topic in the Wine User Guide before adding aliases
;See a couple of examples for russian users below
"Resolution" = "96"
"Default" = "-adobe-helvetica-"
@@ -95,28 +134,53 @@
;"DefaultSerif" = "-cronyx-times-"
;"DefaultSansSerif" = "-cronyx-helvetica-"
+; the TrueType font dirs you want to make accessible to wine
+[FontDirs]
+;"dir1" = "/usr/X11R6/lib/X11/fonts/TrueType"
+;"dir2" = "/usr/share/fonts/truetype"
+;"dir3" = "/usr/X11R6/lib/X11/fonts/TT"
+;"dir4" = "/usr/share/fonts/TT"
+
[serialports]
"Com1" = "/dev/ttyS0"
"Com2" = "/dev/ttyS1"
+"Com3" = "/dev/ttyS2"
+"Com4" = "/dev/modem"
[parallelports]
"Lpt1" = "/dev/lp0"
+[ppdev]
+;; key: io-base of the emulated port
+;; value : parport-device{,timeout}
+;; timeout for auto closing an open device ( not yet implemented)
+;"378" = "/dev/parport0"
+;"278" = "/dev/parport1"
+;"3bc" = "/dev/parport2"
+
[spooler]
+"FILE:" = "tmp.ps"
"LPT1:" = "|lpr"
"LPT2:" = "|gs -sDEVICE=bj200 -sOutputFile=/tmp/fred -q -"
"LPT3:" = "/dev/lp3"
[ports]
;"read" = "0x779,0x379,0x280-0x2a0"
-; "write" = "0x779,0x379,0x280-0x2a0"
+;"write" = "0x779,0x379,0x280-0x2a0"
-[spy]
-"Exclude" = "WM_SIZE;WM_TIMER;"
+[Debug]
+;"RelayExclude" = "RtlEnterCriticalSection;RtlLeaveCriticalSection"
+;"RelayInclude" = "user32.CreateWindowA"
+;"RelayFromExclude" = "user32;x11drv"
+;"RelayFromInclude" = "sol.exe"
+;"SnoopExclude" = "RtlEnterCriticalSection;RtlLeaveCriticalSection"
+;"SpyExclude" = "WM_SIZE;WM_TIMER;"
[registry]
;These are all booleans. Y/y/T/t/1 are true, N/n/F/f/0 are false.
;Defaults are read all, write to Home
+; Where to find the global registries
+;"GlobalRegistryDir" = "/etc";
; Global registries (stored in /etc)
"LoadGlobalRegistryFiles" = "Y"
; Home registries (stored in ~user/.wine/)
@@ -132,15 +196,10 @@
[Tweak.Layout]
;; supported styles are 'Win31'(default), 'Win95', 'Win98'
+;; this has *nothing* to do with the windows version Wine returns:
+;; set the "Windows" value in the [Version] section if you want that.
"WineLook" = "Win95"
-[Console]
-;"Drivers" = "tty"
-;"XtermProg" = "nxterm"
-;"InitialRows" = "25"
-;"InitialColumns" = "80"
-;"TerminalType" = "nxterm"
-
[Clipboard]
"ClearAllSelections" = "0"
"PersistentSelection" = "1"
@@ -153,11 +212,44 @@
"4" = "/usr/X11R6/lib/X11/fonts/Type1"
[WinMM]
-"Drivers" = "wineoss.drv"
+; Uncomment the "Drivers" line matching your sound setting.
+
+"Drivers" = "wineoss.drv" ; default for most common configurations
+;"Drivers" = "winearts.drv" ; for KDE
+;"Drivers" = "winealsa.drv" ; for ALSA users
+;"Drivers" = "winejack.drv" ; for Jack sound server
+;"Drivers" = "winenas.drv" ; for NAS sound system
+;"Drivers" = "wineaudioio.drv" ; for Solaris machines
+;"Drivers" = "" ; to disable sound
"WaveMapper" = "msacm.drv"
"MidiMapper" = "midimap.drv"
-# </wineconf>
+[dsound]
+;; HEL only: Number of waveOut fragments ahead to mix in new buffers.
+;"HELmargin" = "5"
+;; HEL only: Number of waveOut fragments ahead to queue to driver.
+;"HELqueue" = "5"
+;; Max number of fragments to prebuffer
+;"SndQueueMax" = "28"
+;; Min number of fragments to prebuffer
+;"SndQueueMin" = "12"
+;; Forces emulation mode (using wave api)
+;"HardwareAcceleration" = "Emulation"
+;; Sets default playback device (0 - number of devices - 1)
+;"DefaultPlayback" = "0" ; use first device (/dev/dsp)
+;"DefaultPlayback" = "1" ; use second device (/dev/dsp1)
+;"DefaultPlayback" = "2" ; use third device (/dev/dsp2)
+;; Sets default capture device (0 - number of devices - 1)
+;"DefaultCapture" = "0" ; use first device (/dev/dsp)
+;"DefaultCapture" = "1" ; use second device (/dev/dsp1)
+;"DefaultCapture" = "2" ; use third device (/dev/dsp2)
+
+[Network]
+;; Use the DNS (Unix) host name always as NetBIOS "ComputerName" (boolean, default "Y").
+;; Set to N if you need a persistent NetBIOS ComputerName that possibly differs
+;; from the Unix host name. You'll need to set ComputerName in
+;; HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\ComputerName\ComputerName, too.
+;"UseDnsComputerName" = "N"
#########################################
# Application dependent sections follow #
@@ -193,3 +285,5 @@
"crtdll" = "native"
"imagehlp" = "native"
"rnaph" = "native"
+
+# [/wineconf]
diff -urN winesetuptk-0.6.1b-orig/data/cfg_wine_with_windows.ini winesetuptk-0.6.1b/data/cfg_wine_with_windows.ini
--- winesetuptk-0.6.1b-orig/data/cfg_wine_with_windows.ini 2001-08-27 12:01:32.000000000 -0400
+++ winesetuptk-0.6.1b/data/cfg_wine_with_windows.ini 2003-10-13 12:23:39.000000000 -0400
@@ -1,6 +1,9 @@
WINE REGISTRY Version 2
;; All keys relative to \\Machine\\Software\\Wine\\Wine\\Config
+;; If you think it is necessary to show others your complete config for a
+;; bug report, filter out empty lines and comments with
+;; grep -v "^;" ~/.wine/config | grep '.'
;;
;; MS-DOS drives configuration
;;
@@ -33,46 +36,41 @@
; Enabling this may crash some programs that do recursive lookups of a whole
; subdir tree in case of a symlink pointing back to itself.
;"ShowDirSymlinks" = "1"
+;"ShowDotFiles" = "1"
"ShellLinker" = "wineshelllink"
-# <wineconf>
+# [wineconf]
+[Version]
+; Windows version to imitate (win95,win98,winme,nt351,nt40,win2k,winxp,win2k3,win20,win30,win31)
+;"Windows" = "win98"
+; DOS version to imitate
+;"DOS" = "6.22"
+
+; Be careful here, wrong DllOverrides settings have the potential
+; to pretty much kill your setup.
[DllOverrides]
+; some dlls you may want to change
+"oleaut32" = "builtin, native"
+"ole32" = "builtin, native"
"commdlg" = "builtin, native"
"comdlg32" = "builtin, native"
-"ver" = "builtin, native"
-"version" = "builtin, native"
"shell" = "builtin, native"
"shell32" = "builtin, native"
"shfolder" = "builtin, native"
"shlwapi" = "builtin, native"
-"lzexpand" = "builtin, native"
-"lz32" = "builtin, native"
-"comctl32" = "builtin, native"
-"commctrl" = "builtin, native"
+"shdocvw" = "builtin, native"
"advapi32" = "builtin, native"
-"crtdll" = "builtin, native"
-"mpr" = "builtin, native"
-"winspool.drv" = "builtin, native"
-"ddraw" = "builtin, native"
-"dinput" = "builtin, native"
-"dsound" = "builtin, native"
-"opengl32" = "builtin, native"
"msvcrt" = "native, builtin"
-"rpcrt4" = "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"
+; you can specify applications too
+; this one will apply for all notepad.exe
+;"*notepad.exe" = "native, builtin"
+; this one will apply only for a particular file
+;"C:\\windows\\regedit.exe" = "native, builtin"
; default for all other dlls
-"*" = "native, builtin, so"
+"*" = "builtin, native"
[x11drv]
; Number of colors to allocate from the system palette
@@ -88,28 +86,36 @@
; Allow the window manager to manage created windows
"Managed" = "Y"
; Use a desktop window of 640x480 for Wine
-"Desktop" = "N"
+;"Desktop" = "640x480"
; Use XFree86 DGA extension if present
; (make sure /dev/mem is accessible by you !)
"UseDGA" = "Y"
-; Use XShm extension if present
-"UseXShm" = "Y"
+; Use XVidMode extension if present
+"UseXVidMode" = "Y"
+; Use the take focus protocol
+"UseTakeFocus" = "Y"
; Enable DirectX mouse grab
"DXGrab" = "N"
; Create the desktop window with a double-buffered visual
; (useful to play OpenGL games)
"DesktopDoubleBuffered" = "N"
-; Code page used for captions in managed mode
-; 0 means default ANSI code page (CP_ACP == 0)
-"TextCP" = "0"
-; Use this if you have more than one port for video on your setup
-; (Wine uses for now the first 'input image' it finds).
-;; "XVideoPort" = "43"
; Run in synchronous mode (useful for debugging X11 problems)
;;"Synchronous" = "Y"
+;
+; Use the Render extension to render client side fonts (default "Y")
+;;"ClientSideWithRender" = "Y"
+; Fallback on X core requests to render client side fonts (default "Y")
+;;"ClientSideWithCore" = "Y"
+; Set both of the previous two to "N" in order to force X11 server side fonts
+;
+; Anti-alias fonts if using the Render extension (default "Y")
+;;"ClientSideAntiAliasWithRender" = "Y"
+; Anti-alias fonts if using core requests fallback (default "Y")
+;;"ClientSideAntiAliasWithCore" = "Y"
+;
[fonts]
-;Read documentation/fonts before adding aliases
+;Read the Fonts topic in the Wine User Guide before adding aliases
;See a couple of examples for russian users below
"Resolution" = "96"
"Default" = "-adobe-helvetica-"
@@ -128,28 +134,53 @@
;"DefaultSerif" = "-cronyx-times-"
;"DefaultSansSerif" = "-cronyx-helvetica-"
+; the TrueType font dirs you want to make accessible to wine
+[FontDirs]
+;"dir1" = "/usr/X11R6/lib/X11/fonts/TrueType"
+;"dir2" = "/usr/share/fonts/truetype"
+;"dir3" = "/usr/X11R6/lib/X11/fonts/TT"
+;"dir4" = "/usr/share/fonts/TT"
+
[serialports]
"Com1" = "/dev/ttyS0"
"Com2" = "/dev/ttyS1"
+"Com3" = "/dev/ttyS2"
+"Com4" = "/dev/modem"
[parallelports]
"Lpt1" = "/dev/lp0"
+[ppdev]
+;; key: io-base of the emulated port
+;; value : parport-device{,timeout}
+;; timeout for auto closing an open device ( not yet implemented)
+;"378" = "/dev/parport0"
+;"278" = "/dev/parport1"
+;"3bc" = "/dev/parport2"
+
[spooler]
+"FILE:" = "tmp.ps"
"LPT1:" = "|lpr"
"LPT2:" = "|gs -sDEVICE=bj200 -sOutputFile=/tmp/fred -q -"
"LPT3:" = "/dev/lp3"
[ports]
;"read" = "0x779,0x379,0x280-0x2a0"
-; "write" = "0x779,0x379,0x280-0x2a0"
+;"write" = "0x779,0x379,0x280-0x2a0"
-[spy]
-"Exclude" = "WM_SIZE;WM_TIMER;"
+[Debug]
+;"RelayExclude" = "RtlEnterCriticalSection;RtlLeaveCriticalSection"
+;"RelayInclude" = "user32.CreateWindowA"
+;"RelayFromExclude" = "user32;x11drv"
+;"RelayFromInclude" = "sol.exe"
+;"SnoopExclude" = "RtlEnterCriticalSection;RtlLeaveCriticalSection"
+;"SpyExclude" = "WM_SIZE;WM_TIMER;"
[registry]
;These are all booleans. Y/y/T/t/1 are true, N/n/F/f/0 are false.
;Defaults are read all, write to Home
+; Where to find the global registries
+;"GlobalRegistryDir" = "/etc";
; Global registries (stored in /etc)
"LoadGlobalRegistryFiles" = "Y"
; Home registries (stored in ~user/.wine/)
@@ -165,15 +196,10 @@
[Tweak.Layout]
;; supported styles are 'Win31'(default), 'Win95', 'Win98'
+;; this has *nothing* to do with the windows version Wine returns:
+;; set the "Windows" value in the [Version] section if you want that.
"WineLook" = "Win95"
-[Console]
-;"Drivers" = "tty"
-;"XtermProg" = "nxterm"
-;"InitialRows" = "25"
-;"InitialColumns" = "80"
-;"TerminalType" = "nxterm"
-
[Clipboard]
"ClearAllSelections" = "0"
"PersistentSelection" = "1"
@@ -186,11 +212,44 @@
"4" = "/usr/X11R6/lib/X11/fonts/Type1"
[WinMM]
-"Drivers" = "wineoss.drv"
+; Uncomment the "Drivers" line matching your sound setting.
+
+"Drivers" = "wineoss.drv" ; default for most common configurations
+;"Drivers" = "winearts.drv" ; for KDE
+;"Drivers" = "winealsa.drv" ; for ALSA users
+;"Drivers" = "winejack.drv" ; for Jack sound server
+;"Drivers" = "winenas.drv" ; for NAS sound system
+;"Drivers" = "wineaudioio.drv" ; for Solaris machines
+;"Drivers" = "" ; to disable sound
"WaveMapper" = "msacm.drv"
"MidiMapper" = "midimap.drv"
-# </wineconf>
+[dsound]
+;; HEL only: Number of waveOut fragments ahead to mix in new buffers.
+;"HELmargin" = "5"
+;; HEL only: Number of waveOut fragments ahead to queue to driver.
+;"HELqueue" = "5"
+;; Max number of fragments to prebuffer
+;"SndQueueMax" = "28"
+;; Min number of fragments to prebuffer
+;"SndQueueMin" = "12"
+;; Forces emulation mode (using wave api)
+;"HardwareAcceleration" = "Emulation"
+;; Sets default playback device (0 - number of devices - 1)
+;"DefaultPlayback" = "0" ; use first device (/dev/dsp)
+;"DefaultPlayback" = "1" ; use second device (/dev/dsp1)
+;"DefaultPlayback" = "2" ; use third device (/dev/dsp2)
+;; Sets default capture device (0 - number of devices - 1)
+;"DefaultCapture" = "0" ; use first device (/dev/dsp)
+;"DefaultCapture" = "1" ; use second device (/dev/dsp1)
+;"DefaultCapture" = "2" ; use third device (/dev/dsp2)
+
+[Network]
+;; Use the DNS (Unix) host name always as NetBIOS "ComputerName" (boolean, default "Y").
+;; Set to N if you need a persistent NetBIOS ComputerName that possibly differs
+;; from the Unix host name. You'll need to set ComputerName in
+;; HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\ComputerName\ComputerName, too.
+;"UseDnsComputerName" = "N"
#########################################
# Application dependent sections follow #
@@ -238,3 +297,5 @@
[AppDefaults\\nlnotes.exe\\x11drv]
"Desktop" = "800x600"
+
+# [/wineconf]
diff -urN winesetuptk-0.6.1b-orig/data/help.txt winesetuptk-0.6.1b/data/help.txt
--- winesetuptk-0.6.1b-orig/data/help.txt 2001-12-16 16:37:00.000000000 -0500
+++ winesetuptk-0.6.1b/data/help.txt 2003-10-13 11:49:21.000000000 -0400
@@ -259,6 +259,8 @@
to /dev/mem.
Use X shared memory
+(X shared memory is now an obsolete Wine option which doesn't
+have any effet)
If you don't want DirectX to use DGA, you can at least use X Shared
Memory extensions (XShm). It is much slower than DGA, since the app
@@ -291,10 +293,11 @@
Architecture, which is able to take over the entire
display and run the program full-screen at maximum speed
-[CScrMoreLook-Xshm-Tooltip]
-Much slower than DGA, since the app doesn't have direct access to the
-physical frame buffer, but using shared memory to draw the frame is at
-least faster than sending the data through the standard X11 socket
+[CStrMoreLook-XVidMode-Tooltip]
+Enables the XVidMode extension, if present.
+
+[CStrMoreLook-TakeFocus-Tooltip]
+Enables the use of the take focus protocol.
[CScrMoreLook-DXgrab-Tooltip]
Select this to convince the mouse cursor
