August 2014 - Wine-Commits - list.winehq.org

Zhenbo Li : mshtml: Added IHTMLImgElement::isMap property implementation.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 5ee21f9a5256f326baeb1e61c886d5045e2f193a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee21f9a5256f326baeb1e61c… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Aug 18 17:01:55 2014 +0800 mshtml: Added IHTMLImgElement::isMap property implementation. --- dlls/mshtml/htmlimg.c | 30 ++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 21 +++++++++++++++++++++ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 212d01e..a793397 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -102,15 +102,37 @@ static HRESULT WINAPI HTMLImgElement_Invoke(IHTMLImgElement *iface, DISPID dispI static HRESULT WINAPI HTMLImgElement_put_isMap(IHTMLImgElement *iface, VARIANT_BOOL v) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLImageElement_SetIsMap(This->nsimg, v != VARIANT_FALSE); + if (NS_FAILED(nsres)) { + ERR("Set IsMap failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLImgElement_get_isMap(IHTMLImgElement *iface, VARIANT_BOOL *p) { HTMLImgElement *This = impl_from_IHTMLImgElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool b; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if (p == NULL) + return E_INVALIDARG; + + nsres = nsIDOMHTMLImageElement_GetIsMap(This->nsimg, &b); + if (NS_FAILED(nsres)) { + ERR("Get IsMap failed: %08x\n", nsres); + return E_FAIL; + } + *p = b ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLImgElement_put_useMap(IHTMLImgElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cfde7ac..86a9aa3 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2810,6 +2810,25 @@ static void _test_img_complete(unsigned line, IHTMLElement *elem, VARIANT_BOOL e IHTMLImgElement_Release(img); } +#define test_img_isMap(u, c) _test_img_isMap(__LINE__,u, c) +static void _test_img_isMap(unsigned line, IUnknown *unk, VARIANT_BOOL v) +{ + IHTMLImgElement *img = _get_img_iface(line, unk); + VARIANT_BOOL b = 100; + HRESULT hres; + + hres = IHTMLImgElement_put_isMap(img, v); + ok_(__FILE__,line) (hres == S_OK, "put_isMap failed: %08x\n", hres); + + hres = IHTMLImgElement_get_isMap(img, &b); + ok_(__FILE__,line) (hres == S_OK, "get_isMap failed: %08x\n", hres); + ok_(__FILE__,line) (b == v, "isMap = %x, expected %x\n", b, v); + + hres = IHTMLImgElement_get_isMap(img, NULL); + ok_(__FILE__,line) (hres == E_INVALIDARG, "ret = %08x, expected E_INVALIDARG\n", hres); + IHTMLImgElement_Release(img); +} + static void test_dynamic_properties(IHTMLElement *elem) { static const WCHAR attr1W[] = {'a','t','t','r','1',0}; @@ -6958,6 +6977,8 @@ static void test_elems(IHTMLDocument2 *doc) test_img_set_alt((IUnknown*)elem, "alt test"); test_img_name((IUnknown*)elem, "WineImg"); test_img_complete(elem, VARIANT_FALSE); + test_img_isMap((IUnknown*)elem, VARIANT_TRUE); + test_img_isMap((IUnknown*)elem, VARIANT_FALSE); IHTMLElement_Release(elem); }

1 0

André Hentschel : wpcap: Implement pcap_dispatch.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 927f8bee4669239408f8d44e5452014696c4f072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=927f8bee4669239408f8d44e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 22:47:44 2014 +0200 wpcap: Implement pcap_dispatch. --- dlls/wpcap/wpcap.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 29aa08c..b80a4e0 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -1,7 +1,7 @@ /* * WPcap.dll Proxy. * - * Copyright 2011 André Hentschel + * Copyright 2011, 2014 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +19,8 @@ */ #include <pcap/pcap.h> +#include "windef.h" +#include "winbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wpcap); @@ -37,6 +39,40 @@ int CDECL wine_pcap_datalink(pcap_t *p) return pcap_datalink(p); } +typedef struct +{ + void (CALLBACK *pfn_cb)(u_char *, const struct pcap_pkthdr *, const u_char *); + void *user_data; +} PCAP_HANDLER_CALLBACK; + +static void pcap_handler_callback(u_char *user_data, const struct pcap_pkthdr *h, const u_char *p) +{ + PCAP_HANDLER_CALLBACK *pcb; + TRACE("(%p %p %p)\n", user_data, h, p); + pcb = (PCAP_HANDLER_CALLBACK *)user_data; + pcb->pfn_cb(pcb->user_data, h, p); + HeapFree(GetProcessHeap(), 0, pcb); + TRACE("Callback COMPLETED\n"); +} + +int CDECL wine_pcap_dispatch(pcap_t *p, int cnt, + void (CALLBACK *callback)(u_char *, const struct pcap_pkthdr *, const u_char *), + unsigned char *user) +{ + TRACE("(%p %i %p %p)\n", p, cnt, callback, user); + + if (callback) + { + PCAP_HANDLER_CALLBACK *pcb; + pcb = HeapAlloc(GetProcessHeap(), 0, sizeof(PCAP_HANDLER_CALLBACK)); + pcb->pfn_cb = callback; + pcb->user_data = user; + return pcap_dispatch(p, cnt, pcap_handler_callback, (unsigned char*)pcb); + } + + return pcap_dispatch(p, cnt, NULL, user); +} + int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) { int ret; diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 6dd67a1..92b5052 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -15,7 +15,7 @@ @ stub pcap_datalink_name_to_val @ stub pcap_datalink_val_to_description @ stub pcap_datalink_val_to_name -@ stub pcap_dispatch +@ cdecl pcap_dispatch(ptr long ptr ptr) wine_pcap_dispatch @ stub pcap_dump @ stub pcap_dump_close @ stub pcap_dump_file

1 0

André Hentschel : wpcap: Implement pcap_snapshot.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: eaad4fea8912589d22fb6c9b6d894c37db06f31e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaad4fea8912589d22fb6c9b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 15 21:54:03 2014 +0200 wpcap: Implement pcap_snapshot. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index f5402a4..29aa08c 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -118,6 +118,12 @@ int CDECL wine_pcap_setfilter(pcap_t *p, struct bpf_program *fp) return pcap_setfilter(p, fp); } +int CDECL wine_pcap_snapshot(pcap_t *p) +{ + TRACE("(%p)\n", p); + return pcap_snapshot(p); +} + int CDECL wine_pcap_stats(pcap_t *p, struct pcap_stat *ps) { TRACE("(%p %p)\n", p, ps); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 2af9197..6dd67a1 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -71,7 +71,7 @@ @ stub pcap_setnonblock @ stub pcap_setsampling @ stub pcap_setuserbuffer -@ stub pcap_snapshot +@ cdecl pcap_snapshot(ptr) wine_pcap_snapshot @ cdecl pcap_stats(ptr ptr) wine_pcap_stats @ stub pcap_stats_ex @ stub pcap_strerror

1 0

Henri Verbeet : d3d9: wined3d_device_get_available_texture_mem() returns a UINT.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 888b278096cd773241cad9a107314c22addaa53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=888b278096cd773241cad9a10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:19 2014 +0200 d3d9: wined3d_device_get_available_texture_mem() returns a UINT. --- dlls/d3d9/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1117138..7d41e4e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -343,15 +343,15 @@ static HRESULT WINAPI d3d9_device_TestCooperativeLevel(IDirect3DDevice9Ex *iface static UINT WINAPI d3d9_device_GetAvailableTextureMem(IDirect3DDevice9Ex *iface) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + UINT ret; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_get_available_texture_mem(device->wined3d_device); + ret = wined3d_device_get_available_texture_mem(device->wined3d_device); wined3d_mutex_unlock(); - return hr; + return ret; } static HRESULT WINAPI d3d9_device_EvictManagedResources(IDirect3DDevice9Ex *iface)

1 0

Henri Verbeet : d3d8: wined3d_device_get_available_texture_mem() returns a UINT.
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 8fe8495908e416fea8222fae2d93e7af4c5db21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fe8495908e416fea8222fae2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:18 2014 +0200 d3d8: wined3d_device_get_available_texture_mem() returns a UINT. --- dlls/d3d8/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3ee43f0..8458583 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -400,15 +400,15 @@ static HRESULT WINAPI d3d8_device_TestCooperativeLevel(IDirect3DDevice8 *iface) static UINT WINAPI d3d8_device_GetAvailableTextureMem(IDirect3DDevice8 *iface) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; + UINT ret; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_get_available_texture_mem(device->wined3d_device); + ret = wined3d_device_get_available_texture_mem(device->wined3d_device); wined3d_mutex_unlock(); - return hr; + return ret; } static HRESULT WINAPI d3d8_device_ResourceManagerDiscardBytes(IDirect3DDevice8 *iface, DWORD byte_count)

1 0

Henri Verbeet : ddraw: Clamp video memory to UINT_MAX in ddraw7_GetAvailableVidMem().
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 1fb7ccdc1351d00ea64f20e1d5f914bd4848bdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fb7ccdc1351d00ea64f20e1d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 18 08:26:17 2014 +0200 ddraw: Clamp video memory to UINT_MAX in ddraw7_GetAvailableVidMem(). --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index df74122..5f0070a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1926,7 +1926,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C struct wined3d_adapter_identifier desc = {0}; hr = wined3d_get_adapter_identifier(ddraw->wined3d, WINED3DADAPTER_DEFAULT, 0, &desc); - *total = desc.video_memory; + *total = min(UINT_MAX, desc.video_memory); } wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f5248cc..374c273 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -20,6 +20,7 @@ #define __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H #include <assert.h> +#include <limits.h> #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION

1 0

Nikolay Sivov : oleaut32/tests: Remove duplicate code blocks (PVS-Studio).
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: b378baedaa23dd66f7fd0e122feda7323ebc819f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b378baedaa23dd66f7fd0e122… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 13:04:17 2014 +0400 oleaut32/tests: Remove duplicate code blocks (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 804fb76..6acd4e2 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2902,9 +2902,6 @@ static void test_VarMod(void) } else if((l == VT_VARIANT) || (r == VT_VARIANT)) { hexpected = DISP_E_BADVARTYPE; - } else if(lFound && !rFound) - { - hexpected = DISP_E_BADVARTYPE; } else if(!lFound && !rFound) { hexpected = DISP_E_BADVARTYPE;

1 0

Nikolay Sivov : mshtml: Free buffer for empty strings too (PVS-Studio).
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 2ee84d5ae21868fbc74efb6e6f99c2bbdf011dbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ee84d5ae21868fbc74efb6e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 13:53:13 2014 +0400 mshtml: Free buffer for empty strings too (PVS-Studio). --- dlls/mshtml/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index ea8cea6..ca01288 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -375,7 +375,7 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite (void**)&uihandler2); if(SUCCEEDED(hres)) { hres = IDocHostUIHandler2_GetOverrideKeyPath(uihandler2, &override_key_path, 0); - if(hres == S_OK && override_key_path && override_key_path[0]) { + if(hres == S_OK && override_key_path) { if(override_key_path[0]) { /*FIXME: use override_key_path */ FIXME("override_key_path = %s\n", debugstr_w(override_key_path));

1 0

Nikolay Sivov : odbccp32/tests: Remove test of always true conditions ( PVS-Studio).
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 44677f2f7847d78dc20f4ce8cb29df1262c18a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=44677f2f7847d78dc20f4ce8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 13:20:49 2014 +0400 odbccp32/tests: Remove test of always true conditions (PVS-Studio). --- dlls/odbccp32/tests/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 40846e5..cfe9532 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -36,11 +36,11 @@ static void test_SQLConfigMode(void) bool_ret = SQLGetConfigMode(&config_mode); ok(bool_ret && config_mode == ODBC_BOTH_DSN, "Failed to get the initial SQLGetConfigMode or it was not both\n"); - bool_ret = SQLSetConfigMode(3); + /* try to set invalid mode */ + bool_ret = SQLSetConfigMode(ODBC_SYSTEM_DSN+1); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); ok(!bool_ret && sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_PARAM_SEQUENCE, "SQLSetConfigMode with invalid argument did not fail correctly\n"); - ok (ODBC_SYSTEM_DSN == 2 && ODBC_USER_DSN == 1 && ODBC_BOTH_DSN == 0, "SQLSetConfigMode modes not as expected\n"); for (i = ODBC_SYSTEM_DSN; i >= ODBC_BOTH_DSN; --i) { ok(SQLSetConfigMode((UWORD)i), "SQLSetConfigMode Failed to set config mode\n");

1 0

Nikolay Sivov : comctl32/pager: Reduce pointer scope so it doesn' t point to inner scope vars (PVS-Studio).
by Alexandre Julliard Aug. 18, 2014

Aug. 18, 2014

Module: wine Branch: master Commit: 5741ebb8fdc5034734cfb96465e5f97ff326a18e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5741ebb8fdc5034734cfb9646… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 16 11:30:01 2014 +0400 comctl32/pager: Reduce pointer scope so it doesn't point to inner scope vars (PVS-Studio). --- dlls/comctl32/pager.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 74bca5e..bd9eb68 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -753,7 +753,7 @@ static LRESULT PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) { POINT clpt, pt; - RECT wnrect, *btnrect = NULL; + RECT wnrect; BOOL topLeft = FALSE; INT btnstate = 0; INT hit; @@ -766,8 +766,9 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) ClientToScreen(infoPtr->hwndSelf, &pt); GetWindowRect(infoPtr->hwndSelf, &wnrect); if (PtInRect(&wnrect, pt)) { - RECT TLbtnrect, BRbtnrect; - PAGER_GetButtonRects(infoPtr, &TLbtnrect, &BRbtnrect, FALSE); + RECT topleft, bottomright, *rect = NULL; + + PAGER_GetButtonRects(infoPtr, &topleft, &bottomright, FALSE); clpt = pt; MapWindowPoints(0, infoPtr->hwndSelf, &clpt, 1); @@ -775,23 +776,23 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) if ((hit == PGB_TOPORLEFT) && (infoPtr->TLbtnState == PGF_NORMAL)) { topLeft = TRUE; - btnrect = &TLbtnrect; + rect = &topleft; infoPtr->TLbtnState = PGF_HOT; btnstate = infoPtr->TLbtnState; } else if ((hit == PGB_BOTTOMORRIGHT) && (infoPtr->BRbtnState == PGF_NORMAL)) { topLeft = FALSE; - btnrect = &BRbtnrect; + rect = &bottomright; infoPtr->BRbtnState = PGF_HOT; btnstate = infoPtr->BRbtnState; } /* If in one of the buttons the capture and draw buttons */ - if (btnrect) + if (rect) { TRACE("[%p] draw btn (%s), Capture %s, style %08x\n", - infoPtr->hwndSelf, wine_dbgstr_rect(btnrect), + infoPtr->hwndSelf, wine_dbgstr_rect(rect), (infoPtr->bCapture) ? "TRUE" : "FALSE", infoPtr->dwStyle); if (!infoPtr->bCapture) @@ -804,7 +805,7 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y) SetTimer(infoPtr->hwndSelf, TIMERID1, 0x3e, 0); hdc = GetWindowDC(infoPtr->hwndSelf); /* OffsetRect(wnrect, 0 | 1, 0 | 1) */ - PAGER_DrawButton(hdc, infoPtr->clrBk, *btnrect, + PAGER_DrawButton(hdc, infoPtr->clrBk, *rect, infoPtr->dwStyle & PGS_HORZ, topLeft, btnstate); ReleaseDC(infoPtr->hwndSelf, hdc); return 0;

1 0