Replace references to the Config file with HKCU
Uwe Bonnes
bon at elektron.ikp.physik.tu-darmstadt.de
Sat Jul 2 14:40:12 CDT 2005
Changelog
wine/dlls/winmm/wineoss/dsrender.c wine/dlls/gdi/driver.c
wine/dlls/gdi/freetype.c wine/dlls/ntdll/version.c
wine/dlls/winmm/wineoss/audio.c wine/dlls/x11drv/xfont.c
wine/dlls/winspool/info.c wine/dlls/wineps/init.c
wine/dlls/winedos/soundblaster.c
Replace (obvious) references to obsolete config file with (hopefully
right) references to HKCU
--
Uwe Bonnes bon at elektron.ikp.physik.tu-darmstadt.de
Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
Index: wine/dlls/winmm/wineoss/dsrender.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/dsrender.c,v
retrieving revision 1.8
diff -u -r1.8 dsrender.c
--- wine/dlls/winmm/wineoss/dsrender.c 6 Jun 2005 19:50:35 -0000 1.8
+++ wine/dlls/winmm/wineoss/dsrender.c 2 Jul 2005 19:33:38 -0000
@@ -345,7 +345,7 @@
dsdb->fd, 0);
if (dsdb->mapping == (LPBYTE)-1) {
ERR("Could not map sound device for direct access (%s)\n", strerror(errno));
- ERR("Use: \"HardwareAcceleration\" = \"Emulation\" in the [dsound] section of your config file.\n");
+ ERR("Use: \"HardwareAcceleration\" = \"Emulation\" HKCU\\Software\\Wine\\DirectSound\n");
return DSERR_GENERIC;
}
TRACE("The sound device has been mapped for direct access at %p, size=%ld\n", dsdb->mapping, dsdb->maplen);
Index: wine/dlls/winmm/wineoss/audio.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/audio.c,v
retrieving revision 1.163
diff -u -r1.163 audio.c
--- wine/dlls/winmm/wineoss/audio.c 30 May 2005 11:12:07 -0000 1.163
+++ wine/dlls/winmm/wineoss/audio.c 2 Jul 2005 19:33:45 -0000
@@ -511,7 +511,7 @@
/* check if the fragment sizes are the same */
if (ossdev->audio_fragment != (frag ? *frag : 0) ) {
ERR("FullDuplex: Playback and Capture hardware acceleration levels are different.\n"
- "Use: \"HardwareAcceleration\" = \"Emulation\" in the [dsound] section of your config file.\n");
+ "Use: \"HardwareAcceleration\" = \"Emulation\" in the HKCU\\Software\\Wine\\Dsound\n");
return WAVERR_BADFORMAT;
}
if (GetCurrentThreadId() != ossdev->owner_tid)
Index: wine/dlls/gdi/driver.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/driver.c,v
retrieving revision 1.38
diff -u -r1.38 driver.c
--- wine/dlls/gdi/driver.c 20 Jun 2005 16:04:32 -0000 1.38
+++ wine/dlls/gdi/driver.c 2 Jul 2005 19:33:45 -0000
@@ -207,7 +207,7 @@
/**********************************************************************
* load_display_driver
*
- * Special case for loading the display driver: get the name from the config file
+ * Special case for loading the display driver: get the name from the HKCU\Software\Wine\Drivers
*/
static struct graphics_driver *load_display_driver(void)
{
Index: wine/dlls/gdi/freetype.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/freetype.c,v
retrieving revision 1.88
diff -u -r1.88 freetype.c
--- wine/dlls/gdi/freetype.c 28 Jun 2005 19:15:17 -0000 1.88
+++ wine/dlls/gdi/freetype.c 2 Jul 2005 19:33:52 -0000
@@ -1219,7 +1219,7 @@
load_fontconfig_fonts();
- /* then look in any directories that we've specified in the config file */
+ /* then look in any directories that we've specified in HKCU\Software\Wine\Fonts */
/* @@ Wine registry key: HKCU\Software\Wine\Fonts */
if(RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Fonts", &hkey) == ERROR_SUCCESS)
{
Index: wine/dlls/ntdll/version.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/version.c,v
retrieving revision 1.20
diff -u -r1.20 version.c
--- wine/dlls/ntdll/version.c 21 Jun 2005 09:52:41 -0000 1.20
+++ wine/dlls/ntdll/version.c 2 Jul 2005 19:33:53 -0000
@@ -223,7 +223,7 @@
} while (p);
}
- MESSAGE("Invalid Windows version value '%s' specified in config file.\n", buffer );
+ MESSAGE("Invalid Windows version value '%s' specified in HKCU\\Software\\Wine section.\n", buffer );
MESSAGE("Valid versions are:" );
for (i = 0; i < NB_WINDOWS_VERSIONS; i++)
{
Index: wine/dlls/x11drv/xfont.c
===================================================================
RCS file: /home/wine/wine/dlls/x11drv/xfont.c,v
retrieving revision 1.20
diff -u -r1.20 xfont.c
--- wine/dlls/x11drv/xfont.c 22 Jun 2005 12:02:47 -0000 1.20
+++ wine/dlls/x11drv/xfont.c 2 Jul 2005 19:34:00 -0000
@@ -1624,7 +1624,7 @@
* Create font aliases for some standard windows fonts using user's
* default choice of (sans-)serif fonts
*
- * Read user-defined aliases from config file. Format is as follows
+ * Read user-defined aliases from HKCU\\Software\\Wine\\X11 Driver. Format is as follows
*
* Alias# = [Windows font name],[LFD font name], <substitute original name>
*
Index: wine/dlls/winspool/info.c
===================================================================
RCS file: /home/wine/wine/dlls/winspool/info.c,v
retrieving revision 1.109
diff -u -r1.109 info.c
--- wine/dlls/winspool/info.c 30 Jun 2005 18:10:59 -0000 1.109
+++ wine/dlls/winspool/info.c 2 Jul 2005 19:34:07 -0000
@@ -507,7 +507,7 @@
#endif
if(!done) { /* If we have any CUPS based printers, skip looking for printcap printers */
- /* Check for [ppd] section in config file before parsing /etc/printcap */
+ /* Check in HKCU\Software\Wine\Printing\PPD Files before parsing /etc/printcap */
/* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */
if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Printing\\PPD Files",
&hkey) == ERROR_SUCCESS) {
Index: wine/dlls/wineps/init.c
===================================================================
RCS file: /home/wine/wine/dlls/wineps/init.c,v
retrieving revision 1.63
diff -u -r1.63 init.c
--- wine/dlls/wineps/init.c 28 Jun 2005 13:51:14 -0000 1.63
+++ wine/dlls/wineps/init.c 2 Jul 2005 19:34:09 -0000
@@ -594,7 +594,7 @@
res = GetPrinterDataA(hPrinter, "PPD File", &ppdType, ppdFileName, needed, &needed);
}
}
- /* Look for a ppd file for this printer in the config file.
+ /* Look for a ppd file for this printer in HKCU\Software\Wine\Printing\PPD Files.
* First look under that printer's name, and then under 'generic'
*/
/* @@ Wine registry key: HKCU\Software\Wine\Printing\PPD Files */
Index: wine/dlls/winedos/soundblaster.c
===================================================================
RCS file: /home/wine/wine/dlls/winedos/soundblaster.c,v
retrieving revision 1.5
diff -u -r1.5 soundblaster.c
--- wine/dlls/winedos/soundblaster.c 17 Jun 2005 10:11:37 -0000 1.5
+++ wine/dlls/winedos/soundblaster.c 2 Jul 2005 19:34:09 -0000
@@ -33,7 +33,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(sblaster);
/* Board Configuration */
-/* FIXME: Should be in a config file */
+/* FIXME: Should be in HKCU\Software\Wine */
#define SB_IRQ 5
#define SB_IRQ_PRI 11
#define SB_DMA 1
More information about the wine-patches
mailing list