system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-05 10:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

shell32/shellview: Remove unneeded memset, release browser reference on failure.

Browse source
This commit is contained in:
Nikolay Sivov 2010-03-06 23:53:38 +03:00 committed by Alexandre Julliard
parent 537e3821d5
commit 4261aaffd7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/shell32/shlview.c
View file

@ -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);