December 2005 - Wine-Commits

appdb/xinha dialog.js htmlarea.css htmlarea.js ...
by WineHQ Dec. 6, 2005

Dec. 6, 2005

ChangeSet ID: 21712 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2005/12/06 21:37:40 Modified files: xinha : dialog.js htmlarea.css htmlarea.js inline-dialog.js panel-dialog.js popupwin.js xinha/contrib : lc_parse_strings.php xinha/examples : custom.css dynamic.css full_example-body.html full_example-menu.html full_example.css full_example.html full_example.js stylist.css xinha/lang : de.js fr.js no.js xinha/plugins/CSS: css.js xinha/plugins/CharCounter: char-counter.js xinha/plugins/CharCounter/lang: de.js fr.js no.js xinha/plugins/CharacterMap: character-map.js xinha/plugins/CharacterMap/lang: de.js fr.js it.js nl.js no.js xinha/plugins/CharacterMap/popups: select_character.html xinha/plugins/ContextMenu: context-menu.js xinha/plugins/ContextMenu/lang: de.js el.js fr.js he.js nl.js no.js pl.js xinha/plugins/DoubleClick: double-click.js xinha/plugins/DynamicCSS: dynamiccss.js xinha/plugins/DynamicCSS/lang: de.js fr.js nl.js no.js xinha/plugins/EnterParagraphs: enter-paragraphs.js xinha/plugins/FindReplace: find-replace.js fr_engine.js xinha/plugins/FindReplace/lang: de.js fr.js no.js pl.js pt_br.js xinha/plugins/FindReplace/popups: find_replace.html xinha/plugins/Forms: forms.js xinha/plugins/Forms/popups: fieldset.html form.html input.html label.html select.html textarea.html xinha/plugins/FullPage: full-page.js xinha/plugins/FullPage/lang: de.js fr.js he.js nl.js no.js pl.js ro.js xinha/plugins/FullPage/popups: docprop.html xinha/plugins/FullScreen: full-screen.js xinha/plugins/FullScreen/lang: de.js fr.js no.js pl.js xinha/plugins/HtmlTidy: html-tidy-logic.php html-tidy.js xinha/plugins/HtmlTidy/lang: de.js fr.js nl.js no.js xinha/plugins/InsertAnchor: insert-anchor.js xinha/plugins/InsertAnchor/lang: de.js fr.js no.js xinha/plugins/InsertAnchor/popups: insert_anchor.html xinha/plugins/InsertPicture: InsertPicture.php insert-picture.js viewpicture.html xinha/plugins/InsertPicture/lang: de.js xinha/plugins/InsertWords: insert-words.js xinha/plugins/Linker: linker.js xinha/plugins/Linker/dTree: dtree.js xinha/plugins/Linker/lang: de.js fr.js no.js pl.js xinha/plugins/ListType: list-type.js xinha/plugins/ListType/lang: de.js fr.js nl.js pl.js xinha/plugins/QuickTag: quick-tag.js xinha/plugins/QuickTag/lang: no.js pt_br.js xinha/plugins/QuickTag/popups: quicktag.html xinha/plugins/SpellChecker: aspell_setup.php spell-check-logic.cgi spell-check-logic.php spell-check-ui.html spell-check-ui.js spell-checker.js xinha/plugins/SpellChecker/lang: cz.js da.js de.js fr.js he.js hu.js nl.js no.js ro.js xinha/plugins/Stylist: stylist.js xinha/plugins/Stylist/lang: de.js no.js xinha/plugins/SuperClean: dialog.html super-clean.js xinha/plugins/SuperClean/img: ed_superclean.gif xinha/plugins/SuperClean/lang: de.js fr.js no.js xinha/plugins/TableOperations: table-operations.js xinha/plugins/TableOperations/lang: cz.js da.js de.js el.js fi.js fr.js he.js it.js nl.js no.js ro.js xinha/plugins/UnFormat: un-format.js xinha/plugins/UnFormat/lang: de.js nl.js no.js xinha/plugins/UnFormat/popups: unformat.html xinha/popups : about.html color_picker.js editor_help.html insert_image.html insert_table.html link.html popup.js xinha/skins/blue-look: skin.css xinha/skins/blue-metallic: skin.css xinha/skins/green-look: skin.css xinha/skins/inditreuse: skin.css xinha/skins/titan: skin.css xinha/skins/xp-blue: skin.css xinha/skins/xp-green: skin.css Added files: xinha/examples : Extended.html ext_example-body.html ext_example-dest.php ext_example-menu.php ext_example.html xinha/plugins/InsertAnchor/lang: pl.js xinha/plugins/InsertPicture/lang: fr.js no.js xinha/plugins/ListType/lang: no.js xinha/plugins/QuickTag/lang: fr.js pl.js xinha/plugins/Stylist/lang: fr.js pl.js xinha/plugins/TableOperations/lang: pl.js xinha/plugins/UnFormat/lang: fr.js Removed files: xinha : popupdiv.js Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Upgrade to xinha svn head to fix issues with xinha editors not appearing in Firefox 1.5 Patch: http://cvs.winehq.org/patch.py?id=21712 Old revision New revision Changes Path 1.1 1.2 +5 -5 appdb/xinha/dialog.js 1.1 1.2 +1 -6 appdb/xinha/htmlarea.css 1.1 1.2 +245 -175 appdb/xinha/htmlarea.js 1.1 1.2 +11 -11 appdb/xinha/inline-dialog.js 1.1 1.2 +6 -6 appdb/xinha/panel-dialog.js 1.1 1.2 +3 -3 appdb/xinha/popupwin.js 1.1 Removed +0 -0 appdb/xinha/popupdiv.js 1.1 1.2 +15 -12 appdb/xinha/contrib/lc_parse_strings.php 1.1 1.2 +1 -1 appdb/xinha/examples/custom.css 1.1 1.2 +1 -1 appdb/xinha/examples/dynamic.css 1.1 1.2 +1 -1 appdb/xinha/examples/full_example-body.html 1.1 1.2 +29 -3 appdb/xinha/examples/full_example-menu.html 1.1 1.2 +1 -1 appdb/xinha/examples/full_example.css 1.1 1.2 +1 -1 appdb/xinha/examples/full_example.html 1.1 1.2 +10 -5 appdb/xinha/examples/full_example.js 1.1 1.2 +1 -1 appdb/xinha/examples/stylist.css Added 1.1 +0 -0 appdb/xinha/examples/Extended.html Added 1.1 +0 -0 appdb/xinha/examples/ext_example-body.html Added 1.1 +0 -0 appdb/xinha/examples/ext_example-dest.php Added 1.1 +0 -0 appdb/xinha/examples/ext_example-menu.php Added 1.1 +0 -0 appdb/xinha/examples/ext_example.html 1.1 1.2 +145 -135 appdb/xinha/lang/de.js 1.1 1.2 +3 -2 appdb/xinha/lang/fr.js 1.1 1.2 +10 -2 appdb/xinha/lang/no.js 1.1 1.2 +3 -3 appdb/xinha/plugins/CSS/css.js 1.1 1.2 +8 -6 appdb/xinha/plugins/CharCounter/char-counter.js 1.1 1.2 +2 -8 appdb/xinha/plugins/CharCounter/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/CharCounter/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/CharCounter/lang/no.js 1.1 1.2 +2 -2 appdb/xinha/plugins/CharacterMap/character-map.js 1.1 1.2 +0 -3 appdb/xinha/plugins/CharacterMap/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/CharacterMap/lang/fr.js 1.1 1.2 +3 -7 appdb/xinha/plugins/CharacterMap/lang/it.js 1.1 1.2 +1 -4 appdb/xinha/plugins/CharacterMap/lang/nl.js 1.1 1.2 +1 -2 appdb/xinha/plugins/CharacterMap/lang/no.js 1.1 1.2 +1 -1 appdb/xinha/plugins/CharacterMap/popups/select_character.html 1.1 1.2 +9 -9 appdb/xinha/plugins/ContextMenu/context-menu.js 1.1 1.2 +2 -6 appdb/xinha/plugins/ContextMenu/lang/de.js 1.1 1.2 +1 -3 appdb/xinha/plugins/ContextMenu/lang/el.js 1.1 1.2 +1 -1 appdb/xinha/plugins/ContextMenu/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ContextMenu/lang/he.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ContextMenu/lang/nl.js 1.1 1.2 +1 -3 appdb/xinha/plugins/ContextMenu/lang/no.js 1.1 1.2 +1 -2 appdb/xinha/plugins/ContextMenu/lang/pl.js 1.1 1.2 +2 -2 appdb/xinha/plugins/DoubleClick/double-click.js 1.1 1.2 +6 -6 appdb/xinha/plugins/DynamicCSS/dynamiccss.js 1.1 1.2 +1 -4 appdb/xinha/plugins/DynamicCSS/lang/de.js 1.1 1.2 +1 -9 appdb/xinha/plugins/DynamicCSS/lang/fr.js 1.1 1.2 +1 -4 appdb/xinha/plugins/DynamicCSS/lang/nl.js 1.1 1.2 +1 -2 appdb/xinha/plugins/DynamicCSS/lang/no.js 1.1 1.2 +2 -2 appdb/xinha/plugins/EnterParagraphs/enter-paragraphs.js 1.1 1.2 +2 -2 appdb/xinha/plugins/FindReplace/find-replace.js 1.1 1.2 +8 -8 appdb/xinha/plugins/FindReplace/fr_engine.js 1.1 1.2 +21 -32 appdb/xinha/plugins/FindReplace/lang/de.js 1.1 1.2 +20 -20 appdb/xinha/plugins/FindReplace/lang/fr.js 1.1 1.2 +20 -21 appdb/xinha/plugins/FindReplace/lang/no.js 1.1 1.2 +21 -32 appdb/xinha/plugins/FindReplace/lang/pl.js 1.1 1.2 +24 -32 appdb/xinha/plugins/FindReplace/lang/pt_br.js 1.1 1.2 +5 -5 appdb/xinha/plugins/FindReplace/popups/find_replace.html 1.1 1.2 +6 -6 appdb/xinha/plugins/Forms/forms.js 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/fieldset.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/form.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/input.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/label.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/select.html 1.1 1.2 +4 -4 appdb/xinha/plugins/Forms/popups/textarea.html 1.1 1.2 +11 -10 appdb/xinha/plugins/FullPage/full-page.js 1.1 1.2 +4 -15 appdb/xinha/plugins/FullPage/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/FullPage/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullPage/lang/he.js 1.1 1.2 +10 -21 appdb/xinha/plugins/FullPage/lang/nl.js 1.1 1.2 +4 -2 appdb/xinha/plugins/FullPage/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullPage/lang/pl.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullPage/lang/ro.js 1.1 1.2 +3 -3 appdb/xinha/plugins/FullPage/popups/docprop.html 1.1 1.2 +2 -2 appdb/xinha/plugins/FullScreen/full-screen.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullScreen/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/FullScreen/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/FullScreen/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/FullScreen/lang/pl.js 1.1 1.2 +16 -5 appdb/xinha/plugins/HtmlTidy/html-tidy-logic.php 1.1 1.2 +3 -3 appdb/xinha/plugins/HtmlTidy/html-tidy.js 1.1 1.2 +3 -13 appdb/xinha/plugins/HtmlTidy/lang/de.js 1.1 1.2 +5 -14 appdb/xinha/plugins/HtmlTidy/lang/fr.js 1.1 1.2 +2 -13 appdb/xinha/plugins/HtmlTidy/lang/nl.js 1.1 1.2 +3 -3 appdb/xinha/plugins/HtmlTidy/lang/no.js 1.1 1.2 +97 -97 appdb/xinha/plugins/InsertAnchor/insert-anchor.js 1.1 1.2 +1 -3 appdb/xinha/plugins/InsertAnchor/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/InsertAnchor/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/InsertAnchor/lang/no.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertAnchor/lang/pl.js 1.1 1.2 +5 -6 appdb/xinha/plugins/InsertAnchor/popups/insert_anchor.html 1.1 1.2 +7 -7 appdb/xinha/plugins/InsertPicture/InsertPicture.php 1.1 1.2 +1 -1 appdb/xinha/plugins/InsertPicture/insert-picture.js 1.1 1.2 +10 -10 appdb/xinha/plugins/InsertPicture/viewpicture.html 1.1 1.2 +6 -11 appdb/xinha/plugins/InsertPicture/lang/de.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertPicture/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertPicture/lang/no.js 1.1 1.2 +2 -3 appdb/xinha/plugins/InsertWords/insert-words.js 1.1 1.2 +13 -14 appdb/xinha/plugins/Linker/linker.js 1.1 1.2 +8 -9 appdb/xinha/plugins/Linker/dTree/dtree.js 1.1 1.2 +3 -4 appdb/xinha/plugins/Linker/lang/de.js 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/lang/fr.js 1.1 1.2 +1 -2 appdb/xinha/plugins/Linker/lang/no.js 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/lang/pl.js 1.1 1.2 +1 -1 appdb/xinha/plugins/ListType/list-type.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ListType/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/ListType/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ListType/lang/nl.js 1.1 1.2 +1 -12 appdb/xinha/plugins/ListType/lang/pl.js Added 1.1 +0 -0 appdb/xinha/plugins/ListType/lang/no.js 1.1 1.2 +2 -2 appdb/xinha/plugins/QuickTag/quick-tag.js 1.1 1.2 +1 -2 appdb/xinha/plugins/QuickTag/lang/no.js 1.1 1.2 +11 -11 appdb/xinha/plugins/QuickTag/lang/pt_br.js Added 1.1 +0 -0 appdb/xinha/plugins/QuickTag/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/QuickTag/lang/pl.js 1.1 1.2 +13 -13 appdb/xinha/plugins/QuickTag/popups/quicktag.html 1.1 1.2 +44 -11 appdb/xinha/plugins/SpellChecker/aspell_setup.php 1.1 1.2 +0 -0 appdb/xinha/plugins/SpellChecker/spell-check-logic.cgi 1.1 1.2 +1 -1 appdb/xinha/plugins/SpellChecker/spell-check-logic.php 1.1 1.2 +2 -2 appdb/xinha/plugins/SpellChecker/spell-check-ui.html 1.1 1.2 +21 -21 appdb/xinha/plugins/SpellChecker/spell-check-ui.js 1.1 1.2 +4 -4 appdb/xinha/plugins/SpellChecker/spell-checker.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/cz.js 1.1 1.2 +1 -11 appdb/xinha/plugins/SpellChecker/lang/da.js 1.1 1.2 +2 -4 appdb/xinha/plugins/SpellChecker/lang/de.js 1.1 1.2 +1 -13 appdb/xinha/plugins/SpellChecker/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/he.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/hu.js 1.1 1.2 +2 -14 appdb/xinha/plugins/SpellChecker/lang/nl.js 1.1 1.2 +1 -2 appdb/xinha/plugins/SpellChecker/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/SpellChecker/lang/ro.js 1.1 1.2 +12 -12 appdb/xinha/plugins/Stylist/stylist.js 1.1 1.2 +1 -12 appdb/xinha/plugins/Stylist/lang/de.js 1.1 1.2 +1 -2 appdb/xinha/plugins/Stylist/lang/no.js Added 1.1 +0 -0 appdb/xinha/plugins/Stylist/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/Stylist/lang/pl.js 1.1 1.2 +1 -25 appdb/xinha/plugins/SuperClean/dialog.html 1.1 1.2 +147 -43 appdb/xinha/plugins/SuperClean/super-clean.js 1.1 1.2 +1 -3 appdb/xinha/plugins/SuperClean/img/ed_superclean.gif 1.1 1.2 +3 -13 appdb/xinha/plugins/SuperClean/lang/de.js 1.1 1.2 +4 -15 appdb/xinha/plugins/SuperClean/lang/fr.js 1.1 1.2 +3 -3 appdb/xinha/plugins/SuperClean/lang/no.js 1.1 1.2 +38 -28 appdb/xinha/plugins/TableOperations/table-operations.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/cz.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/da.js 1.1 1.2 +1 -3 appdb/xinha/plugins/TableOperations/lang/de.js 1.1 1.2 +1 -3 appdb/xinha/plugins/TableOperations/lang/el.js 1.1 1.2 +1 -2 appdb/xinha/plugins/TableOperations/lang/fi.js 1.1 1.2 +1 -13 appdb/xinha/plugins/TableOperations/lang/fr.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/he.js 1.1 1.2 +1 -3 appdb/xinha/plugins/TableOperations/lang/it.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/nl.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/no.js 1.1 1.2 +1 -12 appdb/xinha/plugins/TableOperations/lang/ro.js Added 1.1 +0 -0 appdb/xinha/plugins/TableOperations/lang/pl.js 1.1 1.2 +4 -4 appdb/xinha/plugins/UnFormat/un-format.js 1.1 1.2 +9 -7 appdb/xinha/plugins/UnFormat/lang/de.js 1.1 1.2 +9 -7 appdb/xinha/plugins/UnFormat/lang/nl.js 1.1 1.2 +8 -9 appdb/xinha/plugins/UnFormat/lang/no.js Added 1.1 +0 -0 appdb/xinha/plugins/UnFormat/lang/fr.js 1.1 1.2 +4 -4 appdb/xinha/plugins/UnFormat/popups/unformat.html 1.1 1.2 +1 -0 appdb/xinha/popups/about.html 1.1 1.2 +4 -4 appdb/xinha/popups/color_picker.js 1.1 1.2 +52 -7 appdb/xinha/popups/editor_help.html 1.1 1.2 +5 -5 appdb/xinha/popups/insert_image.html 1.1 1.2 +4 -4 appdb/xinha/popups/insert_table.html 1.1 1.2 +6 -6 appdb/xinha/popups/link.html 1.1 1.2 +8 -8 appdb/xinha/popups/popup.js 1.1 1.2 +1 -0 appdb/xinha/skins/blue-look/skin.css 1.1 1.2 +3 -2 appdb/xinha/skins/blue-metallic/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/green-look/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/inditreuse/skin.css 1.1 1.2 +11 -5 appdb/xinha/skins/titan/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/xp-blue/skin.css 1.1 1.2 +1 -0 appdb/xinha/skins/xp-green/skin.css

1 0

Robert Shearman : OLE: Implement ITypeInfo_AddressOfMember.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 1f68feeef11f4c64cc55b4ceb3a9040fdf8ac551 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f68feeef11f4c64cc55b4c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:24:45 2005 +0100 OLE: Implement ITypeInfo_AddressOfMember. --- dlls/oleaut32/typelib.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ebf1903..5ed9a82 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5671,7 +5671,53 @@ static HRESULT WINAPI ITypeInfo_fnAddres MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - FIXME("(%p) stub!\n", This); + HRESULT hr; + BSTR dll, entry; + WORD ordinal; + HMODULE module; + + TRACE("(%p)->(0x%lx, 0x%x, %p)\n", This, memid, invKind, ppv); + + hr = ITypeInfo_GetDllEntry(iface, memid, invKind, &dll, &entry, &ordinal); + if (FAILED(hr)) + return hr; + + module = LoadLibraryW(dll); + if (!module) + { + ERR("couldn't load %s\n", debugstr_w(dll)); + SysFreeString(dll); + if (entry) SysFreeString(entry); + return STG_E_FILENOTFOUND; + } + /* FIXME: store library somewhere where we can free it */ + + if (entry) + { + LPSTR entryA; + INT len = WideCharToMultiByte(CP_ACP, 0, entry, -1, NULL, 0, NULL, NULL); + entryA = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP, 0, entry, -1, entryA, len, NULL, NULL); + + *ppv = GetProcAddress(module, entryA); + if (!*ppv) + ERR("function not found %s\n", debugstr_a(entryA)); + + HeapFree(GetProcessHeap(), 0, entryA); + } + else + { + *ppv = GetProcAddress(module, MAKEINTRESOURCEA(ordinal)); + if (!*ppv) + ERR("function not found %d\n", ordinal); + } + + SysFreeString(dll); + if (entry) SysFreeString(entry); + + if (!*ppv) + return TYPE_E_DLLFUNCTIONNOTFOUND; + return S_OK; }

1 0

Robert Shearman : OLE: Implement undocumented behaviour in DispCallFunc.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: a056a9a89cc42fc445fc8c5bf24ac73dbf71b81e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a056a9a89cc42fc445fc8c5… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:25:51 2005 +0100 OLE: Implement undocumented behaviour in DispCallFunc. Fix DispCallFunc to work with MSDN-undocumented behaviour used by Office 2003 and document the function. --- dlls/oleaut32/typelib.c | 68 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5ed9a82..a6e2495 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5173,6 +5173,45 @@ static HRESULT typedescvt_to_variantvt(I /*********************************************************************** * DispCallFunc (OLEAUT32.@) + * + * Invokes a function of the specifed calling convention, passing the + * specified arguments and returns the result. + * + * PARAMS + * pvInstance [I] Optional pointer to the instance whose function to invoke. + * oVft [I] The offset in the vtable. See notes. + * cc [I] Calling convention of the function to call. + * vtReturn [I] The return type of the function. + * cActuals [I] Number of parameters. + * prgvt [I] The types of the parameters to pass. This is used for sizing only. + * prgpvarg [I] The arguments to pass. + * pvargResult [O] The return value of the function. Can be NULL. + * + * RETURNS + * Success: S_OK. + * Failure: HRESULT code. + * + * NOTES + * The HRESULT return value of this function is not affected by the return + * value of the user supplied function, which is returned in pvargResult. + * + * If pvInstance is NULL then a non-object function is to be called and oVft + * is the address of the function to call. + * + * The cc parameter can be one of the following values: + *|CC_FASTCALL + *|CC_CDECL + *|CC_PASCAL + *|CC_STDCALL + *|CC_FPFASTCALL + *|CC_SYSCALL + *|CC_MPWCDECL + *|CC_MPWPASCAL + * + * BUGS + * Native accepts arguments in the reverse order. I.e. the first item in the + * prgpvarg array is the last argument in the C/C++ declaration of the + * function to be called. */ HRESULT WINAPI DispCallFunc( @@ -5187,10 +5226,10 @@ DispCallFunc( pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); - /* DispCallFunc is only used to invoke methods belonging to an - * IDispatch-derived COM interface. So we need to add a first parameter - * to the list of arguments, to supply the interface pointer */ - argsize = 1; + argsize = 0; + if (pvInstance) + argsize++; /* for This pointer */ + for (i=0;i<cActuals;i++) { TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_argsize(prgvt[i])); @@ -5198,8 +5237,14 @@ DispCallFunc( argsize += _argsize(prgvt[i]); } args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*argsize); - args[0] = (DWORD)pvInstance; /* this is the fake IDispatch interface pointer */ - argspos = 1; + + argspos = 0; + if (pvInstance) + { + args[0] = (DWORD)pvInstance; /* the This pointer is always the first parameter */ + argspos++; + } + for (i=0;i<cActuals;i++) { VARIANT *arg = prgpvarg[i]; @@ -5208,7 +5253,16 @@ DispCallFunc( argspos += _argsize(prgvt[i]); } - hres = _invoke((*(FARPROC**)pvInstance)[oVft/sizeof(void *)],cc,argsize,args); + if (pvInstance) + { + FARPROC *vtable = *(FARPROC**)pvInstance; + hres = _invoke(vtable[oVft/sizeof(void *)], cc, argsize, args); + } + else + /* if we aren't invoking an object then the function pointer is stored + * in oVft */ + hres = _invoke((FARPROC)oVft, cc, argsize, args); + if (pvargResult && (vtReturn != VT_EMPTY)) { TRACE("Method returned 0x%08lx\n",hres);

1 0

Robert Shearman : OLE: Fix brokenness in typelib marshaller caused by dispinterface retval fix.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: b0d8e06caf47a8e7aee32b89575f6740d1a39d7d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0d8e06caf47a8e7aee32b8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:24:19 2005 +0100 OLE: Fix brokenness in typelib marshaller caused by dispinterface retval fix. Fix more fallout from dispinterface retval patch: make typelib marshaler use the internal function description so that it calls dispinterface functions with the correct number of parameters again. Also fixes some memory leaks caused by the fact that a corresponding ReleaseXDesc function has to be called for each GetXDesc. --- dlls/oleaut32/tmarshal.c | 16 +++++++++------- dlls/oleaut32/typelib.c | 38 +++++++++++++++++++++++++++----------- dlls/oleaut32/typelib.h | 2 ++ 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 0886fc3..50a9135 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -304,12 +304,12 @@ _get_typeinfo_for_iid(REFIID riid, IType */ static int _nroffuncs(ITypeInfo *tinfo) { int n, max = 0; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; HRESULT hres; n=0; while (1) { - hres = ITypeInfo_GetFuncDesc(tinfo,n,&fdesc); + hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo,n,&fdesc); if (hres) return max+1; if (fdesc->oVft/4 > max) @@ -1053,6 +1053,7 @@ deserialize_param( (DWORD*)(((LPBYTE)*arg)+vdesc->u.oInst), buf ); + ITypeInfo2_ReleaseVarDesc(tinfo2, vdesc); if (debugout && (i<tattr->cVars-1)) TRACE_(olerelay)(","); } if (debugout) TRACE_(olerelay)("}"); @@ -1108,7 +1109,7 @@ deserialize_param( /* Searches function, also in inherited interfaces */ static HRESULT _get_funcdesc( - ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, FUNCDESC **fdesc, BSTR *iname, BSTR *fname) + ITypeInfo *tinfo, int iMethod, ITypeInfo **tactual, const FUNCDESC **fdesc, BSTR *iname, BSTR *fname) { int i = 0, j = 0; HRESULT hres; @@ -1120,7 +1121,8 @@ _get_funcdesc( ITypeInfo_AddRef(*tactual); while (1) { - hres = ITypeInfo_GetFuncDesc(tinfo, i, fdesc); + hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo, i, fdesc); + if (hres) { ITypeInfo *tinfo2; HREFTYPE href; @@ -1164,7 +1166,7 @@ static DWORD xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) { DWORD *args = ((DWORD*)&tpinfo)+1, *xargs; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; HRESULT hres; int i, relaydeb = TRACE_ON(olerelay); marshal_state buf; @@ -1451,7 +1453,7 @@ PSFacBuf_CreateProxy( HRESULT hres; ITypeInfo *tinfo; int i, nroffuncs; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; TMProxyImpl *proxy; TYPEATTR *typeattr; @@ -1647,7 +1649,7 @@ TMStubImpl_Invoke( LPRPCSTUBBUFFER iface, RPCOLEMESSAGE* xmsg,IRpcChannelBuffer*rpcchanbuf) { int i; - FUNCDESC *fdesc; + const FUNCDESC *fdesc; TMStubImpl *This = (TMStubImpl *)iface; HRESULT hres; DWORD *args, res, *xargs, nrofargs; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b2f417e..ebf1903 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4489,6 +4489,24 @@ static HRESULT TLB_AllocAndInitFuncDesc( return S_OK; } +HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) +{ + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; + const TLBFuncDesc *pFDesc; + int i; + + for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next) + ; + + if (pFDesc) + { + *ppFuncDesc = &pFDesc->funcdesc; + return S_OK; + } + + return E_INVALIDARG; +} + /* ITypeInfo::GetFuncDesc * * Retrieves the FUNCDESC structure that contains information about a @@ -4499,21 +4517,19 @@ static HRESULT WINAPI ITypeInfo_fnGetFun LPFUNCDESC *ppFuncDesc) { ITypeInfoImpl *This = (ITypeInfoImpl *)iface; - int i; - const TLBFuncDesc *pFDesc; + const FUNCDESC *internal_funcdesc; + HRESULT hr; TRACE("(%p) index %d\n", This, index); - for(i=0, pFDesc=This->funclist; i!=index && pFDesc; i++, pFDesc=pFDesc->next) - ; - - if(pFDesc) - return TLB_AllocAndInitFuncDesc( - &pFDesc->funcdesc, - ppFuncDesc, - This->TypeAttr.typekind == TKIND_DISPATCH); + hr = ITypeInfoImpl_GetInternalFuncDesc((ITypeInfo *)iface, index, &internal_funcdesc); + if (FAILED(hr)) + return hr; - return E_INVALIDARG; + return TLB_AllocAndInitFuncDesc( + internal_funcdesc, + ppFuncDesc, + This->TypeAttr.typekind == TKIND_DISPATCH); } static HRESULT TLB_AllocAndInitVarDesc( const VARDESC *src, VARDESC **dest_ptr ) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 3bb6811..c286fae 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -600,6 +600,8 @@ WORD typeofarray #include "poppack.h" +HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ); + extern DWORD _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args); extern void dump_Variant(const VARIANT * pvar);

1 0

Robert Shearman : OLE: Add tests for the typelib version of ITypeComp_Bind.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 36f112973e0eb08204e984f03f3656002f8416b4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=36f112973e0eb08204e984f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:23:19 2005 +0100 OLE: Add tests for the typelib version of ITypeComp_Bind. --- dlls/oleaut32/tests/typelib.c | 158 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 158 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 5e48ece..e70538c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "oleauto.h" +#define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08lx\n", hr) + static void ref_count_test(LPCWSTR type_lib) { ITypeLib *iface; @@ -56,8 +58,164 @@ static void ref_count_test(LPCWSTR type_ ok(ITypeLib_Release(iface) == 0, "ITypeLib should be destroyed here.\n"); } +static void test_TypeComp(void) +{ + ITypeLib *pTypeLib; + ITypeComp *pTypeComp; + HRESULT hr; + ULONG ulHash; + DESCKIND desckind; + BINDPTR bindptr; + ITypeInfo *pTypeInfo; + static WCHAR wszStdOle2[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; + static WCHAR wszStdFunctions[] = {'S','t','d','F','u','n','c','t','i','o','n','s',0}; + static WCHAR wszSavePicture[] = {'S','a','v','e','P','i','c','t','u','r','e',0}; + static WCHAR wszOLE_TRISTATE[] = {'O','L','E','_','T','R','I','S','T','A','T','E',0}; + static WCHAR wszUnchecked[] = {'U','n','c','h','e','c','k','e','d',0}; + static WCHAR wszIUnknown[] = {'I','U','n','k','n','o','w','n',0}; + static WCHAR wszFont[] = {'F','o','n','t',0}; + static WCHAR wszGUID[] = {'G','U','I','D',0}; + static WCHAR wszStdPicture[] = {'S','t','d','P','i','c','t','u','r','e',0}; + static WCHAR wszOLE_COLOR[] = {'O','L','E','_','C','O','L','O','R',0}; + + hr = LoadTypeLib(wszStdOle2, &pTypeLib); + ok_ole_success(hr, LoadTypeLib); + + hr = ITypeLib_GetTypeComp(pTypeLib, &pTypeComp); + ok_ole_success(hr, ITypeLib_GetTypeComp); + + /* test getting a TKIND_MODULE */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszStdFunctions); + hr = ITypeComp_Bind(pTypeComp, wszStdFunctions, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_TYPECOMP, + "desckind should have been DESCKIND_TYPECOMP instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + + ITypeComp_Release(bindptr.lptcomp); + + /* test getting a TKIND_MODULE with INVOKE_PROPERTYGET */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszStdFunctions); + hr = ITypeComp_Bind(pTypeComp, wszStdFunctions, ulHash, INVOKE_PROPERTYGET, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_TYPECOMP, + "desckind should have been DESCKIND_TYPECOMP instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + + /* test getting a function within a TKIND_MODULE */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszSavePicture); + hr = ITypeComp_Bind(pTypeComp, wszSavePicture, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_FUNCDESC, + "desckind should have been DESCKIND_FUNCDESC instead of %d\n", + desckind); + ok(bindptr.lpfuncdesc != NULL, "bindptr.lpfuncdesc should not have been set to NULL\n"); + ITypeInfo_ReleaseFuncDesc(pTypeInfo, bindptr.lpfuncdesc); + ITypeInfo_Release(pTypeInfo); + + /* test getting a function within a TKIND_MODULE with INVOKE_PROPERTYGET */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszSavePicture); + hr = ITypeComp_Bind(pTypeComp, wszSavePicture, ulHash, INVOKE_PROPERTYGET, &pTypeInfo, &desckind, &bindptr); + todo_wine ok(hr == TYPE_E_TYPEMISMATCH, + "ITypeComp_Bind should have failed with TYPE_E_TYPEMISMATCH instead of 0x%08lx\n", + hr); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_ENUM */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszOLE_TRISTATE); + hr = ITypeComp_Bind(pTypeComp, wszOLE_TRISTATE, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_TYPECOMP, + "desckind should have been DESCKIND_TYPECOMP instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + + ITypeComp_Release(bindptr.lptcomp); + + /* test getting a value within a TKIND_ENUM */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszUnchecked); + hr = ITypeComp_Bind(pTypeComp, wszUnchecked, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_VARDESC, + "desckind should have been DESCKIND_VARDESC instead of %d\n", + desckind); + ITypeInfo_ReleaseVarDesc(pTypeInfo, bindptr.lpvardesc); + ITypeInfo_Release(pTypeInfo); + + /* test getting a TKIND_INTERFACE */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszIUnknown); + hr = ITypeComp_Bind(pTypeComp, wszIUnknown, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_DISPATCH */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszFont); + hr = ITypeComp_Bind(pTypeComp, wszFont, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_RECORD/TKIND_ALIAS */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszGUID); + hr = ITypeComp_Bind(pTypeComp, wszGUID, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_ALIAS */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszOLE_COLOR); + hr = ITypeComp_Bind(pTypeComp, wszOLE_COLOR, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + /* test getting a TKIND_COCLASS */ + ulHash = LHashValOfNameSys(SYS_WIN32, LOCALE_NEUTRAL, wszStdPicture); + hr = ITypeComp_Bind(pTypeComp, wszStdPicture, ulHash, 0, &pTypeInfo, &desckind, &bindptr); + ok_ole_success(hr, ITypeComp_Bind); + + ok(desckind == DESCKIND_NONE, + "desckind should have been DESCKIND_NONE instead of %d\n", + desckind); + ok(!pTypeInfo, "pTypeInfo should have been set to NULL\n"); + ok(!bindptr.lptcomp, "bindptr should have been set to NULL\n"); + + ITypeComp_Release(pTypeComp); + ITypeLib_Release(pTypeLib); +} + START_TEST(typelib) { static const WCHAR type_lib_stdole32[] = {'s','t','d','o','l','e','3','2','.','t','l','b',0}; ref_count_test(type_lib_stdole32); + test_TypeComp(); }

1 0

Robert Shearman : OLE: Update the type of the oVft parameter for DispCallFunc.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 806cdce355428b2cbdb8e926fab06d9288e2323e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=806cdce355428b2cbdb8e92… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Dec 6 21:23:09 2005 +0100 OLE: Update the type of the oVft parameter for DispCallFunc. --- dlls/oleaut32/typelib.c | 2 +- include/oleauto.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5c1d6c8..b2f417e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5160,7 +5160,7 @@ static HRESULT typedescvt_to_variantvt(I */ HRESULT WINAPI DispCallFunc( - void* pvInstance, ULONG oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, + void* pvInstance, ULONG_PTR oVft, CALLCONV cc, VARTYPE vtReturn, UINT cActuals, VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult) { int i, argsize, argspos; diff --git a/include/oleauto.h b/include/oleauto.h index 3317b81..e74882b 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -715,7 +715,7 @@ HRESULT WINAPI DispInvoke(void*,ITypeInf EXCEPINFO*,UINT*); HRESULT WINAPI CreateDispTypeInfo(INTERFACEDATA*,LCID,ITypeInfo**); HRESULT WINAPI CreateStdDispatch(IUnknown*,void*,ITypeInfo*,IUnknown**); -HRESULT WINAPI DispCallFunc(void*,ULONG,CALLCONV,VARTYPE,UINT,VARTYPE*, +HRESULT WINAPI DispCallFunc(void*,ULONG_PTR,CALLCONV,VARTYPE,UINT,VARTYPE*, VARIANTARG**,VARIANT*);

1 0

Detlef Riekenberg : c2man: Remove HTML warnings.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 2c5fee9c582ebb7d80ff0fc4f7fb516ca411f8d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c5fee9c582ebb7d80ff0fc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Dec 6 21:22:28 2005 +0100 c2man: Remove HTML warnings. --- tools/c2man.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/c2man.pl b/tools/c2man.pl index 8d11d1c..7797e0c 100755 --- a/tools/c2man.pl +++ b/tools/c2man.pl @@ -1388,7 +1388,7 @@ sub output_api_section_start($$) if ($opt_output_format eq "h") { - print OUTPUT "\n<p><h2 class=\"section\">",$section_name,"</h2></p>\n"; + print OUTPUT "\n<h2 class=\"section\">",$section_name,"</h2>\n"; } elsif ($opt_output_format eq "s") { @@ -1447,7 +1447,7 @@ sub output_api_synopsis($) if ($opt_output_format eq "h") { - print OUTPUT "<p><pre class=\"proto\">\n ", $comment->{RETURNS}," ",$comment->{COMMENT_NAME},"\n (\n"; + print OUTPUT "<pre class=\"proto\">\n ", $comment->{RETURNS}," ",$comment->{COMMENT_NAME},"\n (\n"; @fmt = ("", "\n", "<tt class=\"param\">", "</tt>"); } elsif ($opt_output_format eq "s") @@ -1502,7 +1502,7 @@ sub output_api_synopsis($) if ($opt_output_format eq "h") { - print OUTPUT " )\n\n</pre></p>\n"; + print OUTPUT " )\n</pre>\n"; } elsif ($opt_output_format eq "s") {

1 0

Kai Blin : secur32: Implementing AcquireCredentialsHandle(A|W) for the NTLM
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 79aff338a3e32313502daf2487f9da81c83d3934 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=79aff338a3e32313502daf2… Author: Kai Blin <blin(a)gmx.net> Date: Tue Dec 6 21:22:57 2005 +0100 secur32: Implementing AcquireCredentialsHandle(A|W) for the NTLM security provider. --- dlls/secur32/Makefile.in | 2 dlls/secur32/ntlm.c | 445 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 366 insertions(+), 81 deletions(-)

1 0

Robert Reif : winejack: Fix driver load and initialization.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 18441ac0273247e8f837be840c166023b2853cbf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=18441ac0273247e8f837be8… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Dec 6 21:22:08 2005 +0100 winejack: Fix driver load and initialization. Move wave in/out initialization from wave out to driver. Add index number to device names. Fix memset bug where only first wave in caps was zeroed. --- dlls/winmm/winejack/audio.c | 25 ++++++++----------------- dlls/winmm/winejack/jack.c | 4 +++- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/winmm/winejack/audio.c b/dlls/winmm/winejack/audio.c index 2ef0acb..146d0bc 100644 --- a/dlls/winmm/winejack/audio.c +++ b/dlls/winmm/winejack/audio.c @@ -890,9 +890,7 @@ LONG JACK_WaveRelease(void) LONG JACK_WaveInit(void) { int i; - - static const WCHAR ini_out[] = {'J','A','C','K',' ','W','a','v','e','O','u','t',' ','D','r','i','v','e','r',0}; - static const WCHAR ini_in [] = {'J','A','C','K',' ','W','a','v','e','I','n',' ',' ','D','r','i','v','e','r',0}; + CHAR szPname[MAXPNAMELEN]; TRACE("called\n"); @@ -930,8 +928,8 @@ LONG JACK_WaveInit(void) WOutDev[i].caps.wMid = 0x00FF; /* Manufac ID */ WOutDev[i].caps.wPid = 0x0001; /* Product ID */ - strcpyW(WOutDev[i].caps.szPname, ini_out); - + snprintf(szPname, sizeof(szPname), "JACK WaveOut %d", i); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, WOutDev[i].caps.szPname, sizeof(WOutDev[i].caps.szPname)/sizeof(WCHAR)); snprintf(WOutDev[i].interface_name, sizeof(WOutDev[i].interface_name), "winejack: %d", i); WOutDev[i].caps.vDriverVersion = 0x0100; @@ -959,12 +957,13 @@ LONG JACK_WaveInit(void) /* then do input device */ for (i = 0; i < MAX_WAVEINDRV; ++i) { - /* TODO: we should initialize read stuff here */ - memset(&WInDev[0].caps, 0, sizeof(WInDev[0].caps)); + /* TODO: we should initialize read stuff here */ + memset(&WInDev[i].caps, 0, sizeof(WInDev[i].caps)); WInDev[i].caps.wMid = 0x00FF; WInDev[i].caps.wPid = 0x0001; - strcpyW(WInDev[i].caps.szPname, ini_in); + snprintf(szPname, sizeof(szPname), "JACK WaveIn %d", i); + MultiByteToWideChar(CP_ACP, 0, szPname, -1, WInDev[i].caps.szPname, sizeof(WInDev[i].caps.szPname)/sizeof(WCHAR)); snprintf(WInDev[i].interface_name, sizeof(WInDev[i].interface_name), "winejack: %d", i); WInDev[i].caps.vDriverVersion = 0x0100; @@ -1666,18 +1665,10 @@ DWORD WINAPI JACK_wodMessage(UINT wDevID switch (wMsg) { case DRVM_INIT: - TRACE("DRVM_INIT\n"); - return JACK_WaveInit(); case DRVM_EXIT: - TRACE("DRVM_EXIT\n"); - return JACK_WaveRelease(); case DRVM_ENABLE: - /* FIXME: Pretend this is supported */ - TRACE("DRVM_ENABLE\n"); - return 0; case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - TRACE("DRVM_DISABLE\n"); + /* FIXME: Pretend this is supported */ return 0; case WODM_OPEN: return wodOpen(wDevID, (LPWAVEOPENDESC)dwParam1, dwParam2); case WODM_CLOSE: return wodClose(wDevID); diff --git a/dlls/winmm/winejack/jack.c b/dlls/winmm/winejack/jack.c index d5e12ba..c712634 100644 --- a/dlls/winmm/winejack/jack.c +++ b/dlls/winmm/winejack/jack.c @@ -66,7 +66,7 @@ static LRESULT JACK_drvLoad(void) } } - return 1; + return JACK_WaveInit(); } /************************************************************************** @@ -79,6 +79,8 @@ static LRESULT JACK_drvFree(void) if(jackhandle && (jackhandle != (void*)-1)) { + JACK_WaveRelease(); + TRACE("calling wine_dlclose() on jackhandle\n"); wine_dlclose(jackhandle, NULL, 0); jackhandle = NULL;

1 0

Eric Pouech : mciwave: save/record.
by Alexandre Julliard Dec. 6, 2005

Dec. 6, 2005

Module: wine Branch: refs/heads/master Commit: 9cba6ceacddcab2afd264a8c9c1c82c1bf73af17 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9cba6ceacddcab2afd264a8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 6 21:21:48 2005 +0100 mciwave: save/record. - fix for playback after a sound has been recorded - shall fix also opening the mci device without name - bug reported (and fix tested) by Peter Astrand --- dlls/winmm/mciwave/mciwave.c | 272 +++++++++++++++++++++--------------------- 1 files changed, 138 insertions(+), 134 deletions(-)

1 0