April 2016 - Wine-commits - list.winehq.org

Dmitry Timoshkov : user32/tests: Add some tests for dialog owner disabled state.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: b555f41020b2d3bf2fad98b03d35fd98b541758b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b555f41020b2d3bf2fad98b03… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 12 18:23:54 2016 +0800 user32/tests: Add some tests for dialog owner disabled state. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 789cf9b..dd5f967 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4258,6 +4258,74 @@ static INT_PTR WINAPI empty_dlg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM return 0; } +static INT_PTR WINAPI empty_dlg_proc3(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_INITDIALOG) + EndDialog(hwnd, 0); + + return 0; +} + +struct dialog_param +{ + HWND parent, grand_parent; + DLGTEMPLATE *dlg_data; +}; + +static INT_PTR WINAPI empty_dlg_proc2(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_INITDIALOG) + { + DWORD style = GetWindowLongA(hwnd, GWL_STYLE); + struct dialog_param *param = (struct dialog_param *)lparam; + BOOL parent_is_child; + HWND disabled_hwnd; + + parent_is_child = (GetWindowLongA(param->parent, GWL_STYLE) & (WS_POPUP | WS_CHILD)) == WS_CHILD; + + ok(IsWindowEnabled(hwnd), "wrong state for %p\n", hwnd); + if (parent_is_child) + { + ok(IsWindowEnabled(param->parent), "wrong state for %08x\n", style); + disabled_hwnd = param->grand_parent; + } + else + { + ok(!IsWindowEnabled(param->parent), "wrong state for %08x\n", style); + disabled_hwnd = param->parent; + } + + if (param->grand_parent) + { + if (parent_is_child) + ok(!IsWindowEnabled(param->grand_parent), "wrong state for %08x\n", style); + else + ok(IsWindowEnabled(param->grand_parent), "wrong state for %08x\n", style); + } + + DialogBoxIndirectParamA(GetModuleHandleA(NULL), param->dlg_data, disabled_hwnd, empty_dlg_proc3, 0); + ok(IsWindowEnabled(disabled_hwnd), "wrong state for %08x\n", style); + + ok(IsWindowEnabled(hwnd), "wrong state for %p\n", hwnd); + ok(IsWindowEnabled(param->parent), "wrong state for %p\n", param->parent); + if (param->grand_parent) + ok(IsWindowEnabled(param->grand_parent), "wrong state for %p (%08x)\n", param->grand_parent, style); + + DialogBoxIndirectParamA(GetModuleHandleA(NULL), param->dlg_data, hwnd, empty_dlg_proc3, 0); + ok(IsWindowEnabled(hwnd), "wrong state for %p\n", hwnd); + ok(IsWindowEnabled(param->parent), "wrong state for %p\n", param->parent); + if (param->grand_parent) + ok(IsWindowEnabled(param->grand_parent), "wrong state for %p (%08x)\n", param->grand_parent, style); + + param->dlg_data->style |= WS_CHILD; + DialogBoxIndirectParamA(GetModuleHandleA(NULL), param->dlg_data, hwnd, empty_dlg_proc3, 0); + ok(IsWindowEnabled(hwnd), "wrong state for %p (%08x)\n", hwnd, style); + + EndDialog(hwnd, 0); + } + return 0; +} + static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_out, DWORD ex_style_out) { struct @@ -4269,11 +4337,19 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou WCHAR caption[1]; } dlg_data; DWORD style, ex_style; - HWND hwnd, parent = 0; + HWND hwnd, grand_parent = 0, parent = 0; + struct dialog_param param; if (style_in & WS_CHILD) - parent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, + { + grand_parent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(grand_parent != 0, "grand_parent creation failed\n"); + } + + parent = CreateWindowExA(0, "static", NULL, style_in, + 0, 0, 0, 0, grand_parent, NULL, NULL, NULL); + ok(parent != 0, "parent creation failed, style %#x\n", style_in); dlg_data.dt.style = style_in; dlg_data.dt.dwExtendedStyle = ex_style_in; @@ -4297,6 +4373,8 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou ok(style == (style_out | DS_3DLOOK), "got %#x\n", style); ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); + ok(IsWindowEnabled(parent), "wrong parent state (dialog style %#x)\n", style_in); + /* try setting the styles explicitly */ SetWindowLongA(hwnd, GWL_EXSTYLE, ex_style_in); style = GetWindowLongA(hwnd, GWL_STYLE); @@ -4330,7 +4408,18 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); DestroyWindow(hwnd); + + param.parent = parent; + param.grand_parent = grand_parent; + param.dlg_data = &dlg_data.dt; + DialogBoxIndirectParamA(GetModuleHandleA(NULL), &dlg_data.dt, parent, empty_dlg_proc2, (LPARAM)&param); + + ok(IsWindowEnabled(parent), "wrong parent state (dialog style %#x)\n", style_in); + if (grand_parent) + ok(IsWindowEnabled(grand_parent), "wrong grand parent state (dialog style %#x)\n", style_in); + DestroyWindow(parent); + DestroyWindow(grand_parent); } static void test_dialog_styles(void)

1 0

Piotr Caban : ieframe: Restore closed IOleClientSite in DoVerb.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 17379dcd083e66539014ab73cade423c22f26128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17379dcd083e66539014ab73c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 11 18:46:09 2016 +0200 ieframe: Restore closed IOleClientSite in DoVerb. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/oleobject.c | 28 +++++++++++++++++++++++++++- dlls/ieframe/tests/webbrowser.c | 24 ++++++++++++++++++------ 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 3880354..b586cc9 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -190,6 +190,7 @@ struct WebBrowser { INT version; IOleClientSite *client; + IOleClientSite *client_closed; IOleContainer *container; IOleInPlaceSiteEx *inplace; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 1076afe..4dcc536 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -292,6 +292,11 @@ static void release_client_site(WebBrowser *This) This->client = NULL; } + if(This->client_closed) { + IOleClientSite_Release(This->client_closed); + This->client_closed = NULL; + } + if(This->shell_embedding_hwnd) { DestroyWindow(This->shell_embedding_hwnd); This->shell_embedding_hwnd = NULL; @@ -460,6 +465,11 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE TRACE("(%p)->(%p)\n", This, pClientSite); + if(This->client_closed) { + IOleClientSite_Release(This->client_closed); + This->client_closed = NULL; + } + if(This->client == pClientSite) return S_OK; @@ -549,6 +559,8 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { WebBrowser *This = impl_from_IOleObject(iface); + IOleClientSite *client; + HRESULT hres; TRACE("(%p)->(%d)\n", This, dwSaveOption); @@ -569,7 +581,13 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) if(This->inplace) IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); - return IOleObject_SetClientSite(iface, NULL); + /* store old client site - we need to restore it in DoVerb */ + client = This->client; + if(This->client) + IOleClientSite_AddRef(This->client); + hres = IOleObject_SetClientSite(iface, NULL); + This->client_closed = client; + return hres; } static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker* pmk) @@ -611,6 +629,14 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag TRACE("(%p)->(%d %p %p %d %p %s)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, wine_dbgstr_rect(lprcPosRect)); + /* restore closed client site if we have one */ + if(!This->client && This->client_closed) { + IOleClientSite *client = This->client_closed; + This->client_closed = NULL; + IOleObject_SetClientSite(iface, client); + IOleClientSite_Release(client); + } + switch (iVerb) { case OLEIVERB_SHOW: diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 4d28073..521e2ce 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -51,7 +51,7 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); static BOOL expect_ ## func = FALSE, called_ ## func = FALSE #define SET_EXPECT(func) \ - expect_ ## func = TRUE + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) #define CHECK_EXPECT2(func) \ do { \ @@ -71,6 +71,12 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_NOT_CALLED(func) \ + do { \ + ok(!called_ ## func, "unexpected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + #define CLEAR_CALLED(func) \ expect_ ## func = called_ ## func = FALSE @@ -3633,19 +3639,25 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) hres = IOleObject_DoVerb(oo, OLEIVERB_HIDE, NULL, (IOleClientSite*)0xdeadbeef, 0, (HWND)0xdeadbeef, NULL); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); - todo_wine CHECK_CALLED(GetContainer); - todo_wine CHECK_CALLED(Site_GetWindow); - todo_wine CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); - todo_wine CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(Invoke_AMBIENT_SILENT); hres = IOleObject_GetClientSite(oo, &ocs); ok(hres == S_OK, "hres = %x\n", hres); - todo_wine ok(ocs == &ClientSite, "ocs != &ClientSite\n"); + ok(ocs == &ClientSite, "ocs != &ClientSite\n"); if(ocs) IOleClientSite_Release(ocs); + SET_EXPECT(OnFocus_FALSE); + SET_EXPECT(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); + SET_EXPECT(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); + todo_wine CHECK_NOT_CALLED(OnFocus_FALSE); + todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); + todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); test_close = FALSE; IOleObject_Release(oo);

1 0

Nikolay Sivov : ieframe: Simplify IPersist_Load, make error handling more straightforward.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 9de5b114302e62f63427e4e808e61416e0955eb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de5b114302e62f63427e4e80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 22:14:54 2016 +0300 ieframe: Simplify IPersist_Load, make error handling more straightforward. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/intshcut.c | 179 +++++++++++++++++++++--------------------------- 1 file changed, 79 insertions(+), 100 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 19b253d..385b059 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -420,135 +420,114 @@ static HRESULT WINAPI PersistFile_IsDirty(IPersistFile *pFile) return This->isDirty ? S_OK : S_FALSE; } -/* A helper function: Allocate and fill rString. Return number of bytes read. */ -static DWORD get_profile_string(LPCWSTR lpAppName, LPCWSTR lpKeyName, +/* Returns allocated profile string and a standard return code. */ +static HRESULT get_profile_string(LPCWSTR lpAppName, LPCWSTR lpKeyName, LPCWSTR lpFileName, WCHAR **rString ) { DWORD r = 0; DWORD len = 128; WCHAR *buffer; + *rString = NULL; buffer = CoTaskMemAlloc(len * sizeof(*buffer)); - if (buffer != NULL) - { - r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, buffer, len, lpFileName); - while (r == len-1) - { - WCHAR *realloc_buf; + if (!buffer) + return E_OUTOFMEMORY; - len *= 2; - realloc_buf = CoTaskMemRealloc(buffer, len * sizeof(*buffer)); - if (realloc_buf == NULL) - { - CoTaskMemFree(buffer); - *rString = NULL; - return 0; - } - buffer = realloc_buf; + r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, buffer, len, lpFileName); + while (r == len-1) + { + WCHAR *realloc_buf; - r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, buffer, len, lpFileName); + len *= 2; + realloc_buf = CoTaskMemRealloc(buffer, len * sizeof(*buffer)); + if (realloc_buf == NULL) + { + CoTaskMemFree(buffer); + return E_OUTOFMEMORY; } + buffer = realloc_buf; + + r = GetPrivateProfileStringW(lpAppName, lpKeyName, NULL, buffer, len, lpFileName); } *rString = buffer; - return r; + return r ? S_OK : E_FAIL; } static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileName, DWORD dwMode) { - WCHAR str_header[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; - WCHAR str_URL[] = {'U','R','L',0}; - WCHAR str_iconfile[] = {'i','c','o','n','f','i','l','e',0}; - WCHAR str_iconindex[] = {'i','c','o','n','i','n','d','e','x',0}; + InternetShortcut *This = impl_from_IPersistFile(pFile); + static WCHAR str_header[] = {'I','n','t','e','r','n','e','t','S','h','o','r','t','c','u','t',0}; + static WCHAR str_URL[] = {'U','R','L',0}; + static WCHAR str_iconfile[] = {'i','c','o','n','f','i','l','e',0}; + static WCHAR str_iconindex[] = {'i','c','o','n','i','n','d','e','x',0}; WCHAR *filename = NULL; + WCHAR *url; HRESULT hr; - InternetShortcut *This = impl_from_IPersistFile(pFile); + IPropertyStorage *pPropStg; + WCHAR *iconfile; + WCHAR *iconindexstring; + TRACE("(%p, %s, 0x%x)\n", pFile, debugstr_w(pszFileName), dwMode); + if (dwMode != 0) FIXME("ignoring unimplemented mode 0x%x\n", dwMode); + filename = co_strdupW(pszFileName); - if (filename != NULL) - { - DWORD r; - WCHAR *url; + if (!filename) + return E_OUTOFMEMORY; - r = get_profile_string(str_header, str_URL, pszFileName, &url); + if (FAILED(hr = get_profile_string(str_header, str_URL, pszFileName, &url))) + { + CoTaskMemFree(filename); + return hr; + } - if (url == NULL) - { - hr = E_OUTOFMEMORY; - CoTaskMemFree(filename); - } - else if (r == 0) - { - hr = E_FAIL; - CoTaskMemFree(filename); - } - else - { - hr = S_OK; - CoTaskMemFree(This->currentFile); - This->currentFile = filename; - CoTaskMemFree(This->url); - This->url = url; - This->isDirty = FALSE; - } + CoTaskMemFree(This->currentFile); + This->currentFile = filename; + CoTaskMemFree(This->url); + This->url = url; + This->isDirty = FALSE; - /* Now we're going to read in the iconfile and iconindex. - If we don't find them, that's not a failure case -- it's possible - that they just aren't in there. */ - if (SUCCEEDED(hr)) - { - IPropertyStorage *pPropStg; - WCHAR *iconfile; - WCHAR *iconindexstring; - hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, - STGM_READWRITE | STGM_SHARE_EXCLUSIVE, - &pPropStg); - - if (get_profile_string(str_header, str_iconfile, pszFileName, &iconfile)) - { - PROPSPEC ps; - PROPVARIANT pv; - ps.ulKind = PRSPEC_PROPID; - ps.u.propid = PID_IS_ICONFILE; - pv.vt = VT_LPWSTR; - pv.u.pwszVal = iconfile; - hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); - if (FAILED(hr)) - { - TRACE("Failed to store the iconfile to our property storage. hr = 0x%x\n", hr); - } - } - CoTaskMemFree(iconfile); + /* Now we're going to read in the iconfile and iconindex. + If we don't find them, that's not a failure case -- it's possible + that they just aren't in there. */ + hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStg); - if (get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring)) - { - int iconindex; - PROPSPEC ps; - PROPVARIANT pv; - char *iconindexastring = co_strdupWtoA(iconindexstring); - sscanf(iconindexastring, "%d", &iconindex); - CoTaskMemFree(iconindexastring); - ps.ulKind = PRSPEC_PROPID; - ps.u.propid = PID_IS_ICONINDEX; - pv.vt = VT_I4; - pv.u.iVal = iconindex; - hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); - if (FAILED(hr)) - { - TRACE("Failed to store the iconindex to our property storage. hr = 0x%x\n", hr); - } - } - CoTaskMemFree(iconindexstring); + if (get_profile_string(str_header, str_iconfile, pszFileName, &iconfile) == S_OK) + { + PROPSPEC ps; + PROPVARIANT pv; + ps.ulKind = PRSPEC_PROPID; + ps.u.propid = PID_IS_ICONFILE; + pv.vt = VT_LPWSTR; + pv.u.pwszVal = iconfile; + hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); + if (FAILED(hr)) + TRACE("Failed to store the iconfile to our property storage. hr = 0x%x\n", hr); + } + CoTaskMemFree(iconfile); - IPropertyStorage_Release(pPropStg); - } - else - hr = E_OUTOFMEMORY; + if (get_profile_string(str_header, str_iconindex, pszFileName, &iconindexstring) == S_OK) + { + int iconindex; + PROPSPEC ps; + PROPVARIANT pv; + char *iconindexastring = co_strdupWtoA(iconindexstring); + sscanf(iconindexastring, "%d", &iconindex); + CoTaskMemFree(iconindexastring); + ps.ulKind = PRSPEC_PROPID; + ps.u.propid = PID_IS_ICONINDEX; + pv.vt = VT_I4; + pv.u.iVal = iconindex; + hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); + if (FAILED(hr)) + TRACE("Failed to store the iconindex to our property storage. hr = 0x%x\n", hr); } - else - hr = E_OUTOFMEMORY; + CoTaskMemFree(iconindexstring); + + IPropertyStorage_Release(pPropStg); return hr; }

1 0

Nikolay Sivov : ieframe: Convert to integer without additional string buffer allocation.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: b771a4a488f4a27ffe6dedabaa9447160a611a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b771a4a488f4a27ffe6dedaba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 22:14:55 2016 +0300 ieframe: Convert to integer without additional string buffer allocation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/intshcut.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 385b059..563cfc2 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -514,9 +514,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam int iconindex; PROPSPEC ps; PROPVARIANT pv; - char *iconindexastring = co_strdupWtoA(iconindexstring); - sscanf(iconindexastring, "%d", &iconindex); - CoTaskMemFree(iconindexastring); + iconindex = strtolW(iconindexstring, NULL, 10); ps.ulKind = PRSPEC_PROPID; ps.u.propid = PID_IS_ICONINDEX; pv.vt = VT_I4;

1 0

Nikolay Sivov : ieframe: Handle storage opening failure in shortcut Load() .
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 4302281d51ef8e6bc41be42f7df04d8510d17545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4302281d51ef8e6bc41be42f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 11 22:14:56 2016 +0300 ieframe: Handle storage opening failure in shortcut Load(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/intshcut.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 563cfc2..2376b1b 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -483,6 +483,15 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam return hr; } + hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStg); + if (FAILED(hr)) + { + CoTaskMemFree(filename); + CoTaskMemFree(url); + return hr; + } + CoTaskMemFree(This->currentFile); This->currentFile = filename; CoTaskMemFree(This->url); @@ -492,8 +501,6 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam /* Now we're going to read in the iconfile and iconindex. If we don't find them, that's not a failure case -- it's possible that they just aren't in there. */ - hr = IPropertySetStorage_Open(This->property_set_storage, &FMTID_Intshcut, - STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &pPropStg); if (get_profile_string(str_header, str_iconfile, pszFileName, &iconfile) == S_OK) {

1 0

Michael Stefaniuc : shell32/tests: Use SetRect instead of open coding it.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 851777dcb174e4f85bdfa82276f1327a456216f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851777dcb174e4f85bdfa8227… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 12 12:32:50 2016 +0200 shell32/tests: Use SetRect instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/appbar.c | 30 ++++++------------------------ dlls/shell32/tests/ebrowser.c | 20 ++++++++++---------- dlls/shell32/tests/shlview.c | 3 +-- 3 files changed, 17 insertions(+), 36 deletions(-) diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 8138131..ca72f3f 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -232,10 +232,7 @@ static void test_setpos(void) windows[0].registered = TRUE; windows[0].to_be_deleted = FALSE; windows[0].edge = ABE_BOTTOM; - windows[0].desired_rect.left = 0; - windows[0].desired_rect.right = screen_width; - windows[0].desired_rect.top = screen_height - 15; - windows[0].desired_rect.bottom = screen_height; + SetRect(&windows[0].desired_rect, 0, screen_height - 15, screen_width, screen_height); SetWindowLongPtrA(windows[0].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[0]); testwindow_setpos(windows[0].hwnd); do_events(); @@ -253,10 +250,7 @@ static void test_setpos(void) windows[1].registered = TRUE; windows[1].to_be_deleted = FALSE; windows[1].edge = ABE_BOTTOM; - windows[1].desired_rect.left = 0; - windows[1].desired_rect.right = screen_width; - windows[1].desired_rect.top = screen_height - 10; - windows[1].desired_rect.bottom = screen_height; + SetRect(&windows[1].desired_rect, 0, screen_height - 10, screen_width, screen_height); SetWindowLongPtrA(windows[1].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[1]); testwindow_setpos(windows[1].hwnd); @@ -285,10 +279,7 @@ static void test_setpos(void) windows[2].registered = TRUE; windows[2].to_be_deleted = FALSE; windows[2].edge = ABE_BOTTOM; - windows[2].desired_rect.left = 0; - windows[2].desired_rect.right = screen_width; - windows[2].desired_rect.top = screen_height - 10; - windows[2].desired_rect.bottom = screen_height; + SetRect(&windows[2].desired_rect, 0, screen_height - 10, screen_width, screen_height); SetWindowLongPtrA(windows[2].hwnd, GWLP_USERDATA, (LONG_PTR)&windows[2]); testwindow_setpos(windows[2].hwnd); @@ -299,10 +290,7 @@ static void test_setpos(void) /* move windows[2] to the right side of the screen */ windows[2].edge = ABE_RIGHT; - windows[2].desired_rect.left = screen_width - 15; - windows[2].desired_rect.right = screen_width; - windows[2].desired_rect.top = 0; - windows[2].desired_rect.bottom = screen_height; + SetRect(&windows[2].desired_rect, screen_width - 15, 0, screen_width, screen_height); testwindow_setpos(windows[2].hwnd); do_events_until(no_appbars_intersect); @@ -312,10 +300,7 @@ static void test_setpos(void) /* move windows[1] to the top of the screen */ windows[1].edge = ABE_TOP; - windows[1].desired_rect.left = 0; - windows[1].desired_rect.right = screen_width; - windows[1].desired_rect.top = 0; - windows[1].desired_rect.bottom = 15; + SetRect(&windows[1].desired_rect, 0, 0, screen_width, 15); testwindow_setpos(windows[1].hwnd); do_events_until(no_appbars_intersect); @@ -325,10 +310,7 @@ static void test_setpos(void) /* move windows[1] back to the bottom of the screen */ windows[1].edge = ABE_BOTTOM; - windows[1].desired_rect.left = 0; - windows[1].desired_rect.right = screen_width; - windows[1].desired_rect.top = screen_height - 10; - windows[1].desired_rect.bottom = screen_height; + SetRect(&windows[1].desired_rect, 0, screen_height - 10, screen_width, screen_height); testwindow_setpos(windows[1].hwnd); do_events_until(no_appbars_intersect); diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 3b22ffb..57f52c9 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -98,7 +98,7 @@ static HRESULT ebrowser_instantiate(IExplorerBrowser **peb) static HRESULT ebrowser_initialize(IExplorerBrowser *peb) { RECT rc; - rc.top = rc.left = 0; rc.bottom = rc.right = 500; + SetRect(&rc, 0, 0, 500, 500); return IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); } @@ -802,7 +802,7 @@ static void test_initialization(void) /* Initialize with a few different rectangles */ peb = NULL; ebrowser_instantiate(&peb); - rc.left = 50; rc.top = 20; rc.right = 100; rc.bottom = 80; + SetRect(&rc, 50, 20, 100, 80); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); hr = IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); @@ -861,7 +861,7 @@ static void test_initialization(void) ebrowser_instantiate(&peb); hr = IExplorerBrowser_SetOptions(peb, EBO_NOBORDER); ok(hr == S_OK, "got 0x%08x\n", hr); - rc.left = 50; rc.top = 20; rc.right = 100; rc.bottom = 80; + SetRect(&rc, 50, 20, 100, 80); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -889,7 +889,7 @@ static void test_initialization(void) ok(lres == 0, "Got refcount %d\n", lres); ebrowser_instantiate(&peb); - rc.left = -1; rc.top = -1; rc.right = 1; rc.bottom = 1; + SetRect(&rc, -1, -1, 1, 1); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); IExplorerBrowser_Destroy(peb); @@ -897,7 +897,7 @@ static void test_initialization(void) ok(lres == 0, "Got refcount %d\n", lres); ebrowser_instantiate(&peb); - rc.left = 10; rc.top = 10; rc.right = 5; rc.bottom = 5; + SetRect(&rc, 10, 10, 5, 5); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); IExplorerBrowser_Destroy(peb); @@ -905,7 +905,7 @@ static void test_initialization(void) ok(lres == 0, "Got refcount %d\n", lres); ebrowser_instantiate(&peb); - rc.left = 10; rc.top = 10; rc.right = 5; rc.bottom = 5; + SetRect(&rc, 10, 10, 5, 5); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "got (0x%08x)\n", hr); IExplorerBrowser_Destroy(peb); @@ -1105,12 +1105,12 @@ static void test_basics(void) hr = IExplorerBrowser_SetRect(peb, NULL, rc); ok(hr == S_OK, "got (0x%08x)\n", hr); - rc.left = 100; rc.top = 100; rc.right = 10; rc.bottom = 10; + SetRect(&rc, 100, 100, 10, 10); hr = IExplorerBrowser_SetRect(peb, NULL, rc); ok(hr == S_OK, "got (0x%08x)\n", hr); /* SetRect with DeferWindowPos */ - rc.left = rc.top = 0; rc.right = rc.bottom = 10; + SetRect(&rc, 0, 0, 10, 10); hdwp = BeginDeferWindowPos(1); hr = IExplorerBrowser_SetRect(peb, &hdwp, rc); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -1125,7 +1125,7 @@ static void test_basics(void) ok(!lres, "EndDeferWindowPos succeeded unexpectedly.\n"); /* Test positioning */ - rc.left = 10; rc.top = 20; rc.right = 50; rc.bottom = 50; + SetRect(&rc, 10, 20, 50, 50); hr = IExplorerBrowser_SetRect(peb, NULL, rc); ok(hr == S_OK, "got (0x%08x)\n", hr); hr = IExplorerBrowser_QueryInterface(peb, &IID_IShellBrowser, (void**)&psb); @@ -1715,7 +1715,7 @@ static void test_InputObject(void) hr = IInputObject_TranslateAcceleratorIO(pio, &msg_a); todo_wine ok(hr == E_FAIL, "Got 0x%08x\n", hr); - rc.left = 0; rc.top = 0; rc.right = 100; rc.bottom = 100; + SetRect(&rc, 0, 0, 100, 100); hr = IExplorerBrowser_Initialize(peb, hwnd, &rc, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 8b2b5b4..2c683e3 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -761,8 +761,7 @@ if (0) settings.ViewMode = FVM_ICON; settings.fFlags = 0; hwnd_view = (HWND)0xdeadbeef; - r.left = r.top = 0; - r.right = r.bottom = 100; + SetRect(&r, 0, 0, 100, 100); hr = IShellView_CreateViewWindow(view, NULL, &settings, browser, &r, &hwnd_view); ok(hr == S_OK, "got (0x%08x)\n", hr); ok(IsWindow(hwnd_view), "got %p\n", hwnd_view);

1 0

Huw Davies : gdi32: Use abs() on an integer argument to avoid a clang warning.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: bb4ead4c7cc7b285b16bb3432785f23736e5fb67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb4ead4c7cc7b285b16bb3432… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 12 12:33:13 2016 +0100 gdi32: Use abs() on an integer argument to avoid a clang warning. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/painting.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index f978001..32b6183 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -303,8 +303,8 @@ BOOL WINAPI ArcTo( HDC hdc, INT xstart, INT ystart, INT xend, INT yend ) { - double width = fabs(right-left), - height = fabs(bottom-top), + double width = abs( right - left ), + height = abs( bottom - top ), xradius = width/2, yradius = height/2, xcenter = right > left ? left+xradius : right+xradius,

1 0

Aaryaman Vasishta : d3drm/tests: Add tests for IDirect3DRM*::CreateObject.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 0e6578d16bb8d61a8746c1c3312475ef65b4b4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6578d16bb8d61a8746c1c33… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Apr 11 23:52:31 2016 +0530 d3drm/tests: Add tests for IDirect3DRM*::CreateObject. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index c94d31e..72691f7 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1238,6 +1238,107 @@ static void CDECL destroy_callback1(IDirect3DRMObject *obj, void *arg) ctxt->called++; } +static void test_object(void) +{ + static const struct + { + REFCLSID clsid; + REFIID iid; + } + tests[] = + { + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice2 }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMDevice3 }, + { &CLSID_CDirect3DRMDevice, &IID_IDirect3DRMWinDevice }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture2 }, + { &CLSID_CDirect3DRMTexture, &IID_IDirect3DRMTexture3 }, + { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport }, + { &CLSID_CDirect3DRMViewport, &IID_IDirect3DRMViewport2 }, + }; + IDirect3DRM *d3drm1; + IDirect3DRM2 *d3drm2; + IDirect3DRM3 *d3drm3; + IUnknown *unknown; + HRESULT hr; + ULONG ref1, ref2, ref3, ref4; + int i; + + hr = Direct3DRMCreate(&d3drm1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM interface (hr = %#x).\n", hr); + ref1 = get_refcount((IUnknown *)d3drm1); + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %#x).\n", hr); + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %#x).\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); + todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown); + todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL); + todo_wine ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#x.\n", i, hr); + + hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); + todo_wine ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); + if (SUCCEEDED(hr)) + { + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + IUnknown_Release(unknown); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + + hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); + ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + IUnknown_Release(unknown); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + + hr = IDirect3DRM3_CreateObject(d3drm3, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); + ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#x.\n", i, hr); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + IUnknown_Release(unknown); + ref2 = get_refcount((IUnknown *)d3drm1); + ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %u, ref2 = %u.\n", i, ref1, ref2); + ref3 = get_refcount((IUnknown *)d3drm2); + ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %u, ref3 = %u.\n", i, ref1, ref3); + ref4 = get_refcount((IUnknown *)d3drm3); + ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", i, ref1, ref4); + } + } + + IDirect3DRM_Release(d3drm1); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM3_Release(d3drm3); +} + static void test_Viewport(void) { struct destroy_context context; @@ -4287,6 +4388,7 @@ START_TEST(d3drm) test_Face(); test_Frame(); test_Device(); + test_object(); test_Viewport(); test_Light(); test_Material2();

1 0

Aaryaman Vasishta : d3drm/tests: Add tests for IDirect3DRMObject::Add/ DeleteDestroyCallback.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: e62475b0f1edd6959c3971ff8ebdef965b471bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62475b0f1edd6959c3971ff8… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Apr 11 23:52:32 2016 +0530 d3drm/tests: Add tests for IDirect3DRMObject::Add/DeleteDestroyCallback. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 240 ++++++++++++++++++++++------------------------- 1 file changed, 114 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e62475b0f1edd6959c397…

1 0

Alistair Leslie-Hughes : wininet: Free socket when connection is freed.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 5ee82583f7716c140a02c4eb043e80d64cd33c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee82583f7716c140a02c4eb0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 11 18:41:25 2016 +1000 wininet: Free socket when connection is freed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/netconnection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 7305860..63b84aa 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -396,6 +396,7 @@ void free_netconn(netconn_t *netconn) DeleteSecurityContext(&netconn->ssl_ctx); } + close_netconn(netconn); heap_free(netconn); }

1 0