December 2008 - Wine-Commits

Alexandre Julliard : msi/tests: Avoid sizeof in traces.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 2a5cf54f05194201f36a138193c3d1336c7f26b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5cf54f05194201f36a13819… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 20 13:32:47 2008 +0100 msi/tests: Avoid sizeof in traces. --- dlls/msi/tests/msi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 7201329..3396f5c 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -7940,7 +7940,7 @@ static void test_MsiEnumPatchesEx(void) ok(context == MSIINSTALLCONTEXT_USERMANAGED, "Expected MSIINSTALLCONTEXT_USERMANAGED, got %d\n", context); ok(size == lstrlenA(usersid) * sizeof(WCHAR), - "Expected %d, got %d\n", lstrlenA(usersid) * sizeof(WCHAR), size); + "Got %d\n", size); /* pcchTargetUserSid is exactly the length of szTargetUserSid */ lstrcpyA(patchcode, "apple"); @@ -7961,7 +7961,7 @@ static void test_MsiEnumPatchesEx(void) ok(!strncmp(targetsid, usersid, lstrlenA(usersid) - 1), "Expected \"%s\", got \"%s\"\n", usersid, targetsid); ok(size == lstrlenA(usersid) * sizeof(WCHAR), - "Expected %d, got %d\n", lstrlenA(usersid) * sizeof(WCHAR), size); + "Got %d\n", size); /* pcchTargetUserSid has enough room for NULL terminator */ lstrcpyA(patchcode, "apple");

1 0

Chris Wulff : mscoree: Add a stub for LockClrVersion.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 5b5b199d9aa67c4072ea57c51de7adfdd5eb7039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5b199d9aa67c4072ea57c51… Author: Chris Wulff <crwulff(a)rochester.rr.com> Date: Fri Dec 19 23:09:28 2008 -0500 mscoree: Add a stub for LockClrVersion. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ include/mscoree.idl | 2 ++ 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 0195b62..03fbc1c 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -70,7 +70,7 @@ @ stdcall LoadLibraryShim(ptr ptr ptr ptr) @ stub LoadLibraryWithPolicyShim @ stdcall LoadStringRCEx(long long ptr long long ptr) -@ stub LockClrVersion +@ stdcall LockClrVersion(ptr ptr ptr) @ stub MetaDataGetDispenser @ stdcall ND_CopyObjDst(ptr ptr long long) @ stdcall ND_CopyObjSrc(ptr long ptr long) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 78ef1d3..386f4f7 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -257,6 +257,12 @@ HRESULT WINAPI LoadLibraryShim( LPCWSTR szDllName, LPCWSTR szVersion, LPVOID pvR return S_OK; } +HRESULT WINAPI LockClrVersion(FLockClrVersionCallback hostCallback, FLockClrVersionCallback *pBeginHostSetup, FLockClrVersionCallback *pEndHostSetup) +{ + FIXME("(%p %p %p): stub\n", hostCallback, pBeginHostSetup, pEndHostSetup); + return S_OK; +} + HRESULT WINAPI CoInitializeCor(DWORD fFlags) { FIXME("(0x%08x): stub\n", fFlags); diff --git a/include/mscoree.idl b/include/mscoree.idl index 5877eb6..aed31da 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -27,6 +27,8 @@ cpp_quote("HRESULT WINAPI GetCORSystemDirectory(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetCORVersion(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPWSTR,DWORD,DWORD*,LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI LoadLibraryShim(LPCWSTR,LPCWSTR,LPVOID,HMODULE*);") +cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)();") +cpp_quote("HRESULT WINAPI LockClrVersion(FLockClrVersionCallback,FLockClrVersionCallback*,FLockClrVersionCallback*);") typedef void* HDOMAINENUM;

1 0

Christian Costa : winealsa.drv: Handle midi sysex greater than a buffer.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 96291a4b0d9b0cd036246af612e99384320a68a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96291a4b0d9b0cd036246af61… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Dec 18 21:22:32 2008 +0100 winealsa.drv: Handle midi sysex greater than a buffer. --- dlls/winealsa.drv/midi.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index dedfe02..c1bcb10 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -374,27 +374,34 @@ static DWORD WINAPI midRecThread(LPVOID arg) break; case SND_SEQ_EVENT_SYSEX: { + int pos = 0; int len = ev->data.ext.len; LPBYTE ptr = (BYTE*) ev->data.ext.ptr; LPMIDIHDR lpMidiHdr; - /* FIXME: Should handle sysex greater than lpMidiHdr->dwBufferLength */ EnterCriticalSection(&crit_sect); - if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - if (lpMidiHdr->dwBytesRecorded + len <= lpMidiHdr->dwBufferLength) { - memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, ptr, len); - lpMidiHdr->dwBytesRecorded += len; - if (*(ptr + (len-1)) == 0xF7) { + while (len) { + if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { + int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); + memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, ptr + pos, copylen); + lpMidiHdr->dwBytesRecorded += copylen; + len -= copylen; + pos += copylen; + /* We check if we reach the end of buffer or the end of sysex before notifying + * to handle the case where ALSA splitted the sysex into several events */ + if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || + (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)lpMidiHdr->lpNext; if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) WARN("Couldn't notify client\n"); } - } else - FIXME("No enough space in the buffer to store sysex!\n"); - } else - FIXME("Sysex received but no buffer to store it!\n"); + } else { + FIXME("Sysex data received but no buffer to store it!\n"); + break; + } + } LeaveCriticalSection(&crit_sect); } break;

1 0

Andrei Derevyanko : mshtml: Updated test of QueryInterface.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 2afc8fcd5a788b94c64de654823bf2f8b262338e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afc8fcd5a788b94c64de6548… Author: Andrei Derevyanko <and(a)etersoft.ru> Date: Thu Dec 18 14:59:57 2008 +0300 mshtml: Updated test of QueryInterface. --- dlls/mshtml/tests/htmldoc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 84803fb..ed69725 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3766,6 +3766,11 @@ static void test_QueryInterface(IUnknown *unk) hres = IUnknown_QueryInterface(unk, &IID_UndocumentedScriptIface, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(qi == NULL, "qi=%p, expected NULL\n", qi); + + qi = (void*)0xdeadbeef; + hres = IUnknown_QueryInterface(unk, &IID_IMarshal, (void**)&qi); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); } static void init_test(enum load_state_t ls) {

1 0

Andrei Derevyanko : mshtml: Silence IMarshal QueryInterface FIXME.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 6ea2e4bc21d851963e1326623ae7cfdea9284b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea2e4bc21d851963e1326623… Author: Andrei Derevyanko <and(a)etersoft.ru> Date: Thu Dec 18 14:45:45 2008 +0300 mshtml: Silence IMarshal QueryInterface FIXME. --- dlls/mshtml/htmldoc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0f4bcf4..8e5981b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -138,6 +138,9 @@ static HRESULT WINAPI HTMLDocument_QueryInterface(IHTMLDocument2 *iface, REFIID }else if(IsEqualGUID(&IID_IPersistPropertyBag, riid)) { TRACE("(%p)->(IID_IPersistPropertyBag %p) returning NULL\n", This, ppvObject); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IMarshal, riid)) { + TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppvObject); + return E_NOINTERFACE; }else if(dispex_query_interface(&This->dispex, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; }

1 0

Dylan Smith : richedit: Move message handling to function callable without window.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 5dc1271ba6af791e2f7475da12ed7fb1b25451ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dc1271ba6af791e2f7475da1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Dec 19 10:57:28 2008 -0500 richedit: Move message handling to function callable without window. In order to make the message handling available to windowless richedit controls, the message handling must be in a function that can be called from the ITextServices_TxSendMessage method. This method will never have a handle to a window to pass to RichEditWndProc_common in order to get the editor with GetWindowLongPtrW, but passing the editor will work (even if hWnd is NULL). --- dlls/riched20/editor.c | 132 +++++++++++++++++++++++++++++------------------ dlls/riched20/editor.h | 2 + 2 files changed, 83 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5dc1271ba6af791e2f747…

1 0

Dylan Smith : richedit: Avoid re-calculating positions found in wrapping for painting.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 97a83147b3ce867604088fec0072290c044ed30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=97a83147b3ce867604088fec0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Dec 19 09:54:58 2008 -0500 richedit: Avoid re-calculating positions found in wrapping for painting. When the text is wrapped, the positions for all the runs, paragraphs, and cells are already calculated and stored. The only thing left to do for painting is to offset them by the formatting rectangle and the scroll position. --- dlls/riched20/paint.c | 203 +++++++++++++++++++------------------------------ dlls/riched20/wrap.c | 3 +- 2 files changed, 81 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97a83147b3ce867604088…

1 0

Dylan Smith : richedit: Removed redundant editor height variables and calculations.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: dc03b6b2f25cc4aa63ad2776943f55fd3f5aa656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc03b6b2f25cc4aa63ad27769… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Fri Dec 19 08:15:04 2008 -0500 richedit: Removed redundant editor height variables and calculations. During wrapping there were three different heights that were being stored, with only one of them being done correctly. The other ones failed to incorporate the height of the paragraph or row, so ended up being incorrect. --- dlls/riched20/editor.c | 1 - dlls/riched20/editstr.h | 1 - dlls/riched20/paint.c | 4 ++-- dlls/riched20/wrap.c | 15 +-------------- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a9994bc..58301aa 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2605,7 +2605,6 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->pCursors[2] = ed->pCursors[0]; ed->pCursors[3] = ed->pCursors[1]; ed->nLastTotalLength = ed->nTotalLength = 0; - ed->nHeight = 0; ed->nUDArrowX = -1; ed->nSequence = 0; ed->rgbBackColor = -1; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 0c8435b..cde05f9 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -333,7 +333,6 @@ typedef struct tagME_TextEditor int nCursors; SIZE sizeWindow; int nTotalLength, nLastTotalLength; - int nHeight; int nUDArrowX; int nSequence; COLORREF rgbBackColor; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 521f646..0e12191 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1101,7 +1101,7 @@ void ME_Scroll(ME_TextEditor *editor, int value, int type) hWnd = editor->hWnd; winStyle = GetWindowLongW(hWnd, GWL_STYLE); bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; - bScrollBarWillBeVisible = (editor->nHeight > editor->sizeWindow.cy) + bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy) || (winStyle & ES_DISABLENOSCROLL); if (bScrollBarIsVisible != bScrollBarWillBeVisible) { @@ -1127,7 +1127,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) hWnd = editor->hWnd; si.cbSize = sizeof(si); bScrollBarWasVisible = ME_GetYScrollVisible(editor); - bScrollBarWillBeVisible = editor->nHeight > editor->sizeWindow.cy; + bScrollBarWillBeVisible = editor->nTotalLength > editor->sizeWindow.cy; si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS; if (GetWindowLongW(hWnd, GWL_STYLE) & ES_DISABLENOSCROLL) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index d989a2d..890c2bd 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -578,17 +578,14 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_Context c; BOOL bModified = FALSE; int yStart = -1; - int yLastPos = 0; ME_InitContext(&c, editor, GetDC(editor->hWnd)); c.pt.x = 0; - editor->nHeight = 0; item = editor->pBuffer->pFirst->next; while(item != editor->pBuffer->pLast) { BOOL bRedraw = FALSE; assert(item->type == diParagraph); - editor->nHeight = max(editor->nHeight, item->member.para.pt.y); if ((item->member.para.nFlags & MEPF_REWRAP) || (item->member.para.pt.y != c.pt.y)) bRedraw = TRUE; @@ -605,8 +602,6 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) bModified = bModified | bRedraw; - yLastPos = max(yLastPos, c.pt.y); - if (item->member.para.nFlags & MEPF_ROWSTART) { ME_DisplayItem *cell = ME_FindItemFwd(item, diCell); @@ -718,18 +713,10 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) editor->nTotalLength = c.pt.y; editor->pBuffer->pLast->member.para.pt.x = 0; - editor->pBuffer->pLast->member.para.pt.y = yLastPos; + editor->pBuffer->pLast->member.para.pt.y = c.pt.y; ME_DestroyContext(&c, editor->hWnd); - /* Each paragraph may contain multiple rows, which should be scrollable, even - if the containing paragraph has pt.y == 0 */ - item = editor->pBuffer->pFirst; - while ((item = ME_FindItemFwd(item, diStartRow)) != NULL) { - assert(item->type == diStartRow); - editor->nHeight = max(editor->nHeight, item->member.row.pt.y); - } - if (bModified || editor->nTotalLength < editor->nLastTotalLength) ME_InvalidateMarkedParagraphs(editor); return bModified;

1 0

Alistair Leslie-Hughes : msxml3: Add ISupportErrorInfo interface to IXMLDOMDocument.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 40fdc88efc9eff0a4d12cec2ade4a2b0de457808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40fdc88efc9eff0a4d12cec2a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 19 19:48:58 2008 +1100 msxml3: Add ISupportErrorInfo interface to IXMLDOMDocument. --- dlls/msxml3/domdoc.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/domdoc.c | 10 ++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index f71b134..a24f16f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -57,6 +57,7 @@ typedef struct _domdoc const struct IPersistStreamVtbl *lpvtblIPersistStream; const struct IObjectWithSiteVtbl *lpvtblIObjectWithSite; const struct IObjectSafetyVtbl *lpvtblIObjectSafety; + const struct ISupportErrorInfoVtbl *lpvtblISupportErrorInfo; LONG ref; VARIANT_BOOL async; VARIANT_BOOL validating; @@ -248,6 +249,10 @@ static inline domdoc *impl_from_IObjectSafety(IObjectSafety *iface) return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblIObjectSafety)); } +static inline domdoc *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) +{ + return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpvtblISupportErrorInfo)); +} /************************************************************************ * xmldoc implementation of IPersistStream. @@ -375,6 +380,46 @@ static const IPersistStreamVtbl xmldoc_IPersistStream_VTable = xmldoc_IPersistStream_GetSizeMax, }; +/* ISupportErrorInfo interface */ +static HRESULT WINAPI support_error_QueryInterface( + ISupportErrorInfo *iface, + REFIID riid, void** ppvObj ) +{ + domdoc *This = impl_from_ISupportErrorInfo(iface); + return IXMLDocument_QueryInterface((IXMLDocument *)This, riid, ppvObj); +} + +static ULONG WINAPI support_error_AddRef( + ISupportErrorInfo *iface ) +{ + domdoc *This = impl_from_ISupportErrorInfo(iface); + return IXMLDocument_AddRef((IXMLDocument *)This); +} + +static ULONG WINAPI support_error_Release( + ISupportErrorInfo *iface ) +{ + domdoc *This = impl_from_ISupportErrorInfo(iface); + return IXMLDocument_Release((IXMLDocument *)This); +} + +static HRESULT WINAPI support_error_InterfaceSupportsErrorInfo( + ISupportErrorInfo *iface, + REFIID riid ) +{ + FIXME("(%p)->(%s)\n", iface, debugstr_guid(riid)); + return S_FALSE; +} + +static const struct ISupportErrorInfoVtbl support_error_vtbl = +{ + support_error_QueryInterface, + support_error_AddRef, + support_error_Release, + support_error_InterfaceSupportsErrorInfo +}; + +/* IXMLDOMDocument2 interface */ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID riid, void** ppvObject ) { domdoc *This = impl_from_IXMLDOMDocument2( iface ); @@ -402,6 +447,10 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii { *ppvObject = (IObjectWithSite*)&(This->lpvtblIObjectWithSite); } + else if( IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *ppvObject = &This->lpvtblISupportErrorInfo; + } else if(dispex_query_interface(&This->dispex, riid, ppvObject)) { return *ppvObject ? S_OK : E_NOINTERFACE; @@ -2138,6 +2187,7 @@ HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **docu doc->lpvtblIPersistStream = &xmldoc_IPersistStream_VTable; doc->lpvtblIObjectWithSite = &domdocObjectSite; doc->lpvtblIObjectSafety = &domdocObjectSafetyVtbl; + doc->lpvtblISupportErrorInfo = &support_error_vtbl; doc->ref = 1; doc->async = 0; doc->validating = 0; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 73ba932..0c8c147 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -400,6 +400,7 @@ static void test_domdoc( void ) IXMLDOMAttribute *node_attr = NULL; IXMLDOMNode *nodeChild = NULL; IXMLDOMProcessingInstruction *nodePI = NULL; + ISupportErrorInfo *support_error = NULL; VARIANT_BOOL b; VARIANT var; BSTR str; @@ -862,6 +863,15 @@ static void test_domdoc( void ) IXMLDOMProcessingInstruction_Release(nodePI); } + r = IXMLDOMDocument_QueryInterface( doc, &IID_ISupportErrorInfo, (LPVOID*)&support_error ); + ok( r == S_OK, "ret %08x\n", r ); + if(r == S_OK) + { + r = ISupportErrorInfo_InterfaceSupportsErrorInfo( support_error, &IID_IXMLDOMDocument ); + todo_wine ok( r == S_OK, "ret %08x\n", r ); + ISupportErrorInfo_Release( support_error ); + } + r = IXMLDOMDocument_Release( doc ); ok( r == 0, "document ref count incorrect\n");

1 0

Alistair Leslie-Hughes : msxml3: Make functions static.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: c5c29c28f28ffbd696e498be769e3aca07ba7f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c29c28f28ffbd696e498be7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Dec 19 06:58:39 2008 +1100 msxml3: Make functions static. --- dlls/msxml3/httprequest.c | 2 +- dlls/msxml3/msxml_private.h | 1 - dlls/msxml3/xmlelem.c | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3c96277..c539573 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -75,7 +75,7 @@ static ULONG WINAPI httprequest_AddRef(IXMLHTTPRequest *iface) return InterlockedIncrement( &This->ref ); } -ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) +static ULONG WINAPI httprequest_Release(IXMLHTTPRequest *iface) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); ULONG ref; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index e33b994..917543d 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -67,7 +67,6 @@ extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ); extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ); extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); -extern HRESULT XMLElementCollection_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); extern xmlDocPtr parse_xml(char *ptr, int len); diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 8166e6a..0105a0a 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +static HRESULT XMLElementCollection_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); + /********************************************************************** * IXMLElement */ @@ -732,7 +734,7 @@ static const struct IEnumVARIANTVtbl xmlelem_collection_IEnumVARIANTvtbl = xmlelem_collection_IEnumVARIANT_Clone }; -HRESULT XMLElementCollection_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj) +static HRESULT XMLElementCollection_create(IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj) { xmlelem_collection *collection; xmlNodePtr ptr;

1 0