wine-commits September 2009

wine-commits@winehq.org

3 participants
866 discussions

Dylan Smith : richedit: Handle to parent window is cached.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 3fe20bdc7ea59b3e5711bed26d86c433109b21e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe20bdc7ea59b3e5711bed26… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Sep 30 10:46:37 2009 -0400 richedit: Handle to parent window is cached. The parent window for the richedit control on creation is the one that receives notify messages, even after the parent has been changed using SetParent. --- dlls/riched20/editor.c | 11 ++++++----- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 2 +- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/txthost.c | 17 +++++++++++------ 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 97e55ba..11d4925 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2035,14 +2035,14 @@ ME_FilterEvent(ME_TextEditor *editor, UINT msg, WPARAM* wParam, LPARAM* lParam) { MSGFILTER msgf; - if (!editor->hWnd) return FALSE; + if (!editor->hWnd || !editor->hwndParent) return FALSE; msgf.nmhdr.hwndFrom = editor->hWnd; msgf.nmhdr.idFrom = GetWindowLongW(editor->hWnd, GWLP_ID); msgf.nmhdr.code = EN_MSGFILTER; msgf.msg = msg; msgf.wParam = *wParam; msgf.lParam = *lParam; - if (SendMessageW(GetParent(editor->hWnd), WM_NOTIFY, msgf.nmhdr.idFrom, (LPARAM)&msgf)) + if (SendMessageW(editor->hwndParent, WM_NOTIFY, msgf.nmhdr.idFrom, (LPARAM)&msgf)) return FALSE; *wParam = msgf.wParam; *lParam = msgf.lParam; @@ -2598,7 +2598,7 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) } if(SUCCEEDED(IRichEditOleCallback_GetContextMenu(editor->lpOleCallback, seltype, NULL, &selrange, &menu))) { - TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, GetParent(editor->hWnd), NULL); + TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, editor->hwndParent, NULL); DestroyMenu(menu); } return TRUE; @@ -2612,6 +2612,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) LONG selbarwidth; ed->hWnd = NULL; + ed->hwndParent = NULL; ed->texthost = texthost; ed->bEmulateVersion10 = bEmulateVersion10; ITextHost_TxGetPropertyBits(texthost, @@ -4369,7 +4370,7 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, ITextHost *texthost; TRACE("WM_NCCREATE: hWnd %p style 0x%08x\n", hWnd, pcs->style); - texthost = ME_CreateTextHost(hWnd, FALSE); + texthost = ME_CreateTextHost(hWnd, pcs, FALSE); return texthost != NULL; } else if (msg != WM_NCDESTROY) @@ -4499,7 +4500,7 @@ LRESULT WINAPI RichEdit10ANSIWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam; TRACE("WM_NCCREATE: hWnd %p style 0x%08x\n", hWnd, pcs->style); - texthost = ME_CreateTextHost(hWnd, TRUE); + texthost = ME_CreateTextHost(hWnd, pcs, TRUE); return texthost != NULL; } return RichEditANSIWndProc(hWnd, msg, wParam, lParam); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 7edd86f..8a5304b 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -271,7 +271,7 @@ struct RTFTable *ME_MakeTableDef(ME_TextEditor *editor); void ME_InitTableDef(ME_TextEditor *editor, struct RTFTable *tableDef); /* txthost.c */ -ITextHost *ME_CreateTextHost(HWND hwnd, BOOL bEmulateVersion10); +ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion10); #ifdef __i386__ /* Use wrappers to perform thiscall on i386 */ #define TXTHOST_VTABLE(This) (&itextHostStdcallVtbl) #else /* __i386__ */ diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 6258a63..115662c 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -326,7 +326,7 @@ typedef struct tagME_FontCacheItem typedef struct tagME_TextEditor { - HWND hWnd; + HWND hWnd, hwndParent; ITextHost *texthost; BOOL bEmulateVersion10; ME_TextBuffer *pBuffer; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index e5f6310..15ac461 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5741,7 +5741,7 @@ static void test_WM_NOTIFY(void) SetWindowLongPtr(hwndRichedit_WM_NOTIFY, GWLP_HWNDPARENT, 0); SendMessage(hwndRichedit_WM_NOTIFY, WM_KEYDOWN, VK_RIGHT, 0); SendMessage(hwndRichedit_WM_NOTIFY, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); - todo_wine ok(sel_start == 1 && sel_end == 1, + ok(sel_start == 1 && sel_end == 1, "selections is incorrectly at (%d,%d)\n", sel_start, sel_end); DestroyWindow(hwndRichedit_WM_NOTIFY); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 0ccb177..950d200 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -44,7 +44,7 @@ typedef struct ITextHostImpl { static const ITextHostVtbl textHostVtbl; -ITextHost *ME_CreateTextHost(HWND hwnd, BOOL bEmulateVersion10) +ITextHost *ME_CreateTextHost(HWND hwnd, CREATESTRUCTW *cs, BOOL bEmulateVersion10) { ITextHostImpl *texthost; texthost = CoTaskMemAlloc(sizeof(*texthost)); @@ -60,6 +60,7 @@ ITextHost *ME_CreateTextHost(HWND hwnd, BOOL bEmulateVersion10) editor = ME_MakeEditor((ITextHost*)texthost, bEmulateVersion10); editor->exStyleFlags = GetWindowLongW(hwnd, GWL_EXSTYLE); editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ + editor->hwndParent = cs->hwndParent; SetWindowLongPtrW(hwnd, 0, (LONG_PTR)editor); } @@ -448,9 +449,13 @@ HRESULT WINAPI ITextHostImpl_TxNotify(ITextHost *iface, void *pv) { ITextHostImpl *This = (ITextHostImpl *)iface; + ME_TextEditor *editor = (ME_TextEditor*)GetWindowLongPtrW(This->hWnd, 0); HWND hwnd = This->hWnd; - HWND parent = GetParent(hwnd); - UINT id = GetWindowLongW(hwnd, GWLP_ID); + UINT id; + + if (!editor || !editor->hwndParent) return S_OK; + + id = GetWindowLongW(hwnd, GWLP_ID); switch (iNotify) { @@ -471,13 +476,13 @@ HRESULT WINAPI ITextHostImpl_TxNotify(ITextHost *iface, info->hwndFrom = hwnd; info->idFrom = id; info->code = iNotify; - SendMessageW(parent, WM_NOTIFY, id, (LPARAM)info); + SendMessageW(editor->hwndParent, WM_NOTIFY, id, (LPARAM)info); break; } case EN_UPDATE: /* Only sent when the window is visible. */ - if (!IsWindowVisible(This->hWnd)) + if (!IsWindowVisible(hwnd)) break; /* Fall through */ case EN_CHANGE: @@ -487,7 +492,7 @@ HRESULT WINAPI ITextHostImpl_TxNotify(ITextHost *iface, case EN_MAXTEXT: case EN_SETFOCUS: case EN_VSCROLL: - SendMessageW(parent, WM_COMMAND, MAKEWPARAM(id, iNotify), (LPARAM)hwnd); + SendMessageW(editor->hwndParent, WM_COMMAND, MAKEWPARAM(id, iNotify), (LPARAM)hwnd); break; case EN_MSGFILTER:

1 0

Dylan Smith : richedit: Added test to show that handle to parent is cached.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 992381b36e915be95fc3631a27100b961cd38779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992381b36e915be95fc3631a2… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Sep 30 10:46:32 2009 -0400 richedit: Added test to show that handle to parent is cached. --- dlls/riched20/tests/editor.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ce164b3..e5f6310 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5639,6 +5639,7 @@ static void test_eventMask(void) static int received_WM_NOTIFY = 0; static int modify_at_WM_NOTIFY = 0; +static BOOL filter_on_WM_NOTIFY = FALSE; static HWND hwndRichedit_WM_NOTIFY; static LRESULT WINAPI WM_NOTIFY_ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -5647,6 +5648,7 @@ static LRESULT WINAPI WM_NOTIFY_ParentMsgCheckProcA(HWND hwnd, UINT message, WPA { received_WM_NOTIFY = 1; modify_at_WM_NOTIFY = SendMessage(hwndRichedit_WM_NOTIFY, EM_GETMODIFY, 0, 0); + if (filter_on_WM_NOTIFY) return TRUE; } return DefWindowProcA(hwnd, message, wParam, lParam); } @@ -5656,6 +5658,7 @@ static void test_WM_NOTIFY(void) HWND parent; WNDCLASSA cls; CHARFORMAT2 cf2; + int sel_start, sel_end; /* register class to capture WM_NOTIFY */ cls.style = 0; @@ -5718,6 +5721,29 @@ static void test_WM_NOTIFY(void) ok(received_WM_NOTIFY == 1, "Expected WM_NOTIFY was NOT sent!\n"); SendMessage(hwndRichedit_WM_NOTIFY, WM_SETREDRAW, TRUE, 0); + /* Test filtering key events. */ + SendMessage(hwndRichedit_WM_NOTIFY, EM_SETSEL, 0, 0); + SendMessage(hwndRichedit_WM_NOTIFY, EM_SETEVENTMASK, 0, ENM_KEYEVENTS); + SendMessage(hwndRichedit_WM_NOTIFY, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + received_WM_NOTIFY = 0; + SendMessage(hwndRichedit_WM_NOTIFY, WM_KEYDOWN, VK_RIGHT, 0); + SendMessage(hwndRichedit_WM_NOTIFY, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 1 && sel_end == 1, + "selections is incorrectly at (%d,%d)\n", sel_start, sel_end); + filter_on_WM_NOTIFY = TRUE; + received_WM_NOTIFY = 0; + SendMessage(hwndRichedit_WM_NOTIFY, WM_KEYDOWN, VK_RIGHT, 0); + SendMessage(hwndRichedit_WM_NOTIFY, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + ok(sel_start == 1 && sel_end == 1, + "selections is incorrectly at (%d,%d)\n", sel_start, sel_end); + + /* test with owner set to NULL */ + SetWindowLongPtr(hwndRichedit_WM_NOTIFY, GWLP_HWNDPARENT, 0); + SendMessage(hwndRichedit_WM_NOTIFY, WM_KEYDOWN, VK_RIGHT, 0); + SendMessage(hwndRichedit_WM_NOTIFY, EM_GETSEL, (WPARAM)&sel_start, (LPARAM)&sel_end); + todo_wine ok(sel_start == 1 && sel_end == 1, + "selections is incorrectly at (%d,%d)\n", sel_start, sel_end); + DestroyWindow(hwndRichedit_WM_NOTIFY); DestroyWindow(parent); }

1 0

Detlef Riekenberg : fltlib: Add a stub dll.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: eb8b165785ca85dbb221b1c7e81e71557b38425a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8b165785ca85dbb221b1c7e… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Sep 30 14:24:46 2009 +0200 fltlib: Add a stub dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/fltlib/Makefile.in | 13 +++++++++++++ dlls/fltlib/fltlib.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/fltlib/fltlib.spec | 29 +++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d05447a..9233a42 100755 --- a/configure +++ b/configure @@ -14860,6 +14860,14 @@ dlls/faultrep/Makefile: dlls/faultrep/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/faultrep/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/fltlib/Makefile" +test "x$enable_fltlib" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + fltlib" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/fltlib/Makefile: dlls/fltlib/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/fltlib/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/fusion/Makefile" test "x$enable_fusion" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ fusion" @@ -18846,6 +18854,7 @@ do "dlls/dxgi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxgi/tests/Makefile" ;; "dlls/dxguid/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/dxguid/Makefile" ;; "dlls/faultrep/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/faultrep/Makefile" ;; + "dlls/fltlib/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fltlib/Makefile" ;; "dlls/fusion/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/Makefile" ;; "dlls/fusion/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/fusion/tests/Makefile" ;; "dlls/gdi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/gdi32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 27ae652..3d32d28 100644 --- a/configure.ac +++ b/configure.ac @@ -2220,6 +2220,7 @@ WINE_CONFIG_MAKEFILE([dlls/dxgi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_D WINE_CONFIG_MAKEFILE([dlls/dxgi/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/dxguid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS]) WINE_CONFIG_MAKEFILE([dlls/faultrep/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/fltlib/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/fusion/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/fusion/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/gdi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/fltlib/Makefile.in b/dlls/fltlib/Makefile.in new file mode 100644 index 0000000..f0addf1 --- /dev/null +++ b/dlls/fltlib/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = fltlib.dll +IMPORTS = kernel32 + +C_SRCS = \ + fltlib.c + +@MAKE_DLL_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/fltlib/fltlib.c b/dlls/fltlib/fltlib.c new file mode 100644 index 0000000..08baf8f --- /dev/null +++ b/dlls/fltlib/fltlib.c @@ -0,0 +1,45 @@ +/* + * Copyright 2009 Detlef Riekenberg + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(fltlib); + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* use native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + } + return TRUE; +} diff --git a/dlls/fltlib/fltlib.spec b/dlls/fltlib/fltlib.spec new file mode 100644 index 0000000..ac1d7ec --- /dev/null +++ b/dlls/fltlib/fltlib.spec @@ -0,0 +1,29 @@ +@ stub FilterAttach +@ stub FilterAttachAtAltitude +@ stub FilterClose +@ stub FilterConnectCommunicationPort +@ stub FilterCreate +@ stub FilterDetach +@ stub FilterFindClose +@ stub FilterFindFirst +@ stub FilterFindNext +@ stub FilterGetDosName +@ stub FilterGetInformation +@ stub FilterGetMessage +@ stub FilterInstanceClose +@ stub FilterInstanceCreate +@ stub FilterInstanceFindClose +@ stub FilterInstanceFindFirst +@ stub FilterInstanceFindNext +@ stub FilterInstanceGetInformation +@ stub FilterLoad +@ stub FilterReplyMessage +@ stub FilterSendMessage +@ stub FilterUnload +@ stub FilterVolumeClose +@ stub FilterVolumeFindClose +@ stub FilterVolumeFindFirst +@ stub FilterVolumeFindNext +@ stub FilterVolumeInstanceFindClose +@ stub FilterVolumeInstanceFindFirst +@ stub FilterVolumeInstanceFindNext

1 0

Jacek Caban : msxml3: Get rid of node internal IUnknown.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 83e912743cb856c5c8e8ac51092e1b66ee5b24fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e912743cb856c5c8e8ac510… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 15:36:38 2009 +0200 msxml3: Get rid of node internal IUnknown. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 104 ++++++++++++++++--------------------------- dlls/msxml3/pi.c | 2 +- dlls/msxml3/text.c | 2 +- 11 files changed, 48 insertions(+), 76 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index ee2cdfa..426fdcb 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -93,7 +93,7 @@ static ULONG WINAPI domattr_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); + destroy_xmlnode(This->node); HeapFree( GetProcessHeap(), 0, This ); } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 44d869d..b488203 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -100,7 +100,7 @@ static ULONG WINAPI domcdata_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); + destroy_xmlnode(This->node); HeapFree( GetProcessHeap(), 0, This ); } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 536d460..86712f3 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -94,7 +94,7 @@ static ULONG WINAPI domcomment_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); + destroy_xmlnode(This->node); HeapFree( GetProcessHeap(), 0, This ); } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index 658773e..10a35b3 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -93,7 +93,7 @@ static ULONG WINAPI domfrag_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); + destroy_xmlnode(This->node); HeapFree( GetProcessHeap(), 0, This ); } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index ad0fe0a..b6bc189 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -509,7 +509,7 @@ static ULONG WINAPI domdoc_Release( if (This->site) IUnknown_Release( This->site ); - IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); + destroy_xmlnode(This->node); if(This->schema) IXMLDOMSchemaCollection_Release( This->schema ); if (This->stream) IStream_Release(This->stream); HeapFree( GetProcessHeap(), 0, This ); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 531d43e..accd0ed 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -108,7 +108,7 @@ static ULONG WINAPI domelem_Release( TRACE("(%p) ref=%d\n", This, ref); if(!ref) { - IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); + destroy_xmlnode(This->node); heap_free(This); } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index fb56862..820edc7 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -93,7 +93,7 @@ static ULONG WINAPI entityref_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); + destroy_xmlnode(This->node); HeapFree( GetProcessHeap(), 0, This ); } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 57dec0f..c4568f4 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -144,7 +144,6 @@ typedef struct _xmlnode { DispatchEx dispex; const struct IXMLDOMNodeVtbl *lpVtbl; - const struct IUnknownVtbl *lpInternalUnkVtbl; IUnknown *pUnkOuter; LONG ref; xmlNodePtr node; @@ -161,6 +160,7 @@ static inline IXMLDOMNode *IXMLDOMNode_from_impl(xmlnode *This) } extern xmlnode *create_basic_node(xmlNodePtr,IUnknown*,dispex_static_data_t*); +extern void destroy_xmlnode(xmlnode*); extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument2 **document); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 987b07d..643f99e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -66,11 +66,6 @@ static const WCHAR szFloat[] = {'f','l','o','a','t',0}; static const WCHAR szUUID[] = {'u','u','i','d',0}; static const WCHAR szBinHex[] = {'b','i','n','.','h','e','x',0}; -static inline xmlnode *impl_from_InternalUnknown( IUnknown *iface ) -{ - return (xmlnode *)((char*)iface - FIELD_OFFSET(xmlnode, lpInternalUnkVtbl)); -} - xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ) { xmlnode *This; @@ -91,23 +86,52 @@ static HRESULT WINAPI xmlnode_QueryInterface( void** ppvObject ) { xmlnode *This = impl_from_IXMLDOMNode( iface ); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); - return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); + if(This->pUnkOuter) + return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); + + if (IsEqualGUID(riid, &IID_IUnknown)) { + *ppvObject = iface; + }else if (IsEqualGUID( riid, &IID_IDispatch) || + IsEqualGUID( riid, &IID_IXMLDOMNode)) { + *ppvObject = &This->lpVtbl; + }else { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *ppvObject = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef( (IUnknown*)*ppvObject ); + return S_OK; } static ULONG WINAPI xmlnode_AddRef( IXMLDOMNode *iface ) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - return IUnknown_AddRef(This->pUnkOuter); + + if(This->pUnkOuter) + return IUnknown_AddRef(This->pUnkOuter); + + return InterlockedIncrement(&This->ref); } static ULONG WINAPI xmlnode_Release( IXMLDOMNode *iface ) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - return IUnknown_Release(This->pUnkOuter); + LONG ref; + + if(This->pUnkOuter) + return IUnknown_Release(This->pUnkOuter); + + ref = InterlockedDecrement( &This->ref ); + if(!ref) + destroy_xmlnode(This); + + return ref; } static HRESULT WINAPI xmlnode_GetTypeInfoCount( @@ -1484,64 +1508,13 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl = xmlnode_transformNodeToObject, }; -static HRESULT WINAPI Internal_QueryInterface( - IUnknown *iface, - REFIID riid, - void** ppvObject ) +void destroy_xmlnode(xmlnode *This) { - xmlnode *This = impl_from_InternalUnknown( iface ); - - TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); - - - if ( IsEqualGUID( riid, &IID_IUnknown )) - *ppvObject = iface; - else if ( IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IXMLDOMNode ) ) - *ppvObject = &This->lpVtbl; - else - { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); - *ppvObject = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef( (IUnknown*)*ppvObject ); - - return S_OK; -} - -static ULONG WINAPI Internal_AddRef( - IUnknown *iface ) -{ - xmlnode *This = impl_from_InternalUnknown( iface ); - return InterlockedIncrement( &This->ref ); + if(This->node) + xmldoc_release(This->node->doc); + HeapFree( GetProcessHeap(), 0, This ); } -static ULONG WINAPI Internal_Release( - IUnknown *iface ) -{ - xmlnode *This = impl_from_InternalUnknown( iface ); - ULONG ref; - - ref = InterlockedDecrement( &This->ref ); - if ( ref == 0 ) - { - if( This->node ) - xmldoc_release( This->node->doc ); - HeapFree( GetProcessHeap(), 0, This ); - } - - return ref; -} - -static const struct IUnknownVtbl internal_unk_vtbl = -{ - Internal_QueryInterface, - Internal_AddRef, - Internal_Release -}; - xmlnode *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter, dispex_static_data_t *dispex_data ) { xmlnode *This; @@ -1554,12 +1527,11 @@ xmlnode *create_basic_node( xmlNodePtr node, IUnknown *pUnkOuter, dispex_static_ xmldoc_add_ref( node->doc ); This->lpVtbl = &xmlnode_vtbl; - This->lpInternalUnkVtbl = &internal_unk_vtbl; if(pUnkOuter) This->pUnkOuter = pUnkOuter; /* Don't take a ref on outer Unknown */ else - This->pUnkOuter = (IUnknown *)&This->lpInternalUnkVtbl; + This->pUnkOuter = NULL; if(dispex_data) init_dispex(&This->dispex, This->pUnkOuter, dispex_data); @@ -1602,7 +1574,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) break; default: FIXME("only creating basic node for type %d\n", node->type); - pUnk = (IUnknown*)&create_basic_node( node, NULL, NULL )->lpInternalUnkVtbl; + pUnk = (IUnknown*)&create_basic_node( node, NULL, NULL )->lpVtbl; } hr = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMNode, (LPVOID*)&ret); diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 2156ab5..859e128 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -93,7 +93,7 @@ static ULONG WINAPI dom_pi_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); + destroy_xmlnode(This->node); HeapFree( GetProcessHeap(), 0, This ); } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 5856c93..a384bea 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -102,7 +102,7 @@ static ULONG WINAPI domtext_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { - IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); + destroy_xmlnode(This->node); HeapFree( GetProcessHeap(), 0, This ); }

1 0

Jacek Caban : msxml3: Store xmlnode pointer in dom_pi.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 4ca6e39f64bb410e228f162259f68d67666375d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca6e39f64bb410e228f16225… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 15:35:51 2009 +0200 msxml3: Store xmlnode pointer in dom_pi. --- dlls/msxml3/pi.c | 96 +++++++++++++++++++++++++---------------------------- 1 files changed, 45 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ca6e39f64bb410e228f1…

1 0

Jacek Caban : msxml3: Store xmlnode pointer in entityref.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 2ed84025977934d8cb5817025b8ea66c39d4c542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed84025977934d8cb5817025… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 15:35:29 2009 +0200 msxml3: Store xmlnode pointer in entityref. --- dlls/msxml3/entityref.c | 90 ++++++++++++++++++++++------------------------- 1 files changed, 42 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ed84025977934d8cb581…

1 0

Jacek Caban : msxml3: Store xmlnode pointer in domfrag.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 8513db208dff605803bb74674d4a56fef6be1a50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8513db208dff605803bb74674… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 15:35:11 2009 +0200 msxml3: Store xmlnode pointer in domfrag. --- dlls/msxml3/docfrag.c | 90 +++++++++++++++++++++++-------------------------- 1 files changed, 42 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8513db208dff605803bb7…

1 0

Jacek Caban : msxml3: Store xmlnode pointer in domcomment.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: 3d16dc095f492be0775b1b35c43e7b0b34b5fd67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d16dc095f492be0775b1b35c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 15:34:45 2009 +0200 msxml3: Store xmlnode pointer in domcomment. --- dlls/msxml3/comment.c | 112 ++++++++++++++++++++++-------------------------- 1 files changed, 51 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d16dc095f492be0775b1…

1 0

Jacek Caban : msxml3: Store xmlnode pointer in domcdata.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: bd407680c62eb9dc36a70508fc473b4486418cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd407680c62eb9dc36a70508f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 15:34:21 2009 +0200 msxml3: Store xmlnode pointer in domcdata. --- dlls/msxml3/cdata.c | 108 +++++++++++++++++++++++---------------------------- 1 files changed, 49 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd407680c62eb9dc36a70…

1 0

Jacek Caban : msxml3: Store xmlnode pointer in domattr.
by Alexandre Julliard 30 Sep '09

30 Sep '09

Module: wine Branch: master Commit: f78f5a6110b0f32e41ce3acfdc0a6a91e425116c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78f5a6110b0f32e41ce3acfd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 15:34:03 2009 +0200 msxml3: Store xmlnode pointer in domattr. --- dlls/msxml3/attribute.c | 96 ++++++++++++++++++++++------------------------- 1 files changed, 45 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f78f5a6110b0f32e41ce3…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2009