November 2012 - Wine-commits

Dmitry Timoshkov : windowscodecs: Implement QueryCapability in the TIFF decoder.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: a3711295dad197c55ec5c0f6756dde6097a25c52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3711295dad197c55ec5c0f67… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 21 17:12:47 2012 +0800 windowscodecs: Implement QueryCapability in the TIFF decoder. --- dlls/windowscodecs/tests/tiffformat.c | 7 ------- dlls/windowscodecs/tiffformat.c | 19 +++++++++++++++---- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 4cbda4d..d8cb10a 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -212,31 +212,25 @@ static void test_QueryCapability(void) capability = 0xdeadbeef; hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); -todo_wine ok(hr == S_OK, "QueryCapability error %#x\n", hr); -todo_wine ok(capability == exp_caps || capability == exp_caps_xp, "expected %#x, got %#x\n", exp_caps, capability); frame_count = 0xdeadbeef; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); ok(hr == S_OK, "GetFrameCount error %#x\n", hr); -todo_wine ok(frame_count == 1, "expected 1, got %u\n", frame_count); pos.QuadPart = 0; hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); ok(hr == S_OK, "IStream_Seek error %#x\n", hr); -todo_wine ok(cur_pos.QuadPart > 4 && cur_pos.QuadPart < sizeof(tiff_1bpp_data), "current stream pos is at %x/%x\n", cur_pos.u.LowPart, cur_pos.u.HighPart); hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); -todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); -todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); IWICBitmapDecoder_Release(decoder); @@ -261,7 +255,6 @@ todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); -todo_wine ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); IWICBitmapDecoder_Release(decoder); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f22d9f6..bacc9c5 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -550,11 +550,22 @@ static ULONG WINAPI TiffDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI TiffDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI TiffDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, + DWORD *capability) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, stream, capability); + + if (!stream || !capability) return E_INVALIDARG; + + hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); + if (hr != S_OK) return hr; + + *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages | + WICBitmapDecoderCapabilityCanEnumerateMetadata; + return S_OK; } static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream,

1 0

Alexandre Julliard : user32: Don' t check for driver events before normal messages in GetMessage.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 8ba4c316f2a65354783a03e0559abee2082b813f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ba4c316f2a65354783a03e05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 21 19:20:09 2012 +0100 user32: Don't check for driver events before normal messages in GetMessage. --- dlls/user32/message.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 6d45671..2ffbf6e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3727,9 +3727,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT USER_CheckNotLock(); - /* check for graphics events */ - USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); - if (first || last) { if ((first <= WM_KEYLAST) && (last >= WM_KEYFIRST)) mask |= QS_KEY;

1 0

Alexandre Julliard : user32: Don' t check for driver events before normal messages in PeekMessage.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 841214ddb4d4dc620e6b51dfe6655b585d423edc URL: http://source.winehq.org/git/wine.git/?a=commit;h=841214ddb4d4dc620e6b51dfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 21 19:20:27 2012 +0100 user32: Don't check for driver events before normal messages in PeekMessage. --- dlls/user32/message.c | 15 ++++++++++----- dlls/user32/tests/msg.c | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2ffbf6e..ba37a3a 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3681,14 +3681,19 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, USER_CheckNotLock(); - /* check for graphics events */ - USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); - if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { + DWORD ret; + flush_window_surfaces( !(flags & PM_NOYIELD) ); - if (!(flags & PM_NOYIELD)) wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); - return FALSE; + + if (flags & PM_NOYIELD) + ret = USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); + else + ret = wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); + + /* if we received driver events, check again for a pending message */ + if (ret == WAIT_TIMEOUT || !peek_message( &msg, hwnd, first, last, flags, 0 )) return FALSE; } /* copy back our internal safe copy of message data to msg_out. diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bfc3830..9816f13 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6795,6 +6795,7 @@ static void test_interthread_messages(void) wnd_event.hwnd = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); ok (wnd_event.hwnd != 0, "Failed to create parent window\n"); + flush_events(); flush_sequence(); log_all_parent_messages++; wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL );

1 0

Jacek Caban : mshtml: Always use UTF-8 encoding in nsWineURL.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: d202daa1829f60bc5c05a8c4cf8a2ad57e7eb792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d202daa1829f60bc5c05a8c4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 15:06:34 2012 +0100 mshtml: Always use UTF-8 encoding in nsWineURL. --- dlls/mshtml/mshtml_private.h | 30 ++++++++++++++++++++++++++++++ dlls/mshtml/nsio.c | 34 +++++++++++++++++----------------- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f9c05f0..d2c7b28 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1102,6 +1102,36 @@ static inline char *heap_strdupWtoA(LPCWSTR str) return ret; } +static inline WCHAR *heap_strdupUtoW(const char *str) +{ + WCHAR *ret = NULL; + + if(str) { + size_t len; + + len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_UTF8, 0, str, -1, ret, len); + } + + return ret; +} + +static inline char *heap_strdupWtoU(const WCHAR *str) +{ + char *ret = NULL; + + if(str) { + size_t size = WideCharToMultiByte(CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL); + ret = heap_alloc(size); + if(ret) + WideCharToMultiByte(CP_UTF8, 0, str, -1, ret, size, NULL, NULL); + } + + return ret; +} + static inline void windowref_addref(windowref_t *ref) { InterlockedIncrement(&ref->ref); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 90543df..e3520d1 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -162,12 +162,12 @@ static nsresult return_wstr_nsacstr(nsACString *ret_str, const WCHAR *str, int l return NS_OK; } - lena = WideCharToMultiByte(CP_ACP, 0, str, len, NULL, 0, NULL, NULL); + lena = WideCharToMultiByte(CP_UTF8, 0, str, len, NULL, 0, NULL, NULL); stra = heap_alloc(lena+1); if(!stra) return NS_ERROR_OUT_OF_MEMORY; - WideCharToMultiByte(CP_ACP, 0, str, len, stra, lena, NULL, NULL); + WideCharToMultiByte(CP_UTF8, 0, str, len, stra, lena, NULL, NULL); stra[lena] = 0; nsACString_SetData(ret_str, stra); @@ -1769,7 +1769,7 @@ static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *r return NS_ERROR_UNEXPECTED; } - vala = heap_strdupWtoA(val); + vala = heap_strdupWtoU(val); SysFreeString(val); if(!vala) return NS_ERROR_OUT_OF_MEMORY; @@ -1876,7 +1876,7 @@ static nsresult NSAPI nsURI_SetSpec(nsIFileURL *iface, const nsACString *aSpec) return NS_ERROR_UNEXPECTED; nsACString_GetData(aSpec, &speca); - spec = heap_strdupAtoW(speca); + spec = heap_strdupUtoW(speca); if(!spec) return NS_ERROR_OUT_OF_MEMORY; @@ -1942,7 +1942,7 @@ static nsresult NSAPI nsURI_SetScheme(nsIFileURL *iface, const nsACString *aSche return NS_ERROR_UNEXPECTED; nsACString_GetData(aScheme, &schemea); - scheme = heap_strdupAtoW(schemea); + scheme = heap_strdupUtoW(schemea); if(!scheme) return NS_ERROR_OUT_OF_MEMORY; @@ -2002,7 +2002,7 @@ static nsresult NSAPI nsURI_SetUserPass(nsIFileURL *iface, const nsACString *aUs if(*user_pass) { WCHAR *ptr; - buf = heap_strdupAtoW(user_pass); + buf = heap_strdupUtoW(user_pass); if(!buf) return NS_ERROR_OUT_OF_MEMORY; @@ -2049,7 +2049,7 @@ static nsresult NSAPI nsURI_SetUsername(nsIFileURL *iface, const nsACString *aUs return NS_ERROR_UNEXPECTED; nsACString_GetData(aUsername, &usera); - user = heap_strdupAtoW(usera); + user = heap_strdupUtoW(usera); if(!user) return NS_ERROR_OUT_OF_MEMORY; @@ -2083,7 +2083,7 @@ static nsresult NSAPI nsURI_SetPassword(nsIFileURL *iface, const nsACString *aPa return NS_ERROR_UNEXPECTED; nsACString_GetData(aPassword, &passa); - pass = heap_strdupAtoW(passa); + pass = heap_strdupUtoW(passa); if(!pass) return NS_ERROR_OUT_OF_MEMORY; @@ -2118,7 +2118,7 @@ static nsresult NSAPI nsURI_GetHostPort(nsIFileURL *iface, nsACString *aHostPort if(!ptr) ptr = val; - vala = heap_strdupWtoA(ptr); + vala = heap_strdupWtoU(ptr); SysFreeString(val); if(!vala) return NS_ERROR_OUT_OF_MEMORY; @@ -2161,7 +2161,7 @@ static nsresult NSAPI nsURI_SetHost(nsIFileURL *iface, const nsACString *aHost) return NS_ERROR_UNEXPECTED; nsACString_GetData(aHost, &hosta); - host = heap_strdupAtoW(hosta); + host = heap_strdupUtoW(hosta); if(!host) return NS_ERROR_OUT_OF_MEMORY; @@ -2230,7 +2230,7 @@ static nsresult NSAPI nsURI_SetPath(nsIFileURL *iface, const nsACString *aPath) return NS_ERROR_UNEXPECTED; nsACString_GetData(aPath, &patha); - path = heap_strdupAtoW(patha); + path = heap_strdupUtoW(patha); if(!path) return NS_ERROR_OUT_OF_MEMORY; @@ -2292,7 +2292,7 @@ static nsresult NSAPI nsURI_SchemeIs(nsIFileURL *iface, const char *scheme, cpp_ if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR)); + MultiByteToWideChar(CP_UTF8, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR)); *_retval = !strcmpW(scheme_name, buf); SysFreeString(scheme_name); return NS_OK; @@ -2336,7 +2336,7 @@ static nsresult NSAPI nsURI_Resolve(nsIFileURL *iface, const nsACString *aRelati return NS_ERROR_UNEXPECTED; nsACString_GetData(aRelativePath, &patha); - path = heap_strdupAtoW(patha); + path = heap_strdupUtoW(patha); if(!path) return NS_ERROR_OUT_OF_MEMORY; @@ -2352,7 +2352,7 @@ static nsresult NSAPI nsURI_Resolve(nsIFileURL *iface, const nsACString *aRelati if(FAILED(hres)) return NS_ERROR_FAILURE; - reta = heap_strdupWtoA(ret); + reta = heap_strdupWtoU(ret); SysFreeString(ret); if(!reta) return NS_ERROR_OUT_OF_MEMORY; @@ -2404,7 +2404,7 @@ static nsresult NSAPI nsURL_GetRef(nsIFileURL *iface, nsACString *aRef) if(FAILED(hres)) return NS_ERROR_UNEXPECTED; - refa = heap_strdupWtoA(ref); + refa = heap_strdupWtoU(ref); SysFreeString(ref); if(ref && !refa) return NS_ERROR_OUT_OF_MEMORY; @@ -2427,7 +2427,7 @@ static nsresult NSAPI nsURL_SetRef(nsIFileURL *iface, const nsACString *aRef) return NS_ERROR_UNEXPECTED; nsACString_GetData(aRef, &refa); - ref = heap_strdupAtoW(refa); + ref = heap_strdupUtoW(refa); if(!ref) return NS_ERROR_OUT_OF_MEMORY; @@ -2563,7 +2563,7 @@ static nsresult NSAPI nsURL_SetQuery(nsIFileURL *iface, const nsACString *aQuery return NS_ERROR_UNEXPECTED; nsACString_GetData(aQuery, &querya); - query = heap_strdupAtoW(querya); + query = heap_strdupUtoW(querya); if(!query) return NS_ERROR_OUT_OF_MEMORY;

1 0

Jacek Caban : mshtml: Added nsIURI::GetOriginCharset implementation.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 2f5123cbbc8655fc410ed47b0e7dff51d857a3ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5123cbbc8655fc410ed47b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 15:06:46 2012 +0100 mshtml: Added nsIURI::GetOriginCharset implementation. --- dlls/mshtml/nsio.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e3520d1..89a7fe8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -63,6 +63,7 @@ struct nsWineURI { nsChannelBSC *channel_bsc; IUri *uri; IUriBuilder *uri_builder; + char *origin_charset; BOOL is_doc_uri; BOOL is_mutable; DWORD scheme; @@ -140,7 +141,7 @@ static BOOL compare_ignoring_frag(IUri *uri1, IUri *uri2) return ret; } -static nsresult create_nsuri(IUri*,HTMLOuterWindow*,NSContainer*,nsWineURI**); +static nsresult create_nsuri(IUri*,HTMLOuterWindow*,NSContainer*,const char*,nsWineURI**); static const char *debugstr_nsacstr(const nsACString *nsstr) { @@ -1847,6 +1848,7 @@ static nsrefcnt NSAPI nsURI_Release(nsIFileURL *iface) nsIWebBrowserChrome_Release(&This->container->nsIWebBrowserChrome_iface); if(This->uri) IUri_Release(This->uri); + heap_free(This->origin_charset); heap_free(This); } @@ -2309,7 +2311,8 @@ static nsresult NSAPI nsURI_Clone(nsIFileURL *iface, nsIURI **_retval) if(!ensure_uri(This)) return NS_ERROR_UNEXPECTED; - nsres = create_nsuri(This->uri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(This->uri, This->window_ref ? This->window_ref->window : NULL, + This->container, This->origin_charset, &wine_uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); return nsres; @@ -2384,8 +2387,11 @@ static nsresult NSAPI nsURI_GetAsciiHost(nsIFileURL *iface, nsACString *aAsciiHo static nsresult NSAPI nsURI_GetOriginCharset(nsIFileURL *iface, nsACString *aOriginCharset) { nsWineURI *This = impl_from_nsIFileURL(iface); - FIXME("(%p)->(%p)\n", This, aOriginCharset); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)->(%p)\n", This, aOriginCharset); + + nsACString_SetData(aOriginCharset, This->origin_charset); + return NS_OK; } static nsresult NSAPI nsURL_GetRef(nsIFileURL *iface, nsACString *aRef) @@ -2481,7 +2487,8 @@ static nsresult NSAPI nsURI_CloneIgnoreRef(nsIFileURL *iface, nsIURI **_retval) if(!uri) return NS_ERROR_FAILURE; - nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->container, &wine_uri); + nsres = create_nsuri(uri, This->window_ref ? This->window_ref->window : NULL, This->container, + This->origin_charset, &wine_uri); IUri_Release(uri); if(NS_FAILED(nsres)) { WARN("create_nsuri failed: %08x\n", nsres); @@ -2850,7 +2857,8 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { nsStandardURL_Init }; -static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, nsWineURI **_retval) +static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, + const char *origin_charset, nsWineURI **_retval) { nsWineURI *ret; HRESULT hres; @@ -2874,6 +2882,14 @@ static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *c if(FAILED(hres)) ret->scheme = URL_SCHEME_UNKNOWN; + if(origin_charset && *origin_charset && strcmp(origin_charset, "UTF-8")) { + ret->origin_charset = heap_strdupA(origin_charset); + if(!ret->origin_charset) { + nsIFileURL_Release(&ret->nsIFileURL_iface); + return NS_ERROR_OUT_OF_MEMORY; + } + } + TRACE("retval=%p\n", ret); *_retval = ret; return NS_OK; @@ -2890,7 +2906,7 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, const WCHAR *url, nsWineURI **re if(FAILED(hres)) return hres; - nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, &uri); + nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, NULL, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -2942,7 +2958,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC if(orig_channel->uri->window_ref) window = orig_channel->uri->window_ref->window; - nsres = create_nsuri(iuri, window, NULL, &uri); + nsres = create_nsuri(iuri, window, NULL, NULL, &uri); IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; @@ -3257,7 +3273,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(FAILED(hres)) return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); - nsres = create_nsuri(urlmon_uri, window, NULL, &wine_uri); + nsres = create_nsuri(urlmon_uri, window, NULL, NULL, &wine_uri); IUri_Release(urlmon_uri); if(base_wine_uri) nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface);

1 0

Nikolay Sivov : msxml3: Properly update node to doc link when cloning.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 2b5ddbfe9a39b7c16fb20b33b0201252c51532cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5ddbfe9a39b7c16fb20b33b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 21 19:50:32 2012 -0500 msxml3: Properly update node to doc link when cloning. --- dlls/msxml3/node.c | 2 +- dlls/msxml3/tests/domdoc.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 30ce1b9..7b6e1ab 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -595,7 +595,7 @@ HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) clone = xmlCopyNode(This->node, deep ? 1 : 2); if (clone) { - clone->doc = This->node->doc; + xmlSetTreeDoc(clone, This->node->doc); xmldoc_add_orphan(clone->doc, clone); node = create_node(clone); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4b894b0..3a62c95 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6073,7 +6073,7 @@ static void test_cloneNode(void ) IXMLDOMNamedNodeMap *mapAttr; LONG length, length1; LONG attr_cnt, attr_cnt1; - IXMLDOMNode *node; + IXMLDOMNode *node, *attr; IXMLDOMNode *node_clone; IXMLDOMNode *node_first; HRESULT hr; @@ -6134,6 +6134,11 @@ static void test_cloneNode(void ) hr = IXMLDOMNamedNodeMap_get_length(mapAttr, &attr_cnt1); ok( hr == S_OK, "ret %08x\n", hr ); ok(attr_cnt1 == 3, "got %d\n", attr_cnt1); + /* now really get some attributes from cloned element */ + attr = NULL; + hr = IXMLDOMNamedNodeMap_getNamedItem(mapAttr, _bstr_("id"), &attr); + ok(hr == S_OK, "ret %08x\n", hr); + IXMLDOMNode_Release(attr); IXMLDOMNamedNodeMap_Release(mapAttr); ok(length == length1, "wrong Child count (%d, %d)\n", length, length1);

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DDEVICE2.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 55ee76431ccb593ae19e98e255406cff65a36b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ee76431ccb593ae19e98e25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:19 2012 +0100 d3drm: Avoid LPDIRECT3DDEVICE2. --- dlls/d3drm/d3drm.c | 10 ++++------ dlls/d3drm/device.c | 18 ++++++++---------- include/d3drm.h | 6 ++++-- include/d3drmobj.h | 8 ++++---- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index e90ce30..dd33a2f 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -629,9 +629,8 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromSurface(IDirect3DRM2 *ifa return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2* iface, LPDIRECT3D2 pD3D, - LPDIRECT3DDEVICE2 pD3DDev, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2 *iface, + IDirect3D2 *pD3D, IDirect3DDevice2 *pD3DDev, IDirect3DRMDevice2 **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); @@ -1073,9 +1072,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromSurface(IDirect3DRM3 *ifa return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); } -static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3* iface, LPDIRECT3D2 d3d, - LPDIRECT3DDEVICE2 d3ddev, - LPDIRECT3DRMDEVICE3* device) +static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3 *iface, + IDirect3D2 *d3d, IDirect3DDevice2 *d3ddev, IDirect3DRMDevice3 **device) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 05ca080..5d2b249 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -421,9 +421,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D2(IDirect3DRMDevice2* iface, - LPDIRECT3D2 lpD3D, - LPDIRECT3DDEVICE2 lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D2(IDirect3DRMDevice2 *iface, + IDirect3D2 *lpD3D, IDirect3DDevice2 *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -460,8 +459,8 @@ static DWORD WINAPI IDirect3DRMDevice2Impl_GetRenderMode(IDirect3DRMDevice2* ifa return IDirect3DRMDevice3_GetRenderMode(&This->IDirect3DRMDevice3_iface); } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice2(IDirect3DRMDevice2* iface, - LPDIRECT3DDEVICE2 * dev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice2(IDirect3DRMDevice2 *iface, + IDirect3DDevice2 **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -856,9 +855,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice } /*** IDirect3DRMDevice2 methods ***/ -static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D2(IDirect3DRMDevice3* iface, - LPDIRECT3D2 lpD3D, - LPDIRECT3DDEVICE2 lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D2(IDirect3DRMDevice3 *iface, + IDirect3D2 *lpD3D, IDirect3DDevice2 *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); @@ -897,8 +895,8 @@ static DWORD WINAPI IDirect3DRMDevice3Impl_GetRenderMode(IDirect3DRMDevice3* ifa return This->rendermode; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevice3* iface, - LPDIRECT3DDEVICE2 * dev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevice3 *iface, + IDirect3DDevice2 **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); diff --git a/include/d3drm.h b/include/d3drm.h index 3ec1183..4125e8a 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -206,7 +206,8 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE2 *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, + IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, @@ -344,7 +345,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE3 *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, + IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 2265b56..1df113d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -526,11 +526,11 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; /*** IDirect3DRMDevice2 methods ***/ - STDMETHOD(InitFromD3D2)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev) PURE; + STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; STDMETHOD(SetRenderMode)(THIS_ DWORD flags) PURE; STDMETHOD_(DWORD, GetRenderMode)(THIS) PURE; - STDMETHOD(GetDirect3DDevice2)(THIS_ LPDIRECT3DDEVICE2 *) PURE; + STDMETHOD(GetDirect3DDevice2)(THIS_ IDirect3DDevice2 **device) PURE; }; #undef INTERFACE @@ -671,11 +671,11 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; /*** IDirect3DRMDevice2 methods ***/ - STDMETHOD(InitFromD3D2)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev) PURE; + STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; STDMETHOD(SetRenderMode)(THIS_ DWORD flags) PURE; STDMETHOD_(DWORD, GetRenderMode)(THIS) PURE; - STDMETHOD(GetDirect3DDevice2)(THIS_ LPDIRECT3DDEVICE2 *) PURE; + STDMETHOD(GetDirect3DDevice2)(THIS_ IDirect3DDevice2 **device) PURE; /*** IDirect3DRMDevice3 methods ***/ STDMETHOD(FindPreferredTextureFormat)(THIS_ DWORD BitDepths, DWORD flags, LPDDPIXELFORMAT pDDPF) PURE; STDMETHOD(RenderStateChange)(THIS_ D3DRENDERSTATETYPE drsType, DWORD val, DWORD flags) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DDEVICE.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 49041569462fffbfe779738860fc73567f2e1ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49041569462fffbfe77973886… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:20 2012 +0100 d3drm: Avoid LPDIRECT3DDEVICE. --- dlls/d3drm/d3drm.c | 3 ++- dlls/d3drm/device.c | 18 ++++++++---------- include/d3drm.h | 3 ++- include/d3drmobj.h | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index dd33a2f..7261eb2 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -251,7 +251,8 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromSurface(IDirect3DRM *iface return Direct3DRMDevice_create(&IID_IDirect3DRMDevice, (IUnknown**)ppDevice); } -static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM* iface, LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE * ppDevice) +static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM *iface, + IDirect3D *pD3D, IDirect3DDevice *pD3DDev, IDirect3DRMDevice **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 5d2b249..ed6055b 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -212,9 +212,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_Init(IDirect3DRMDevice2* iface, ULO } /*** IDirect3DRMDevice2 methods ***/ -static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2* iface, - LPDIRECT3D lpD3D, - LPDIRECT3DDEVICE lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2 *iface, + IDirect3D *lpD3D, IDirect3DDevice *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -411,8 +410,8 @@ static D3DRMTEXTUREQUALITY WINAPI IDirect3DRMDevice2Impl_GetTextureQuality(IDire return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice2* iface, - LPDIRECT3DDEVICE * dev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice2 *iface, + IDirect3DDevice **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -639,9 +638,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_Init(IDirect3DRMDevice3* iface, ULO return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3* iface, - LPDIRECT3D lpD3D, - LPDIRECT3DDEVICE lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3 *iface, + IDirect3D *lpD3D, IDirect3DDevice *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); @@ -844,8 +842,8 @@ static D3DRMTEXTUREQUALITY WINAPI IDirect3DRMDevice3Impl_GetTextureQuality(IDire return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice3* iface, - LPDIRECT3DDEVICE * dev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice3 *iface, + IDirect3DDevice **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); diff --git a/include/d3drm.h b/include/d3drm.h index 4125e8a..8311759 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -71,7 +71,8 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device, + IDirect3DRMDevice **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 1df113d..5e50abe 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -376,7 +376,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -397,7 +397,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; }; #undef INTERFACE @@ -503,7 +503,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -524,7 +524,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; /*** IDirect3DRMDevice2 methods ***/ STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; @@ -648,7 +648,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -669,7 +669,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; /*** IDirect3DRMDevice2 methods ***/ STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_IAGetVertexBuffers().
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 860c0eb24e5077458ef90113558531e8dd33852c URL: http://source.winehq.org/git/wine.git/?a=commit;h=860c0eb24e5077458ef901135… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:22 2012 +0100 d3d10core: Implement d3d10_device_IAGetVertexBuffers(). --- dlls/d3d10core/device.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 2501da99..853c538 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -527,8 +527,31 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetInputLayout(ID3D10Device *iface, static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer **buffers, UINT *strides, UINT *offsets) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n", iface, start_slot, buffer_count, buffers, strides, offsets); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, start_slot + i, + &wined3d_buffer, &offsets[i], &strides[i]))) + ERR("Failed to get vertex buffer.\n"); + + if (!wined3d_buffer) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_IAGetIndexBuffer(ID3D10Device *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_IAGetIndexBuffer().
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: d0d213f7d14d242ad5ebd5893ec0ea0edc82b7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d213f7d14d242ad5ebd5893… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:21 2012 +0100 d3d10core: Implement d3d10_device_IAGetIndexBuffer(). --- dlls/d3d10core/device.c | 20 +++++++++++++++++++- dlls/d3d8/device.c | 3 ++- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 6 ++++-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 6 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index be55387..2501da99 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -534,7 +534,25 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_IAGetIndexBuffer(ID3D10Device *iface, ID3D10Buffer **buffer, DXGI_FORMAT *format, UINT *offset) { - FIXME("iface %p, buffer %p, format %p, offset %p stub!\n", iface, buffer, format, offset); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + enum wined3d_format_id wined3d_format; + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + TRACE("iface %p, buffer %p, format %p, offset %p.\n", iface, buffer, format, offset); + + wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format); + *format = dxgi_format_from_wined3dformat(wined3d_format); + *offset = 0; /* FIXME */ + if (!wined3d_buffer) + { + *buffer = NULL; + return; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + *buffer = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(*buffer); } static void STDMETHODCALLTYPE d3d10_device_GSGetConstantBuffers(ID3D10Device *iface, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d1dcd02..d8d230f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2302,6 +2302,7 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, IDirect3DIndexBuffer8 **buffer, UINT *base_vertex_index) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d8_indexbuffer *buffer_impl; @@ -2313,7 +2314,7 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, /* The case from UINT to INT is safe because d3d8 will never set negative values */ wined3d_mutex_lock(); *base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); - if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device))) + if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format))) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer8_iface; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0c70f96..1c707e2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2483,6 +2483,7 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 **buffer) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d9_indexbuffer *buffer_impl; @@ -2492,7 +2493,7 @@ static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3 return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device))) + if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format))) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer9_iface; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea11f70..3211038 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2236,10 +2236,12 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, } } -struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device) +struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, + enum wined3d_format_id *format) { - TRACE("device %p.\n", device); + TRACE("device %p, format %p.\n", device, format); + *format = device->stateBlock->state.index_format; return device->stateBlock->state.index_buffer; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e97c102..cb8304a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -65,7 +65,7 @@ @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) -@ cdecl wined3d_device_get_index_buffer(ptr) +@ cdecl wined3d_device_get_index_buffer(ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) @ cdecl wined3d_device_get_material(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 329698a..cf86df6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2125,7 +2125,8 @@ HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); -struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, + enum wined3d_format_id *format); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, struct wined3d_light *light); HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable);

1 0