As per Eric's message...
cvs rm -rf documentation/samples/win.ini
ChangeLog
Merge win.ini/[mci extensions] into the registry.
Index: winedefault.reg
===================================================================
RCS file: /var/cvs/wine/winedefault.reg,v
retrieving revision 1.77
diff -u -r1.77 winedefault.reg
--- winedefault.reg 22 Aug 2003 23:53:29 -0000 1.77
+++ winedefault.reg 15 Oct 2003 05:39:24 -0000
@@ -44,6 +44,49 @@
"DragFullWindows"="0"
#
+# WinMM config
+#
+[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI Extensions]
+"cda"="cdaudio"
+"mid"="sequencer"
+"midi"="sequencer"
+"rmi"="sequencer"
+# aif"="MPEGVideo"
+"aifc"="MPEGVideo"
+# aiff"="MPEGVideo"
+"asf"="MPEGVideo2"
+"asx"="MPEGVideo2"
+"au"="MPEGVideo"
+# avi"="MPEGVideo"
+"lsf"="MPEGVideo2"
+"lsx"="MPEGVideo2"
+"m1v"="MPEGVideo"
+"m3u"="MPEGVideo"
+# mov"="MPEGVideo"
+"m3u"="MPEGVideo"
+"mp2"="MPEGVideo"
+"mp2v"="MPEGVideo"
+"mp3"="MPEGVideo"
+"mpa"="MPEGVideo"
+"mpe"="MPEGVideo"
+"mpeg"="MPEGVideo"
+"mpg"="MPEGVideo"
+"mpv"="MPEGVideo"
+"mpv2"="MPEGVideo"
+# qt"="MPEGVideo"
+"snd"="MPEGVideo"
+"rmi"="MPEGVideo"
+# wav"="MPEGVideo"
+"wav"="waveaudio"
+"wax"="MPEGVideo2"
+"wm"="MPEGVideo2"
+"wma"="MPEGVideo2"
+"wmp"="MPEGVideo2"
+"wmv"="MPEGVideo2"
+"wmx"="MPEGVideo2"
+"wvx"="MPEGVideo2"
+
+#
# Override default load address of BDE (Borland database engine),
# since it's not available on Linux
#
Index: dlls/winmm/mci.c
===================================================================
RCS file: /var/cvs/wine/dlls/winmm/mci.c,v
retrieving revision 1.47
diff -u -r1.47 mci.c
--- dlls/winmm/mci.c 6 Oct 2003 21:03:32 -0000 1.47
+++ dlls/winmm/mci.c 15 Oct 2003 05:32:54 -0000
@@ -35,6 +35,7 @@
#include "mmsystem.h"
#include "winuser.h"
#include "winnls.h"
+#include "winreg.h"
#include "digitalv.h"
#include "winemm.h"
@@ -185,13 +186,17 @@
static DWORD MCI_GetDevTypeFromFileName(LPCSTR fileName, LPSTR buf, UINT len)
{
LPSTR tmp;
+ HKEY hKey;
if ((tmp = strrchr(fileName, '.'))) {
- GetProfileStringA("mci extensions", tmp + 1, "*", buf, len);
- if (strcmp(buf, "*") != 0) {
- return 0;
- }
- TRACE("No [mci extensions] entry for '%s' found.\n", tmp);
+ if (RegOpenKeyExA( HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\MCI Extensions",
+ 0, KEY_QUERY_VALUE, &hKey ) == ERROR_SUCCESS) {
+ DWORD dwLen = len;
+ LONG lRet = RegQueryValueExA( hKey, tmp + 1, 0, 0, buf, &dwLen );
+ RegCloseKey( hKey );
+ if (lRet == ERROR_SUCCESS) return 0;
+ }
+ TRACE("No ...\\MCI Extensions entry for '%s' found.\n", tmp);
}
return MCIERR_EXTENSION_NOT_FOUND;
}
--
Dimi.
