From 4261aaffd7861821192c6dcbb44882e63dc0e7e9 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Sat, 6 Mar 2010 23:53:38 +0300 Subject: [PATCH] shell32/shellview: Remove unneeded memset, release browser reference on failure. --- dlls/shell32/shlview.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2b1ac1f0321..c2fb9730e1e 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2068,7 +2068,7 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2* iface, LPSV2C /* Get our parent window */ IShellBrowser_AddRef(This->pShellBrowser); - IShellBrowser_GetWindow(This->pShellBrowser, &(This->hWndParent)); + IShellBrowser_GetWindow(This->pShellBrowser, &This->hWndParent); /* Try to get the ICommDlgBrowserInterface, adds a reference !!! */ This->pCommDlgBrowser = NULL; @@ -2079,7 +2079,6 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2* iface, LPSV2C /* If our window class has not been registered, then do so */ if (!GetClassInfoW(shell32_hInstance, SV_CLASS_NAME, &wc)) { - ZeroMemory(&wc, sizeof(wc)); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = ShellView_WndProc; wc.cbClsExtra = 0; @@ -2102,7 +2101,11 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2* iface, LPSV2C CheckToolbar(This); - if (!wnd) return E_FAIL; + if (!wnd) + { + IShellBrowser_Release(This->pShellBrowser); + return E_FAIL; + } SetWindowPos(wnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); UpdateWindow(wnd); -- 2.11.4.GIT