September 2014 - Wine-Commits

Henri Verbeet : d3d10core: Implement d3d10_device_VSGetShaderResources().
by Alexandre Julliard Sept. 17, 2014

Sept. 17, 2014

Module: wine Branch: master Commit: 482e5f589b9d67e92d3ad3e2923ad7306dc67f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=482e5f589b9d67e92d3ad3e29… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 17 10:40:27 2014 +0200 d3d10core: Implement d3d10_device_VSGetShaderResources(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 14 ++++++++++++++ dlls/wined3d/view.c | 7 +++++++ dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.h | 3 +++ 5 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 89c0bba..201dca3 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -881,8 +881,27 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetPrimitiveTopology(ID3D10Device1 static void STDMETHODCALLTYPE d3d10_device_VSGetShaderResources(ID3D10Device1 *iface, UINT start_slot, UINT view_count, ID3D10ShaderResourceView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + for (i = 0; i < view_count; ++i) + { + struct wined3d_shader_resource_view *wined3d_view; + struct d3d10_shader_resource_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_vs_resource_view(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_shader_resource_view_get_parent(wined3d_view); + views[i] = &view_impl->ID3D10ShaderResourceView_iface; + ID3D10ShaderResourceView_AddRef(views[i]); + } } static void STDMETHODCALLTYPE d3d10_device_VSGetSamplers(ID3D10Device1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index be5c461..aaded97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2172,6 +2172,20 @@ void CDECL wined3d_device_set_vs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_VERTEX, idx, view); } +struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_resource_view(const struct wined3d_device *device, + UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_SHADER_RESOURCE_VIEWS) + { + WARN("Invalid view index %u.\n", idx); + return NULL; + } + + return device->state.shader_resource_view[WINED3D_SHADER_TYPE_VERTEX][idx]; +} + static void wined3d_device_set_sampler(struct wined3d_device *device, enum wined3d_shader_type type, UINT idx, struct wined3d_sampler *sampler) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 26575e2..1f8db54 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -183,6 +183,13 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v return refcount; } +void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader_resource_view *view) +{ + TRACE("view %p.\n", view); + + 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) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2437aac..7edc82c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -94,6 +94,7 @@ @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) +@ cdecl wined3d_device_get_vs_resource_view(ptr long) @ cdecl wined3d_device_get_vs_sampler(ptr long) @ cdecl wined3d_device_incref(ptr) @ cdecl wined3d_device_init_3d(ptr ptr) @@ -202,6 +203,7 @@ @ cdecl wined3d_shader_resource_view_create(ptr ptr ptr) @ cdecl wined3d_shader_resource_view_decref(ptr) +@ cdecl wined3d_shader_resource_view_get_parent(ptr) @ cdecl wined3d_shader_resource_view_incref(ptr) @ cdecl wined3d_stateblock_apply(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e66faef..907ead3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2184,6 +2184,8 @@ HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *devi UINT start_register, float *constants, UINT vector4f_count); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); +struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device, + UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); @@ -2415,6 +2417,7 @@ HRESULT __cdecl wined3d_shader_set_local_constants_float(struct wined3d_shader * 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); +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); void __cdecl wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock);

1 0

Alistair Leslie-Hughes : hnetcfg: Allow NetFwOpenPort to be created.
by Alexandre Julliard Sept. 17, 2014

Sept. 17, 2014

Module: wine Branch: master Commit: fe802040f60a5c81ca587d67fe8c58dddcfdab36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe802040f60a5c81ca587d67f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 17 15:11:06 2014 +1000 hnetcfg: Allow NetFwOpenPort to be created. --- dlls/hnetcfg/hnetcfg.c | 5 +++++ dlls/hnetcfg/hnetcfg_private.h | 1 + dlls/hnetcfg/port.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hnetcfg/hnetcfg.c b/dlls/hnetcfg/hnetcfg.c index f508dea..809b540 100644 --- a/dlls/hnetcfg/hnetcfg.c +++ b/dlls/hnetcfg/hnetcfg.c @@ -112,6 +112,7 @@ static const struct IClassFactoryVtbl hnetcfg_cf_vtbl = static hnetcfg_cf fw_manager_cf = { { &hnetcfg_cf_vtbl }, NetFwMgr_create }; static hnetcfg_cf fw_app_cf = { { &hnetcfg_cf_vtbl }, NetFwAuthorizedApplication_create }; +static hnetcfg_cf fw_openport_cf = { { &hnetcfg_cf_vtbl }, NetFwOpenPort_create }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -142,6 +143,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { cf = &fw_app_cf.IClassFactory_iface; } + else if (IsEqualGUID( rclsid, &CLSID_NetFwOpenPort )) + { + cf = &fw_openport_cf.IClassFactory_iface; + } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv ); diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index 05b0aee..273c97b 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -34,4 +34,5 @@ HRESULT NetFwProfile_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwAuthorizedApplication_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwAuthorizedApplications_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwOpenPorts_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT NetFwOpenPort_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index b81456f..9c3babc 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -321,7 +321,7 @@ static const struct INetFwOpenPortVtbl fw_port_vtbl = fw_port_get_BuiltIn }; -static HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT NetFwOpenPort_create( IUnknown *pUnkOuter, LPVOID *ppObj ) { fw_port *fp;

1 0

Jactry Zeng : riched20: Implement ITextRange::GetDuplicate.
by Alexandre Julliard Sept. 17, 2014

Sept. 17, 2014

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 ITextSelection::Collapse.
by Alexandre Julliard Sept. 17, 2014

Sept. 17, 2014

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

Jactry Zeng : riched20: Implement ITextSelection:: GetStart and ITextSelection::GetEnd.
by Alexandre Julliard Sept. 16, 2014

Sept. 16, 2014

Module: wine Branch: master Commit: 52fee14932cfed76e52627f39df806b14d2b76f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fee14932cfed76e52627f39… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 16 18:39:10 2014 +0800 riched20: Implement ITextSelection::GetStart and ITextSelection::GetEnd. --- dlls/riched20/richole.c | 16 +++++++++--- dlls/riched20/tests/richole.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index dab26f3..ddaee28 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1630,11 +1630,15 @@ static HRESULT WINAPI ITextSelection_fnSetFormattedText(ITextSelection *me, ITex static HRESULT WINAPI ITextSelection_fnGetStart(ITextSelection *me, LONG *pcpFirst) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + LONG lim; if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!pcpFirst) + return E_INVALIDARG; + ME_GetSelectionOfs(This->reOle->editor, pcpFirst, &lim); + TRACE("%d\n", *pcpFirst); + return S_OK; } static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG cpFirst) @@ -1650,11 +1654,15 @@ static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG cpFirst static HRESULT WINAPI ITextSelection_fnGetEnd(ITextSelection *me, LONG *pcpLim) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + LONG first; if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented\n"); - return E_NOTIMPL; + if (!pcpLim) + return E_INVALIDARG; + ME_GetSelectionOfs(This->reOle->editor, &first, pcpLim); + TRACE("%d\n", *pcpLim); + return S_OK; } static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG cpLim) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 681c5f7..312ab28 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -695,6 +695,66 @@ static void test_ITextRange_GetStart_GetEnd(void) release_interfaces(&w, &reOle, &txtDoc, NULL); } +static void test_ITextSelection_GetStart_GetEnd(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hres; + int 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 = 2, lim = 5; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 2, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 5, "got wrong end value: %d\n", end); + + first = 5, lim = 2; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 2, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 5, "got wrong end value: %d\n", end); + + first = 0, lim = -1; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 0, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 13, "got wrong end value: %d\n", end); + + first = 13, lim = 13; + SendMessageA(w, EM_SETSEL, first, lim); + start = 0xdeadbeef; + hres = ITextSelection_GetStart(txtSel, &start); + ok(hres == S_OK, "ITextSelection_GetStart\n"); + ok(start == 12, "got wrong start value: %d\n", start); + end = 0xdeadbeef; + hres = ITextSelection_GetEnd(txtSel, &end); + ok(hres == S_OK, "ITextSelection_GetEnd\n"); + ok(end == 12, "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 @@ -706,6 +766,7 @@ START_TEST(richole) test_ITextDocument_Open(); test_ITextSelection_GetText(); test_ITextSelection_GetChar(); + test_ITextSelection_GetStart_GetEnd(); test_ITextDocument_Range(); test_ITextRange_GetChar(); test_ITextRange_GetStart_GetEnd();

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateBitmapFromWicBitmap().
by Alexandre Julliard Sept. 16, 2014

Sept. 16, 2014

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

Jacek Caban : jscript: Add DISPATCH_PROPERTYGET flag only for DISPATCH_METHOD call in disp_call_value.
by Alexandre Julliard Sept. 16, 2014

Sept. 16, 2014

Module: wine Branch: master Commit: 02406d4fd4d55a9ef3950f2ba3932088b2fcbac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02406d4fd4d55a9ef3950f2ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:42:33 2014 +0200 jscript: Add DISPATCH_PROPERTYGET flag only for DISPATCH_METHOD call in disp_call_value. Spotted by Qian Hong. --- dlls/jscript/dispex.c | 2 +- dlls/jscript/tests/run.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 347e7e1..604bd26 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1202,7 +1202,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W return hres; } - if(r && argc) + if(r && argc && flags == DISPATCH_METHOD) flags |= DISPATCH_PROPERTYGET; hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index f6d600a..b8edd7d 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -95,6 +95,7 @@ DEFINE_EXPECT(dispexfunc_value); DEFINE_EXPECT(testobj_delete_test); DEFINE_EXPECT(testobj_delete_nodelete); DEFINE_EXPECT(testobj_value); +DEFINE_EXPECT(testobj_construct); DEFINE_EXPECT(testobj_prop_d); DEFINE_EXPECT(testobj_withprop_d); DEFINE_EXPECT(testobj_withprop_i); @@ -364,6 +365,10 @@ static HRESULT WINAPI testObj_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, case INVOKE_FUNC|INVOKE_PROPERTYGET: ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); break; + case DISPATCH_CONSTRUCT: + CHECK_EXPECT(testobj_construct); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + break; default: ok(0, "invalid flag (%x)\n", wFlags); } @@ -2121,6 +2126,10 @@ static BOOL run_tests(void) parse_script_a("ok(String.prototype.concat.call(testObj, ' OK') === '1 OK', 'wrong concat result');"); CHECK_CALLED(testobj_value); + SET_EXPECT(testobj_construct); + parse_script_a("var t = new testObj(1);"); + CHECK_CALLED(testobj_construct); + SET_EXPECT(global_propget_d); SET_EXPECT(global_propget_i); parse_script_a("this.testPropGet;");

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_sourceIndex implementation.
by Alexandre Julliard Sept. 16, 2014

Sept. 16, 2014

Module: wine Branch: master Commit: 063ef3ca0e15981645eb7f5bc872db4ccdcad6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=063ef3ca0e15981645eb7f5bc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 16 20:20:02 2014 +0200 mshtml: Added IHTMLElement::get_sourceIndex implementation. --- dlls/mshtml/htmlelem.c | 6 ++-- dlls/mshtml/htmlelemcol.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 60 ++++++++++++++++++++++++++++--------- 4 files changed, 121 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 363a89a..3037c10 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -907,8 +907,10 @@ static HRESULT WINAPI HTMLElement_contains(IHTMLElement *iface, IHTMLElement *pC static HRESULT WINAPI HTMLElement_get_sourceIndex(IHTMLElement *iface, LONG *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_elem_source_index(This, p); } static HRESULT WINAPI HTMLElement_get_recordNumber(IHTMLElement *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 8fd61ed..1542926 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -746,6 +747,75 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, ns return HTMLElementCollection_Create(buf.buf, buf.len); } +HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) +{ + elem_vector_t buf = {NULL, 0, 8}; + nsIDOMNode *parent_node, *iter; + UINT16 parent_type; + HTMLDOMNode *node; + int i; + nsresult nsres; + HRESULT hres; + + iter = elem->node.nsnode; + nsIDOMNode_AddRef(iter); + + /* Find document or document fragment parent. */ + while(1) { + nsres = nsIDOMNode_GetParentNode(iter, &parent_node); + nsIDOMNode_Release(iter); + assert(nsres == NS_OK); + if(!parent_node) + break; + + nsres = nsIDOMNode_GetNodeType(parent_node, &parent_type); + assert(nsres == NS_OK); + + if(parent_type != ELEMENT_NODE) { + if(parent_type != DOCUMENT_NODE && parent_type != DOCUMENT_FRAGMENT_NODE) + FIXME("Unexpected parent_type %d\n", parent_type); + break; + } + + iter = parent_node; + } + + if(!parent_node) { + *ret = -1; + return S_OK; + } + + hres = get_node(elem->node.doc, parent_node, TRUE, &node); + nsIDOMNode_Release(parent_node); + if(FAILED(hres)) + return hres; + + + /* Create all children collection and find the element in it. + * This could be optimized if we ever find the reason. */ + buf.buf = heap_alloc(buf.size*sizeof(*buf.buf)); + if(!buf.buf) { + IHTMLDOMNode_Release(&node->IHTMLDOMNode_iface); + return E_OUTOFMEMORY; + } + + create_all_list(elem->node.doc, node, &buf); + + for(i=0; i < buf.len; i++) { + if(buf.buf[i] == elem) + break; + } + IHTMLDOMNode_Release(&node->IHTMLDOMNode_iface); + heap_free(buf.buf); + if(i == buf.len) { + FIXME("The element is not in parent's child list?\n"); + return E_UNEXPECTED; + } + + *ret = i; + return S_OK; +} + static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len) { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 19e424f..78d61f0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -961,6 +961,7 @@ HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN; IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; +HRESULT get_elem_source_index(HTMLElement*,LONG*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; HRESULT elem_string_attr_getter(HTMLElement*,const WCHAR*,BOOL,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 17f39ce..9f352f6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1142,6 +1142,17 @@ static void _test_elem_offset(unsigned line, IUnknown *unk, const char *parent_t IHTMLElement_Release(elem); } +#define test_elem_source_index(a,b) _test_elem_source_index(__LINE__,a,b) +static void _test_elem_source_index(unsigned line, IHTMLElement *elem, int index) +{ + LONG l = 0xdeadbeef; + HRESULT hres; + + hres = IHTMLElement_get_sourceIndex(elem, &l); + ok_(__FILE__,line)(hres == S_OK, "get_sourceIndex failed: %08x\n", hres); + ok_(__FILE__,line)(l == index, "sourceIndex = %d, expected %d\n", l, index); +} + #define get_doc_node(d) _get_doc_node(__LINE__,d) static IHTMLDocument2 *_get_doc_node(unsigned line, IHTMLDocument2 *doc) { @@ -2105,6 +2116,26 @@ static void _test_range_parent(unsigned line, IHTMLTxtRange *range, elem_type_t IHTMLElement_Release(elem); } +#define get_elem_col_item_idx(a,b) _get_elem_col_item_idx(__LINE__,a,b) +static IHTMLElement *_get_elem_col_item_idx(unsigned line, IHTMLElementCollection *col, int i) +{ + VARIANT name, index; + IHTMLElement *elem; + IDispatch *disp; + HRESULT hres; + + V_VT(&index) = VT_EMPTY; + V_VT(&name) = VT_I4; + V_I4(&name) = i; + hres = IHTMLElementCollection_item(col, name, index, &disp); + ok_(__FILE__,line)(hres == S_OK, "item failed: %08x\n", hres); + ok_(__FILE__,line)(disp != NULL, "disp == NULL\n"); + + elem = _get_elem_iface(line, (IUnknown*)disp); + IDispatch_Release(disp); + return elem; +} + #define test_elem_collection(c,t,l) _test_elem_collection(__LINE__,c,t,l) static void _test_elem_collection(unsigned line, IUnknown *unk, const elem_type_t *elem_types, LONG exlen) @@ -2290,20 +2321,8 @@ static void _test_elem_getelembytag(unsigned line, IUnknown *unk, elem_type_t ty HeapFree(GetProcessHeap(), 0, types); - if(ret) { - IDispatch *disp; - VARIANT v; - - V_VT(&v) = VT_I4; - V_I4(&v) = 0; - disp = NULL; - hres = IHTMLElementCollection_item(col, v, v, &disp); - ok(hres == S_OK, "item failed: %08x\n", hres); - ok(disp != NULL, "disp == NULL\n"); - *ret = _get_elem_iface(line, (IUnknown*)disp); - IDispatch_Release(disp); - } - + if(ret) + *ret = get_elem_col_item_idx(col, 0); IHTMLElementCollection_Release(col); } @@ -6909,6 +6928,15 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "get_all failed: %08x\n", hres); test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); test_elem_col_item(col, "x", item_types, sizeof(item_types)/sizeof(item_types[0])); + + elem = get_elem_col_item_idx(col, 0); + test_elem_source_index(elem, 0); + IHTMLElement_Release(elem); + + elem = get_elem_col_item_idx(col, 3); + test_elem_source_index(elem, 3); + IHTMLElement_Release(elem); + IHTMLElementCollection_Release(col); hres = IHTMLDocument2_get_images(doc, &collection); @@ -7012,6 +7040,7 @@ static void test_elems(IHTMLDocument2 *doc) elem2 = test_elem_get_parent((IUnknown*)elem3); ok(elem2 == NULL, "elem2 != NULL\n"); + test_elem_source_index(elem3, 0); IHTMLElement_Release(elem3); test_elem_getelembytag((IUnknown*)elem, ET_OPTION, 2, NULL); @@ -7737,6 +7766,7 @@ static void test_create_elems(IHTMLDocument2 *doc) ok(type == 1, "type=%d\n", type); test_ifaces((IUnknown*)elem, elem_iids); test_disp((IUnknown*)elem, &DIID_DispHTMLGenericElement, "[object]"); + test_elem_source_index(elem, -1); body = doc_get_body(doc); test_node_has_child((IUnknown*)body, VARIANT_FALSE); @@ -8333,7 +8363,9 @@ static void test_docfrag(IHTMLDocument2 *doc) ok(location == (void*)0xdeadbeef, "location changed\n"); br = test_create_elem(doc, "BR"); + test_elem_source_index(br, -1); test_node_append_child((IUnknown*)frag, (IUnknown*)br); + test_elem_source_index(br, 0); IHTMLElement_Release(br); div = get_elem_by_id(doc, "divid", TRUE);

1 0

Henri Verbeet : d3d10core: Create wined3d views for shader resource views.
by Alexandre Julliard Sept. 16, 2014

Sept. 16, 2014

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 : d2d1: Implement d2d_d3d_render_target_CreateBitmap().
by Alexandre Julliard Sept. 16, 2014

Sept. 16, 2014

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