October 2011 - Wine-Commits

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

Oct. 31, 2011

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

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

Oct. 31, 2011

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 : winhlp32: Convert dialogs to po files.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 4707afc74c7a91c5a4be0e8f66ca5631ee185b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4707afc74c7a91c5a4be0e8f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 29 12:12:23 2011 +0200 winhlp32: Convert dialogs to po files. --- po/ar.po | 13 +++++++++++ po/bg.po | 15 ++++++++++++ po/ca.po | 15 ++++++++++++ po/cs.po | 23 +++++++++++++++++++ po/da.po | 12 ++++++++++ po/de.po | 12 ++++++++++ po/el.po | 14 ++++++++++++ po/en.po | 12 ++++++++++ po/en_US.po | 12 ++++++++++ po/eo.po | 15 ++++++++++++ po/es.po | 12 ++++++++++ po/fa.po | 13 +++++++++++ po/fi.po | 15 ++++++++++++ po/fr.po | 12 ++++++++++ po/he.po | 12 ++++++++++ po/hi.po | 12 ++++++++++ po/hu.po | 15 ++++++++++++ po/it.po | 12 ++++++++++ po/ja.po | 12 ++++++++++ po/ko.po | 12 ++++++++++ po/lt.po | 12 ++++++++++ po/ml.po | 12 ++++++++++ po/nb_NO.po | 12 ++++++++++ po/nl.po | 12 ++++++++++ po/or.po | 12 ++++++++++ po/pa.po | 12 ++++++++++ po/pl.po | 12 ++++++++++ po/pt_BR.po | 12 ++++++++++ po/pt_PT.po | 12 ++++++++++ po/rm.po | 14 ++++++++++++ po/ro.po | 12 ++++++++++ po/ru.po | 12 ++++++++++ po/sk.po | 14 ++++++++++++ po/sl.po | 12 ++++++++++ po/sr_RS(a)cyrillic.po | 15 ++++++++++++ po/sr_RS(a)latin.po | 12 ++++++++++ po/sv.po | 12 ++++++++++ po/te.po | 12 ++++++++++ po/th.po | 14 ++++++++++++ po/tr.po | 23 +++++++++++++++++++ po/uk.po | 12 ++++++++++ po/wa.po | 15 ++++++++++++ po/wine.pot | 12 ++++++++++ po/zh_CN.po | 12 ++++++++++ po/zh_TW.po | 19 ++++++++++++++++ programs/winhlp32/Da.rc | 44 ------------------------------------- programs/winhlp32/De.rc | 42 ----------------------------------- programs/winhlp32/En.rc | 40 ---------------------------------- programs/winhlp32/Es.rc | 41 ----------------------------------- programs/winhlp32/Fr.rc | 46 --------------------------------------- programs/winhlp32/He.rc | 47 ---------------------------------------- programs/winhlp32/It.rc | 43 ------------------------------------ programs/winhlp32/Ja.rc | 43 ------------------------------------ programs/winhlp32/Ko.rc | 42 ----------------------------------- programs/winhlp32/Lt.rc | 42 ----------------------------------- programs/winhlp32/Makefile.in | 25 +-------------------- programs/winhlp32/Nl.rc | 42 ----------------------------------- programs/winhlp32/No.rc | 39 --------------------------------- programs/winhlp32/Pl.rc | 42 ----------------------------------- programs/winhlp32/Pt.rc | 48 ----------------------------------------- programs/winhlp32/Ro.rc | 43 ------------------------------------ programs/winhlp32/Ru.rc | 42 ----------------------------------- programs/winhlp32/Si.rc | 41 ----------------------------------- programs/winhlp32/Sr.rc | 44 ------------------------------------- programs/winhlp32/Sv.rc | 43 ------------------------------------ programs/winhlp32/Uk.rc | 47 ---------------------------------------- programs/winhlp32/Zh.rc | 45 -------------------------------------- programs/winhlp32/winhlp32.rc | 16 +++++++++++++ 68 files changed, 617 insertions(+), 930 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4707afc74c7a91c5a4be0…

1 0

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

Oct. 31, 2011

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 Oct. 31, 2011

Oct. 31, 2011

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 Oct. 31, 2011

Oct. 31, 2011

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

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

Oct. 31, 2011

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

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

Oct. 31, 2011

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

Henri Verbeet : wined3d: Make the device parameter to wined3d_event_query_issue() const.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: f8e7b1e80c578b5cff3248f4ce5d5561507f7a95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e7b1e80c578b5cff3248f4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 30 18:06:36 2011 +0100 wined3d: Make the device parameter to wined3d_event_query_issue() const. --- dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index d88d182..79572a2 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -179,7 +179,7 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_ return ret; } -void wined3d_event_query_issue(struct wined3d_event_query *query, struct wined3d_device *device) +void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 73f1ea1..1a08c5b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1046,7 +1046,7 @@ enum wined3d_event_query_result void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; -void wined3d_event_query_issue(struct wined3d_event_query *query, struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; struct wined3d_context

1 0

Alexandre Julliard : wineps: Make color devices report 32 bits per pixel.
by Alexandre Julliard Oct. 31, 2011

Oct. 31, 2011

Module: wine Branch: master Commit: 8a808a49f9c1ebbe42faf8c74a016879c82be8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a808a49f9c1ebbe42faf8c74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 23:11:04 2011 +0200 wineps: Make color devices report 32 bits per pixel. --- dlls/wineps.drv/init.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index d667436..5235998 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -452,7 +452,7 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) case DESKTOPVERTRES: return physDev->vertRes; case BITSPIXEL: - return (physDev->pi->ppd->ColorDevice != CD_False) ? 8 : 1; + return (physDev->pi->ppd->ColorDevice != CD_False) ? 32 : 1; case PLANES: return 1; case NUMBRUSHES: @@ -464,7 +464,7 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) case NUMFONTS: return 39; case NUMCOLORS: - return (physDev->pi->ppd->ColorDevice != CD_False) ? 256 : -1; + return -1; case PDEVICESIZE: return sizeof(PSDRV_PDEVICE); case CURVECAPS:

1 0