December 2014 - Wine-Commits

Nikolay Sivov : comctl32/tests: Fix imagelist leak (Valgrind).
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 44dbf381a73b21ca34c3f9aa7f5af79203d7a935 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44dbf381a73b21ca34c3f9aa7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 1 08:16:39 2014 +0300 comctl32/tests: Fix imagelist leak (Valgrind). --- dlls/comctl32/tests/imagelist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 921a16a..6f13846 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -295,6 +295,7 @@ static void test_begindrag(void) drag = ImageList_GetDragImage(NULL, NULL); ok(ret && drag, "ImageList drag was created\n"); ImageList_EndDrag(); + ImageList_Destroy(himl); } static void test_hotspot(void)

1 0

Jacek Caban : mshtml: Added support for flag 2 in getAttribute.
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 1454e302a80c218343420a7402da4d6e2dec4c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1454e302a80c218343420a740… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 1 12:55:51 2014 +0100 mshtml: Added support for flag 2 in getAttribute. --- dlls/mshtml/htmlelem.c | 35 +++++++++++++++++++++++++++++++---- dlls/mshtml/tests/jstest.html | 12 ++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 48fff3f..f81ccee 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -606,6 +606,10 @@ static HRESULT WINAPI HTMLElement_Invoke(IHTMLElement *iface, DISPID dispIdMembe wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } +#define ATTRFLAG_CASESENSITIVE 0x0001 +#define ATTRFLAG_ASSTRING 0x0002 +#define ATTRFLAG_EXPANDURL 0x0004 + static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttributeName, VARIANT AttributeValue, LONG lFlags) { @@ -618,7 +622,7 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), debugstr_variant(&AttributeValue), lFlags); hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - (lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); + (lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive) | fdexNameEnsure, &dispid); if(FAILED(hres)) return hres; @@ -647,8 +651,11 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr TRACE("(%p)->(%s %08x %p)\n", This, debugstr_w(strAttributeName), lFlags, AttributeValue); + if(lFlags & ~(ATTRFLAG_CASESENSITIVE|ATTRFLAG_ASSTRING)) + FIXME("Unsuported flags %x\n", lFlags); + hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); + lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &dispid); if(hres == DISP_E_UNKNOWNNAME) { V_VT(AttributeValue) = VT_NULL; return S_OK; @@ -659,8 +666,28 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr return hres; } - return IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, + hres = IDispatchEx_InvokeEx(&This->node.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYGET, &dispParams, AttributeValue, &excep, NULL); + if(FAILED(hres)) + return hres; + + if(lFlags & ATTRFLAG_ASSTRING) { + switch(V_VT(AttributeValue)) { + case VT_BSTR: + break; + case VT_DISPATCH: + IDispatch_Release(V_DISPATCH(AttributeValue)); + V_VT(AttributeValue) = VT_BSTR; + V_BSTR(AttributeValue) = SysAllocString(NULL); + break; + default: + hres = VariantChangeType(AttributeValue, AttributeValue, 0, VT_BSTR); + if(FAILED(hres)) + return hres; + } + } + + return S_OK; } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName, @@ -673,7 +700,7 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); hres = IDispatchEx_GetDispID(&This->node.dispex.IDispatchEx_iface, strAttributeName, - lFlags&1 ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); + lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); if(hres == DISP_E_UNKNOWNNAME) { *pfSuccess = VARIANT_FALSE; return S_OK; diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 39cdae5..2b3634e 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -148,12 +148,16 @@ function test_attrs() { x = input.getAttribute("style"); ok(x === s, "getAttribute('style') = " + x); ok(s.cssText === "", "s.cssText = " + s.cssText); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); input.setAttribute("style", "display: none"); x = input.getAttribute("style"); ok(x === s, "getAttribute('style') = " + x); ok(s.cssText === "", "s.cssText = " + s.cssText); ok(s.display === "", "s.display = " + s.display); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); s.display = "none"; ok(s.cssText != "", "s.cssText = " + s.cssText); @@ -163,6 +167,8 @@ function test_attrs() { ok(x === s, "getAttribute('style') = " + x); ok(s.cssText != "", "s.cssText = " + s.cssText); ok(s.display === "none", "s.display = " + s.display); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); input.setAttribute("style", null); x = input.getAttribute("style"); @@ -173,11 +179,15 @@ function test_attrs() { x = input.getAttribute("fireEvent"); ok(x === input.fireEvent, "input.getAttribute('fireEvent') = " + x); + x = input.getAttribute("fireEvent", 2); + ok(x === "", "getAttribute('fireEvent') = " + x); input.setAttribute("fireEvent", 3); ok(input.fireEvent === 3, "input.fireEvent = " + input.fireEvent); x = input.getAttribute("fireEvent"); ok(x === 3, "input.getAttribute('fireEvent') = " + x); + x = input.getAttribute("fireEvent", 2); + ok(x === "3", "getAttribute('fireEvent') = " + x); b = input.removeAttribute("style"); ok(b === true, "removeAttribute('style') failed"); @@ -186,6 +196,8 @@ function test_attrs() { ok(x === s, "getAttribute('style') = " + x); ok(s.display === "", "s.display = " + s.display); ok(s.cssText === "", "s.cssText = " + s.cssText); + x = input.getAttribute("style", 2); + ok(x === "", "getAttribute('style') = " + x); b = input.removeAttribute("style"); ok(b === true, "removeAttribute('style') failed");

1 0

Iván Matellanes : msvcrt: Call the _nolock variant when the file is already locked.
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 17fcef507f8c05f2ae45b2b47c091f8e6e6582d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fcef507f8c05f2ae45b2b47… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Nov 28 20:48:31 2014 +0100 msvcrt: Call the _nolock variant when the file is already locked. --- dlls/msvcrt/file.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b0f8735..5176f58 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1417,7 +1417,7 @@ void CDECL MSVCRT_rewind(MSVCRT_FILE* file) TRACE(":file (%p) fd (%d)\n",file,file->_file); MSVCRT__lock_file(file); - MSVCRT_fseek(file, 0L, SEEK_SET); + MSVCRT__fseek_nolock(file, 0L, SEEK_SET); MSVCRT_clearerr(file); MSVCRT__unlock_file(file); } @@ -3586,7 +3586,7 @@ char * CDECL MSVCRT_fgets(char *s, int size, MSVCRT_FILE* file) MSVCRT__lock_file(file); - while ((size >1) && (cc = MSVCRT_fgetc(file)) != MSVCRT_EOF && cc != '\n') + while ((size >1) && (cc = MSVCRT__fgetc_nolock(file)) != MSVCRT_EOF && cc != '\n') { *s++ = (char)cc; size --; @@ -3676,7 +3676,7 @@ int CDECL MSVCRT__getw(MSVCRT_FILE* file) MSVCRT__lock_file(file); for (j=0; j<sizeof(int); j++) { - k = MSVCRT_fgetc(file); + k = MSVCRT__fgetc_nolock(file); if (k == MSVCRT_EOF) { file->_flag |= MSVCRT__IOEOF; MSVCRT__unlock_file(file); @@ -3726,7 +3726,7 @@ MSVCRT_wchar_t * CDECL MSVCRT_fgetws(MSVCRT_wchar_t *s, int size, MSVCRT_FILE* f MSVCRT__lock_file(file); - while ((size >1) && (cc = MSVCRT_fgetwc(file)) != MSVCRT_WEOF && cc != '\n') + while ((size >1) && (cc = MSVCRT__fgetwc_nolock(file)) != MSVCRT_WEOF && cc != '\n') { *s++ = cc; size --; @@ -4452,7 +4452,7 @@ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) int ret; MSVCRT__lock_file(file); - ret = MSVCRT_fwrite(s, sizeof(*s), len, file) == len ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock(s, sizeof(*s), len, file) == len ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(file); return ret; } @@ -4468,14 +4468,14 @@ int CDECL MSVCRT_fputws(const MSVCRT_wchar_t *s, MSVCRT_FILE* file) MSVCRT__lock_file(file); if (!(get_ioinfo_nolock(file->_file)->wxflag & WX_TEXT)) { - ret = MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(file); return ret; } tmp_buf = add_std_buffer(file); for (i=0; i<len; i++) { - if(MSVCRT_fputwc(s[i], file) == MSVCRT_WEOF) { + if(MSVCRT__fputwc_nolock(s[i], file) == MSVCRT_WEOF) { if(tmp_buf) remove_std_buffer(file); MSVCRT__unlock_file(file); return MSVCRT_WEOF; @@ -4512,8 +4512,8 @@ char * CDECL MSVCRT_gets(char *buf) char * buf_start = buf; MSVCRT__lock_file(MSVCRT_stdin); - for(cc = MSVCRT_fgetc(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; - cc = MSVCRT_fgetc(MSVCRT_stdin)) + for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n'; + cc = MSVCRT__fgetc_nolock(MSVCRT_stdin)) if(cc != '\r') *buf++ = (char)cc; *buf = '\0'; @@ -4532,8 +4532,8 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf) MSVCRT_wchar_t* ws = buf; MSVCRT__lock_file(MSVCRT_stdin); - for (cc = MSVCRT_fgetwc(MSVCRT_stdin); cc != MSVCRT_WEOF && cc != '\n'; - cc = MSVCRT_fgetwc(MSVCRT_stdin)) + for (cc = MSVCRT__fgetwc_nolock(MSVCRT_stdin); cc != MSVCRT_WEOF && cc != '\n'; + cc = MSVCRT__fgetwc_nolock(MSVCRT_stdin)) { if (cc != '\r') *buf++ = (MSVCRT_wchar_t)cc; @@ -4578,12 +4578,12 @@ int CDECL MSVCRT_puts(const char *s) int ret; MSVCRT__lock_file(MSVCRT_stdout); - if(MSVCRT_fwrite(s, sizeof(*s), len, MSVCRT_stdout) != len) { + if(MSVCRT__fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { MSVCRT__unlock_file(MSVCRT_stdout); return MSVCRT_EOF; } - ret = MSVCRT_fwrite("\n",1,1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock("\n",1,1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(MSVCRT_stdout); return ret; } @@ -4598,12 +4598,12 @@ int CDECL MSVCRT__putws(const MSVCRT_wchar_t *s) int ret; MSVCRT__lock_file(MSVCRT_stdout); - if(MSVCRT_fwrite(s, sizeof(*s), len, MSVCRT_stdout) != len) { + if(MSVCRT__fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { MSVCRT__unlock_file(MSVCRT_stdout); return MSVCRT_EOF; } - ret = MSVCRT_fwrite(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + ret = MSVCRT__fwrite_nolock(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(MSVCRT_stdout); return ret; } @@ -4671,7 +4671,7 @@ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, MSVCRT_size_t s MSVCRT__lock_file(file); - MSVCRT_fflush(file); + MSVCRT__fflush_nolock(file); if(file->_flag & MSVCRT__IOMYBUF) MSVCRT_free(file->_base); file->_flag &= ~(MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF); @@ -4823,13 +4823,13 @@ static int puts_clbk_file_w(void *file, int len, const MSVCRT_wchar_t *str) MSVCRT__lock_file(file); if(!(get_ioinfo_nolock(((MSVCRT_FILE*)file)->_file)->wxflag & WX_TEXT)) { - ret = MSVCRT_fwrite(str, sizeof(MSVCRT_wchar_t), len, file); + ret = MSVCRT__fwrite_nolock(str, sizeof(MSVCRT_wchar_t), len, file); MSVCRT__unlock_file(file); return ret; } for(i=0; i<len; i++) { - if(MSVCRT_fputwc(str[i], file) == MSVCRT_WEOF) { + if(MSVCRT__fputwc_nolock(str[i], file) == MSVCRT_WEOF) { MSVCRT__unlock_file(file); return -1; }

1 0

Sebastian Lackner : ws2_32/tests: Fix several copy and paste errors.
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: d57ccd54f8d751b57490d5a74c3a81ac31297313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57ccd54f8d751b57490d5a74… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Nov 29 09:55:39 2014 +0100 ws2_32/tests: Fix several copy and paste errors. --- dlls/ws2_32/tests/sock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 106588d..16f98c0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3358,14 +3358,14 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 2, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); ok(send(fdWrite, "test", 4, 0) == 4, "failed to send data\n"); FD_ZERO(&readfds); FD_SET(fdRead, &readfds); ret = select(fdRead+1, &readfds, NULL, NULL, &select_timeout); ok(ret == 1, "select returned %d\n", ret); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); FD_ZERO(&readfds); FD_SET(fdWrite, &readfds); @@ -3373,7 +3373,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 2, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); while(1) { FD_ZERO(&writefds); @@ -3388,7 +3388,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 1, "select returned %d\n", ret); ok(!FD_ISSET(fdWrite, &readfds), "fdWrite socket is in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); ok(send(fdRead, "test", 4, 0) == 4, "failed to send data\n"); Sleep(100); @@ -3398,7 +3398,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &readfds, NULL, &select_timeout); ok(ret == 2, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); - ok(FD_ISSET(fdRead, &readfds), "fdWrite socket is not in the set\n"); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); closesocket(fdRead); closesocket(fdWrite);

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateBitmapBrush().
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 0cb8722837143203c44d568881642e7f375ef6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb8722837143203c44d56888… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 08:45:45 2014 +0100 d2d1: Implement d2d_d3d_render_target_CreateBitmapBrush(). --- dlls/d2d1/brush.c | 175 +++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/d2d1_private.h | 4 ++ dlls/d2d1/render_target.c | 14 +++- 3 files changed, 190 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 6366086..2986c27 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -448,11 +448,184 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget * (ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl); } +static inline struct d2d_brush *impl_from_ID2D1BitmapBrush(ID2D1BitmapBrush *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush *iface, + REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1BitmapBrush) + || IsEqualGUID(iid, &IID_ID2D1Brush) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1BitmapBrush_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_AddRef(ID2D1BitmapBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + ULONG refcount = InterlockedIncrement(&brush->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + ULONG refcount = InterlockedDecrement(&brush->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, brush); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_GetFactory(ID2D1BitmapBrush *iface, + ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetOpacity(ID2D1BitmapBrush *iface, float opacity) +{ + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, opacity %.8e.\n", iface, opacity); + + brush->opacity = opacity; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetTransform(ID2D1BitmapBrush *iface, + const D2D1_MATRIX_3X2_F *transform) +{ + FIXME("iface %p, transform %p stub!\n", iface, transform); +} + +static float STDMETHODCALLTYPE d2d_bitmap_brush_GetOpacity(ID2D1BitmapBrush *iface) +{ + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p.\n", iface); + + return brush->opacity; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_GetTransform(ID2D1BitmapBrush *iface, + D2D1_MATRIX_3X2_F *transform) +{ + static const D2D1_MATRIX_3X2_F identity = + { + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + }; + + FIXME("iface %p, transform %p stub!\n", iface, transform); + + *transform = identity; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) +{ + FIXME("iface %p, mode %#x stub!\n", iface, mode); +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush *iface, D2D1_EXTEND_MODE mode) +{ + FIXME("iface %p, mode %#x stub!\n", iface, mode); +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapBrush *iface, + D2D1_BITMAP_INTERPOLATION_MODE mode) +{ + FIXME("iface %p, mode %#x stub!\n", iface, mode); +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap *bitmap) +{ + FIXME("iface %p, bitmap %p stub!\n", iface, bitmap); +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeX(ID2D1BitmapBrush *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_EXTEND_MODE_CLAMP; +} + +static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeY(ID2D1BitmapBrush *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_EXTEND_MODE_CLAMP; +} + +static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInterpolationMode(ID2D1BitmapBrush *iface) +{ + FIXME("iface %p stub!\n", iface); + + return D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR; +} + +static void STDMETHODCALLTYPE d2d_bitmap_brush_GetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap **bitmap) +{ + FIXME("iface %p, bitmap %p stub!\n", iface, bitmap); +} + +static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = +{ + d2d_bitmap_brush_QueryInterface, + d2d_bitmap_brush_AddRef, + d2d_bitmap_brush_Release, + d2d_bitmap_brush_GetFactory, + d2d_bitmap_brush_SetOpacity, + d2d_bitmap_brush_SetTransform, + d2d_bitmap_brush_GetOpacity, + d2d_bitmap_brush_GetTransform, + d2d_bitmap_brush_SetExtendModeX, + d2d_bitmap_brush_SetExtendModeY, + d2d_bitmap_brush_SetInterpolationMode, + d2d_bitmap_brush_SetBitmap, + d2d_bitmap_brush_GetExtendModeX, + d2d_bitmap_brush_GetExtendModeY, + d2d_bitmap_brush_GetInterpolationMode, + d2d_bitmap_brush_GetBitmap, +}; + +void d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, const ID2D1Bitmap *bitmap, + const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) +{ + FIXME("Ignoring brush properties.\n"); + + d2d_brush_init(brush, render_target, D2D_BRUSH_TYPE_BITMAP, brush_desc, + (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); +} + struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) { if (!iface) return NULL; assert(iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl - || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl); + || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_linear_gradient_brush_vtbl + || iface->lpVtbl == (const ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); return CONTAINING_RECORD(iface, struct d2d_brush, ID2D1Brush_iface); } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8504e68..05e678c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -34,6 +34,7 @@ enum d2d_brush_type { D2D_BRUSH_TYPE_SOLID, D2D_BRUSH_TYPE_LINEAR, + D2D_BRUSH_TYPE_BITMAP, }; struct d2d_clip_stack @@ -124,6 +125,9 @@ void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *rend void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient) DECLSPEC_HIDDEN; +void d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1RenderTarget *render_target, + const ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, + const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; struct d2d_stroke_style diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f7e07d2..bdefab8 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -364,10 +364,20 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1BitmapBrush **brush) { - FIXME("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p stub!\n", + struct d2d_brush *object; + + TRACE("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p.\n", iface, bitmap, bitmap_brush_desc, brush_desc, brush); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_bitmap_brush_init(object, iface, bitmap, bitmap_brush_desc, brush_desc); + + TRACE("Created brush %p.\n", object); + *brush = (ID2D1BitmapBrush *)&object->ID2D1Brush_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSolidColorBrush(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Make "transform" in d2d_d3d_render_target_Clear() const.
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: ac4bd550a5e1bc00be25f167f1c521f71b915914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac4bd550a5e1bc00be25f167f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 08:45:44 2014 +0100 d2d1: Make "transform" in d2d_d3d_render_target_Clear() const. --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0f5907f..f7e07d2 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -826,7 +826,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa ID3D10Buffer *vs_cb, *ps_cb; HRESULT hr; - static float transform[] = + static const float transform[] = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0.0f,

1 0

Henri Verbeet : wined3d: Keep a reference to the resource in shader resource views.
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 0e8f2786e9de5e3711184ec975daca8e6f66ba41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8f2786e9de5e3711184ec97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 08:45:43 2014 +0100 wined3d: Keep a reference to the resource in shader resource views. --- dlls/d3d10core/view.c | 10 +++++++++- dlls/wined3d/view.c | 9 +++++++-- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 4 ++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 5c02131..fc2e8cd 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -987,6 +987,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) { + struct wined3d_resource *wined3d_resource; HRESULT hr; view->ID3D10ShaderResourceView_iface.lpVtbl = &d3d10_shader_resource_view_vtbl; @@ -1002,7 +1003,14 @@ HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, view->desc = *desc; } - if (FAILED(hr = wined3d_shader_resource_view_create(view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view))) + if (!(wined3d_resource = wined3d_resource_from_resource(resource))) + { + ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); + return E_FAIL; + } + + if (FAILED(hr = wined3d_shader_resource_view_create(wined3d_resource, + view, &d3d10_null_wined3d_parent_ops, &view->wined3d_view))) { WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr); return hr; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1f8db54..9cda64d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -176,7 +176,10 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v if (!refcount) { + /* Call wined3d_object_destroyed() before releasing the resource, + * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); + wined3d_resource_decref(view->resource); HeapFree(GetProcessHeap(), 0, view); } @@ -190,8 +193,8 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } -HRESULT CDECL wined3d_shader_resource_view_create(void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_shader_resource_view **view) +HRESULT CDECL wined3d_shader_resource_view_create(struct wined3d_resource *resource, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view) { struct wined3d_shader_resource_view *object; @@ -201,6 +204,8 @@ HRESULT CDECL wined3d_shader_resource_view_create(void *parent, const struct win return E_OUTOFMEMORY; object->refcount = 1; + object->resource = resource; + wined3d_resource_incref(resource); object->parent = parent; object->parent_ops = parent_ops; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 740dabc..050383c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2663,6 +2663,7 @@ struct wined3d_shader_resource_view { LONG refcount; + struct wined3d_resource *resource; void *parent; const struct wined3d_parent_ops *parent_ops; }; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 44a2726..2362cbc 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2441,8 +2441,8 @@ ULONG __cdecl wined3d_shader_incref(struct wined3d_shader *shader); HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader *shader, UINT start_idx, const float *src_data, UINT vector4f_count); -HRESULT __cdecl wined3d_shader_resource_view_create(void *parent, const struct wined3d_parent_ops *parent_ops, - struct wined3d_shader_resource_view **view); +HRESULT __cdecl wined3d_shader_resource_view_create(struct wined3d_resource *resource, void *parent, + const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view); ULONG __cdecl wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view); void * __cdecl wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view); ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view);

1 0

Henri Verbeet : wined3d: Unbind shader resource views in state_unbind_resources().
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 08b06b7d8f7396937c3d278219ce3b6cefa0476a URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b06b7d8f7396937c3d27821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 1 08:45:42 2014 +0100 wined3d: Unbind shader resource views in state_unbind_resources(). --- dlls/wined3d/stateblock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7e8c782..dc146fc 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -458,6 +458,7 @@ ULONG CDECL wined3d_stateblock_incref(struct wined3d_stateblock *stateblock) void state_unbind_resources(struct wined3d_state *state) { + struct wined3d_shader_resource_view *srv; struct wined3d_vertex_declaration *decl; struct wined3d_sampler *sampler; struct wined3d_texture *texture; @@ -529,6 +530,15 @@ void state_unbind_resources(struct wined3d_state *state) wined3d_sampler_decref(sampler); } } + + for (j = 0; j < MAX_SHADER_RESOURCE_VIEWS; ++j) + { + if ((srv = state->shader_resource_view[i][j])) + { + state->shader_resource_view[i][j] = NULL; + wined3d_shader_resource_view_decref(srv); + } + } } }

1 0

André Hentschel : d3dx9_36/tests: Remove unused function (Clang).
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 09761309ad94f6126de6226fc7d1d147a6d7bb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09761309ad94f6126de6226fc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 30 13:15:37 2014 +0100 d3dx9_36/tests: Remove unused function (Clang). --- dlls/d3dx9_36/tests/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 5846281..7a4dff8 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -24,12 +24,6 @@ #include "d3dx9tex.h" #include "resources.h" -static inline int get_ref(IUnknown *obj) -{ - IUnknown_AddRef(obj); - return IUnknown_Release(obj); -} - #define check_release(obj, exp) _check_release(__LINE__, obj, exp) static inline void _check_release(unsigned int line, IUnknown *obj, int exp) {

1 0

Marcus Meissner : oleacc: Free the mapping on error (Coverity).
by Alexandre Julliard Dec. 1, 2014

Dec. 1, 2014

Module: wine Branch: master Commit: 9ad8aff7e1286a66cca09ca245ecf3b2b1759fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad8aff7e1286a66cca09ca24… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 30 13:09:23 2014 +0100 oleacc: Free the mapping on error (Coverity). --- dlls/oleacc/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index e5fe6cd..fa7d592 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -219,8 +219,10 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo return E_FAIL; data = GlobalAlloc(GMEM_FIXED, size); - if(!data) + if(!data) { + UnmapViewOfFile(view); return E_OUTOFMEMORY; + } memcpy(data, view, size); UnmapViewOfFile(view);

1 0