Module: wine Branch: master Commit: f90b5bfe731ee73bc3c2e2d1974831187676edb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90b5bfe731ee73bc3c2e2d197...
Author: Marcus Meissner meissner@suse.de Date: Wed Mar 2 12:30:04 2011 +0100
shdocvw: Rewrite code to make more understandable (Coverity).
---
dlls/shdocvw/shlinstobj.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index d272c91..63bf0e6 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -375,16 +375,15 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, ppvClassObj);
/* Figure if there is an 'Instance' subkey for the given CLSID and acquire a handle. */ - if (!StringFromGUID2(rclsid, wszInstanceKey + 6, CHARS_IN_GUID) || - !(wszInstanceKey[5+CHARS_IN_GUID]='\') || /* Repair the null-termination. */ - ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, wszInstanceKey, 0, KEY_READ, &hInstanceKey)) - { + if (!StringFromGUID2(rclsid, wszInstanceKey + 6, CHARS_IN_GUID)) + return CLASS_E_CLASSNOTAVAILABLE; + wszInstanceKey[5+CHARS_IN_GUID] = '\'; /* Repair the null-termination. */ + if (ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, wszInstanceKey, 0, KEY_READ, &hInstanceKey)) /* If there is no 'Instance' subkey, then it's not a Shell Instance Object. */ return CLASS_E_CLASSNOTAVAILABLE; - }
- if (RegQueryValueExW(hInstanceKey, wszCLSID, NULL, &dwType, (LPBYTE)wszCLSIDInstance, &cbBytes) - != ERROR_SUCCESS || FAILED(CLSIDFromString(wszCLSIDInstance, &clsidInstance))) + if (ERROR_SUCCESS != RegQueryValueExW(hInstanceKey, wszCLSID, NULL, &dwType, (LPBYTE)wszCLSIDInstance, &cbBytes) || + FAILED(CLSIDFromString(wszCLSIDInstance, &clsidInstance))) { /* 'Instance' should have a 'CLSID' value with a well-formed clsid-string. */ FIXME("Failed to infer instance CLSID! %s\n", debugstr_w(wszCLSIDInstance));