Commit fa96beb5 authored by Andrew Talbot's avatar Andrew Talbot Committed by Alexandre Julliard

ole32: Indentation fix.

parent 8cf55497
...@@ -2740,15 +2740,9 @@ HRESULT WINAPI CoCreateInstance( ...@@ -2740,15 +2740,9 @@ HRESULT WINAPI CoCreateInstance(
TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid), TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid),
pUnkOuter, dwClsContext, debugstr_guid(iid), ppv); pUnkOuter, dwClsContext, debugstr_guid(iid), ppv);
/*
* Sanity check
*/
if (ppv==0) if (ppv==0)
return E_POINTER; return E_POINTER;
/*
* Initialize the "out" parameter
*/
*ppv = 0; *ppv = 0;
if (!(apt = COM_CurrentApt())) if (!(apt = COM_CurrentApt()))
...@@ -2765,10 +2759,13 @@ HRESULT WINAPI CoCreateInstance( ...@@ -2765,10 +2759,13 @@ HRESULT WINAPI CoCreateInstance(
* The Standard Global Interface Table (GIT) object is a process-wide singleton. * The Standard Global Interface Table (GIT) object is a process-wide singleton.
* Rather than create a class factory, we can just check for it here * Rather than create a class factory, we can just check for it here
*/ */
if (IsEqualIID(rclsid, &CLSID_StdGlobalInterfaceTable)) { if (IsEqualIID(rclsid, &CLSID_StdGlobalInterfaceTable))
{
if (StdGlobalInterfaceTableInstance == NULL) if (StdGlobalInterfaceTableInstance == NULL)
StdGlobalInterfaceTableInstance = StdGlobalInterfaceTable_Construct(); StdGlobalInterfaceTableInstance = StdGlobalInterfaceTable_Construct();
hres = IGlobalInterfaceTable_QueryInterface( (IGlobalInterfaceTable*) StdGlobalInterfaceTableInstance, iid, ppv); hres = IGlobalInterfaceTable_QueryInterface((IGlobalInterfaceTable*)StdGlobalInterfaceTableInstance,
iid,
ppv);
if (hres) return hres; if (hres) return hres;
TRACE("Retrieved GIT (%p)\n", *ppv); TRACE("Retrieved GIT (%p)\n", *ppv);
...@@ -2795,12 +2792,14 @@ HRESULT WINAPI CoCreateInstance( ...@@ -2795,12 +2792,14 @@ HRESULT WINAPI CoCreateInstance(
*/ */
hres = IClassFactory_CreateInstance(lpclf, pUnkOuter, iid, ppv); hres = IClassFactory_CreateInstance(lpclf, pUnkOuter, iid, ppv);
IClassFactory_Release(lpclf); IClassFactory_Release(lpclf);
if(FAILED(hres)) if (FAILED(hres))
{ {
if (hres == CLASS_E_NOAGGREGATION && pUnkOuter) if (hres == CLASS_E_NOAGGREGATION && pUnkOuter)
FIXME("Class %s does not support aggregation\n", debugstr_guid(rclsid)); FIXME("Class %s does not support aggregation\n", debugstr_guid(rclsid));
else else
FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n", debugstr_guid(iid), debugstr_guid(rclsid),hres); FIXME("no instance created for interface %s of class %s, hres is 0x%08x\n",
debugstr_guid(iid),
debugstr_guid(rclsid),hres);
} }
return hres; return hres;
......
...@@ -1937,7 +1937,8 @@ HRESULT WINAPI OleSetMenuDescriptor( ...@@ -1937,7 +1937,8 @@ HRESULT WINAPI OleSetMenuDescriptor(
/* If OLEMenu hooks are already installed for this thread, fail /* If OLEMenu hooks are already installed for this thread, fail
* Note: This effectively means that OleSetMenuDescriptor cannot * Note: This effectively means that OleSetMenuDescriptor cannot
* be called twice in succession on the same frame window * be called twice in succession on the same frame window
* without first calling it with a null hOleMenu to uninstall */ * without first calling it with a null hOleMenu to uninstall
*/
if ( OLEMenu_IsHookInstalled( GetCurrentThreadId() ) ) if ( OLEMenu_IsHookInstalled( GetCurrentThreadId() ) )
return E_FAIL; return E_FAIL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment