wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Alexandre Julliard : wrc: Increase the font size when translating a dialog to a language that needs a larger font .
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 1eeaa874b35d60413a378b430a3093ceee75ab71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eeaa874b35d60413a378b430… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 11:28:52 2011 +0100 wrc: Increase the font size when translating a dialog to a language that needs a larger font. --- tools/wrc/po.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index d93c1b7..1882d78 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -64,6 +64,11 @@ static int is_rtl_language( const language_t *lan ) return lan->id == LANG_ARABIC || lan->id == LANG_HEBREW || lan->id == LANG_PERSIAN; } +static int uses_larger_font( const language_t *lan ) +{ + return lan->id == LANG_CHINESE || lan->id == LANG_JAPANESE || lan->id == LANG_KOREAN; +} + static version_t *get_dup_version( language_t *lang ) { /* English "translations" take precedence over the original rc contents */ @@ -659,7 +664,6 @@ static void add_pot_dialog( po_file_t po, const resource_t *res ) const dialog_t *dlg = res->res.dlg; if (dlg->title) add_po_string( po, dlg->title, NULL, NULL ); - if (dlg->font) add_po_string( po, dlg->font->name, NULL, NULL ); add_pot_dialog_controls( po, dlg->controls ); } @@ -703,6 +707,7 @@ static void compare_dialogs( const dialog_t *english_dlg, const dialog_t *dlg ) font = convert_msgid_ascii( dlg->font->name, 0 ); size = dlg->font->size; } + if (uses_larger_font( dlg->lvc.language )) english_size++; if (!english_font || !font || strcasecmp( english_font, font ) || english_size != size) warning( "%s: dialog %s doesn't have the same font (%s %u vs %s %u)\n", @@ -757,8 +762,6 @@ static void add_po_dialog( const resource_t *english, const resource_t *res ) if (english_dlg->title && dlg->title) add_po_string( po, english_dlg->title, dlg->title, dlg->lvc.language ); - if (english_dlg->font && dlg->font) - add_po_string( po, english_dlg->font->name, dlg->font->name, dlg->lvc.language ); add_po_dialog_controls( po, english_dlg->controls, dlg->controls, dlg->lvc.language ); } @@ -1079,8 +1082,9 @@ static void translate_dialog( dialog_t *dlg, dialog_t *new, int *found ) if (dlg->font) { new->font = xmalloc( sizeof(*dlg->font) ); - new->font = dlg->font; - new->font->name = translate_string( dlg->font->name, found ); + *new->font = *dlg->font; + if (uses_larger_font( new->lvc.language )) new->font->size++; + new->font->name = convert_string( dlg->font->name, str_unicode, 1252 ); } new->controls = translate_controls( dlg->controls, found ); }

1 0

Alexandre Julliard : wrc: Set the WS_EX_LAYOUTRTL flag when translating a dialog to a RTL language.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: f13f25343cc30a70e2fc595f7213a2014932f914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13f25343cc30a70e2fc595f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 11:22:23 2011 +0100 wrc: Set the WS_EX_LAYOUTRTL flag when translating a dialog to a RTL language. --- tools/wrc/po.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index f44c395..d93c1b7 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -59,6 +59,11 @@ static int is_english( const language_t *lan ) return lan->id == LANG_ENGLISH && lan->sub == SUBLANG_DEFAULT; } +static int is_rtl_language( const language_t *lan ) +{ + return lan->id == LANG_ARABIC || lan->id == LANG_HEBREW || lan->id == LANG_PERSIAN; +} + static version_t *get_dup_version( language_t *lang ) { /* English "translations" take precedence over the original rc contents */ @@ -674,6 +679,8 @@ static void compare_dialogs( const dialog_t *english_dlg, const dialog_t *dlg ) if (dlg->gotexstyle) exstyle = dlg->exstyle->or_mask; if (english_dlg->gotstyle) english_style = english_dlg->style->or_mask; if (english_dlg->gotexstyle) english_exstyle = english_dlg->exstyle->or_mask; + if (is_rtl_language( dlg->lvc.language )) english_exstyle |= WS_EX_LAYOUTRTL; + if (english_style != style) warning( "%s: dialog %s doesn't have the same style (%08x vs %08x)\n", get_language_name( dlg->lvc.language ), title, style, english_style ); @@ -1061,6 +1068,14 @@ static stringtable_t *translate_stringtable( stringtable_t *stt, language_t *lan static void translate_dialog( dialog_t *dlg, dialog_t *new, int *found ) { if (dlg->title) new->title = translate_string( dlg->title, found ); + if (is_rtl_language( new->lvc.language )) + { + new->gotexstyle = TRUE; + if (dlg->gotexstyle) + new->exstyle = new_style( dlg->exstyle->or_mask | WS_EX_LAYOUTRTL, dlg->exstyle->and_mask ); + else + new->exstyle = new_style( WS_EX_LAYOUTRTL, 0 ); + } if (dlg->font) { new->font = xmalloc( sizeof(*dlg->font) );

1 0

Alexandre Julliard : wrc: Print warnings for mismatched dialogs during po file generation.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 413f5ccba5a344a10ee8c567e713d402de027353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413f5ccba5a344a10ee8c567e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 31 11:04:36 2011 +0100 wrc: Print warnings for mismatched dialogs during po file generation. --- tools/wrc/po.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 82 insertions(+), 11 deletions(-) diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 9cb2b42..f44c395 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -559,22 +559,22 @@ static po_file_t get_po_file( const language_t *lang ) return po_file->po; } -static char *get_po_file_name( const language_t *lang ) +static const char *get_language_name( const language_t *lang ) { + static char name[20]; unsigned int i; - char name[40]; - sprintf( name, "%02x-%02x", lang->id, lang->sub ); for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) - { if (languages[i].id == lang->id && languages[i].sub == lang->sub) - { - strcpy( name, languages[i].name ); - break; - } - } - strcat( name, ".po" ); - return xstrdup( name ); + return languages[i].name; + + sprintf( name, "%02x-%02x", lang->id, lang->sub ); + return name; +} + +static char *get_po_file_name( const language_t *lang ) +{ + return strmake( "%s.po", get_language_name( lang ) ); } static unsigned int flush_po_files( const char *output_name ) @@ -658,6 +658,75 @@ static void add_pot_dialog( po_file_t po, const resource_t *res ) add_pot_dialog_controls( po, dlg->controls ); } +static void compare_dialogs( const dialog_t *english_dlg, const dialog_t *dlg ) +{ + const control_t *english_ctrl, *ctrl; + unsigned int style = 0, exstyle = 0, english_style = 0, english_exstyle = 0; + char *name; + char *title = english_dlg->title ? convert_msgid_ascii( english_dlg->title, 0 ) : xstrdup("??"); + + if (english_dlg->width != dlg->width || english_dlg->height != dlg->height) + warning( "%s: dialog %s doesn't have the same size (%d,%d vs %d,%d)\n", + get_language_name( dlg->lvc.language ), title, dlg->width, dlg->height, + english_dlg->width, english_dlg->height ); + + if (dlg->gotstyle) style = dlg->style->or_mask; + if (dlg->gotexstyle) exstyle = dlg->exstyle->or_mask; + if (english_dlg->gotstyle) english_style = english_dlg->style->or_mask; + if (english_dlg->gotexstyle) english_exstyle = english_dlg->exstyle->or_mask; + if (english_style != style) + warning( "%s: dialog %s doesn't have the same style (%08x vs %08x)\n", + get_language_name( dlg->lvc.language ), title, style, english_style ); + if (english_exstyle != exstyle) + warning( "%s: dialog %s doesn't have the same exstyle (%08x vs %08x)\n", + get_language_name( dlg->lvc.language ), title, exstyle, english_exstyle ); + + if (english_dlg->font || dlg->font) + { + int size = 0, english_size = 0; + char *font = NULL, *english_font = NULL; + + if (english_dlg->font) + { + english_font = convert_msgid_ascii( english_dlg->font->name, 0 ); + english_size = english_dlg->font->size; + } + if (dlg->font) + { + font = convert_msgid_ascii( dlg->font->name, 0 ); + size = dlg->font->size; + } + + if (!english_font || !font || strcasecmp( english_font, font ) || english_size != size) + warning( "%s: dialog %s doesn't have the same font (%s %u vs %s %u)\n", + get_language_name(dlg->lvc.language), title, + english_font ? english_font : "default", english_size, + font ? font : "default", size ); + free( font ); + free( english_font ); + } + english_ctrl = english_dlg->controls; + ctrl = dlg->controls; + for ( ; english_ctrl && ctrl; ctrl = ctrl->next, english_ctrl = english_ctrl->next ) + { + if (control_has_title( english_ctrl )) + name = convert_msgid_ascii( english_ctrl->title->name.s_name, 0 ); + else + name = strmake( "%d", ctrl->id ); + + if (english_ctrl->width != ctrl->width || english_ctrl->height != ctrl->height) + warning( "%s: dialog %s control %s doesn't have the same size (%d,%d vs %d,%d)\n", + get_language_name( dlg->lvc.language ), title, name, + ctrl->width, ctrl->height, english_ctrl->width, english_ctrl->height ); + if (english_ctrl->x != ctrl->x || english_ctrl->y != ctrl->y) + warning( "%s: dialog %s control %s doesn't have the same position (%d,%d vs %d,%d)\n", + get_language_name( dlg->lvc.language ), title, name, + ctrl->x, ctrl->y, english_ctrl->x, english_ctrl->y ); + free( name ); + } + free( title ); +} + static void add_po_dialog_controls( po_file_t po, const control_t *english_ctrl, const control_t *ctrl, const language_t *lang ) { @@ -677,6 +746,8 @@ static void add_po_dialog( const resource_t *english, const resource_t *res ) const dialog_t *dlg = res->res.dlg; po_file_t po = get_po_file( dlg->lvc.language ); + compare_dialogs( english_dlg, dlg ); + if (english_dlg->title && dlg->title) add_po_string( po, english_dlg->title, dlg->title, dlg->lvc.language ); if (english_dlg->font && dlg->font)

1 0

Michael Stefaniuc : include: Make "long" numeric constants LP64/ LLP64 proof (winuser.h).
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 1435b5ecd73b56fe87376ef5cbf5c90d39035030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1435b5ecd73b56fe87376ef5c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 31 00:27:15 2011 +0100 include: Make "long" numeric constants LP64/LLP64 proof (winuser.h). --- dlls/user32/tests/scroll.c | 8 +- dlls/user32/tests/win.c | 2 +- dlls/user32/win.c | 4 +- include/winuser.h | 318 ++++++++++++++++++++++---------------------- 4 files changed, 166 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1435b5ecd73b56fe87376…

1 0

Michael Stefaniuc : include: Fix numeric constants in dinput. h for LLP64 compilers.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 8f923e38af8a1181ec928cf69687619af66c71a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f923e38af8a1181ec928cf69… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 29 00:38:03 2011 +0200 include: Fix numeric constants in dinput.h for LLP64 compilers. Fixup for f334333cb56a23143f447f7b893f8de928d7091d. --- include/dinput.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index bd9d898..353ec55 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -167,20 +167,20 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DIERR_READONLY E_ACCESSDENIED #define DIERR_HANDLEEXISTS E_ACCESSDENIED #ifndef E_PENDING -#define E_PENDING 0x8000000A +#define E_PENDING __MSABI_LONG(0x8000000A) #endif -#define DIERR_INSUFFICIENTPRIVS 0x80040200 -#define DIERR_DEVICEFULL 0x80040201 -#define DIERR_MOREDATA 0x80040202 -#define DIERR_NOTDOWNLOADED 0x80040203 -#define DIERR_HASEFFECTS 0x80040204 -#define DIERR_NOTEXCLUSIVEACQUIRED 0x80040205 -#define DIERR_INCOMPLETEEFFECT 0x80040206 -#define DIERR_NOTBUFFERED 0x80040207 -#define DIERR_EFFECTPLAYING 0x80040208 -#define DIERR_UNPLUGGED 0x80040209 -#define DIERR_REPORTFULL 0x8004020A -#define DIERR_MAPFILEFAIL 0x8004020B +#define DIERR_INSUFFICIENTPRIVS __MSABI_LONG(0x80040200) +#define DIERR_DEVICEFULL __MSABI_LONG(0x80040201) +#define DIERR_MOREDATA __MSABI_LONG(0x80040202) +#define DIERR_NOTDOWNLOADED __MSABI_LONG(0x80040203) +#define DIERR_HASEFFECTS __MSABI_LONG(0x80040204) +#define DIERR_NOTEXCLUSIVEACQUIRED __MSABI_LONG(0x80040205) +#define DIERR_INCOMPLETEEFFECT __MSABI_LONG(0x80040206) +#define DIERR_NOTBUFFERED __MSABI_LONG(0x80040207) +#define DIERR_EFFECTPLAYING __MSABI_LONG(0x80040208) +#define DIERR_UNPLUGGED __MSABI_LONG(0x80040209) +#define DIERR_REPORTFULL __MSABI_LONG(0x8004020A) +#define DIERR_MAPFILEFAIL __MSABI_LONG(0x8004020B) #define DIENUM_STOP 0 #define DIENUM_CONTINUE 1

1 0

Michael Stefaniuc : include: Fix numeric constants in digitalv. h for LLP64 compilers.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: f9f9750586a38879187d60f9352cb756df317175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f9750586a38879187d60f93… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 29 00:30:12 2011 +0200 include: Fix numeric constants in digitalv.h for LLP64 compilers. Fixup for 4b6ad8c21923164fce70efd3d175808e2fb26113. --- include/digitalv.h | 506 ++++++++++++++++++++++++++-------------------------- 1 files changed, 253 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9f9750586a38879187d6…

1 0

Vitaliy Margolen : dinput: Report mouse and keyboard as being emulated. This works better for some games.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 35016b05130b71e36d3c28ace956a6a6ca2414f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35016b05130b71e36d3c28ace… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Oct 30 14:52:45 2011 -0600 dinput: Report mouse and keyboard as being emulated. This works better for some games. --- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 4de8692..c23a023 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -373,7 +373,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa } devcaps.dwSize = lpDIDevCaps->dwSize; - devcaps.dwFlags = DIDC_ATTACHED; + devcaps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; if (This->base.dinput->dwVersion >= 0x0800) devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (DI8DEVTYPEKEYBOARD_UNKNOWN << 8); else diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 4b65e89..06403e1 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -666,7 +666,7 @@ static HRESULT WINAPI SysMouseWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, } devcaps.dwSize = lpDIDevCaps->dwSize; - devcaps.dwFlags = DIDC_ATTACHED; + devcaps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; if (This->base.dinput->dwVersion >= 0x0800) devcaps.dwDevType = DI8DEVTYPE_MOUSE | (DI8DEVTYPEMOUSE_TRADITIONAL << 8); else

1 0

Nikolay Sivov : msxml3: Implement IEnumVARIANT::Next() for IXMLDOMSelection .
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 4bb9da77767602e3fb798654da0920b7f157691c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb9da77767602e3fb798654d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 30 10:57:09 2011 +0300 msxml3: Implement IEnumVARIANT::Next() for IXMLDOMSelection. --- dlls/msxml3/selection.c | 43 ++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 95 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 133 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 0e62a68..31137f3 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -65,6 +65,8 @@ typedef struct _enumvariant IXMLDOMSelection *selection; BOOL own; + + LONG pos; } enumvariant; typedef struct _domselection @@ -507,12 +509,44 @@ static ULONG WINAPI enumvariant_Release(IEnumVARIANT *iface ) static HRESULT WINAPI enumvariant_Next( IEnumVARIANT *iface, ULONG celt, - VARIANT *rgvar, - ULONG *pceltFetched) + VARIANT *var, + ULONG *fetched) { enumvariant *This = impl_from_IEnumVARIANT( iface ); - FIXME("(%p)->(%u %p %p): stub\n", This, celt, rgvar, pceltFetched); - return E_NOTIMPL; + IXMLDOMNode *node; + ULONG ret_count = 0; + + TRACE("(%p)->(%u %p %p)\n", This, celt, var, fetched); + + if (fetched) *fetched = 0; + + if (celt && !var) return E_INVALIDARG; + + for (; celt > 0; celt--, var++, This->pos++) + { + IDispatch *disp = NULL; + HRESULT hr; + + node = NULL; + hr = IXMLDOMSelection_get_item(This->selection, This->pos, &node); + if (hr != S_OK) break; + + IXMLDOMNode_QueryInterface(node, &IID_IDispatch, (void**)&disp); + IXMLDOMNode_Release(node); + + V_VT(var) = VT_DISPATCH; + V_DISPATCH(var) = disp; + + ret_count++; + } + + if (fetched) (*fetched)++; + + /* we need to advance one step more for some reason */ + if (ret_count) + IXMLDOMSelection_nextNode(This->selection, &node); + + return celt == 0 ? S_OK : S_FALSE; } static HRESULT WINAPI enumvariant_Skip( @@ -561,6 +595,7 @@ static HRESULT create_enumvariant(IXMLDOMSelection *selection, BOOL own, IUnknow This->ref = 0; This->selection = selection; This->own = own; + This->pos = 0; if (This->own) IXMLDOMSelection_AddRef(selection); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 62ccb4e..ee2128b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1728,6 +1728,15 @@ SZ_EMAIL_DTD " <attachment id=\"patch1\">0001-msxml3-tests-DTD-validation.patch</attachment>" "</email>"; +static const char xpath_simple_list[] = +"<?xml version=\"1.0\"?>" +"<root>" +" <a/>" +" <b/>" +" <c/>" +" <d/>" +"</root>"; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -10043,11 +10052,16 @@ static void test_selection(void) { IXMLDOMSelection *selection, *selection2; IEnumVARIANT *enum1, *enum2, *enum3; - IDispatch *disp; IXMLDOMNodeList *list; IXMLDOMDocument *doc; + IXMLDOMNode *node; + IDispatch *disp; VARIANT_BOOL b; HRESULT hr; + VARIANT v; + BSTR name; + ULONG ret; + LONG len; doc = create_document(&IID_IXMLDOMDocument); @@ -10150,7 +10164,86 @@ static void test_selection(void) IXMLDOMNodeList_Release(list); + /* test if IEnumVARIANT touches selection context */ + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(xpath_simple_list), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_selectNodes(doc, _bstr_("root/*"), &list); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNodeList_QueryInterface(list, &IID_IXMLDOMSelection, (void**)&selection); + EXPECT_HR(hr, S_OK); + + len = 0; + hr = IXMLDOMSelection_get_length(selection, &len); + EXPECT_HR(hr, S_OK); + ok(len == 4, "got %d\n", len); + + enum1 = NULL; + hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1); + EXPECT_HR(hr, S_OK); + + /* no-op if zero count */ + V_VT(&v) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 0, &v, NULL); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_I2, "got var type %d\n", V_VT(&v)); + + /* positive count, null array pointer */ + hr = IEnumVARIANT_Next(enum1, 1, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + ret = 1; + hr = IEnumVARIANT_Next(enum1, 1, NULL, &ret); + EXPECT_HR(hr, E_INVALIDARG); + ok(ret == 0, "got %d\n", ret); + + V_VT(&v) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); + + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, _bstr_("a")), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + VariantClear(&v); + + /* list cursor is updated */ + hr = IXMLDOMSelection_nextNode(selection, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, _bstr_("c")), "got node name %s\n", wine_dbgstr_w(name)); + IXMLDOMNode_Release(node); + + V_VT(&v) = VT_I2; + hr = IEnumVARIANT_Next(enum1, 1, &v, NULL); + EXPECT_HR(hr, S_OK); + ok(V_VT(&v) == VT_DISPATCH, "got var type %d\n", V_VT(&v)); + hr = IDispatch_QueryInterface(V_DISPATCH(&v), &IID_IXMLDOMNode, (void**)&node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, _bstr_("b")), "got node name %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + IXMLDOMNode_Release(node); + VariantClear(&v); + + hr = IXMLDOMSelection_nextNode(selection, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_get_nodeName(node, &name); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(name, _bstr_("d")), "got node name %s\n", wine_dbgstr_w(name)); + IXMLDOMNode_Release(node); + + IXMLDOMSelection_Release(selection); + IXMLDOMNodeList_Release(list); IXMLDOMDocument_Release(doc); + free_bstrs(); }

1 0

Nikolay Sivov : msxml3: Release IDispatchEx dynamic data properly.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: a35513bbd07d7630d4d3c2e889b780374886cbe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35513bbd07d7630d4d3c2e88… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 30 01:27:50 2011 +0400 msxml3: Release IDispatchEx dynamic data properly. --- dlls/msxml3/dispex.c | 16 ++++++++++++++++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/node.c | 6 ++---- dlls/msxml3/selection.c | 9 +++++---- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 67570c0..274f604 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -653,6 +653,22 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) return TRUE; } +void release_dispex(DispatchEx *This) +{ + dynamic_prop_t *prop; + + if(!This->dynamic_data) + return; + + for(prop = This->dynamic_data->props; prop < This->dynamic_data->props + This->dynamic_data->prop_cnt; prop++) { + VariantClear(&prop->var); + heap_free(prop->name); + } + + heap_free(This->dynamic_data->props); + heap_free(This->dynamic_data); +} + void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data) { dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 2962a0e..8b84aca 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -156,6 +156,7 @@ typedef struct { extern HINSTANCE MSXML_hInstance DECLSPEC_HIDDEN; void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; +void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7219bd3..0e00b38 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1110,6 +1110,7 @@ void destroy_xmlnode(xmlnode *This) { if(This->node) xmldoc_release(This->node->doc); + release_dispex(&This->dispex); } void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispex_static_data_t *dispex_data) @@ -1121,10 +1122,7 @@ void init_xmlnode(xmlnode *This, xmlNodePtr node, IXMLDOMNode *node_iface, dispe This->iface = node_iface; This->parent = NULL; - if(dispex_data) - init_dispex(&This->dispex, (IUnknown*)This->iface, dispex_data); - else - This->dispex.outer = NULL; + init_dispex(&This->dispex, dispex_data ? (IUnknown*)This->iface : NULL, dispex_data); } typedef struct { diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index c90c8c2..0e62a68 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -155,6 +155,7 @@ static ULONG WINAPI domselection_Release( xmlXPathFreeObject(This->result); xmldoc_release(This->node->doc); if (This->enumvariant) IEnumVARIANT_Release(This->enumvariant); + release_dispex(&This->dispex); heap_free(This); } @@ -756,8 +757,9 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) *out = NULL; if (!This || !ctxt || !query) { - hr = E_OUTOFMEMORY; - goto cleanup; + xmlXPathFreeContext(ctxt); + heap_free(This); + return E_OUTOFMEMORY; } This->IXMLDOMSelection_iface.lpVtbl = &domselection_vtbl; @@ -765,6 +767,7 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) This->resultPos = 0; This->node = node; This->enumvariant = NULL; + init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSelection_iface, &domselection_dispex); xmldoc_add_ref(This->node->doc); ctxt->error = query_serror; @@ -804,8 +807,6 @@ HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) goto cleanup; } - init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMSelection_iface, &domselection_dispex); - *out = (IXMLDOMNodeList*)&This->IXMLDOMSelection_iface; hr = S_OK; TRACE("found %d matches\n", xmlXPathNodeSetGetLength(This->result->nodesetval));

1 0

Nikolay Sivov : msxml3: Init dynamic data pointer in IDispatchEx implementation.
by Alexandre Julliard 31 Oct '11

31 Oct '11

Module: wine Branch: master Commit: 4d5b3ddf7c07ac89f003bb6f9a1e9681f1017b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5b3ddf7c07ac89f003bb6f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 29 00:43:00 2011 +0400 msxml3: Init dynamic data pointer in IDispatchEx implementation. --- dlls/msxml3/dispex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index fa9fbb8..67570c0 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -658,4 +658,5 @@ void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *data dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->outer = outer; dispex->data = data; + dispex->dynamic_data = NULL; }

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 October 2011