Andrew Nguyen : shell32: Fix initial reference count for a new IAutoComplete instance.
Alexandre Julliard
julliard at winehq.org
Fri Jan 21 11:08:19 CST 2011
Module: wine
Branch: master
Commit: 7a6c0d2f466793852d273890c67bc4e1c00cebb5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a6c0d2f466793852d273890c67bc4e1c00cebb5
Author: Andrew Nguyen <anguyen at codeweavers.com>
Date: Fri Jan 21 04:56:22 2011 -0600
shell32: Fix initial reference count for a new IAutoComplete instance.
---
dlls/shell32/autocomplete.c | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c
index f50c2b7..d1139e2 100644
--- a/dlls/shell32/autocomplete.c
+++ b/dlls/shell32/autocomplete.c
@@ -121,33 +121,27 @@ static void create_listbox(IAutoCompleteImpl *This)
HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv)
{
IAutoCompleteImpl *lpac;
+ HRESULT hr;
if (pUnkOuter && !IsEqualIID (riid, &IID_IUnknown))
- return CLASS_E_NOAGGREGATION;
+ return CLASS_E_NOAGGREGATION;
lpac = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAutoCompleteImpl));
- if (!lpac)
- return E_OUTOFMEMORY;
+ if (!lpac)
+ return E_OUTOFMEMORY;
lpac->ref = 1;
lpac->lpVtbl = &acvt;
lpac->lpDropDownVtbl = &acdropdownvt;
lpac->enabled = TRUE;
- lpac->enumstr = NULL;
lpac->options = ACO_AUTOAPPEND;
- lpac->wpOrigEditProc = NULL;
- lpac->hwndListBox = NULL;
- lpac->txtbackup = NULL;
- lpac->quickComplete = NULL;
-
- if (FAILED (IUnknown_QueryInterface (_IUnknown_ (lpac), riid, ppv))) {
- IUnknown_Release (_IUnknown_ (lpac));
- return E_NOINTERFACE;
- }
-
+
+ hr = IUnknown_QueryInterface(_IUnknown_ (lpac), riid, ppv);
+ IUnknown_Release(_IUnknown_ (lpac));
+
TRACE("-- (%p)->\n",lpac);
- return S_OK;
+ return hr;
}
/**************************************************************************
More information about the wine-cvs
mailing list