日々精進

備忘録（wineのACM登録バグ）

--- dlls/msacm/internal.c	30 Jun 2004 18:11:39 -0000	1.19
 +++ dlls/msacm/internal.c	23 Aug 2004 21:36:14 -0000
 @@ -294,7 +294,6 @@
  				   'D','r','i','v','e','r','s','3','2','\0'};
      DWORD i, cnt = 0, bufLen, lRet;
      WCHAR buf[2048], *name, *s;
 -    FILETIME lastWrite;
      HKEY hKey;

      /* FIXME: What if the user edits system.ini while the program is running?
 @@ -303,15 +302,17 @@

      lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey);
      if (lRet == ERROR_SUCCESS) {
 -	RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0);
 +	DWORD nameLen, type;
 +	WCHAR name[2048];
 +	lRet = RegQueryInfoKeyW( hKey, 0, 0, 0, 0, 0, 0, &cnt, 0, 0, 0, 0);
  	for (i = 0; i < cnt; i++) {
  	    bufLen = sizeof(buf) / sizeof(buf[0]);
 -	    lRet = RegEnumKeyExW(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite);
 +	    nameLen = sizeof(name) / sizeof(name[0]);
 +	    lRet = RegEnumValueW(hKey, i, name, &nameLen, 0, &type, (LPBYTE)buf, &bufLen);
  	    if (lRet != ERROR_SUCCESS) continue;
 -	    if (strncmpiW(buf, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue;
 -	    if (!(name = strchrW(buf, '='))) continue;
 -	    *name = 0;
 -	    MSACM_RegisterDriver(buf, name + 1, 0);
 +	    if (type != REG_SZ) continue;
 +	    if (strncmpiW(name, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue;
 +	    MSACM_RegisterDriver(name, buf, 0);
  	}
      	RegCloseKey( hKey );
      }