September 2013 - Wine-commits

Jacek Caban : mshtml: Added IHTMLEventObj::x implementation.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: c24767262b296514c42defe14de2a4a4637b1f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24767262b296514c42defe14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 14:18:04 2013 +0200 mshtml: Added IHTMLEventObj::x implementation. --- dlls/mshtml/htmlevent.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9ea1708..ec56029 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -621,10 +622,24 @@ static HRESULT WINAPI HTMLEventObj_get_reason(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); + LONG x = 0; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); - *p = -1; + if(This->nsevent) { + nsIDOMUIEvent *ui_event; + nsresult nsres; + + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); + if(NS_SUCCEEDED(nsres)) { + /* NOTE: pageX is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageX(ui_event, &x); + assert(nsres == NS_OK); + nsIDOMUIEvent_Release(ui_event); + } + } + + *p = x; return S_OK; }

1 0

Jacek Caban : mshtml: Added IHTMLEventObj::y implementation.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 93f9d824ebecccccb0f135c324dc35eaad352fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f9d824ebecccccb0f135c32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 14:18:14 2013 +0200 mshtml: Added IHTMLEventObj::y implementation. --- dlls/mshtml/htmlevent.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ec56029..a7b2969 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -646,10 +646,24 @@ static HRESULT WINAPI HTMLEventObj_get_x(IHTMLEventObj *iface, LONG *p) static HRESULT WINAPI HTMLEventObj_get_y(IHTMLEventObj *iface, LONG *p) { HTMLEventObj *This = impl_from_IHTMLEventObj(iface); + LONG y = 0; - FIXME("(%p)->(%p)\n", This, p); + TRACE("(%p)->(%p)\n", This, p); + + if(This->nsevent) { + nsIDOMUIEvent *ui_event; + nsresult nsres; - *p = -1; + nsres = nsIDOMEvent_QueryInterface(This->nsevent, &IID_nsIDOMUIEvent, (void**)&ui_event); + if(NS_SUCCEEDED(nsres)) { + /* NOTE: pageY is not exactly right here. */ + nsres = nsIDOMUIEvent_GetPageY(ui_event, &y); + assert(nsres == NS_OK); + nsIDOMUIEvent_Release(ui_event); + } + } + + *p = y; return S_OK; }

1 0

Jacek Caban : mshtml: Added IHTMLStyle6::outline property implementation.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 6d13dd697c99ebf6fa603c637234a09b14315720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d13dd697c99ebf6fa603c637… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 16:05:34 2013 +0200 mshtml: Added IHTMLStyle6::outline property implementation. --- dlls/mshtml/htmlstyle.c | 5 ++++- dlls/mshtml/htmlstyle.h | 2 ++ dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 053c326..5ed2f93 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -135,6 +135,8 @@ static const WCHAR attrMarginTop[] = {'m','a','r','g','i','n','-','t','o','p',0}; static const WCHAR attrMinHeight[] = {'m','i','n','-','h','e','i','g','h','t',0}; +static const WCHAR attrOutline[] = + {'o','u','t','l','i','n','e',0}; static const WCHAR attrOverflow[] = {'o','v','e','r','f','l','o','w',0}; static const WCHAR attrOverflowX[] = @@ -241,6 +243,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, {attrMarginTop, DISPID_IHTMLSTYLE_MARGINTOP}, {attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT}, + {attrOutline, DISPID_IHTMLSTYLE6_OUTLINE}, {attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW}, {attrOverflowX, DISPID_IHTMLSTYLE2_OVERFLOWX}, {attrOverflowY, DISPID_IHTMLSTYLE2_OVERFLOWY}, @@ -464,7 +467,7 @@ static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) DWORD len; if(!*val) { - *p = NULL; + *p = (flags & ATTR_NO_NULL) ? SysAllocStringLen(NULL, 0) : NULL; return S_OK; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 4f2e5ab..646375f 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -83,6 +83,7 @@ typedef enum { STYLEID_MARGIN_RIGHT, STYLEID_MARGIN_TOP, STYLEID_MIN_HEIGHT, + STYLEID_OUTLINE, STYLEID_OVERFLOW, STYLEID_OVERFLOW_X, STYLEID_OVERFLOW_Y, @@ -123,3 +124,4 @@ HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, #define ATTR_STR_TO_INT 0x0004 #define ATTR_HEX_INT 0x0008 #define ATTR_REMOVE_COMMA 0x0010 +#define ATTR_NO_NULL 0x0020 diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 912d80c..116181c 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -702,15 +702,19 @@ static HRESULT WINAPI HTMLStyle6_get_counterReset(IHTMLStyle6 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle6_put_outline(IHTMLStyle6 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_OUTLINE, v, 0); } static HRESULT WINAPI HTMLStyle6_get_outline(IHTMLStyle6 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_OUTLINE, p, ATTR_NO_NULL); } static HRESULT WINAPI HTMLStyle6_put_outlineWidth(IHTMLStyle6 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index e42bcb7..71eb955 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -37,6 +37,13 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } +static BOOL wstr_contains(const WCHAR *strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return strstr(buf, stra) != NULL; +} + static BSTR a2bstr(const char *str) { BSTR ret; @@ -464,11 +471,35 @@ static void test_style4(IHTMLStyle4 *style4) VariantClear(&vdefault); } +static void test_style6(IHTMLStyle6 *style) +{ + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLStyle6_get_outline(style, &str); + ok(hres == S_OK, "get_outline failed: %08x\n", hres); + ok(str && !*str, "outline = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("1px"); + hres = IHTMLStyle6_put_outline(style, str); + ok(hres == S_OK, "put_outline failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle6_get_outline(style, &str); + ok(hres == S_OK, "get_outline failed: %08x\n", hres); + ok(wstr_contains(str, "1px"), "outline = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_body_style(IHTMLStyle *style) { IHTMLStyle2 *style2; IHTMLStyle3 *style3; IHTMLStyle4 *style4; + IHTMLStyle6 *style6; VARIANT_BOOL b; VARIANT v; BSTR str; @@ -2064,6 +2095,14 @@ static void test_body_style(IHTMLStyle *style) test_style4(style4); IHTMLStyle4_Release(style4); } + + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle6, (void**)&style6); + if(SUCCEEDED(hres)) { + test_style6(style6); + IHTMLStyle6_Release(style6); + }else { + win_skip("IHTMLStyle6 not available\n"); + } } #define test_style_filter(a,b) _test_style_filter(__LINE__,a,b)

1 0

Bruno Jesus : ws2_32/tests: Fix an ok() call comment.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: d811747a148224c7ec7f8ada0da606679d4bbda7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d811747a148224c7ec7f8ada0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 28 11:57:50 2013 -0300 ws2_32/tests: Fix an ok() call comment. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b085f0b..705981d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5814,7 +5814,7 @@ static void test_getpeername(void) sa_len = 0; ret = getpeername(sock, (struct sockaddr*)&sa_out, &sa_len); - ok(ret == SOCKET_ERROR, "Expected getpeername to return 0, got %d\n", ret); + ok(ret == SOCKET_ERROR, "Expected getpeername to return SOCKET_ERROR, got %d\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Expected WSAGetLastError() to return WSAEFAULT, got %d\n", WSAGetLastError());

1 0

Bruno Jesus : include: Move struct WSABUF and WSAMSG to ws2def.h.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 266811b88e9108fe3dd3c727f931e6ee780c5d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=266811b88e9108fe3dd3c727f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 28 11:58:04 2013 -0300 include: Move struct WSABUF and WSAMSG to ws2def.h. --- include/mswsock.h | 9 --------- include/winsock2.h | 6 ------ include/ws2def.h | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/mswsock.h b/include/mswsock.h index 610dd2c..3e41345 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -157,15 +157,6 @@ typedef struct _TRANSMIT_PACKETS_ELEMENT { } DUMMYUNIONNAME; } TRANSMIT_PACKETS_ELEMENT, *PTRANSMIT_PACKETS_ELEMENT, *LPTRANSMIT_PACKETS_ELEMENT; -typedef struct _WSAMSG { - LPSOCKADDR name; - INT namelen; - LPWSABUF lpBuffers; - DWORD dwBufferCount; - WSABUF Control; - DWORD dwFlags; -} WSAMSG, *PWSAMSG, *LPWSAMSG; - typedef struct _WSACMSGHDR { SIZE_T cmsg_len; INT cmsg_level; diff --git a/include/winsock2.h b/include/winsock2.h index 7516d25..c4e013b 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -345,12 +345,6 @@ DECL_WINELIB_TYPE_AW(WSASERVICECLASSINFO) DECL_WINELIB_TYPE_AW(PWSASERVICECLASSINFO) DECL_WINELIB_TYPE_AW(LPWSASERVICECLASSINFO) -typedef struct _WSABUF -{ - ULONG len; - CHAR* buf; -} WSABUF, *LPWSABUF; - #define WSAEVENT HANDLE #define LPWSAEVENT LPHANDLE #define WSAOVERLAPPED OVERLAPPED diff --git a/include/ws2def.h b/include/ws2def.h index ac68e2b..6255c68 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -78,6 +78,21 @@ typedef enum { ScopeLevelGlobal = 14 } SCOPE_LEVEL; +typedef struct _WSABUF +{ + ULONG len; + CHAR* buf; +} WSABUF, *LPWSABUF; + +typedef struct _WSAMSG { + LPSOCKADDR name; + INT namelen; + LPWSABUF lpBuffers; + DWORD dwBufferCount; + WSABUF Control; + DWORD dwFlags; +} WSAMSG, *PWSAMSG, *LPWSAMSG; + /* * Macros for retrieving control message data returned by WSARecvMsg() */

1 0

Thomas Faber : comctl32: Remove superfluous const from DPA/ DSA function signatures.
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 43dd359ebe7649da81c5b69a6a95594ac4f14db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dd359ebe7649da81c5b69a6… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Sep 28 17:18:03 2013 +0200 comctl32: Remove superfluous const from DPA/DSA function signatures. --- dlls/comctl32/dpa.c | 20 ++++++++++---------- dlls/comctl32/dsa.c | 14 +++++++------- dlls/comctl32/tests/dpa.c | 20 ++++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index dbe9bf8..11dd14f 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -174,7 +174,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, * NOTES * No more information available yet! */ -HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, PFNDPASTREAM saveProc, +HRESULT WINAPI DPA_SaveStream (HDPA hDpa, PFNDPASTREAM saveProc, IStream *pStream, LPVOID pData) { LARGE_INTEGER position; @@ -397,7 +397,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DPA_Destroy (const HDPA hdpa) +BOOL WINAPI DPA_Destroy (HDPA hdpa) { TRACE("(%p)\n", hdpa); @@ -471,7 +471,7 @@ BOOL WINAPI DPA_Grow (HDPA hdpa, INT nGrow) * - If 'hdpa' is a NULL-Pointer, the original implementation crashes, * this implementation just returns NULL. */ -HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew) +HDPA WINAPI DPA_Clone (const HDPA hdpa, HDPA hdpaNew) { INT nNewItems, nSize; HDPA hdpaTemp; @@ -528,7 +528,7 @@ HDPA WINAPI DPA_Clone (const HDPA hdpa, const HDPA hdpaNew) * Success: pointer * Failure: NULL */ -LPVOID WINAPI DPA_GetPtr (const HDPA hdpa, INT nIndex) +LPVOID WINAPI DPA_GetPtr (HDPA hdpa, INT nIndex) { TRACE("(%p %d)\n", hdpa, nIndex); @@ -592,7 +592,7 @@ INT WINAPI DPA_GetPtrIndex (HDPA hdpa, LPCVOID p) * Success: index of the inserted pointer * Failure: -1 */ -INT WINAPI DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p) +INT WINAPI DPA_InsertPtr (HDPA hdpa, INT i, LPVOID p) { TRACE("(%p %d %p)\n", hdpa, i, p); @@ -627,7 +627,7 @@ INT WINAPI DPA_InsertPtr (const HDPA hdpa, INT i, LPVOID p) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p) +BOOL WINAPI DPA_SetPtr (HDPA hdpa, INT i, LPVOID p) { LPVOID *lpTemp; @@ -678,7 +678,7 @@ BOOL WINAPI DPA_SetPtr (const HDPA hdpa, INT i, LPVOID p) * Success: deleted pointer * Failure: NULL */ -LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i) +LPVOID WINAPI DPA_DeletePtr (HDPA hdpa, INT i) { LPVOID *lpDest, *lpSrc, lpTemp = NULL; INT nSize; @@ -731,7 +731,7 @@ LPVOID WINAPI DPA_DeletePtr (const HDPA hdpa, INT i) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DPA_DeleteAllPtrs (const HDPA hdpa) +BOOL WINAPI DPA_DeleteAllPtrs (HDPA hdpa) { TRACE("(%p)\n", hdpa); @@ -814,7 +814,7 @@ static VOID DPA_QuickSort (LPVOID *lpPtrs, INT l, INT r, * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) +BOOL WINAPI DPA_Sort (HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) { if (!hdpa || !pfnCompare) return FALSE; @@ -846,7 +846,7 @@ BOOL WINAPI DPA_Sort (const HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) * Success: index of the pointer in the array. * Failure: -1 */ -INT WINAPI DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart, +INT WINAPI DPA_Search (HDPA hdpa, LPVOID pFind, INT nStart, PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions) { if (!hdpa || !pfnCompare || !pFind) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index 13f63e2..71837db 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -100,7 +100,7 @@ HDSA WINAPI DSA_Create (INT nSize, INT nGrow) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DSA_Destroy (const HDSA hdsa) +BOOL WINAPI DSA_Destroy (HDSA hdsa) { TRACE("(%p)\n", hdsa); @@ -128,7 +128,7 @@ BOOL WINAPI DSA_Destroy (const HDSA hdsa) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest) +BOOL WINAPI DSA_GetItem (HDSA hdsa, INT nIndex, LPVOID pDest) { LPVOID pSrc; @@ -159,7 +159,7 @@ BOOL WINAPI DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest) * Success: pointer to an item * Failure: NULL */ -LPVOID WINAPI DSA_GetItemPtr (const HDSA hdsa, INT nIndex) +LPVOID WINAPI DSA_GetItemPtr (HDSA hdsa, INT nIndex) { LPVOID pSrc; @@ -192,7 +192,7 @@ LPVOID WINAPI DSA_GetItemPtr (const HDSA hdsa, INT nIndex) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) +BOOL WINAPI DSA_SetItem (HDSA hdsa, INT nIndex, LPVOID pSrc) { INT nSize, nNewItems; LPVOID pDest, lpTemp; @@ -248,7 +248,7 @@ BOOL WINAPI DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) * Success: position of the new item * Failure: -1 */ -INT WINAPI DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) +INT WINAPI DSA_InsertItem (HDSA hdsa, INT nIndex, LPVOID pSrc) { INT nNewItems, nSize; LPVOID lpTemp, lpDest; @@ -309,7 +309,7 @@ INT WINAPI DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc) * Success: number of the deleted element * Failure: -1 */ -INT WINAPI DSA_DeleteItem (const HDSA hdsa, INT nIndex) +INT WINAPI DSA_DeleteItem (HDSA hdsa, INT nIndex) { LPVOID lpDest,lpSrc; INT nSize; @@ -361,7 +361,7 @@ INT WINAPI DSA_DeleteItem (const HDSA hdsa, INT nIndex) * Success: TRUE * Failure: FALSE */ -BOOL WINAPI DSA_DeleteAllItems (const HDSA hdsa) +BOOL WINAPI DSA_DeleteAllItems (HDSA hdsa) { TRACE("(%p)\n", hdsa); diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index e359139..644f3aa 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -40,24 +40,24 @@ typedef struct _STREAMDATA DWORD dwItems; } STREAMDATA, *PSTREAMDATA; -static HDPA (WINAPI *pDPA_Clone)(const HDPA,const HDPA); +static HDPA (WINAPI *pDPA_Clone)(const HDPA,HDPA); static HDPA (WINAPI *pDPA_Create)(INT); static HDPA (WINAPI *pDPA_CreateEx)(INT,HANDLE); -static PVOID (WINAPI *pDPA_DeleteAllPtrs)(const HDPA); -static PVOID (WINAPI *pDPA_DeletePtr)(const HDPA,INT); -static BOOL (WINAPI *pDPA_Destroy)(const HDPA); +static PVOID (WINAPI *pDPA_DeleteAllPtrs)(HDPA); +static PVOID (WINAPI *pDPA_DeletePtr)(HDPA,INT); +static BOOL (WINAPI *pDPA_Destroy)(HDPA); static VOID (WINAPI *pDPA_DestroyCallback)(HDPA,PFNDPAENUMCALLBACK,PVOID); static VOID (WINAPI *pDPA_EnumCallback)(HDPA,PFNDPAENUMCALLBACK,PVOID); -static INT (WINAPI *pDPA_GetPtr)(const HDPA,INT); -static INT (WINAPI *pDPA_GetPtrIndex)(const HDPA,PVOID); +static INT (WINAPI *pDPA_GetPtr)(HDPA,INT); +static INT (WINAPI *pDPA_GetPtrIndex)(HDPA,PVOID); static BOOL (WINAPI *pDPA_Grow)(HDPA,INT); -static INT (WINAPI *pDPA_InsertPtr)(const HDPA,INT,PVOID); +static INT (WINAPI *pDPA_InsertPtr)(HDPA,INT,PVOID); static HRESULT (WINAPI *pDPA_LoadStream)(HDPA*,PFNDPASTREAM,IStream*,LPVOID); -static BOOL (WINAPI *pDPA_Merge)(const HDPA,const HDPA,DWORD,PFNDPACOMPARE,PFNDPAMERGE,LPARAM); +static BOOL (WINAPI *pDPA_Merge)(HDPA,HDPA,DWORD,PFNDPACOMPARE,PFNDPAMERGE,LPARAM); static HRESULT (WINAPI *pDPA_SaveStream)(HDPA,PFNDPASTREAM,IStream*,LPVOID); static INT (WINAPI *pDPA_Search)(HDPA,PVOID,INT,PFNDPACOMPARE,LPARAM,UINT); -static BOOL (WINAPI *pDPA_SetPtr)(const HDPA,INT,PVOID); -static BOOL (WINAPI *pDPA_Sort)(const HDPA,PFNDPACOMPARE,LPARAM); +static BOOL (WINAPI *pDPA_SetPtr)(HDPA,INT,PVOID); +static BOOL (WINAPI *pDPA_Sort)(HDPA,PFNDPACOMPARE,LPARAM); #define COMCTL32_GET_PROC(func, ord) \ ((p ## func = (PVOID)GetProcAddress(hcomctl32,(LPCSTR)ord)) ? 1 \

1 0

Marcus Meissner : shell32: Fixed wrong sizeof() in ZeroMemory (Coverity).
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 1440c54b99ab92d74ba577bd66c7399c9db26e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1440c54b99ab92d74ba577bd6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 11:07:14 2013 +0200 shell32: Fixed wrong sizeof() in ZeroMemory (Coverity). --- dlls/shell32/pidl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index a712504..2be47a8 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1182,7 +1182,7 @@ HRESULT WINAPI SHGetDataFromIDListW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, if (len < sizeof(WIN32_FIND_DATAW)) return E_INVALIDARG; - ZeroMemory(pfd, sizeof (WIN32_FIND_DATAA)); + ZeroMemory(pfd, sizeof (WIN32_FIND_DATAW)); _ILGetFileDateTime( pidl, &(pfd->ftLastWriteTime)); pfd->dwFileAttributes = _ILGetFileAttributes(pidl, NULL, 0); pfd->nFileSizeLow = _ILGetFileSize ( pidl, NULL, 0);

1 0

Marcus Meissner : netstat: Allocate WCHARs not CHARs (Coverity).
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: e7858100d6f5021e6409283f9e2157979693e285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7858100d6f5021e6409283f9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 10:52:04 2013 +0200 netstat: Allocate WCHARs not CHARs (Coverity). --- programs/netstat/netstat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index fab39e3..0e52c36 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -90,7 +90,7 @@ static int __cdecl NETSTAT_wprintf(const WCHAR *format, ...) */ if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); + MAX_WRITECONSOLE_SIZE*sizeof(WCHAR)); if (!output_bufW) { WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); return 0;

1 0

Marcus Meissner : wined3d: Fixed sizeof() to HeapAlloc (Coverity).
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 0c9ce583bcf78e531af92f351557e767892c7616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c9ce583bcf78e531af92f351… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 12:55:11 2013 +0200 wined3d: Fixed sizeof() to HeapAlloc (Coverity). --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 631c2ea..282c2d0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3988,7 +3988,7 @@ static DWORD find_input_signature(struct shader_arb_priv *priv, const struct win TRACE("Found existing signature %u\n", found_sig->idx); return found_sig->idx; } - found_sig = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*sig)); + found_sig = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*found_sig)); found_sig->sig = clone_sig(sig); found_sig->idx = priv->ps_sig_number++; TRACE("New signature stored and assigned number %u\n", found_sig->idx);

1 0

Marcus Meissner : attrib: Fixed an allocation size (Coverity).
by Alexandre Julliard 30 Sep '13

30 Sep '13

Module: wine Branch: master Commit: 7c8c90abbb1e76ef391d3a80d690e9db9adf7c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c8c90abbb1e76ef391d3a80d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 29 13:01:51 2013 +0200 attrib: Fixed an allocation size (Coverity). --- programs/attrib/attrib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 443a0c0..4342779 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -68,7 +68,7 @@ static int __cdecl ATTRIB_wprintf(const WCHAR *format, ...) */ if (!output_bufW) output_bufW = HeapAlloc(GetProcessHeap(), 0, - MAX_WRITECONSOLE_SIZE); + MAX_WRITECONSOLE_SIZE*sizeof(WCHAR)); if (!output_bufW) { WINE_FIXME("Out of memory - could not allocate 2 x 64K buffers\n"); return 0;

1 0