December 2008 - Wine-Commits

Michael Karcher : msxml3: attach_xmldoc may fail.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: afb17f29e17b8b2cd6e62b8bf0d2ae02166db573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb17f29e17b8b2cd6e62b8bf… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Nov 29 10:52:24 2008 +0100 msxml3: attach_xmldoc may fail. The upcoming new implementation of attach_xmldoc needs HeapAlloc. Prepare for the failure case. --- dlls/msxml3/domdoc.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c8eec39..f71b134 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -209,7 +209,7 @@ HRESULT xmldoc_remove_orphan(xmlDocPtr doc, xmlNodePtr node) return S_FALSE; } -static void attach_xmldoc( IXMLDOMNode *node, xmlDocPtr xml ) +static HRESULT attach_xmldoc( IXMLDOMNode *node, xmlDocPtr xml ) { xmlnode *This = impl_from_IXMLDOMNode( node ); @@ -220,7 +220,7 @@ static void attach_xmldoc( IXMLDOMNode *node, xmlDocPtr xml ) if(This->node) xmldoc_add_ref(This->node->doc); - return; + return S_OK; } static inline domdoc *impl_from_IXMLDOMDocument2( IXMLDOMDocument2 *iface ) @@ -345,9 +345,8 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( } xmldoc->_private = create_priv(); - attach_xmldoc( This->node, xmldoc ); - return S_OK; + return attach_xmldoc( This->node, xmldoc ); } static HRESULT WINAPI xmldoc_IPersistStream_Save( @@ -1324,7 +1323,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) xmldoc = doparse( ptr, len ); if(xmldoc) { xmldoc->_private = create_priv(); - attach_xmldoc(This->node, xmldoc); + return attach_xmldoc(This->node, xmldoc); } return S_OK; @@ -1377,11 +1376,12 @@ static HRESULT WINAPI domdoc_load( { domdoc *newDoc = impl_from_IXMLDOMDocument2( pNewDoc ); xmldoc = xmlCopyDoc(get_doc(newDoc), 1); - attach_xmldoc(This->node, xmldoc); + hr = attach_xmldoc(This->node, xmldoc); - *isSuccessful = VARIANT_TRUE; + if(SUCCEEDED(hr)) + *isSuccessful = VARIANT_TRUE; - return S_OK; + return hr; } } hr = IUnknown_QueryInterface(V_UNKNOWN(&xmlSource), &IID_IStream, (void**)&pStream); @@ -1438,8 +1438,9 @@ static HRESULT WINAPI domdoc_load( if(!filename || FAILED(hr)) { xmldoc = xmlNewDoc(NULL); xmldoc->_private = create_priv(); - attach_xmldoc(This->node, xmldoc); - hr = S_FALSE; + hr = attach_xmldoc(This->node, xmldoc); + if(SUCCEEDED(hr)) + hr = S_FALSE; } TRACE("ret (%d)\n", hr); @@ -1541,7 +1542,7 @@ static HRESULT WINAPI domdoc_loadXML( xmlDocPtr xmldoc = NULL; char *str; int len; - HRESULT hr = S_FALSE; + HRESULT hr = S_FALSE, hr2; TRACE("%p %s %p\n", This, debugstr_w( bstrXML ), isSuccessful ); @@ -1568,7 +1569,9 @@ static HRESULT WINAPI domdoc_loadXML( xmldoc = xmlNewDoc(NULL); xmldoc->_private = create_priv(); - attach_xmldoc( This->node, xmldoc ); + hr2 = attach_xmldoc( This->node, xmldoc ); + if( FAILED(hr2) ) + hr = hr2; return hr; }

1 0

Michael Karcher : msxml3: Specialize attach_xmlnode to XML documents.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 1c49bc83ae4630dba9b5a86c37042c34859160c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c49bc83ae4630dba9b5a86c3… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Nov 29 10:52:06 2008 +0100 msxml3: Specialize attach_xmlnode to XML documents. attach_xmlnode is only used to attach XML document nodes, and a cast is needed on each call. Rename it to attach_xmldoc, change the parameter type to move the cast at one point into the function. --- dlls/msxml3/domdoc.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f5b7aff..860cd60 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -209,14 +209,14 @@ HRESULT xmldoc_remove_orphan(xmlDocPtr doc, xmlNodePtr node) return S_FALSE; } -static void attach_xmlnode( IXMLDOMNode *node, xmlNodePtr xml ) +static void attach_xmldoc( IXMLDOMNode *node, xmlDocPtr xml ) { xmlnode *This = impl_from_IXMLDOMNode( node ); if(This->node) xmldoc_release(This->node->doc); - This->node = xml; + This->node = (xmlNodePtr) xml; if(This->node) xmldoc_add_ref(This->node->doc); @@ -345,7 +345,7 @@ static HRESULT WINAPI xmldoc_IPersistStream_Load( } xmldoc->_private = create_priv(); - attach_xmlnode( This->node, (xmlNodePtr)xmldoc ); + attach_xmldoc( This->node, xmldoc ); return S_OK; } @@ -1324,7 +1324,7 @@ static HRESULT domdoc_onDataAvailable(void *obj, char *ptr, DWORD len) xmldoc = doparse( ptr, len ); if(xmldoc) { xmldoc->_private = create_priv(); - attach_xmlnode(This->node, (xmlNodePtr) xmldoc); + attach_xmldoc(This->node, xmldoc); } return S_OK; @@ -1364,7 +1364,7 @@ static HRESULT WINAPI domdoc_load( assert( This->node ); - attach_xmlnode(This->node, NULL); + attach_xmldoc(This->node, NULL); switch( V_VT(&xmlSource) ) { @@ -1379,7 +1379,7 @@ static HRESULT WINAPI domdoc_load( { domdoc *newDoc = impl_from_IXMLDOMDocument2( pNewDoc ); xmldoc = xmlCopyDoc(get_doc(newDoc), 1); - attach_xmlnode(This->node, (xmlNodePtr) xmldoc); + attach_xmldoc(This->node, xmldoc); *isSuccessful = VARIANT_TRUE; @@ -1440,7 +1440,7 @@ static HRESULT WINAPI domdoc_load( if(!filename || FAILED(hr)) { xmldoc = xmlNewDoc(NULL); xmldoc->_private = create_priv(); - attach_xmlnode(This->node, (xmlNodePtr) xmldoc); + attach_xmldoc(This->node, xmldoc); hr = S_FALSE; } @@ -1549,7 +1549,7 @@ static HRESULT WINAPI domdoc_loadXML( assert ( This->node ); - attach_xmlnode( This->node, NULL ); + attach_xmldoc( This->node, NULL ); if ( isSuccessful ) { @@ -1572,7 +1572,7 @@ static HRESULT WINAPI domdoc_loadXML( xmldoc = xmlNewDoc(NULL); xmldoc->_private = create_priv(); - attach_xmlnode( This->node, (xmlNodePtr) xmldoc ); + attach_xmldoc( This->node, xmldoc ); return hr; }

1 0

Michael Karcher : msxml3/tests: Fix BSTR leak.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: aefe3456fbb9b7c4c9a9bd602389edec3c5cff1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aefe3456fbb9b7c4c9a9bd602… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Nov 29 10:51:32 2008 +0100 msxml3/tests: Fix BSTR leak. --- dlls/msxml3/tests/domdoc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4cff3cc..bac7e3f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3856,6 +3856,7 @@ static void test_NodeTypeValue(void) hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); ok(hr == S_OK, "ret %08x\n", hr ); ok(!lstrcmpW( V_BSTR(&v), _bstr_("Wine") ), "incorrect value\n"); + VariantClear( &v ); IXMLDOMNode_Release(pNode); }

1 0

Michael Karcher : msxml3: Quiet noisy fixmes.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: a6594da463e338043a2350739be4715011472fa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6594da463e338043a2350739… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Nov 29 10:51:44 2008 +0100 msxml3: Quiet noisy fixmes. The FIXME messages for unknown interfaces should not be emitted for interfaces that should not get implemented. Origin 8 spams you with these messsages. --- dlls/msxml3/cdata.c | 6 ++++++ dlls/msxml3/text.c | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index aa59ec3..dc7399b 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -69,6 +69,12 @@ static HRESULT WINAPI domcdata_QueryInterface( { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } + else if ( IsEqualGUID( riid, &IID_IXMLDOMText ) || + IsEqualGUID( riid, &IID_IXMLDOMElement ) ) + { + TRACE("Unsupported interface\n"); + return E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid)); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index f8e1fc4..c39fd07 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -70,6 +70,13 @@ static HRESULT WINAPI domtext_QueryInterface( { return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } + else if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || + IsEqualGUID( riid, &IID_IXMLDOMCDATASection ) ) + { + /* IXMLDOMText is known to be correct in not implementing these */ + TRACE("Unsupported interface\n"); + return E_NOINTERFACE; + } else { FIXME("Unsupported interface %s\n", debugstr_guid(riid));

1 0

Michael Karcher : msxml3: Move attach_xmlnode.c to domdoc.c.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: b282572ee31eca8d076139bfda3f44a663f70de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b282572ee31eca8d076139bfd… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Nov 29 10:51:58 2008 +0100 msxml3: Move attach_xmlnode.c to domdoc.c. --- dlls/msxml3/domdoc.c | 14 ++++++++++++++ dlls/msxml3/msxml_private.h | 2 -- dlls/msxml3/node.c | 14 -------------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c685889..f5b7aff 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -209,6 +209,20 @@ HRESULT xmldoc_remove_orphan(xmlDocPtr doc, xmlNodePtr node) return S_FALSE; } +static void attach_xmlnode( IXMLDOMNode *node, xmlNodePtr xml ) +{ + xmlnode *This = impl_from_IXMLDOMNode( node ); + + if(This->node) + xmldoc_release(This->node->doc); + + This->node = xml; + if(This->node) + xmldoc_add_ref(This->node->doc); + + return; +} + static inline domdoc *impl_from_IXMLDOMDocument2( IXMLDOMDocument2 *iface ) { return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpVtbl)); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index aa14b9b..e33b994 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -54,8 +54,6 @@ extern IUnknown *create_doc_entity_ref( xmlNodePtr entity ); extern HRESULT queryresult_create( xmlNodePtr, LPWSTR, IXMLDOMNodeList ** ); -extern void attach_xmlnode( IXMLDOMNode *node, xmlNodePtr xmlnode ); - /* data accessors */ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3d6f2f3..aa3b748 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -85,20 +85,6 @@ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ) return This->node; } -void attach_xmlnode( IXMLDOMNode *node, xmlNodePtr xml ) -{ - xmlnode *This = impl_from_IXMLDOMNode( node ); - - if(This->node) - xmldoc_release(This->node->doc); - - This->node = xml; - if(This->node) - xmldoc_add_ref(This->node->doc); - - return; -} - static HRESULT WINAPI xmlnode_QueryInterface( IXMLDOMNode *iface, REFIID riid,

1 0

Michael Karcher : msxml3: Avoid duplicate encoding.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: e55da04e77ddebb1bba378b9b9e6538f0e664b30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55da04e77ddebb1bba378b9b… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sat Nov 29 10:51:20 2008 +0100 msxml3: Avoid duplicate encoding. The libxml documentation suggests to either use xmlEncodedEntitiesReentrant or xmlEncodeSpecialChars, but if you apply both, you end up producing "&amp;". --- dlls/msxml3/node.c | 8 +++----- dlls/msxml3/tests/domdoc.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 19cee8f..3d6f2f3 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -920,7 +920,7 @@ static HRESULT WINAPI xmlnode_put_text( BSTR text) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - xmlChar *str, *str2, *str3; + xmlChar *str, *str2; TRACE("%p\n", This); @@ -937,11 +937,9 @@ static HRESULT WINAPI xmlnode_put_text( /* Escape the string. */ str2 = xmlEncodeEntitiesReentrant(This->node->doc, str); HeapFree(GetProcessHeap(), 0, str); - str3 = xmlEncodeSpecialChars(This->node->doc, str2); - xmlFree(str2); - xmlNodeSetContent(This->node, str3); - xmlFree(str3); + xmlNodeSetContent(This->node, str2); + xmlFree(str2); return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e27c506..4cff3cc 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -176,6 +176,8 @@ static WCHAR szElementXML[] = {'<','E','l','e','T','e','s','t','/','>',0 }; static WCHAR szElementXML2[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','/','>',0 }; static WCHAR szElementXML3[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', 'T','e','s','t','i','n','g','N','o','d','e','<','/','E','l','e','T','e','s','t','>',0 }; +static WCHAR szElementXML4[] = {'<','E','l','e','T','e','s','t',' ','A','t','t','r','=','"','"','>', + '&','a','m','p',';','x',' ',0x2103,'<','/','E','l','e','T','e','s','t','>',0 }; static WCHAR szAttribute[] = {'A','t','t','r',0 }; static WCHAR szAttributeXML[] = {'A','t','t','r','=','"','"',0 }; @@ -190,6 +192,7 @@ static WCHAR szDocFragmentText[] = {'#','d','o','c','u','m','e','n','t','-','f', static WCHAR szEntityRef[] = {'e','n','t','i','t','y','r','e','f',0 }; static WCHAR szEntityRefXML[] = {'&','e','n','t','i','t','y','r','e','f',';',0 }; +static WCHAR szStrangeChars[] = {'&','x',' ',0x2103, 0}; #define expect_bstr_eq_and_free(bstr, expect) { \ BSTR bstrExp = alloc_str_from_narrow(expect); \ @@ -2893,6 +2896,22 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, szElementXML3 ), "incorrect element xml\n"); SysFreeString(str); + /* Test for reversible escaping */ + str = SysAllocString( szStrangeChars ); + hr = IXMLDOMElement_put_text(pElement, str); + ok(hr == S_OK, "ret %08x\n", hr ); + SysFreeString( str ); + + hr = IXMLDOMElement_get_xml(pElement, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szElementXML4 ), "incorrect element xml\n"); + SysFreeString(str); + + hr = IXMLDOMElement_get_text(pElement, &str); + ok(hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, szStrangeChars ), "incorrect element text\n"); + SysFreeString(str); + IXMLDOMElement_Release(pElement); }

1 0

Jeff Zaroyko : ntdll: Avoid NULL deref in RtlDeleteTimer.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 6c597bac2e91c84b5c18ef820295cb5a1e642145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c597bac2e91c84b5c18ef820… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sat Nov 29 09:51:45 2008 +1100 ntdll: Avoid NULL deref in RtlDeleteTimer. --- dlls/ntdll/tests/rtl.c | 11 +++++++++++ dlls/ntdll/threadpool.c | 5 ++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 415f0db..fffe9ac 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -49,6 +49,7 @@ typedef struct _RTL_HANDLE_TABLE static HMODULE hntdll = 0; static SIZE_T (WINAPI *pRtlCompareMemory)(LPCVOID,LPCVOID,SIZE_T); static SIZE_T (WINAPI *pRtlCompareMemoryUlong)(PULONG, SIZE_T, ULONG); +static NTSTATUS (WINAPI *pRtlDeleteTimer)(HANDLE, HANDLE, HANDLE); static VOID (WINAPI *pRtlMoveMemory)(LPVOID,LPCVOID,SIZE_T); static VOID (WINAPI *pRtlFillMemory)(LPVOID,SIZE_T,BYTE); static VOID (WINAPI *pRtlFillMemoryUlong)(LPVOID,SIZE_T,ULONG); @@ -80,6 +81,7 @@ static void InitFunctionPtrs(void) if (hntdll) { pRtlCompareMemory = (void *)GetProcAddress(hntdll, "RtlCompareMemory"); pRtlCompareMemoryUlong = (void *)GetProcAddress(hntdll, "RtlCompareMemoryUlong"); + pRtlDeleteTimer = (void *)GetProcAddress(hntdll, "RtlDeleteTimer"); pRtlMoveMemory = (void *)GetProcAddress(hntdll, "RtlMoveMemory"); pRtlFillMemory = (void *)GetProcAddress(hntdll, "RtlFillMemory"); pRtlFillMemoryUlong = (void *)GetProcAddress(hntdll, "RtlFillMemoryUlong"); @@ -930,6 +932,13 @@ static void test_RtlAllocateAndInitializeSid(void) ok(ret == STATUS_INVALID_SID, "wrong error %08x\n", ret); } +static void test_RtlDeleteTimer(void) +{ + NTSTATUS ret; + ret = pRtlDeleteTimer(NULL, NULL, NULL); + ok(ret == STATUS_INVALID_PARAMETER_1, "expected STATUS_INVALID_PARAMETER_1, got %x\n", ret); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -962,4 +971,6 @@ START_TEST(rtl) test_HandleTables(); if (pRtlAllocateAndInitializeSid) test_RtlAllocateAndInitializeSid(); + if (pRtlDeleteTimer) + test_RtlDeleteTimer(); } diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 9c0dafe..af42b30 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1005,10 +1005,13 @@ NTSTATUS WINAPI RtlDeleteTimer(HANDLE TimerQueue, HANDLE Timer, HANDLE CompletionEvent) { struct queue_timer *t = Timer; - struct timer_queue *q = t->q; + struct timer_queue *q; NTSTATUS status = STATUS_PENDING; HANDLE event = NULL; + if (!Timer) + return STATUS_INVALID_PARAMETER_1; + q = t->q; if (CompletionEvent == INVALID_HANDLE_VALUE) status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); else if (CompletionEvent)

1 0

Andrew Riedi : user32: The frames of .ani cursors are .ico's, not .cur's.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 63908f039b7eba1778a63eb9a7478ba666c0aba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63908f039b7eba1778a63eb9a… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Nov 25 23:10:29 2008 -0800 user32: The frames of .ani cursors are .ico's, not .cur's. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 9729269..8049a67 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1008,7 +1008,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, FIXME("Loading all frames for .ani cursors not implemented.\n"); icon_data = fram_chunk.data + (2 * sizeof(DWORD)); - entry = CURSORICON_FindBestCursorFile( (CURSORICONFILEDIR *) icon_data, + entry = CURSORICON_FindBestIconFile( (CURSORICONFILEDIR *) icon_data, width, height, colors ); frame_bits = HeapAlloc( GetProcessHeap(), 0, entry->dwDIBSize );

1 0

Andrew Riedi : user32: Cursors can have more than one color.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: 506f77b8d6835e2f69db32a0d434d914e63bdd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=506f77b8d6835e2f69db32a0d… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Tue Nov 25 23:07:15 2008 -0800 user32: Cursors can have more than one color. --- dlls/user32/cursoricon.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 655a74a..9729269 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -544,8 +544,8 @@ static BOOL CURSORICON_GetResIconEntry( LPVOID dir, int n, * CURSORICON_FindBestCursor * * Find the cursor closest to the requested size. - * FIXME: parameter 'color' ignored and entries with more than 1 bpp - * ignored too + * + * FIXME: parameter 'color' ignored. */ static int CURSORICON_FindBestCursor( LPVOID dir, fnGetCIEntry get_entry, int width, int height, int color ) @@ -562,8 +562,7 @@ static int CURSORICON_FindBestCursor( LPVOID dir, fnGetCIEntry get_entry, for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) { if ((cx <= width) && (cy <= height) && - (cx > maxwidth) && (cy > maxheight) && - (bits == 1)) + (cx > maxwidth) && (cy > maxheight)) { bestEntry = i; maxwidth = cx; @@ -577,8 +576,7 @@ static int CURSORICON_FindBestCursor( LPVOID dir, fnGetCIEntry get_entry, maxwidth = maxheight = 255; for ( i = 0; get_entry( dir, i, &cx, &cy, &bits ); i++ ) { - if (((cx < maxwidth) && (cy < maxheight) && (bits == 1)) || - (bestEntry==-1)) + if (((cx < maxwidth) && (cy < maxheight)) || (bestEntry == -1)) { bestEntry = i; maxwidth = cx; @@ -958,7 +956,7 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ * \- CHUNK:icon */ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, - INT width, INT height ) + INT width, INT height, INT colors ) { HCURSOR cursor; ani_header header = {0}; @@ -1011,7 +1009,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, icon_data = fram_chunk.data + (2 * sizeof(DWORD)); entry = CURSORICON_FindBestCursorFile( (CURSORICONFILEDIR *) icon_data, - width, height, 1 ); + width, height, colors ); frame_bits = HeapAlloc( GetProcessHeap(), 0, entry->dwDIBSize ); memcpy( frame_bits, icon_data + entry->dwDIBOffset, entry->dwDIBSize ); @@ -1099,7 +1097,8 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, /* Check for .ani. */ if (memcmp( bits, "RIFF", 4 ) == 0) { - hIcon = CURSORICON_CreateIconFromANI( bits, filesize, width, height ); + hIcon = CURSORICON_CreateIconFromANI( bits, filesize, width, height, + colors ); goto end; } @@ -1187,7 +1186,7 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; if (!(dir = LockResource( handle ))) return 0; if (fCursor) - dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, 1); + dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, colors ); else dirEntry = CURSORICON_FindBestIconRes( dir, width, height, colors ); if (!dirEntry) return 0; @@ -1799,7 +1798,7 @@ INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE xdir, BOOL bIcon, if( bIcon ) entry = CURSORICON_FindBestIconRes( dir, width, height, colors ); else - entry = CURSORICON_FindBestCursorRes( dir, width, height, 1); + entry = CURSORICON_FindBestCursorRes( dir, width, height, colors ); if( entry ) retVal = entry->wResId; }

1 0

Vitaliy Margolen : ntdll: Stub NtMakeTemporaryObject.
by Alexandre Julliard Dec. 1, 2008

Dec. 1, 2008

Module: wine Branch: master Commit: de94cfd7e14960e5fb91eaae73dd4d10ecb5c6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de94cfd7e14960e5fb91eaae7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 30 15:01:02 2008 -0700 ntdll: Stub NtMakeTemporaryObject. --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/om.c | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 52db956..006b1fe 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -195,7 +195,7 @@ # @ stub NtLockRegistryKey @ stdcall NtLockVirtualMemory(long ptr ptr long) # @ stub NtMakePermanentObject -@ stub NtMakeTemporaryObject +@ stdcall NtMakeTemporaryObject(long) # @ stub NtMapUserPhysicalPages # @ stub NtMapUserPhysicalPagesScatter @ stdcall NtMapViewOfSection(long long ptr long long ptr ptr long long long) @@ -1039,7 +1039,7 @@ # @ stub ZwLockRegistryKey @ stdcall ZwLockVirtualMemory(long ptr ptr long) NtLockVirtualMemory # @ stub ZwMakePermanentObject -@ stub ZwMakeTemporaryObject +@ stdcall ZwMakeTemporaryObject(long) NtMakeTemporaryObject # @ stub ZwMapUserPhysicalPages # @ stub ZwMapUserPhysicalPagesScatter @ stdcall ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index aba2301..a299a45 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -616,3 +616,22 @@ NTSTATUS WINAPI NtAllocateUuids( FIXME("(%p,%p,%p), stub.\n", Time, Range, Sequence); return 0; } + +/************************************************************************** + * NtMakeTemporaryObject [NTDLL.@] + * ZwMakeTemporaryObject [NTDLL.@] + * + * Make a permanent object temporary. + * + * PARAMS + * Handle [I] handle to permanent object + * + * RETURNS + * Success: STATUS_SUCCESS. + * Failure: An NTSTATUS error code. + */ +NTSTATUS WINAPI NtMakeTemporaryObject( HANDLE Handle ) +{ + FIXME("(%p), stub.\n", Handle); + return STATUS_SUCCESS; +}

1 0