wineoss: Replace registry editing instructions with winecfg

Vitaliy Margolen wine-patch at kievinfo.com
Sun Oct 2 09:20:45 CDT 2005



Vitaliy Margolen

changelog:
  wineoss
  - Replace registry editing instructions with winecfg.
-------------- next part --------------
Index: dlls/winmm/wineoss/audio.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/audio.c,v
retrieving revision 1.165
diff -u -p -r1.165 audio.c
--- dlls/winmm/wineoss/audio.c	9 Sep 2005 10:19:44 -0000	1.165
+++ dlls/winmm/wineoss/audio.c	2 Oct 2005 14:18:52 -0000
@@ -509,10 +509,11 @@ DWORD OSS_OpenDevice(OSS_DEVICE* ossdev,
             return WAVERR_BADFORMAT;
         }
 	/* check if the fragment sizes are the same */
-        if (ossdev->audio_fragment != (frag ? *frag : 0) ) {
+        if (ossdev->audio_fragment != (frag ? *frag : 0) )
+        {
 	    ERR("FullDuplex: Playback and Capture hardware acceleration levels are different.\n"
-	        "Create string value : \"HardwareAcceleration\" = \"Emulation\" in the registry\n"
-                "under [HKEY_CURRENT_USER\\Software\\Wine\\DirectSound].\n");
+	        "Please run winecfg, open \"Audio\" page and set\n"
+                "\"Hardware Acceleration\" to \"Emulation\".\n");
 	    return WAVERR_BADFORMAT;
 	}
         if (GetCurrentThreadId() != ossdev->owner_tid)
Index: dlls/winmm/wineoss/dsrender.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/wineoss/dsrender.c,v
retrieving revision 1.10
diff -u -p -r1.10 dsrender.c
--- dlls/winmm/wineoss/dsrender.c	29 Jul 2005 14:15:31 -0000	1.10
+++ dlls/winmm/wineoss/dsrender.c	2 Oct 2005 14:18:52 -0000
@@ -345,8 +345,8 @@ static HRESULT DSDB_MapBuffer(IDsDriverB
                              dsdb->fd, 0);
         if (dsdb->mapping == (LPBYTE)-1) {
             ERR("Could not map sound device for direct access (%s)\n", strerror(errno));
-	    ERR("Create string value : \"HardwareAcceleration\" = \"Emulation\" in the registry\n"
-                "under [HKEY_CURRENT_USER\\Software\\Wine\\DirectSound].\n");
+	    ERR("Please run winecfg, open \"Audio\" page and set\n"
+                "\"Hardware Acceleration\" to \"Emulation\".\n");
             return DSERR_GENERIC;
         }
         TRACE("The sound device has been mapped for direct access at %p, size=%ld\n", dsdb->mapping, dsdb->maplen);


More information about the wine-patches mailing list