October 2015 - Wine-Commits

Daniel Lehman : msxml3: Treat namespace as attribute in IXMLDOMElement:: getAttribute.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: a20d152282ece6bd28c407ea02cd3826592581ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20d152282ece6bd28c407ea0… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Aug 18 15:32:58 2015 -0700 msxml3: Treat namespace as attribute in IXMLDOMElement::getAttribute. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/element.c | 25 ++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 38d3b47..6e00aa0 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1203,7 +1203,9 @@ static HRESULT WINAPI domelem_getAttribute( domelem *This = impl_from_IXMLDOMElement( iface ); xmlNodePtr element; xmlChar *xml_name, *xml_value = NULL; + xmlChar *local, *prefix; HRESULT hr = S_FALSE; + xmlNsPtr ns; TRACE("(%p)->(%s %p)\n", This, debugstr_w(name), value); @@ -1222,7 +1224,28 @@ static HRESULT WINAPI domelem_getAttribute( if(!xmlValidateNameValue(xml_name)) hr = E_FAIL; else - xml_value = xmlGetNsProp(element, xml_name, NULL); + { + if ((local = xmlSplitQName2(xml_name, &prefix))) + { + if (xmlStrEqual(prefix, BAD_CAST "xmlns")) + { + ns = xmlSearchNs(element->doc, element, local); + if (ns) + xml_value = xmlStrdup(ns->href); + } + else + { + ns = xmlSearchNs(element->doc, element, prefix); + if (ns) + xml_value = xmlGetNsProp(element, local, ns->href); + } + + xmlFree(prefix); + xmlFree(local); + } + else + xml_value = xmlGetNsProp(element, xml_name, NULL); + } heap_free(xml_name); if(xml_value) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ff6783b..1afc894 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10882,6 +10882,56 @@ static void test_getAttributeNode(void) free_bstrs(); } +static void test_getAttribute(void) +{ + IXMLDOMDocument *doc; + IXMLDOMElement *elem; + VARIANT_BOOL v; + VARIANT var; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &v); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + VariantInit(&var); + hr = IXMLDOMElement_getAttribute( elem, _bstr_("xmlns:foo"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("a"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr a")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("foo:b"), &var ); + EXPECT_HR(hr, S_OK); + ok( V_VT(&var) == VT_BSTR, "vt = %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), _bstr_("attr b")), "wrong attr value: %s\n", wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("b"), &var ); + EXPECT_HR(hr, S_FALSE); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + + hr = IXMLDOMElement_getAttribute( elem, _bstr_("non-existent"), &var ); + EXPECT_HR(hr, S_FALSE); + ok( V_VT(&var) == VT_NULL, "vt = %x\n", V_VT(&var)); + VariantClear(&var); + + IXMLDOMElement_Release(elem); + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + typedef struct { DOMNodeType type; const char *name; @@ -12071,6 +12121,7 @@ START_TEST(domdoc) test_dispex(); test_parseerror(); test_getAttributeNode(); + test_getAttribute(); test_supporterrorinfo(); test_nodeValue(); test_get_namespaces();

1 0

Riccardo Bortolato : d3d9: Make use of wined3d_texture_unmap in d3d9_volume_UnlockBox.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 8dd86823fdd9a5e631cf3173727b6f667ef1b611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd86823fdd9a5e631cf31737… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 7 19:04:32 2015 +0200 d3d9: Make use of wined3d_texture_unmap in d3d9_volume_UnlockBox. Also removed wined3d_volume_unmap from wined3d public api. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/volume.c | 2 +- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 1 - 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 25c2c2c..dde8980 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -167,7 +167,7 @@ static HRESULT WINAPI d3d9_volume_UnlockBox(IDirect3DVolume9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_volume_unmap(volume->wined3d_volume); + hr = wined3d_texture_unmap(volume->wined3d_texture, volume->sub_resource_idx); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 743f2dd..608f0c0 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -676,7 +676,7 @@ HRESULT wined3d_volume_map(struct wined3d_volume *volume, return WINED3D_OK; } -HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) +HRESULT wined3d_volume_unmap(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 5406ce0..0efa91c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -284,4 +284,3 @@ @ cdecl wined3d_vertex_declaration_incref(ptr) @ cdecl wined3d_volume_get_resource(ptr) -@ cdecl wined3d_volume_unmap(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2ee844..d75761e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2344,6 +2344,7 @@ void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD loc HRESULT wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) DECLSPEC_HIDDEN; void wined3d_volume_validate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; +HRESULT wined3d_volume_unmap(struct wined3d_volume *volume) DECLSPEC_HIDDEN; void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b8f6001..7422545 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2569,7 +2569,6 @@ void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); -HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume); /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x)

1 0

Sebastian Lackner : ntdll/tests: Add tests for calling NtReadFile/ NtWriteFile on directory.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: b8315e87f18cc8c29aa13ea88ee12a1e0be5587f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8315e87f18cc8c29aa13ea88… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 8 07:25:27 2015 +0200 ntdll/tests: Add tests for calling NtReadFile/NtWriteFile on directory. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 1afb9c8..b8f1847 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -177,6 +177,7 @@ static void create_file_test(void) static const WCHAR pathInvalidNtW[] = {'\\','\\','?','\\',0}; static const WCHAR pathInvalidNt2W[] = {'\\','?','?','\\',0}; static const WCHAR pathInvalidDosW[] = {'\\','D','o','s','D','e','v','i','c','e','s','\\',0}; + static const char testdata[] = "Hello World"; FILE_NETWORK_OPEN_INFORMATION info; NTSTATUS status; HANDLE dir, file; @@ -184,6 +185,9 @@ static void create_file_test(void) OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; UNICODE_STRING nameW; + LARGE_INTEGER offset; + char buf[32]; + DWORD ret; GetCurrentDirectoryW( MAX_PATH, path ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); @@ -195,9 +199,36 @@ static void create_file_test(void) attr.SecurityQualityOfService = NULL; /* try various open modes and options on directories */ - status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_OPEN, FILE_DIRECTORY_FILE, NULL, 0 ); + status = pNtCreateFile( &dir, GENERIC_READ|GENERIC_WRITE, &attr, &io, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_DIRECTORY_FILE, NULL, 0 ); ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + + U(io).Status = 0xdeadbeef; + offset.QuadPart = 0; + status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL ); + todo_wine + ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status ); + if (status == STATUS_PENDING) + { + ret = WaitForSingleObject( dir, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", ret ); + ok( U(io).Status == STATUS_INVALID_DEVICE_REQUEST, + "expected STATUS_INVALID_DEVICE_REQUEST, got %08x\n", U(io).Status ); + } + + U(io).Status = 0xdeadbeef; + offset.QuadPart = 0; + status = pNtWriteFile( dir, NULL, NULL, NULL, &io, testdata, sizeof(testdata), &offset, NULL); + todo_wine + ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtWriteFile error %08x\n", status ); + if (status == STATUS_PENDING) + { + ret = WaitForSingleObject( dir, 1000 ); + ok( ret == WAIT_OBJECT_0, "WaitForSingleObject error %u\n", ret ); + ok( U(io).Status == STATUS_INVALID_DEVICE_REQUEST, + "expected STATUS_INVALID_DEVICE_REQUEST, got %08x\n", U(io).Status ); + } + CloseHandle( dir ); status = pNtCreateFile( &dir, GENERIC_READ, &attr, &io, NULL, 0, FILE_SHARE_READ|FILE_SHARE_WRITE,

1 0

Riccardo Bortolato : d3d9: Make use of wined3d_texture_map in d3d9_volume_LockBox.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: b9cc2859fe21ab82f3bdf77002d9509021037f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9cc2859fe21ab82f3bdf7700… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Wed Oct 7 19:04:31 2015 +0200 d3d9: Make use of wined3d_texture_map in d3d9_volume_LockBox. Also removed wined3d_volume_map from wined3d public api. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/volume.c | 5 ++++- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 2 -- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a1b824b..28db978 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -191,6 +191,8 @@ struct d3d9_volume { IDirect3DVolume9 IDirect3DVolume9_iface; struct d3d9_resource resource; + struct wined3d_texture *wined3d_texture; + unsigned int sub_resource_idx; struct wined3d_volume *wined3d_volume; struct d3d9_texture *texture; }; diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 603fb6e..25c2c2c 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -148,7 +148,8 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface, iface, locked_box, box, flags); wined3d_mutex_lock(); - hr = wined3d_volume_map(volume->wined3d_volume, &map_desc, (const struct wined3d_box *)box, flags); + hr = wined3d_texture_map(volume->wined3d_texture, volume->sub_resource_idx, + &map_desc, (const struct wined3d_box *)box, flags); wined3d_mutex_unlock(); locked_box->RowPitch = map_desc.row_pitch; @@ -209,6 +210,8 @@ void volume_init(struct d3d9_volume *volume, struct wined3d_texture *wined3d_tex volume->resource.refcount = 0; volume->wined3d_volume = wined3d_volume; volume->texture = wined3d_texture_get_parent(wined3d_texture); + volume->wined3d_texture = wined3d_texture; + volume->sub_resource_idx = sub_resource_idx; *parent_ops = &d3d9_volume_wined3d_parent_ops; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 099927c..743f2dd 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -531,7 +531,7 @@ static BOOL wined3d_volume_check_box_dimensions(const struct wined3d_volume *vol return TRUE; } -HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, +HRESULT wined3d_volume_map(struct wined3d_volume *volume, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { struct wined3d_device *device = volume->resource.device; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index dbe078f..5406ce0 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -284,5 +284,4 @@ @ cdecl wined3d_vertex_declaration_incref(ptr) @ cdecl wined3d_volume_get_resource(ptr) -@ cdecl wined3d_volume_map(ptr ptr ptr long) @ cdecl wined3d_volume_unmap(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3071726..e2ee844 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2341,6 +2341,8 @@ void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pit void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void wined3d_volume_invalidate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; +HRESULT wined3d_volume_map(struct wined3d_volume *volume, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) DECLSPEC_HIDDEN; void wined3d_volume_validate_location(struct wined3d_volume *volume, DWORD location) DECLSPEC_HIDDEN; void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c9448df..b8f6001 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2569,8 +2569,6 @@ void * __cdecl wined3d_vertex_declaration_get_parent(const struct wined3d_vertex ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaration *declaration); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); -HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, - struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume); /* Return the integer base-2 logarithm of x. Undefined for x == 0. */

1 0

Iván Matellanes : msvcirt: Implement stdiobuf:: setrwbuf.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 66ff2e3bad1d0b6e011381afc598f5b92fb9f0fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ff2e3bad1d0b6e011381afc… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 7 22:19:30 2015 +0100 msvcirt: Implement stdiobuf::setrwbuf. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 28 ++++++++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 1d915fa..1eefe73 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1580,8 +1580,32 @@ streampos __thiscall stdiobuf_seekoff(stdiobuf *this, streamoff offset, ios_seek DEFINE_THISCALL_WRAPPER(stdiobuf_setrwbuf, 12) int __thiscall stdiobuf_setrwbuf(stdiobuf *this, int read_size, int write_size) { - FIXME("(%p %d %d) stub\n", this, read_size, write_size); - return EOF; + char *reserve; + int buffer_size = read_size + write_size; + + TRACE("(%p %d %d)\n", this, read_size, write_size); + if (read_size < 0 || write_size < 0) + return 0; + if (!buffer_size) { + this->base.unbuffered = 1; + return 0; + } + /* get a new buffer */ + reserve = MSVCRT_operator_new(buffer_size); + if (!reserve) + return 0; + streambuf_setb(&this->base, reserve, reserve + buffer_size, 1); + this->base.unbuffered = 0; + /* set the get/put areas */ + if (read_size > 0) + streambuf_setg(&this->base, reserve, reserve + read_size, reserve + read_size); + else + streambuf_setg(&this->base, NULL, NULL, NULL); + if (write_size > 0) + streambuf_setp(&this->base, reserve + read_size, reserve + buffer_size); + else + streambuf_setp(&this->base, NULL, NULL); + return 1; } /* ?stdiofile(a)stdiobuf@@QAEPAU_iobuf@@XZ */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 8bc45c1..758062c 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -210,6 +210,7 @@ static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*); static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*); static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*); static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int); +static int (*__thiscall p_stdiobuf_setrwbuf)(stdiobuf*, int, int); static int (*__thiscall p_stdiobuf_sync)(stdiobuf*); static int (*__thiscall p_stdiobuf_underflow)(stdiobuf*); @@ -374,6 +375,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA(a)PEAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA(a)XZ"); SET(p_stdiobuf_overflow, "?overflow(a)stdiobuf@@UEAAHH(a)Z"); + SET(p_stdiobuf_setrwbuf, "?setrwbuf(a)stdiobuf@@QEAAHHH(a)Z"); SET(p_stdiobuf_sync, "?sync(a)stdiobuf@@UEAAHXZ"); SET(p_stdiobuf_underflow, "?underflow(a)stdiobuf@@UEAAHXZ"); @@ -458,6 +460,7 @@ static BOOL init(void) SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE(a)PAU_iobuf@@@Z"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE(a)XZ"); SET(p_stdiobuf_overflow, "?overflow(a)stdiobuf@@UAEHH(a)Z"); + SET(p_stdiobuf_setrwbuf, "?setrwbuf(a)stdiobuf@@QAEHHH(a)Z"); SET(p_stdiobuf_sync, "?sync(a)stdiobuf@@UAEHXZ"); SET(p_stdiobuf_underflow, "?underflow(a)stdiobuf@@UAEHXZ"); @@ -2016,6 +2019,35 @@ static void test_stdiobuf(void) ok(stb2.base.gptr == stb2.base.egptr, "wrong get pointer, expected %p got %p\n", stb2.base.egptr, stb2.base.gptr); stb2.base.unbuffered = 1; + /* setrwbuf */ + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 100, 60); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb1.base.allocated == 1, "wrong allocate value, expected 1 got %d\n", stb1.base.allocated); + ok(stb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", stb1.base.unbuffered); + ok(stb1.base.ebuf == stb1.base.base + 160, "expected %p got %p\n", stb1.base.base + 160, stb1.base.ebuf); + ok(stb1.base.eback == stb1.base.base, "wrong get base, expected %p got %p\n", stb1.base.base, stb1.base.eback); + ok(stb1.base.gptr == stb1.base.base + 100, "wrong get pointer, expected %p got %p\n", stb1.base.base + 100, stb1.base.gptr); + ok(stb1.base.egptr == stb1.base.base + 100, "wrong get end, expected %p got %p\n", stb1.base.base + 100, stb1.base.egptr); + ok(stb1.base.pbase == stb1.base.base + 100, "wrong put base, expected %p got %p\n", stb1.base.base + 100, stb1.base.pbase); + ok(stb1.base.pptr == stb1.base.base + 100, "wrong put pointer, expected %p got %p\n", stb1.base.base + 100, stb1.base.pptr); + ok(stb1.base.epptr == stb1.base.base + 160, "wrong put end, expected %p got %p\n", stb1.base.base + 160, stb1.base.epptr); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, -1, 64); + ok(ret == 0 || ret == 1, "expected 0 or 1, got %d\n", ret); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 32, -8); + ok(ret == 0 || ret == 1, "expected 0 or 1, got %d\n", ret); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 0, 64); + ok(ret == 1, "expected 1 got %d\n", ret); + ok(stb1.base.ebuf == stb1.base.base + 64, "expected %p got %p\n", stb1.base.base + 64, stb1.base.ebuf); + ok(stb1.base.eback == NULL, "wrong get base, expected %p got %p\n", NULL, stb1.base.eback); + ok(stb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, stb1.base.gptr); + ok(stb1.base.egptr == NULL, "wrong get end, expected %p got %p\n", NULL, stb1.base.egptr); + ok(stb1.base.pbase == stb1.base.base, "wrong put base, expected %p got %p\n", stb1.base.base, stb1.base.pbase); + ok(stb1.base.pptr == stb1.base.base, "wrong put pointer, expected %p got %p\n", stb1.base.base, stb1.base.pptr); + ok(stb1.base.epptr == stb1.base.base + 64, "wrong put end, expected %p got %p\n", stb1.base.base + 64, stb1.base.epptr); + ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 0, 0); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(stb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", stb1.base.unbuffered); + call_func1(p_stdiobuf_dtor, &stb1); call_func1(p_stdiobuf_dtor, &stb2); fclose(file1);

1 0

Ken Thomases : winemac: Remove JPEG 2000 from the bitmap formats that other bitmap formats can be converted to.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 10b95d0dc74d1c9f069807ec3f397839c3f9cc79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b95d0dc74d1c9f069807ec3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 7 16:22:27 2015 -0500 winemac: Remove JPEG 2000 from the bitmap formats that other bitmap formats can be converted to. Since a983cfb01, the Mac driver won't even present formats, like this one, which don't correspond to a known Windows format through the clipboard APIs, so it's pointless. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_clipboard.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index b8ca796..1d1cb88 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -66,12 +66,10 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) [NSNumber numberWithUnsignedInteger:NSBMPFileType], [NSNumber numberWithUnsignedInteger:NSGIFFileType], [NSNumber numberWithUnsignedInteger:NSJPEGFileType], - [NSNumber numberWithUnsignedInteger:NSJPEG2000FileType], nil]; BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png", - @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", - @"public.jpeg-2000", nil]; + @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", nil]; BitmapOutputTypeMap = [[NSDictionary alloc] initWithObjects:bitmapFileTypes forKeys:BitmapOutputTypes];

1 0

Nikolay Sivov : wiaservc/tests: Basic test for device enumerator.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: 6fc2d3ce2e0e46b1c1302c7279689d843d1c40d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fc2d3ce2e0e46b1c1302c727… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 00:12:34 2015 +0300 wiaservc/tests: Basic test for device enumerator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wiaservc/tests/Makefile.in | 5 +++ dlls/wiaservc/tests/wia.c | 76 +++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/wia_lh.idl | 2 ++ include/wia_xp.idl | 2 ++ include/wiadef.h | 22 ++++++++++++ 8 files changed, 110 insertions(+) diff --git a/configure b/configure index 8b1fb86..2ba059a 100755 --- a/configure +++ b/configure @@ -17872,6 +17872,7 @@ wine_fn_config_dll wer enable_wer implib wine_fn_config_test dlls/wer/tests wer_test wine_fn_config_dll wevtapi enable_wevtapi wine_fn_config_dll wiaservc enable_wiaservc clean +wine_fn_config_test dlls/wiaservc/tests wiaservc_test wine_fn_config_dll win32s16.dll16 enable_win16 wine_fn_config_dll win87em.dll16 enable_win16 wine_fn_config_dll winaspi.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 5e83d39..1e9bd66 100644 --- a/configure.ac +++ b/configure.ac @@ -3385,6 +3385,7 @@ WINE_CONFIG_DLL(wer,,[implib]) WINE_CONFIG_TEST(dlls/wer/tests) WINE_CONFIG_DLL(wevtapi) WINE_CONFIG_DLL(wiaservc,,[clean]) +WINE_CONFIG_TEST(dlls/wiaservc/tests) WINE_CONFIG_DLL(win32s16.dll16,enable_win16) WINE_CONFIG_DLL(win87em.dll16,enable_win16) WINE_CONFIG_DLL(winaspi.dll16,enable_win16) diff --git a/dlls/wiaservc/tests/Makefile.in b/dlls/wiaservc/tests/Makefile.in new file mode 100644 index 0000000..594e1b2 --- /dev/null +++ b/dlls/wiaservc/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wiaservc.dll +IMPORTS = ole32 + +C_SRCS = \ + wia.c diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c new file mode 100644 index 0000000..e3f4edb --- /dev/null +++ b/dlls/wiaservc/tests/wia.c @@ -0,0 +1,76 @@ +/* + * Unit test suite for WIA system + * + * Copyright 2015 Nikolay Sivov 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 <stdio.h> + +#define COBJMACROS + +#include "objbase.h" +#include "initguid.h" +#include "wia_lh.h" + +#include "wine/test.h" + +static IWiaDevMgr *devmanager; + +static void test_EnumDeviceInfo(void) +{ + IEnumWIA_DEV_INFO *devenum; + HRESULT hr; + ULONG count; + + hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, NULL); + ok(FAILED(hr), "got 0x%08x\n", hr); + + hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, &devenum); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (hr == S_OK) { + hr = IEnumWIA_DEV_INFO_GetCount(devenum, NULL); + ok(FAILED(hr), "got 0x%08x\n", hr); + + count = 1000; + hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count != 1000, "got %u\n", count); + + IEnumWIA_DEV_INFO_Release(devenum); +} +} + +START_TEST(wia) +{ + HRESULT hr; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_WiaDevMgr, NULL, CLSCTX_LOCAL_SERVER, &IID_IWiaDevMgr, (void**)&devmanager); + if (FAILED(hr)) { + win_skip("Failed to create WiaDevMgr instance, 0x%08x\n", hr); + CoUninitialize(); + return; + } + + test_EnumDeviceInfo(); + + IWiaDevMgr_Release(devmanager); + CoUninitialize(); +} diff --git a/include/Makefile.in b/include/Makefile.in index 84a6381..3d2c97f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -611,6 +611,7 @@ SRCDIR_INCLUDES = \ werapi.h \ wfext.h \ wia.h \ + wiadef.h \ winbase.h \ wincon.h \ wincred.h \ diff --git a/include/wia_lh.idl b/include/wia_lh.idl index 7cadbc6..284528a 100644 --- a/include/wia_lh.idl +++ b/include/wia_lh.idl @@ -20,6 +20,8 @@ import "unknwn.idl"; import "oaidl.idl"; import "propidl.idl"; +cpp_quote("#include <wiadef.h>") + interface IEnumWIA_DEV_INFO; interface IWiaPropertyStorage; interface IWiaItem; diff --git a/include/wia_xp.idl b/include/wia_xp.idl index 7cadbc6..284528a 100644 --- a/include/wia_xp.idl +++ b/include/wia_xp.idl @@ -20,6 +20,8 @@ import "unknwn.idl"; import "oaidl.idl"; import "propidl.idl"; +cpp_quote("#include <wiadef.h>") + interface IEnumWIA_DEV_INFO; interface IWiaPropertyStorage; interface IWiaItem; diff --git a/include/wiadef.h b/include/wiadef.h new file mode 100644 index 0000000..28e43e0 --- /dev/null +++ b/include/wiadef.h @@ -0,0 +1,22 @@ +/* + * WIA constants + * + * Copyright 2015 Nikolay Sivov 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 + */ + +#define WIA_DEVINFO_ENUM_ALL 0x0000000f +#define WIA_DEVINFO_ENUM_LOCAL 0x00000010

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateBlendState().
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: e2f851783313f34c88943025e80b01e191b14973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f851783313f34c88943025e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:55 2015 +0200 d3d11: Implement d3d11_device_CreateBlendState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 +- dlls/d3d11/device.c | 136 +++++++++++++++++++++++++++++++-------------- dlls/d3d11/state.c | 23 +++++++- 3 files changed, 117 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2f851783313f34c88943…

1 0

Józef Kucia : d3d11: Implement ID3D11BlendState interface.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: abf6b7422d7604f3a2f1d1736b5d57bf9568b2b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf6b7422d7604f3a2f1d1736… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Oct 8 02:55:54 2015 +0200 d3d11: Implement ID3D11BlendState interface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 5 +- dlls/d3d11/state.c | 148 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 131 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b2de1a7..3ee0606 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -275,16 +275,17 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; -/* ID3D10BlendState */ +/* ID3D11BlendState, ID3D10BlendState */ struct d3d_blend_state { + ID3D11BlendState ID3D11BlendState_iface; ID3D10BlendState ID3D10BlendState_iface; LONG refcount; struct wined3d_private_store private_store; D3D10_BLEND_DESC desc; struct wine_rb_entry entry; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 2130399..cdc6ebe 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -30,56 +30,66 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); #define D3D10_FILTER_ANISO_MASK 0x40 #define D3D10_FILTER_COMPARE_MASK 0x80 -static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +/* ID3D11BlendState methods */ + +static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) { - return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState_iface); + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState *iface, REFIID riid, void **object) { + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ID3D10BlendState) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + if (IsEqualGUID(riid, &IID_ID3D11BlendState) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11BlendState_AddRef(iface); *object = iface; return S_OK; } + if (IsEqualGUID(riid, &IID_ID3D10BlendState) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10BlendState_AddRef(&state->ID3D10BlendState_iface); + *object = &state->ID3D10BlendState_iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) { - struct d3d_blend_state *This = impl_from_ID3D10BlendState(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + ULONG refcount = InterlockedIncrement(&state->refcount); - TRACE("%p increasing refcount to %u.\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", state, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface) { - struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - struct d3d_device *device = impl_from_ID3D10Device(state->device); + struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->blend_states, &state->desc); - ID3D10Device1_Release(state->device); + ID3D11Device_Release(state->device); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, state); @@ -88,6 +98,104 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface return refcount; } +static void STDMETHODCALLTYPE d3d11_blend_state_GetDevice(ID3D11BlendState *iface, + ID3D11Device **device) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = state->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_GetPrivateData(ID3D11BlendState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateData(ID3D11BlendState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_blend_state_SetPrivateDataInterface(ID3D11BlendState *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&state->private_store, guid, data); +} + +static void STDMETHODCALLTYPE d3d11_blend_state_GetDesc(ID3D11BlendState *iface, D3D11_BLEND_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl = +{ + /* IUnknown methods */ + d3d11_blend_state_QueryInterface, + d3d11_blend_state_AddRef, + d3d11_blend_state_Release, + /* ID3D11DeviceChild methods */ + d3d11_blend_state_GetDevice, + d3d11_blend_state_GetPrivateData, + d3d11_blend_state_SetPrivateData, + d3d11_blend_state_SetPrivateDataInterface, + /* ID3D11BlendState methods */ + d3d11_blend_state_GetDesc, +}; + +/* ID3D10BlendState methods */ + +static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, + REFIID riid, void **object) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_blend_state_AddRef(&state->ID3D11BlendState_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_blend_state_Release(&state->ID3D11BlendState_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device) @@ -96,8 +204,7 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *ifac TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)state->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface, @@ -162,6 +269,7 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D10_BLEND_DESC *desc) { + state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; wined3d_mutex_lock(); @@ -177,8 +285,8 @@ HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *d } wined3d_mutex_unlock(); - state->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(state->device); + state->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(state->device); return S_OK; }

1 0

Iván Matellanes : msvcirt: Improve implementation of streambuf::pbackfail.
by Alexandre Julliard Oct. 8, 2015

Oct. 8, 2015

Module: wine Branch: master Commit: b34b65e462af459b40821f9b2629b0c7d2c1300b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34b65e462af459b40821f9b2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 7 22:19:32 2015 +0100 msvcirt: Improve implementation of streambuf::pbackfail. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 35 +++++++++++------- dlls/msvcirt/tests/msvcirt.c | 88 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b34b65e462af459b40821…

1 0