September 2014 - Wine-commits

Jactry Zeng : riched20: Implement ITextRange::GetDuplicate.
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: da40589e7157854cbe278f45e3eaefbf25963c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=da40589e7157854cbe278f45e… Author: Jactry Zeng <wine(a)jactry.com> Date: Wed Sep 17 17:36:44 2014 +0800 riched20: Implement ITextRange::GetDuplicate. --- dlls/riched20/richole.c | 9 +++++++-- dlls/riched20/tests/richole.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index ddaee28..d8e206c 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -602,14 +602,19 @@ static HRESULT WINAPI ITextRange_fnSetChar(ITextRange *me, LONG ch) return E_NOTIMPL; } +static HRESULT CreateITextRange(IRichEditOleImpl *reOle, LONG start, LONG end, ITextRange** ppRange); + static HRESULT WINAPI ITextRange_fnGetDuplicate(ITextRange *me, ITextRange **ppRange) { ITextRangeImpl *This = impl_from_ITextRange(me); if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + TRACE("%p %p\n", This, ppRange); + if (!ppRange) + return E_INVALIDARG; + + return CreateITextRange(This->reOle, This->start, This->end, ppRange); } static HRESULT WINAPI ITextRange_fnGetFormattedText(ITextRange *me, ITextRange **ppRange) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 312ab28..2fd12a5 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -755,6 +755,40 @@ static void test_ITextSelection_GetStart_GetEnd(void) release_interfaces(&w, &reOle, &txtDoc, &txtSel); } +static void test_ITextRange_GetDuplicate(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + ITextRange *txtRgeDup = NULL; + HRESULT hres; + LONG first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + first = 0, lim = 4; + hres = ITextDocument_Range(txtDoc, first, lim, &txtRge); + ok(hres == S_OK, "ITextDocument_Range fails 0x%x.\n", hres); + + hres = ITextRange_GetDuplicate(txtRge, &txtRgeDup); + ok(hres == S_OK, "ITextRange_GetDuplicate\n"); + ok(txtRgeDup != txtRge, "A new pointer should be returned\n"); + ITextRange_GetStart(txtRgeDup, &start); + ok(start == first, "got wrong value: %d\n", start); + ITextRange_GetEnd(txtRgeDup, &end); + ok(end == lim, "got wrong value: %d\n", end); + + ITextRange_Release(txtRgeDup); + + hres = ITextRange_GetDuplicate(txtRge, NULL); + ok(hres == E_INVALIDARG, "ITextRange_GetDuplicate\n"); + + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -770,4 +804,5 @@ START_TEST(richole) test_ITextDocument_Range(); test_ITextRange_GetChar(); test_ITextRange_GetStart_GetEnd(); + test_ITextRange_GetDuplicate(); }

1 0

Jactry Zeng : riched20: Implement ITextRange::Collapse.
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: 07154f7fee0cc4dc66772e1eeaf1d82de49e508f URL: http://source.winehq.org/git/wine.git/?a=commit;h=07154f7fee0cc4dc66772e1ee… Author: Jactry Zeng <wine(a)jactry.com> Date: Wed Sep 17 17:38:31 2014 +0800 riched20: Implement ITextRange::Collapse. --- dlls/riched20/richole.c | 15 ++++++-- dlls/riched20/tests/richole.c | 84 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index d8e206c..8e87879 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -743,14 +743,25 @@ static HRESULT WINAPI ITextRange_fnGetStoryType(ITextRange *me, LONG *pValue) return E_NOTIMPL; } +static HRESULT range_Collapse(LONG bStart, LONG *start, LONG *end) +{ + if (*end == *start) + return S_FALSE; + + if (bStart == tomEnd || bStart == tomFalse) + *start = *end; + else + *end = *start; + return S_OK; +} + static HRESULT WINAPI ITextRange_fnCollapse(ITextRange *me, LONG bStart) { ITextRangeImpl *This = impl_from_ITextRange(me); if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + return range_Collapse(bStart, &This->start, &This->end); } static HRESULT WINAPI ITextRange_fnExpand(ITextRange *me, LONG Unit, LONG *pDelta) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 2fd12a5..104b2aa 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -789,6 +789,89 @@ static void test_ITextRange_GetDuplicate(void) release_interfaces(&w, &reOle, &txtDoc, NULL); } +static void test_ITextRange_Collapse(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + LONG first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 4, lim = 8; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomTrue); + ok(hres == S_OK, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 4, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 4, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomStart); + ok(hres == S_OK, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 4, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 4, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomFalse); + ok(hres == S_OK, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 8, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 8, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomEnd); + ok(hres == S_OK, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 8, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 8, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + /* tomStart is the default */ + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, 256); + ok(hres == S_OK, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 4, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 4, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = 6, lim = 6; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomEnd); + ok(hres == S_FALSE, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 6, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 6, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + first = 8, lim = 8; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_Collapse(txtRge, tomStart); + ok(hres == S_FALSE, "ITextRange_Collapse\n"); + ITextRange_GetStart(txtRge, &start); + ok(start == 8, "got wrong start value: %d\n", start); + ITextRange_GetEnd(txtRge, &end); + ok(end == 8, "got wrong end value: %d\n", end); + ITextRange_Release(txtRge); + + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -805,4 +888,5 @@ START_TEST(richole) test_ITextRange_GetChar(); test_ITextRange_GetStart_GetEnd(); test_ITextRange_GetDuplicate(); + test_ITextRange_Collapse(); }

1 0

Jactry Zeng : riched20: Implement ITextSelection::Collapse.
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: 40456439e622c388e0f317219ab9bcaf688991a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40456439e622c388e0f317219… Author: Jactry Zeng <wine(a)jactry.com> Date: Wed Sep 17 17:38:47 2014 +0800 riched20: Implement ITextSelection::Collapse. --- dlls/riched20/richole.c | 9 ++++-- dlls/riched20/tests/richole.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 8e87879..f7e7870 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1754,11 +1754,16 @@ static HRESULT WINAPI ITextSelection_fnGetStoryType(ITextSelection *me, LONG *pV static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + LONG start, end; + HRESULT hres; if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + ME_GetSelectionOfs(This->reOle->editor, &start, &end); + hres = range_Collapse(bStart, &start, &end); + if (SUCCEEDED(hres)) + ME_SetSelection(This->reOle->editor, start, end); + return hres; } static HRESULT WINAPI ITextSelection_fnExpand(ITextSelection *me, LONG Unit, LONG *pDelta) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 104b2aa..eed335c 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -872,6 +872,75 @@ static void test_ITextRange_Collapse(void) release_interfaces(&w, &reOle, &txtDoc, NULL); } +static void test_ITextSelection_Collapse(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hres; + LONG first, lim, start, end; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 4, lim = 8; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomTrue); + ok(hres == S_OK, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 4, "got wrong start value: %d\n", start); + ok(end == 4, "got wrong end value: %d\n", end); + + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomStart); + ok(hres == S_OK, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 4, "got wrong start value: %d\n", start); + ok(end == 4, "got wrong end value: %d\n", end); + + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomFalse); + ok(hres == S_OK, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 8, "got wrong start value: %d\n", start); + ok(end == 8, "got wrong end value: %d\n", end); + + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomEnd); + ok(hres == S_OK, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 8, "got wrong start value: %d\n", start); + ok(end == 8, "got wrong end value: %d\n", end); + + /* tomStart is the default */ + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, 256); + ok(hres == S_OK, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 4, "got wrong start value: %d\n", start); + ok(end == 4, "got wrong end value: %d\n", end); + + first = 6, lim = 6; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomEnd); + ok(hres == S_FALSE, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 6, "got wrong start value: %d\n", start); + ok(end == 6, "got wrong end value: %d\n", end); + + first = 8, lim = 8; + SendMessageA(w, EM_SETSEL, first, lim); + hres = ITextSelection_Collapse(txtSel, tomStart); + ok(hres == S_FALSE, "ITextSelection_Collapse\n"); + SendMessageA(w, EM_GETSEL, (LPARAM)&start, (WPARAM)&end); + ok(start == 8, "got wrong start value: %d\n", start); + ok(end == 8, "got wrong end value: %d\n", end); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -884,6 +953,7 @@ START_TEST(richole) test_ITextSelection_GetText(); test_ITextSelection_GetChar(); test_ITextSelection_GetStart_GetEnd(); + test_ITextSelection_Collapse(); test_ITextDocument_Range(); test_ITextRange_GetChar(); test_ITextRange_GetStart_GetEnd();

1 0

Jacek Caban : wininet: Moved critical section locking to get_cookie callers so that cookie_set_t is also protected.
by Alexandre Julliard 17 Sep '14

17 Sep '14

Module: wine Branch: master Commit: c639e757d5ebdff307f623da2db2d5c94f187a64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c639e757d5ebdff307f623da2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 17 12:09:13 2014 +0200 wininet: Moved critical section locking to get_cookie callers so that cookie_set_t is also protected. --- dlls/wininet/cookie.c | 78 ++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 57e5424..aec3edd 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -576,8 +576,6 @@ static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cooki GetSystemTimeAsFileTime(&tm); - EnterCriticalSection(&cookie_cs); - len = strlenW(host); p = host+len; while(p>host && p[-1]!='.') p--; @@ -604,7 +602,6 @@ static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cooki domain = get_cookie_domain(host, FALSE); if(!domain) { TRACE("Unknown host %s\n", debugstr_w(host)); - LeaveCriticalSection(&cookie_cs); return ERROR_NO_MORE_ITEMS; } @@ -660,7 +657,6 @@ static DWORD get_cookie(const WCHAR *host, const WCHAR *path, DWORD flags, cooki } } - LeaveCriticalSection(&cookie_cs); return ERROR_SUCCESS; } @@ -694,35 +690,43 @@ static void cookie_set_to_string(const cookie_set_t *cookie_set, WCHAR *str) DWORD get_cookie_header(const WCHAR *host, const WCHAR *path, WCHAR **ret) { cookie_set_t cookie_set = {0}; - WCHAR *header, *ptr; DWORD res; static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' '}; + EnterCriticalSection(&cookie_cs); + res = get_cookie(host, path, INTERNET_COOKIE_HTTPONLY, &cookie_set); - if(res != ERROR_SUCCESS) + if(res != ERROR_SUCCESS) { + LeaveCriticalSection(&cookie_cs); return res; - if(!cookie_set.cnt) { - *ret = NULL; - return ERROR_SUCCESS; } - ptr = header = heap_alloc(sizeof(cookieW) + (cookie_set.string_len + 3 /* crlf0 */) * sizeof(WCHAR)); - if(!header) - return ERROR_NOT_ENOUGH_MEMORY; + if(cookie_set.cnt) { + WCHAR *header, *ptr; - memcpy(ptr, cookieW, sizeof(cookieW)); - ptr += sizeof(cookieW)/sizeof(*cookieW); + ptr = header = heap_alloc(sizeof(cookieW) + (cookie_set.string_len + 3 /* crlf0 */) * sizeof(WCHAR)); + if(header) { + memcpy(ptr, cookieW, sizeof(cookieW)); + ptr += sizeof(cookieW)/sizeof(*cookieW); - cookie_set_to_string(&cookie_set, ptr); - heap_free(cookie_set.cookies); - ptr += cookie_set.string_len; + cookie_set_to_string(&cookie_set, ptr); + heap_free(cookie_set.cookies); + ptr += cookie_set.string_len; - *ptr++ = '\r'; - *ptr++ = '\n'; - *ptr++ = 0; + *ptr++ = '\r'; + *ptr++ = '\n'; + *ptr++ = 0; - *ret = header; + *ret = header; + }else { + res = ERROR_NOT_ENOUGH_MEMORY; + } + }else { + *ret = NULL; + } + + LeaveCriticalSection(&cookie_cs); return ERROR_SUCCESS; } @@ -765,32 +769,36 @@ BOOL WINAPI InternetGetCookieExW(LPCWSTR lpszUrl, LPCWSTR lpszCookieName, return FALSE; } + EnterCriticalSection(&cookie_cs); + res = get_cookie(host, path, flags, &cookie_set); if(res != ERROR_SUCCESS) { + LeaveCriticalSection(&cookie_cs); SetLastError(res); return FALSE; } - if(!cookie_set.cnt) { + if(cookie_set.cnt) { + if(!lpCookieData || cookie_set.string_len+1 > *lpdwSize) { + *lpdwSize = (cookie_set.string_len + 1) * sizeof(WCHAR); + TRACE("returning %u\n", *lpdwSize); + if(lpCookieData) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + }else { + *lpdwSize = cookie_set.string_len + 1; + cookie_set_to_string(&cookie_set, lpCookieData); + lpCookieData[cookie_set.string_len] = 0; + } + }else { TRACE("no cookies found for %s\n", debugstr_w(host)); SetLastError(ERROR_NO_MORE_ITEMS); return FALSE; } - if(!lpCookieData || cookie_set.string_len+1 > *lpdwSize) { - *lpdwSize = (cookie_set.string_len + 1) * sizeof(WCHAR); - TRACE("returning %u\n", *lpdwSize); - if(lpCookieData) { - SetLastError(ERROR_INSUFFICIENT_BUFFER); - ret = FALSE; - } - }else { - *lpdwSize = cookie_set.string_len + 1; - cookie_set_to_string(&cookie_set, lpCookieData); - lpCookieData[cookie_set.string_len] = 0; - } - heap_free(cookie_set.cookies); + LeaveCriticalSection(&cookie_cs); return ret; }

1 0

Jacek Caban : oleacc: Added CAccPropServices stub implementation.
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: c5af3d912bdd406a4a37cf9543d723e905aa7390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5af3d912bdd406a4a37cf954… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 21:36:59 2014 +0200 oleacc: Added CAccPropServices stub implementation. --- dlls/oleacc/Makefile.in | 1 + dlls/oleacc/main.c | 6 -- dlls/oleacc/propservice.c | 257 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/tests/main.c | 16 +++ 4 files changed, 274 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5af3d912bdd406a4a37c…

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateMesh().
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: be415203c7e25a38d0f5a248ae1683208dd06671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be415203c7e25a38d0f5a248a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 10:44:12 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateMesh(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 8 ++++ dlls/d2d1/mesh.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/render_target.c | 14 ++++++- 4 files changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 60072ca..6c27e22 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = d3d10_1 dxguid uuid C_SRCS = \ brush.c \ factory.c \ + mesh.c \ render_target.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4ee4ab0..0b8cf2b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -107,4 +107,12 @@ struct d2d_stroke_style void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; +struct d2d_mesh +{ + ID2D1Mesh ID2D1Mesh_iface; + LONG refcount; +}; + +void d2d_mesh_init(struct d2d_mesh *mesh) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c new file mode 100644 index 0000000..b566382 --- /dev/null +++ b/dlls/d2d1/mesh.c @@ -0,0 +1,100 @@ +/* + * Copyright 2014 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_mesh *impl_from_ID2D1Mesh(ID2D1Mesh *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_mesh, ID2D1Mesh_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_mesh_QueryInterface(ID2D1Mesh *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Mesh) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Mesh_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_mesh_AddRef(ID2D1Mesh *iface) +{ + struct d2d_mesh *mesh = impl_from_ID2D1Mesh(iface); + ULONG refcount = InterlockedIncrement(&mesh->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface) +{ + struct d2d_mesh *mesh = impl_from_ID2D1Mesh(iface); + ULONG refcount = InterlockedDecrement(&mesh->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, mesh); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_mesh_GetFactory(ID2D1Mesh *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static HRESULT STDMETHODCALLTYPE d2d_mesh_Open(ID2D1Mesh *iface, ID2D1TessellationSink **sink) +{ + FIXME("iface %p, sink %p stub!\n", iface, sink); + + return E_NOTIMPL; +} + +static const struct ID2D1MeshVtbl d2d_mesh_vtbl = +{ + d2d_mesh_QueryInterface, + d2d_mesh_AddRef, + d2d_mesh_Release, + d2d_mesh_GetFactory, + d2d_mesh_Open, +}; + +void d2d_mesh_init(struct d2d_mesh *mesh) +{ + mesh->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; + mesh->refcount = 1; +} diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 4d69697..8a55890 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -304,9 +304,19 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) { - FIXME("iface %p, mesh %p stub!\n", iface, mesh); + struct d2d_mesh *object; - return E_NOTIMPL; + TRACE("iface %p, mesh %p.\n", iface, mesh); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_mesh_init(object); + + TRACE("Created mesh %p.\n", object); + *mesh = &object->ID2D1Mesh_iface; + + return S_OK; } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateBitmap().
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: 76dd63e4225f0f206ef62044f92283f31f526b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dd63e4225f0f206ef62044f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 10:44:13 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateBitmap(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/bitmap.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 9 +++ dlls/d2d1/render_target.c | 14 +++- 4 files changed, 183 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 6c27e22..1e829da 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = d2d1 IMPORTS = d3d10_1 dxguid uuid C_SRCS = \ + bitmap.c \ brush.c \ factory.c \ mesh.c \ diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c new file mode 100644 index 0000000..10c4296 --- /dev/null +++ b/dlls/d2d1/bitmap.c @@ -0,0 +1,161 @@ +/* + * Copyright 2014 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_bitmap *impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_bitmap, ID2D1Bitmap_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_bitmap_QueryInterface(ID2D1Bitmap *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Bitmap) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Bitmap_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_AddRef(ID2D1Bitmap *iface) +{ + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + ULONG refcount = InterlockedIncrement(&bitmap->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) +{ + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + ULONG refcount = InterlockedDecrement(&bitmap->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, bitmap); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_bitmap_GetFactory(ID2D1Bitmap *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2D1_SIZE_F *size) +{ + FIXME("iface %p, size %p stub!\n", iface, size); + + size->width = 0.0f; + size->height = 0.0f; + return size; +} + +static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_bitmap_GetPixelSize(ID2D1Bitmap *iface, D2D1_SIZE_U *pixel_size) +{ + FIXME("iface %p, pixel_size %p stub!\n", iface, pixel_size); + + pixel_size->width = 0; + pixel_size->height = 0; + return pixel_size; +} + +static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_bitmap_GetPixelFormat(ID2D1Bitmap *iface, D2D1_PIXEL_FORMAT *format) +{ + FIXME("iface %p stub!\n", iface); + + format->format = DXGI_FORMAT_UNKNOWN; + format->alphaMode = D2D1_ALPHA_MODE_UNKNOWN; + return format; +} + +static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap *iface, float *dpi_x, float *dpi_y) +{ + FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); + + *dpi_x = 96.0f; + *dpi_y = 96.0f; +} + +static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface, + const D2D1_POINT_2U *dst_point, ID2D1Bitmap *bitmap, const D2D1_RECT_U *src_rect) +{ + FIXME("iface %p, dst_point %p, bitmap %p, src_rect %p stub!\n", iface, dst_point, bitmap, src_rect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap *iface, + const D2D1_POINT_2U *dst_point, ID2D1RenderTarget *render_target, const D2D1_RECT_U *src_rect) +{ + FIXME("iface %p, dst_point %p, render_target %p, src_rect %p stub!", iface, dst_point, render_target, src_rect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap *iface, + const D2D1_RECT_U *dst_rect, const void *src_data, UINT32 pitch) +{ + FIXME("iface %p, dst_rect %p, src_data %p, pitch %u stub!\n", iface, dst_rect, src_data, pitch); + + return E_NOTIMPL; +} + +static const struct ID2D1BitmapVtbl d2d_bitmap_vtbl = +{ + d2d_bitmap_QueryInterface, + d2d_bitmap_AddRef, + d2d_bitmap_Release, + d2d_bitmap_GetFactory, + d2d_bitmap_GetSize, + d2d_bitmap_GetPixelSize, + d2d_bitmap_GetPixelFormat, + d2d_bitmap_GetDpi, + d2d_bitmap_CopyFromBitmap, + d2d_bitmap_CopyFromRenderTarget, + d2d_bitmap_CopyFromMemory, +}; + +void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data, + UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc) +{ + FIXME("Ignoring bitmap properties.\n"); + + bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl; + bitmap->refcount = 1; +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0b8cf2b..7c7956b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -115,4 +115,13 @@ struct d2d_mesh void d2d_mesh_init(struct d2d_mesh *mesh) DECLSPEC_HIDDEN; +struct d2d_bitmap +{ + ID2D1Bitmap ID2D1Bitmap_iface; + LONG refcount; +}; + +void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data, + UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 8a55890..2c501ef 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -182,10 +182,20 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetFactory(ID2D1RenderTarget static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderTarget *iface, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - FIXME("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p stub!\n", + struct d2d_bitmap *object; + + TRACE("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p.\n", iface, size.width, size.height, src_data, pitch, desc, bitmap); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_bitmap_init(object, size, src_data, pitch, desc); + + TRACE("Created bitmap %p.\n", object); + *bitmap = &object->ID2D1Bitmap_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateBitmapFromWicBitmap().
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: 4e73cd517aa7da918962811c3a6dd891b7119c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e73cd517aa7da918962811c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 10:44:14 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateBitmapFromWicBitmap(). --- dlls/d2d1/render_target.c | 84 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 2c501ef..4a69fce 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -20,6 +20,7 @@ #include "wine/port.h" #include "d2d1_private.h" +#include "wincodec.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -201,10 +202,89 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderT static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap(ID2D1RenderTarget *iface, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - FIXME("iface %p, bitmap_source %p, desc %p, bitmap %p stub!\n", + D2D1_BITMAP_PROPERTIES bitmap_desc; + unsigned int bpp, data_size; + D2D1_SIZE_U size; + WICRect rect; + UINT32 pitch; + HRESULT hr; + void *data; + + TRACE("iface %p, bitmap_source %p, desc %p, bitmap %p.\n", iface, bitmap_source, desc, bitmap); - return E_NOTIMPL; + if (FAILED(hr = IWICBitmapSource_GetSize(bitmap_source, &size.width, &size.height))) + { + WARN("Failed to get bitmap size, hr %#x.\n", hr); + return hr; + } + + if (!desc) + { + bitmap_desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_UNKNOWN; + bitmap_desc.dpiX = 0.0f; + bitmap_desc.dpiY = 0.0f; + } + else + { + bitmap_desc = *desc; + } + + if (bitmap_desc.pixelFormat.format == DXGI_FORMAT_UNKNOWN) + { + WICPixelFormatGUID wic_format; + + if (FAILED(hr = IWICBitmapSource_GetPixelFormat(bitmap_source, &wic_format))) + { + WARN("Failed to get bitmap format, hr %#x.\n", hr); + return hr; + } + + if (IsEqualGUID(&wic_format, &GUID_WICPixelFormat32bppPBGRA) + || IsEqualGUID(&wic_format, &GUID_WICPixelFormat32bppBGR)) + { + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + } + else + { + WARN("Unsupported WIC bitmap format %s.\n", debugstr_guid(&wic_format)); + return D2DERR_UNSUPPORTED_PIXEL_FORMAT; + } + } + + switch (bitmap_desc.pixelFormat.format) + { + case DXGI_FORMAT_B8G8R8A8_UNORM: + bpp = 4; + break; + + default: + FIXME("Unhandled format %#x.\n", bitmap_desc.pixelFormat.format); + return D2DERR_UNSUPPORTED_PIXEL_FORMAT; + } + + pitch = ((bpp * size.width) + 15) & ~15; + data_size = pitch * size.height; + if (!(data = HeapAlloc(GetProcessHeap(), 0, data_size))) + return E_OUTOFMEMORY; + + rect.X = 0; + rect.Y = 0; + rect.Width = size.width; + rect.Height = size.height; + if (FAILED(hr = IWICBitmapSource_CopyPixels(bitmap_source, &rect, pitch, data_size, data))) + { + WARN("Failed to copy bitmap pixels, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, data); + return hr; + } + + hr = d2d_d3d_render_target_CreateBitmap(iface, size, data, pitch, &bitmap_desc, bitmap); + + HeapFree(GetProcessHeap(), 0, data); + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSharedBitmap(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d3d10core: Create wined3d views for shader resource views.
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: e01d2076997a4c5a232d3a6215335c27d2d4703a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01d2076997a4c5a232d3a621… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 10:44:15 2014 +0200 d3d10core: Create wined3d views for shader resource views. --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/view.c | 7 ++++++ dlls/wined3d/view.c | 44 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 4 ++++ dlls/wined3d/wined3d_private.h | 8 +++++++ include/wine/wined3d.h | 6 ++++++ 6 files changed, 70 insertions(+) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index bf6a592..ca8735c 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -157,6 +157,7 @@ struct d3d10_shader_resource_view ID3D10ShaderResourceView ID3D10ShaderResourceView_iface; LONG refcount; + struct wined3d_shader_resource_view *wined3d_view; D3D10_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; ID3D10Device1 *device; diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 27b09a8..40b6201 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -894,6 +894,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderRe if (!refcount) { + wined3d_shader_resource_view_decref(This->wined3d_view); ID3D10Resource_Release(This->resource); ID3D10Device1_Release(This->device); HeapFree(GetProcessHeap(), 0, This); @@ -1001,6 +1002,12 @@ 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))) + { + WARN("Failed to create wined3d shader resource view, hr %#x.\n", hr); + return hr; + } + view->resource = resource; ID3D10Resource_AddRef(resource); view->device = &device->ID3D10Device1_iface; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5ceebdb..26575e2 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -158,3 +158,47 @@ HRESULT CDECL wined3d_rendertarget_view_create_from_surface(struct wined3d_surfa return wined3d_rendertarget_view_create(&desc, &surface->container->resource, parent, parent_ops, view); } + +ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view) +{ + ULONG refcount = InterlockedIncrement(&view->refcount); + + TRACE("%p increasing refcount to %u.\n", view, refcount); + + return refcount; +} + +ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) +{ + ULONG refcount = InterlockedDecrement(&view->refcount); + + TRACE("%p decreasing refcount to %u.\n", view, refcount); + + if (!refcount) + { + view->parent_ops->wined3d_object_destroyed(view->parent); + HeapFree(GetProcessHeap(), 0, view); + } + + return refcount; +} + +HRESULT CDECL wined3d_shader_resource_view_create(void *parent, const struct wined3d_parent_ops *parent_ops, + struct wined3d_shader_resource_view **view) +{ + struct wined3d_shader_resource_view *object; + + TRACE("parent %p, parent_ops %p, view %p.\n", parent, parent_ops, view); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + object->refcount = 1; + object->parent = parent; + object->parent_ops = parent_ops; + + TRACE("Created shader resource view %p.\n", object); + *view = object; + + return WINED3D_OK; +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0ee16c4..80052e5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -199,6 +199,10 @@ @ cdecl wined3d_shader_incref(ptr) @ cdecl wined3d_shader_set_local_constants_float(ptr long ptr long) +@ cdecl wined3d_shader_resource_view_create(ptr ptr ptr) +@ cdecl wined3d_shader_resource_view_decref(ptr) +@ cdecl wined3d_shader_resource_view_incref(ptr) + @ cdecl wined3d_stateblock_apply(ptr) @ cdecl wined3d_stateblock_capture(ptr) @ cdecl wined3d_stateblock_create(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f55b118..e43c356 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2646,6 +2646,14 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( return surface_from_resource(resource); } +struct wined3d_shader_resource_view +{ + LONG refcount; + + void *parent; + const struct wined3d_parent_ops *parent_ops; +}; + struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, const RECT *src_rect, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6dda931..336749d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1984,6 +1984,7 @@ struct wined3d_rendertarget_view; struct wined3d_resource; struct wined3d_sampler; struct wined3d_shader; +struct wined3d_shader_resource_view; struct wined3d_stateblock; struct wined3d_surface; struct wined3d_swapchain; @@ -2409,6 +2410,11 @@ 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); +ULONG __cdecl wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view); +ULONG __cdecl wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view); + void __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_capture(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_VSSetShaderResources().
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: 1e434b52d0896371138b0fcd6726ad75f3c1fc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e434b52d0896371138b0fcd6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 10:44:16 2014 +0200 d3d10core: Implement d3d10_device_VSSetShaderResources(). --- dlls/d3d10core/d3d10core_private.h | 2 + dlls/d3d10core/device.c | 13 ++++++- dlls/d3d10core/view.c | 8 ++++ dlls/wined3d/cs.c | 77 ++++++++++++++++++++++++++------------ dlls/wined3d/device.c | 32 ++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 24 +++++++----- include/wine/wined3d.h | 2 + 8 files changed, 125 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e434b52d0896371138b0…

1 0