ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shdocvw: Rewrite code to make more understandable (Coverity).

Browse Source
This commit is contained in:
Marcus Meissner 2011-03-02 12:30:04 +01:00 committed by Alexandre Julliard
parent 4c6e57654f
commit f90b5bfe73
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/shdocvw/shlinstobj.c
View File

@ -375,16 +375,15 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid,
ppvClassObj); ppvClassObj);
/* Figure if there is an 'Instance' subkey for the given CLSID and acquire a handle. */ /* Figure if there is an 'Instance' subkey for the given CLSID and acquire a handle. */
if (!StringFromGUID2(rclsid, wszInstanceKey + 6, CHARS_IN_GUID) || if (!StringFromGUID2(rclsid, wszInstanceKey + 6, CHARS_IN_GUID))
!(wszInstanceKey[5+CHARS_IN_GUID]='\\') || /* Repair the null-termination. */ return CLASS_E_CLASSNOTAVAILABLE;
ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, wszInstanceKey, 0, KEY_READ, &hInstanceKey)) 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. */ /* If there is no 'Instance' subkey, then it's not a Shell Instance Object. */
return CLASS_E_CLASSNOTAVAILABLE; return CLASS_E_CLASSNOTAVAILABLE;
}
if (RegQueryValueExW(hInstanceKey, wszCLSID, NULL, &dwType, (LPBYTE)wszCLSIDInstance, &cbBytes) if (ERROR_SUCCESS != RegQueryValueExW(hInstanceKey, wszCLSID, NULL, &dwType, (LPBYTE)wszCLSIDInstance, &cbBytes) ||
!= ERROR_SUCCESS || FAILED(CLSIDFromString(wszCLSIDInstance, &clsidInstance))) FAILED(CLSIDFromString(wszCLSIDInstance, &clsidInstance)))
{ {
/* 'Instance' should have a 'CLSID' value with a well-formed clsid-string. */ /* 'Instance' should have a 'CLSID' value with a well-formed clsid-string. */
FIXME("Failed to infer instance CLSID! %s\n", debugstr_w(wszCLSIDInstance)); FIXME("Failed to infer instance CLSID! %s\n", debugstr_w(wszCLSIDInstance));