[PATCH v2 5/5] winmm: Stop looking for drivers in system.ini.

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


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/winmm/driver.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c
index 24db0edc37a..0a1ef05f90d 100644
--- a/dlls/winmm/driver.c
+++ b/dlls/winmm/driver.c
@@ -246,8 +246,6 @@ BOOL	DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz)
 {
     HKEY	hKey, hSecKey;
     DWORD	bufLen, lRet;
-    static const WCHAR wszSystemIni[] = {'S','Y','S','T','E','M','.','I','N','I',0};
-    WCHAR       wsznull = '\0';
 
     TRACE("registry: %s, %s, %p, %d\n", debugstr_w(keyName), debugstr_w(sectName), buf, sz);
 
@@ -261,12 +259,7 @@ BOOL	DRIVER_GetLibName(LPCWSTR keyName, LPCWSTR sectName, LPWSTR buf, int sz)
 	}
         RegCloseKey( hKey );
     }
-    if (lRet == ERROR_SUCCESS) return TRUE;
-
-    /* default to system.ini if we can't find it in the registry,
-     * to support native installations where system.ini is still used */
-    TRACE("system.ini: %s, %s, %p, %d\n", debugstr_w(keyName), debugstr_w(sectName), buf, sz);
-    return GetPrivateProfileStringW(sectName, keyName, &wsznull, buf, sz / sizeof(WCHAR), wszSystemIni);
+    return !lRet;
 }
 
 /**************************************************************************
-- 
2.27.0




More information about the wine-devel mailing list