[PATCH v2 4/5] wine.inf: Move the MCI section to the registry.

Zebediah Figura z.figura12 at gmail.com
Mon Jul 27 20:02:35 CDT 2020


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/winmm/mci.c   | 16 +---------------
 loader/wine.inf.in | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index 870f5d1ca24..1bd957dc4af 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -67,7 +67,6 @@ static const WCHAR wszNull     [] = {0};
 static const WCHAR wszAll      [] = {'A','L','L',0};
 static const WCHAR wszMci      [] = {'M','C','I',0};
 static const WCHAR wszOpen     [] = {'o','p','e','n',0};
-static const WCHAR wszSystemIni[] = {'s','y','s','t','e','m','.','i','n','i',0};
 
 static WINE_MCIDRIVER *MciDrivers;
 
@@ -1907,7 +1906,7 @@ static DWORD MCI_WriteString(LPWSTR lpDstStr, DWORD dstSize, LPCWSTR lpSrcStr)
 static	DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParms)
 {
     DWORD		ret = MCIERR_INVALID_DEVICE_ID, cnt = 0;
-    WCHAR		buf[2048], *s, *p;
+    WCHAR		buf[2048], *s;
     LPWINE_MCIDRIVER	wmd;
     HKEY		hKey;
 
@@ -1940,8 +1939,6 @@ static	DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm
 		    RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0);
 		    RegCloseKey( hKey );
 		}
-		if (GetPrivateProfileStringW(wszMci, 0, wszNull, buf, ARRAY_SIZE(buf), wszSystemIni))
-		    for (s = buf; *s; s += lstrlenW(s) + 1) cnt++;
 	    }
 	} else {
 	    if (dwFlags & MCI_SYSINFO_OPEN) {
@@ -2017,17 +2014,6 @@ static	DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm
 		}
 	        RegCloseKey( hKey );
 	    }
-	    if (!s) {
-		if (GetPrivateProfileStringW(wszMci, 0, wszNull, buf, ARRAY_SIZE(buf), wszSystemIni)) {
-		    for (p = buf; *p; p += lstrlenW(p) + 1, cnt++) {
-                        TRACE("%d: %s\n", cnt, debugstr_w(p));
-			if (cnt == lpParms->dwNumber - 1) {
-			    s = p;
-			    break;
-			}
-		    }
-		}
-	    }
 	    ret = s ? MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, s) : MCIERR_OUTOFRANGE;
 	} else {
 	    FIXME("MCI_SYSINFO_NAME: nth device of type %d\n", lpParms->wDeviceType);
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 6f66f285569..01a4d259777 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -29,7 +29,6 @@ signature="$CHICAGO$"
 [DefaultInstall]
 RegisterDlls=RegisterDllsSection
 WineFakeDlls=FakeDllsWin32,FakeDlls
-UpdateInis=SystemIni
 CopyFiles=InfFiles,NlsFiles,SortFiles
 AddReg=\
     Classes,\
@@ -53,7 +52,6 @@ AddReg=\
 [DefaultInstall.NT]
 RegisterDlls=RegisterDllsSection
 WineFakeDlls=FakeDllsWin32,FakeDlls
-UpdateInis=SystemIni
 CopyFiles=InfFiles,NlsFiles,SortFiles
 AddReg=\
     Classes,\
@@ -79,7 +77,6 @@ AddReg=\
 RegisterDlls=RegisterDllsSection
 WineFakeDlls=FakeDllsWin64,FakeDlls
 WinePreInstall=Wow64
-UpdateInis=SystemIni
 CopyFiles=InfFiles,NlsFiles,SortFiles
 AddReg=\
     Classes,\
@@ -106,7 +103,6 @@ AddReg=\
 RegisterDlls=RegisterDllsSection
 WineFakeDlls=FakeDllsWin64,FakeDlls
 WinePreInstall=Wow64
-UpdateInis=SystemIni
 CopyFiles=InfFiles,NlsFiles,SortFiles
 AddReg=\
     Classes,\
@@ -573,6 +569,7 @@ HKLM,%CurrentVersionNT%\Gre_Initialize,,16
 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1"
 HKLM,%CurrentVersionNT%\Image File Execution Options,,16
 HKLM,%CurrentVersionNT%\IniFileMapping\system.ini,"drivers32",,"SYS:Microsoft\Windows NT\CurrentVersion\Drivers32"
+HKLM,%CurrentVersionNT%\IniFileMapping\system.ini,"mci",,"SYS:Microsoft\Windows NT\CurrentVersion\MCI"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"desktop",,"USR:Control Panel\Desktop"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"devices",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Devices"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"extensions",,"USR:Software\Microsoft\Windows NT\CurrentVersion\Extensions"
@@ -581,6 +578,13 @@ HKLM,%CurrentVersionNT%\IniFileMapping\win.ini,"sounds",,"USR:Control Panel\Soun
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows"
 HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop"
 HKLM,%CurrentVersionNT%\LanguagePack,,16
+HKLM,%CurrentVersionNT%\MCI,"avivideo",,"mciavi32.dll"
+HKLM,%CurrentVersionNT%\MCI,"cdaudio",,"mcicda.dll"
+HKLM,%CurrentVersionNT%\MCI,"mpegvideo",,"mciqtz32.dll"
+HKLM,%CurrentVersionNT%\MCI,"mpegvideo2",,"mciqtz32.dll"
+HKLM,%CurrentVersionNT%\MCI,"sequencer",,"mciseq.dll"
+HKLM,%CurrentVersionNT%\MCI,"vcr",,"mcivisca.drv"
+HKLM,%CurrentVersionNT%\MCI,"waveaudio",,"mciwave.dll"
 HKLM,%CurrentVersionNT%\NetworkCards,,16
 HKLM,%CurrentVersionNT%\OpenGLDrivers,,16
 HKLM,%CurrentVersionNT%\Perflib,,16
@@ -2732,16 +2736,6 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 16427,System\ADO,msado15.dll
 11,,*
 
-[SystemIni]
-system.ini, mci,,"MPEGVideo=mciqtz32.dll"
-system.ini, mci,,"MPEGVideo2=mciqtz32.dll"
-system.ini, mci,,"avivideo=mciavi32.dll"
-system.ini, mci,,"cdaudio=mcicda.dll"
-system.ini, mci,,"sequencer=mciseq.dll"
-system.ini, mci,,"vcr=mcivisca.drv"
-system.ini, mci,,"; videodisc=mcipionr.drv"
-system.ini, mci,,"waveaudio=mciwave.dll"
-
 [Timezones]
 ; The timezone information (TZI field) comes from the Olson timezone database
 ; http://www.twinsun.com/tz/tz-link.htm
-- 
2.27.0




More information about the wine-devel mailing list