avifil32: Registry access calls don't return HRESULT codes.
This commit is contained in:
parent
533f7558aa
commit
bc87dd6026
|
@ -1030,14 +1030,14 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
|
||||||
* First filter is named "All multimedia files" and its filter is a
|
* First filter is named "All multimedia files" and its filter is a
|
||||||
* collection of all possible extensions except "*.*".
|
* collection of all possible extensions except "*.*".
|
||||||
*/
|
*/
|
||||||
if (RegOpenKeyW(HKEY_CLASSES_ROOT, szAVIFileExtensions, &hKey) != S_OK) {
|
if (RegOpenKeyW(HKEY_CLASSES_ROOT, szAVIFileExtensions, &hKey) != ERROR_SUCCESS) {
|
||||||
HeapFree(GetProcessHeap(), 0, lp);
|
HeapFree(GetProcessHeap(), 0, lp);
|
||||||
return AVIERR_ERROR;
|
return AVIERR_ERROR;
|
||||||
}
|
}
|
||||||
for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == S_OK;n++) {
|
for (n = 0;RegEnumKeyW(hKey, n, szFileExt, sizeof(szFileExt)/sizeof(szFileExt[0])) == ERROR_SUCCESS;n++) {
|
||||||
/* get CLSID to extension */
|
/* get CLSID to extension */
|
||||||
size = sizeof(szValue);
|
size = sizeof(szValue);
|
||||||
if (RegQueryValueW(hKey, szFileExt, szValue, &size) != S_OK)
|
if (RegQueryValueW(hKey, szFileExt, szValue, &size) != ERROR_SUCCESS)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* search if the CLSID is already known */
|
/* search if the CLSID is already known */
|
||||||
|
@ -1078,7 +1078,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
|
||||||
RegCloseKey(hKey);
|
RegCloseKey(hKey);
|
||||||
|
|
||||||
/* 2. get descriptions for the CLSIDs and fill out szFilter */
|
/* 2. get descriptions for the CLSIDs and fill out szFilter */
|
||||||
if (RegOpenKeyW(HKEY_CLASSES_ROOT, szClsid, &hKey) != S_OK) {
|
if (RegOpenKeyW(HKEY_CLASSES_ROOT, szClsid, &hKey) != ERROR_SUCCESS) {
|
||||||
HeapFree(GetProcessHeap(), 0, lp);
|
HeapFree(GetProcessHeap(), 0, lp);
|
||||||
return AVIERR_ERROR;
|
return AVIERR_ERROR;
|
||||||
}
|
}
|
||||||
|
@ -1086,7 +1086,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving)
|
||||||
/* first the description */
|
/* first the description */
|
||||||
if (n != 0) {
|
if (n != 0) {
|
||||||
size = sizeof(szValue);
|
size = sizeof(szValue);
|
||||||
if (RegQueryValueW(hKey, lp[n].szClsid, szValue, &size) == S_OK) {
|
if (RegQueryValueW(hKey, lp[n].szClsid, szValue, &size) == ERROR_SUCCESS) {
|
||||||
size = lstrlenW(szValue);
|
size = lstrlenW(szValue);
|
||||||
lstrcpynW(szFilter, szValue, cbFilter);
|
lstrcpynW(szFilter, szValue, cbFilter);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue