wine-commits May 2007

3 participants
715 discussions

appdb/ ./index.php include/util.php xinha/html ...

by WineHQ

ChangeSet ID: 31154 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/31 17:43:10 Modified files: . : index.php include : util.php xinha : htmlarea.js xinha/examples : Extended.html custom.css dynamic.css ext_example-body.html ext_example-menu.php ext_example.html full_example.css full_example.js stylist.css testbed.html xinha/images : ed_about.gif ed_align.gif ed_align_center.gif ed_align_justify.gif ed_align_left.gif ed_align_right.gif ed_buttons_main.gif ed_charmap.gif ed_clearfonts.gif ed_color_bg.gif ed_color_fg.gif ed_copy.gif ed_custom.gif ed_cut.gif ed_delete.gif ed_format_bold.gif ed_format_italic.gif ed_format_strike.gif ed_format_sub.gif ed_format_sup.gif ed_format_underline.gif ed_help.gif ed_hr.gif ed_html.gif ed_image.gif ed_indent_less.gif ed_indent_more.gif ed_killword.gif ed_left_to_right.gif ed_link.gif ed_list_bullet.gif ed_list_num.gif ed_overwrite.gif ed_paste.gif ed_print.gif ed_redo.gif ed_right_to_left.gif ed_rmformat.gif ed_save.gif ed_saveas.gif ed_selectall.gif ed_show_border.gif ed_splitblock.gif ed_splitcel.gif ed_undo.gif ed_word_cleaner.gif fullscreen_maximize.gif fullscreen_minimize.gif insert_table.gif insertfilelink.gif tidy.gif toggle_borders.gif xinha/images/de: bold.gif italic.gif underline.gif xinha/lang : b5.js ch.js cz.js da.js de.js ee.js el.js es.js fi.js fr.js gb.js he.js hu.js it.js ja.js lt.js lv.js nb.js nl.js pl.js ro.js ru.js si.js vn.js xinha/plugins/CSS: css.js xinha/plugins/CharCounter: char-counter.js xinha/plugins/CharCounter/lang: de.js fr.js xinha/plugins/CharacterMap: character-map.js xinha/plugins/CharacterMap/img: ed_charmap.gif xinha/plugins/CharacterMap/lang: de.js fr.js xinha/plugins/CharacterMap/popups: select_character.html xinha/plugins/ContextMenu: 1.pl context-menu.js xinha/plugins/ContextMenu/lang: de.js el.js fr.js he.js nl.js xinha/plugins/DoubleClick: double-click.js xinha/plugins/DynamicCSS: dynamiccss.js xinha/plugins/DynamicCSS/lang: de.js fr.js xinha/plugins/FindReplace: fr_engine.js xinha/plugins/FindReplace/img: ed_find.gif xinha/plugins/FindReplace/popups: find_replace.html xinha/plugins/Forms: forms.js xinha/plugins/Forms/img: ed_button.gif ed_checkbox.gif ed_fieldset.gif ed_file.gif ed_form.gif ed_hidden.gif ed_image.gif ed_label.gif ed_password.gif ed_radio.gif ed_reset.gif ed_select.gif ed_submit.gif ed_text.gif ed_textarea.gif xinha/plugins/Forms/popups: form.html input.html select.html textarea.html xinha/plugins/FullPage: full-page.js xinha/plugins/FullPage/img: docprop.gif xinha/plugins/FullPage/lang: de.js fr.js he.js ro.js xinha/plugins/FullPage/popups: docprop.html xinha/plugins/HtmlTidy: html-tidy-logic.php html-tidy.js xinha/plugins/HtmlTidy/img: html-tidy.gif xinha/plugins/InsertAnchor: insert-anchor.js xinha/plugins/InsertAnchor/img: insert-anchor.gif xinha/plugins/InsertAnchor/popups: insert_anchor.html xinha/plugins/InsertPicture: InsertPicture.php insert-picture.js xinha/plugins/InsertPicture/img: btn_open.gif nopic.gif xinha/plugins/InsertPicture/lang: de.js xinha/plugins/Linker: dialog.html linker.js scan.php xinha/plugins/Linker/dTree: api.html dtree.css dtree.js example01.html xinha/plugins/Linker/dTree/img: base.gif cd.gif copy.gif folder.gif folderopen.gif globe.gif imgfolder.gif join.gif joinbottom.gif line.gif minus.gif minusbottom.gif move.gif musicfolder.gif nolines_minus.gif nolines_plus.gif offline.gif page.gif plus.gif plusbottom.gif question.gif trash.gif xinha/plugins/Linker/lang: de.js fr.js pl.js xinha/plugins/ListType: list-type.js xinha/plugins/ListType/lang: de.js xinha/plugins/QuickTag: tag-lib.js xinha/plugins/QuickTag/img: ed_quicktag.gif xinha/plugins/QuickTag/popups: quicktag.html xinha/plugins/SpellChecker: aspell_setup.php readme-tech.html spell-check-logic.cgi spell-check-logic.php spell-check-savedicts.php spell-check-ui.html spell-check-ui.js spell-checker.js xinha/plugins/SpellChecker/img: he-spell-check.gif spell-check.gif xinha/plugins/SpellChecker/lang: cz.js da.js de.js he.js hu.js nl.js ro.js xinha/plugins/Stylist: stylist.js xinha/plugins/SuperClean: dialog.html super-clean.js tidy.php xinha/plugins/SuperClean/img: ed_superclean.gif xinha/plugins/TableOperations: table-operations.js xinha/plugins/TableOperations/img: cell-delete.gif cell-insert-after.gif cell-insert-before.gif cell-merge.gif cell-prop.gif cell-split.gif col-delete.gif col-insert-after.gif col-insert-before.gif col-split.gif row-delete.gif row-insert-above.gif row-insert-under.gif row-prop.gif row-split.gif table-prop.gif xinha/plugins/TableOperations/lang: cz.js da.js de.js el.js fi.js fr.js he.js it.js nl.js ro.js xinha/plugins/UnFormat/img: unformat.gif xinha/popups : about.html blank.html editor_help.html popup.css popup.js select_color.html xinha/skins/blue-metallic: separator.gif xinha/skins/green-look: button-background.gif separator.gif Added files: images : xinha-red-95.png xinha : Xinha.css XinhaCore.js release-notes.txt xinha/contrib : php-xinha.php xinha/examples : Newbie.html XinhaConfig.js simple_example.html xinha/images : xinha_logo.gif xinha/images/fr: bold.gif strikethrough.gif underline.gif xinha/lang : eu.js fa.js sh.js sr.js sv.js xinha/modules/ColorPicker: ColorPicker.js xinha/modules/CreateLink: link.html link.js xinha/modules/Dialogs: dialog.js inline-dialog.js panel-dialog.js popupwin.js xinha/modules/FullScreen: full-screen.js xinha/modules/FullScreen/lang: de.js fr.js ja.js nb.js pl.js ru.js sv.js xinha/modules/Gecko: Gecko.js paraHandlerBest.js paraHandlerDirty.js xinha/modules/GetHtml: DOMwalk.js TransformInnerHTML.js xinha/modules/InsertImage: insert_image.html insert_image.js xinha/modules/InsertTable: insert_table.html insert_table.js xinha/modules/InternetExplorer: InternetExplorer.js xinha/plugins/CharCounter/lang: ja.js nb.js xinha/plugins/CharacterMap/lang: ja.js nb.js ru.js sv.js xinha/plugins/ContextMenu/lang: ja.js nb.js sv.js xinha/plugins/DynamicCSS/lang: ja.js nb.js xinha/plugins/FindReplace/lang: ja.js nb.js ru.js sv.js xinha/plugins/Forms/lang: ja.js xinha/plugins/FullPage/lang: ja.js nb.js xinha/plugins/HtmlTidy/lang: ja.js nb.js xinha/plugins/InsertAnchor/lang: ja.js nb.js nl.js xinha/plugins/InsertPicture/lang: ja.js nb.js sv.js xinha/plugins/Linker/lang: ja.js nb.js xinha/plugins/ListType/lang: ja.js nb.js ru.js sv.js xinha/plugins/QuickTag/lang: ja.js nb.js xinha/plugins/SpellChecker/lang: ja.js nb.js xinha/plugins/Stylist/lang: ja.js nb.js xinha/plugins/SuperClean/filters: paragraph.js word.js xinha/plugins/SuperClean/lang: ja.js nb.js xinha/plugins/TableOperations/lang: ja.js nb.js ru.js sv.js xinha/plugins/TableOperations/popups: merge_cells.html xinha/plugins/UnFormat/lang: ja.js nb.js Removed files: xinha : dialog.js htmlarea.css inline-dialog.js panel-dialog.js popupwin.js xinha/contrib : lc_parse_strings.php xinha/examples : full_example-body.html full_example-menu.html full_example.html xinha/lang : no.js se.js xinha/plugins/CharCounter/lang: no.js xinha/plugins/CharacterMap/lang: no.js xinha/plugins/ContextMenu/lang: no.js xinha/plugins/DynamicCSS/lang: no.js xinha/plugins/EnterParagraphs: enter-paragraphs.js xinha/plugins/FindReplace/lang: no.js xinha/plugins/FullPage: test.html xinha/plugins/FullPage/lang: no.js xinha/plugins/HtmlTidy/lang: no.js xinha/plugins/InsertAnchor/lang: no.js xinha/plugins/InsertPicture/lang: no.js xinha/plugins/Linker/lang: no.js xinha/plugins/ListType/lang: no.js xinha/plugins/QuickTag/lang: no.js xinha/plugins/SpellChecker/lang: no.js xinha/plugins/Stylist/lang: no.js xinha/plugins/SuperClean/lang: no.js xinha/plugins/TableOperations/lang: no.js xinha/plugins/UnFormat/lang: no.js xinha/popups : color_picker.js custom2.html insert_image.html insert_table.html link.html old_insert_image.html Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Upgrade to Xinha 0.931. Xinha has been optimized for size and dozens of issues have been closed out since the last upgrade . Add Firefox and Xinha buttons to main page to show our support. Patch: http://cvs.winehq.org/patch.py?id=31154 Old revision New revision Changes Path 1.47 1.48 +20 -0 appdb/index.php Added 1.1 +0 -0 appdb/images/xinha-red-95.png 1.87 1.88 +1 -1 appdb/include/util.php 1.2 1.3 +23 -5587 appdb/xinha/htmlarea.js Added 1.1 +0 -0 appdb/xinha/Xinha.css Added 1.1 +0 -0 appdb/xinha/XinhaCore.js Added 1.1 +0 -0 appdb/xinha/release-notes.txt 1.2 Removed +1 -1 appdb/xinha/dialog.js 1.2 Removed +0 -0 appdb/xinha/htmlarea.css 1.2 Removed +0 -0 appdb/xinha/inline-dialog.js 1.2 Removed +0 -0 appdb/xinha/panel-dialog.js 1.2 Removed +0 -0 appdb/xinha/popupwin.js Added 1.1 +0 -0 appdb/xinha/contrib/php-xinha.php 1.2 Removed +0 -0 appdb/xinha/contrib/lc_parse_strings.php 1.1 1.2 +141 -62 appdb/xinha/examples/Extended.html 1.2 1.3 +3 -3 appdb/xinha/examples/custom.css 1.2 1.3 +3 -3 appdb/xinha/examples/dynamic.css 1.1 1.2 +64 -62 appdb/xinha/examples/ext_example-body.html 1.1 1.2 +79 -74 appdb/xinha/examples/ext_example-menu.php 1.1 1.2 +6 -6 appdb/xinha/examples/ext_example.html 1.2 1.3 +5 -4 appdb/xinha/examples/full_example.css 1.2 1.3 +97 -155 appdb/xinha/examples/full_example.js 1.2 1.3 +3 -3 appdb/xinha/examples/stylist.css 1.1 1.2 +30 -13 appdb/xinha/examples/testbed.html Added 1.1 +0 -0 appdb/xinha/examples/Newbie.html Added 1.1 +0 -0 appdb/xinha/examples/XinhaConfig.js Added 1.1 +0 -0 appdb/xinha/examples/simple_example.html 1.2 Removed +0 -0 appdb/xinha/examples/full_example-body.html 1.2 Removed +0 -0 appdb/xinha/examples/full_example-menu.html 1.2 Removed +0 -0 appdb/xinha/examples/full_example.html 1.1 1.2 +1 -1 appdb/xinha/images/ed_about.gif 1.1 1.2 +14 -11 appdb/xinha/images/ed_align.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_align_center.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_align_justify.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_align_left.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_align_right.gif 1.1 1.2 +53 -39 appdb/xinha/images/ed_buttons_main.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_charmap.gif 1.1 1.2 +3 -3 appdb/xinha/images/ed_clearfonts.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_color_bg.gif 1.1 1.2 +3 -4 appdb/xinha/images/ed_color_fg.gif 1.1 1.2 +2 -1 appdb/xinha/images/ed_copy.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_custom.gif 1.1 1.2 +1 -2 appdb/xinha/images/ed_cut.gif 1.1 1.2 +1 -2 appdb/xinha/images/ed_delete.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_format_bold.gif 1.1 1.2 +2 -1 appdb/xinha/images/ed_format_italic.gif 1.1 1.2 +1 -2 appdb/xinha/images/ed_format_strike.gif 1.1 1.2 +2 -2 appdb/xinha/images/ed_format_sub.gif 1.1 1.2 +3 -1 appdb/xinha/images/ed_format_sup.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_format_underline.gif 1.1 1.2 +2 -1 appdb/xinha/images/ed_help.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_hr.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_html.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_image.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_indent_less.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_indent_more.gif 1.1 1.2 +2 -3 appdb/xinha/images/ed_killword.gif 1.1 1.2 +3 -1 appdb/xinha/images/ed_left_to_right.gif 1.1 1.2 +1 -3 appdb/xinha/images/ed_link.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_list_bullet.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_list_num.gif 1.1 1.2 +1 -2 appdb/xinha/images/ed_overwrite.gif 1.1 1.2 +2 -1 appdb/xinha/images/ed_paste.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_print.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_redo.gif 1.1 1.2 +2 -2 appdb/xinha/images/ed_right_to_left.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_rmformat.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_save.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_saveas.gif 1.1 1.2 +1 -3 appdb/xinha/images/ed_selectall.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_show_border.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_splitblock.gif 1.1 1.2 +2 -1 appdb/xinha/images/ed_splitcel.gif 1.1 1.2 +1 -1 appdb/xinha/images/ed_undo.gif 1.1 1.2 +2 -3 appdb/xinha/images/ed_word_cleaner.gif 1.1 1.2 +1 -1 appdb/xinha/images/fullscreen_maximize.gif 1.1 1.2 +1 -1 appdb/xinha/images/fullscreen_minimize.gif 1.1 1.2 +1 -2 appdb/xinha/images/insert_table.gif 1.1 1.2 +2 -2 appdb/xinha/images/insertfilelink.gif 1.1 1.2 +5 -3 appdb/xinha/images/tidy.gif 1.1 1.2 +1 -1 appdb/xinha/images/toggle_borders.gif Added 1.1 +0 -0 appdb/xinha/images/xinha_logo.gif 1.1 1.2 +1 -1 appdb/xinha/images/de/bold.gif 1.1 1.2 +1 -1 appdb/xinha/images/de/italic.gif 1.1 1.2 +1 -1 appdb/xinha/images/de/underline.gif Added 1.1 +0 -0 appdb/xinha/images/fr/bold.gif Added 1.1 +0 -0 appdb/xinha/images/fr/strikethrough.gif Added 1.1 +0 -0 appdb/xinha/images/fr/underline.gif 1.1 1.2 +29 -29 appdb/xinha/lang/b5.js 1.1 1.2 +56 -56 appdb/xinha/lang/ch.js 1.1 1.2 +50 -50 appdb/xinha/lang/cz.js 1.1 1.2 +30 -30 appdb/xinha/lang/da.js 1.2 1.3 +168 -147 appdb/xinha/lang/de.js 1.1 1.2 +50 -50 appdb/xinha/lang/ee.js 1.1 1.2 +55 -55 appdb/xinha/lang/el.js 1.1 1.2 +40 -40 appdb/xinha/lang/es.js 1.1 1.2 +38 -38 appdb/xinha/lang/fi.js 1.2 1.3 +168 -129 appdb/xinha/lang/fr.js 1.1 1.2 +29 -29 appdb/xinha/lang/gb.js 1.1 1.2 +64 -64 appdb/xinha/lang/he.js 1.1 1.2 +64 -64 appdb/xinha/lang/hu.js 1.1 1.2 +55 -55 appdb/xinha/lang/it.js 1.1 1.2 +154 -9 appdb/xinha/lang/ja.js 1.1 1.2 +53 -53 appdb/xinha/lang/lt.js 1.1 1.2 +42 -42 appdb/xinha/lang/lv.js 1.1 1.2 +78 -31 appdb/xinha/lang/nb.js 1.1 1.2 +64 -64 appdb/xinha/lang/nl.js 1.1 1.2 +3 -3 appdb/xinha/lang/pl.js 1.1 1.2 +63 -63 appdb/xinha/lang/ro.js 1.1 1.2 +185 -50 appdb/xinha/lang/ru.js 1.1 1.2 +50 -50 appdb/xinha/lang/si.js 1.1 1.2 +56 -56 appdb/xinha/lang/vn.js Added 1.1 +0 -0 appdb/xinha/lang/eu.js Added 1.1 +0 -0 appdb/xinha/lang/fa.js Added 1.1 +0 -0 appdb/xinha/lang/sh.js Added 1.1 +0 -0 appdb/xinha/lang/sr.js Added 1.1 +0 -0 appdb/xinha/lang/sv.js 1.2 Removed +0 -0 appdb/xinha/lang/no.js 1.1 Removed +0 -0 appdb/xinha/lang/se.js Added 1.1 +0 -0 appdb/xinha/modules/ColorPicker/ColorPicker.js Added 1.1 +0 -0 appdb/xinha/modules/CreateLink/link.html Added 1.1 +0 -0 appdb/xinha/modules/CreateLink/link.js Added 1.1 +0 -0 appdb/xinha/modules/Dialogs/dialog.js Added 1.1 +0 -0 appdb/xinha/modules/Dialogs/inline-dialog.js Added 1.1 +0 -0 appdb/xinha/modules/Dialogs/panel-dialog.js Added 1.1 +0 -0 appdb/xinha/modules/Dialogs/popupwin.js Added 1.1 +0 -0 appdb/xinha/modules/FullScreen/full-screen.js Added 1.1 +0 -0 appdb/xinha/modules/FullScreen/lang/de.js Added 1.1 +0 -0 appdb/xinha/modules/FullScreen/lang/fr.js Added 1.1 +0 -0 appdb/xinha/modules/FullScreen/lang/ja.js Added 1.1 +0 -0 appdb/xinha/modules/FullScreen/lang/nb.js Added 1.1 +0 -0 appdb/xinha/modules/FullScreen/lang/pl.js Added 1.1 +0 -0 appdb/xinha/modules/FullScreen/lang/ru.js Added 1.1 +0 -0 appdb/xinha/modules/FullScreen/lang/sv.js Added 1.1 +0 -0 appdb/xinha/modules/Gecko/Gecko.js Added 1.1 +0 -0 appdb/xinha/modules/Gecko/paraHandlerBest.js Added 1.1 +0 -0 appdb/xinha/modules/Gecko/paraHandlerDirty.js Added 1.1 +0 -0 appdb/xinha/modules/GetHtml/DOMwalk.js Added 1.1 +0 -0 appdb/xinha/modules/GetHtml/TransformInnerHTML.js Added 1.1 +0 -0 appdb/xinha/modules/InsertImage/insert_image.html Added 1.1 +0 -0 appdb/xinha/modules/InsertImage/insert_image.js Added 1.1 +0 -0 appdb/xinha/modules/InsertTable/insert_table.html Added 1.1 +0 -0 appdb/xinha/modules/InsertTable/insert_table.js Added 1.1 +0 -0 appdb/xinha/modules/InternetExplorer/InternetExplorer.js 1.2 1.3 +72 -147 appdb/xinha/plugins/CSS/css.js 1.2 1.3 +105 -88 appdb/xinha/plugins/CharCounter/char-counter.js 1.2 1.3 +3 -1 appdb/xinha/plugins/CharCounter/lang/de.js 1.2 1.3 +2 -1 appdb/xinha/plugins/CharCounter/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/CharCounter/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/CharCounter/lang/nb.js 1.2 Removed +0 -0 appdb/xinha/plugins/CharCounter/lang/no.js 1.2 1.3 +65 -120 appdb/xinha/plugins/CharacterMap/character-map.js 1.1 1.2 +1 -1 appdb/xinha/plugins/CharacterMap/img/ed_charmap.gif 1.2 1.3 +11 -11 appdb/xinha/plugins/CharacterMap/lang/de.js 1.2 1.3 +1 -1 appdb/xinha/plugins/CharacterMap/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/CharacterMap/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/CharacterMap/lang/nb.js Added 1.1 +0 -0 appdb/xinha/plugins/CharacterMap/lang/ru.js Added 1.1 +0 -0 appdb/xinha/plugins/CharacterMap/lang/sv.js 1.2 Removed +0 -0 appdb/xinha/plugins/CharacterMap/lang/no.js 1.2 1.3 +183 -182 appdb/xinha/plugins/CharacterMap/popups/select_character.html 1.1 1.2 +38 -38 appdb/xinha/plugins/ContextMenu/1.pl 1.2 1.3 +380 -445 appdb/xinha/plugins/ContextMenu/context-menu.js 1.2 1.3 +50 -50 appdb/xinha/plugins/ContextMenu/lang/de.js 1.2 1.3 +47 -47 appdb/xinha/plugins/ContextMenu/lang/el.js 1.2 1.3 +49 -49 appdb/xinha/plugins/ContextMenu/lang/fr.js 1.2 1.3 +47 -47 appdb/xinha/plugins/ContextMenu/lang/he.js 1.2 1.3 +47 -47 appdb/xinha/plugins/ContextMenu/lang/nl.js Added 1.1 +0 -0 appdb/xinha/plugins/ContextMenu/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/ContextMenu/lang/nb.js Added 1.1 +0 -0 appdb/xinha/plugins/ContextMenu/lang/sv.js 1.2 Removed +0 -0 appdb/xinha/plugins/ContextMenu/lang/no.js 1.2 1.3 +1 -5 appdb/xinha/plugins/DoubleClick/double-click.js 1.2 1.3 +199 -237 appdb/xinha/plugins/DynamicCSS/dynamiccss.js 1.2 1.3 +12 -12 appdb/xinha/plugins/DynamicCSS/lang/de.js 1.2 1.3 +6 -6 appdb/xinha/plugins/DynamicCSS/lang/fr.js Added 1.1 +0 -0 appdb/xinha/plugins/DynamicCSS/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/DynamicCSS/lang/nb.js 1.2 Removed +0 -0 appdb/xinha/plugins/DynamicCSS/lang/no.js 1.2 Removed +0 -0 appdb/xinha/plugins/EnterParagraphs/enter-paragraphs.js 1.2 1.3 +143 -148 appdb/xinha/plugins/FindReplace/fr_engine.js 1.1 1.2 +1 -1 appdb/xinha/plugins/FindReplace/img/ed_find.gif Added 1.1 +0 -0 appdb/xinha/plugins/FindReplace/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/FindReplace/lang/nb.js Added 1.1 +0 -0 appdb/xinha/plugins/FindReplace/lang/ru.js Added 1.1 +0 -0 appdb/xinha/plugins/FindReplace/lang/sv.js 1.2 Removed +0 -0 appdb/xinha/plugins/FindReplace/lang/no.js 1.2 1.3 +2 -2 appdb/xinha/plugins/FindReplace/popups/find_replace.html 1.2 1.3 +351 -351 appdb/xinha/plugins/Forms/forms.js 1.1 1.2 +1 -2 appdb/xinha/plugins/Forms/img/ed_button.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Forms/img/ed_checkbox.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Forms/img/ed_fieldset.gif 1.1 1.2 +1 -3 appdb/xinha/plugins/Forms/img/ed_file.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Forms/img/ed_form.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Forms/img/ed_hidden.gif 1.1 1.2 +3 -2 appdb/xinha/plugins/Forms/img/ed_image.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Forms/img/ed_label.gif 1.1 1.2 +1 -3 appdb/xinha/plugins/Forms/img/ed_password.gif 1.1 1.2 +2 -3 appdb/xinha/plugins/Forms/img/ed_radio.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Forms/img/ed_reset.gif 1.1 1.2 +3 -1 appdb/xinha/plugins/Forms/img/ed_select.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Forms/img/ed_submit.gif 1.1 1.2 +1 -3 appdb/xinha/plugins/Forms/img/ed_text.gif 1.1 1.2 +2 -1 appdb/xinha/plugins/Forms/img/ed_textarea.gif Added 1.1 +0 -0 appdb/xinha/plugins/Forms/lang/ja.js 1.2 1.3 +1 -1 appdb/xinha/plugins/Forms/popups/form.html 1.2 1.3 +3 -3 appdb/xinha/plugins/Forms/popups/input.html 1.2 1.3 +4 -4 appdb/xinha/plugins/Forms/popups/select.html 1.2 1.3 +1 -1 appdb/xinha/plugins/Forms/popups/textarea.html 1.2 1.3 +197 -206 appdb/xinha/plugins/FullPage/full-page.js 1.1 Removed +0 -0 appdb/xinha/plugins/FullPage/test.html 1.1 1.2 +4 -3 appdb/xinha/plugins/FullPage/img/docprop.gif 1.2 1.3 +18 -18 appdb/xinha/plugins/FullPage/lang/de.js 1.2 1.3 +16 -16 appdb/xinha/plugins/FullPage/lang/fr.js 1.2 1.3 +14 -14 appdb/xinha/plugins/FullPage/lang/he.js 1.2 1.3 +14 -14 appdb/xinha/plugins/FullPage/lang/ro.js Added 1.1 +0 -0 appdb/xinha/plugins/FullPage/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/FullPage/lang/nb.js 1.2 Removed +0 -0 appdb/xinha/plugins/FullPage/lang/no.js 1.2 1.3 +141 -141 appdb/xinha/plugins/FullPage/popups/docprop.html 1.2 1.3 +78 -78 appdb/xinha/plugins/HtmlTidy/html-tidy-logic.php 1.2 1.3 +104 -104 appdb/xinha/plugins/HtmlTidy/html-tidy.js 1.1 1.2 +2 -2 appdb/xinha/plugins/HtmlTidy/img/html-tidy.gif Added 1.1 +0 -0 appdb/xinha/plugins/HtmlTidy/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/HtmlTidy/lang/nb.js 1.2 Removed +0 -0 appdb/xinha/plugins/HtmlTidy/lang/no.js 1.2 1.3 +75 -96 appdb/xinha/plugins/InsertAnchor/insert-anchor.js 1.1 1.2 +2 -2 appdb/xinha/plugins/InsertAnchor/img/insert-anchor.gif Added 1.1 +0 -0 appdb/xinha/plugins/InsertAnchor/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertAnchor/lang/nb.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertAnchor/lang/nl.js 1.2 Removed +0 -0 appdb/xinha/plugins/InsertAnchor/lang/no.js 1.2 1.3 +2 -2 appdb/xinha/plugins/InsertAnchor/popups/insert_anchor.html 1.2 1.3 +93 -74 appdb/xinha/plugins/InsertPicture/InsertPicture.php 1.2 1.3 +13 -81 appdb/xinha/plugins/InsertPicture/insert-picture.js 1.1 1.2 +1 -2 appdb/xinha/plugins/InsertPicture/img/btn_open.gif 1.1 1.2 +2 -1 appdb/xinha/plugins/InsertPicture/img/nopic.gif 1.2 1.3 +5 -2 appdb/xinha/plugins/InsertPicture/lang/de.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertPicture/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertPicture/lang/nb.js Added 1.1 +0 -0 appdb/xinha/plugins/InsertPicture/lang/sv.js 1.1 Removed +0 -0 appdb/xinha/plugins/InsertPicture/lang/no.js 1.1 1.2 +106 -106 appdb/xinha/plugins/Linker/dialog.html 1.2 1.3 +385 -551 appdb/xinha/plugins/Linker/linker.js 1.1 1.2 +106 -162 appdb/xinha/plugins/Linker/scan.php 1.1 1.2 +251 -251 appdb/xinha/plugins/Linker/dTree/api.html 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/dTree/dtree.css 1.2 1.3 +353 -721 appdb/xinha/plugins/Linker/dTree/dtree.js 1.1 1.2 +52 -52 appdb/xinha/plugins/Linker/dTree/example01.html 1.1 1.2 +3 -1 appdb/xinha/plugins/Linker/dTree/img/base.gif 1.1 1.2 +2 -2 appdb/xinha/plugins/Linker/dTree/img/cd.gif 1.1 1.2 +4 -4 appdb/xinha/plugins/Linker/dTree/img/copy.gif 1.1 1.2 +1 -2 appdb/xinha/plugins/Linker/dTree/img/folder.gif 1.1 1.2 +5 -4 appdb/xinha/plugins/Linker/dTree/img/folderopen.gif 1.1 1.2 +3 -2 appdb/xinha/plugins/Linker/dTree/img/globe.gif 1.1 1.2 +4 -4 appdb/xinha/plugins/Linker/dTree/img/imgfolder.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/dTree/img/join.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/dTree/img/joinbottom.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/dTree/img/line.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/dTree/img/minus.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/dTree/img/minusbottom.gif 1.1 1.2 +4 -3 appdb/xinha/plugins/Linker/dTree/img/move.gif 1.1 1.2 +6 -6 appdb/xinha/plugins/Linker/dTree/img/musicfolder.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/dTree/img/nolines_minus.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/dTree/img/nolines_plus.gif 1.1 1.2 +4 -3 appdb/xinha/plugins/Linker/dTree/img/offline.gif 1.1 1.2 +5 -2 appdb/xinha/plugins/Linker/dTree/img/page.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/dTree/img/plus.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/Linker/dTree/img/plusbottom.gif 1.1 1.2 +3 -2 appdb/xinha/plugins/Linker/dTree/img/question.gif 1.1 1.2 +3 -3 appdb/xinha/plugins/Linker/dTree/img/trash.gif 1.2 1.3 +1 -2 appdb/xinha/plugins/Linker/lang/de.js 1.2 1.3 +1 -2 appdb/xinha/plugins/Linker/lang/fr.js 1.2 1.3 +1 -2 appdb/xinha/plugins/Linker/lang/pl.js Added 1.1 +0 -0 appdb/xinha/plugins/Linker/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/Linker/lang/nb.js 1.2 Removed +0 -0 appdb/xinha/plugins/Linker/lang/no.js 1.2 1.3 +137 -191 appdb/xinha/plugins/ListType/list-type.js 1.2 1.3 +12 -12 appdb/xinha/plugins/ListType/lang/de.js Added 1.1 +0 -0 appdb/xinha/plugins/ListType/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/ListType/lang/nb.js Added 1.1 +0 -0 appdb/xinha/plugins/ListType/lang/ru.js Added 1.1 +0 -0 appdb/xinha/plugins/ListType/lang/sv.js 1.1 Removed +0 -0 appdb/xinha/plugins/ListType/lang/no.js 1.1 1.2 +26 -355 appdb/xinha/plugins/QuickTag/tag-lib.js 1.1 1.2 +2 -1 appdb/xinha/plugins/QuickTag/img/ed_quicktag.gif Added 1.1 +0 -0 appdb/xinha/plugins/QuickTag/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/QuickTag/lang/nb.js 1.2 Removed +0 -0 appdb/xinha/plugins/QuickTag/lang/no.js 1.2 1.3 +0 -2 appdb/xinha/plugins/QuickTag/popups/quicktag.html 1.2 1.3 +123 -123 appdb/xinha/plugins/SpellChecker/aspell_setup.php 1.1 1.2 +114 -114 appdb/xinha/plugins/SpellChecker/readme-tech.html 1.2 1.3 +210 -210 appdb/xinha/plugins/SpellChecker/spell-check-logic.cgi 1.2 1.3 +170 -165 appdb/xinha/plugins/SpellChecker/spell-check-logic.php 1.1 1.2 +37 -37 appdb/xinha/plugins/SpellChecker/spell-check-savedicts.php 1.2 1.3 +125 -124 appdb/xinha/plugins/SpellChecker/spell-check-ui.html 1.2 1.3 +392 -445 appdb/xinha/plugins/SpellChecker/spell-check-ui.js 1.2 1.3 +72 -72 appdb/xinha/plugins/SpellChecker/spell-checker.js 1.1 1.2 +1 -1 appdb/xinha/plugins/SpellChecker/img/he-spell-check.gif 1.1 1.2 +6 -2 appdb/xinha/plugins/SpellChecker/img/spell-check.gif 1.2 1.3 +26 -26 appdb/xinha/plugins/SpellChecker/lang/cz.js 1.2 1.3 +26 -26 appdb/xinha/plugins/SpellChecker/lang/da.js 1.2 1.3 +26 -26 appdb/xinha/plugins/SpellChecker/lang/de.js 1.2 1.3 +27 -27 appdb/xinha/plugins/SpellChecker/lang/he.js 1.2 1.3 +26 -26 appdb/xinha/plugins/SpellChecker/lang/hu.js 1.2 1.3 +27 -27 appdb/xinha/plugins/SpellChecker/lang/nl.js 1.2 1.3 +26 -26 appdb/xinha/plugins/SpellChecker/lang/ro.js Added 1.1 +0 -0 appdb/xinha/plugins/SpellChecker/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/SpellChecker/lang/nb.js 1.2 Removed +0 -0 appdb/xinha/plugins/SpellChecker/lang/no.js 1.2 1.3 +372 -542 appdb/xinha/plugins/Stylist/stylist.js Added 1.1 +0 -0 appdb/xinha/plugins/Stylist/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/Stylist/lang/nb.js 1.2 Removed +0 -0 appdb/xinha/plugins/Stylist/lang/no.js 1.2 1.3 +1 -1 appdb/xinha/plugins/SuperClean/dialog.html 1.2 1.3 +211 -285 appdb/xinha/plugins/SuperClean/super-clean.js 1.1 1.2 +179 -179 appdb/xinha/plugins/SuperClean/tidy.php Added 1.1 +0 -0 appdb/xinha/plugins/SuperClean/filters/paragraph.js Added 1.1 +0 -0 appdb/xinha/plugins/SuperClean/filters/word.js 1.2 1.3 +3 -1 appdb/xinha/plugins/SuperClean/img/ed_superclean.gif Added 1.1 +0 -0 appdb/xinha/plugins/SuperClean/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/SuperClean/lang/nb.js 1.2 Removed +0 -0 appdb/xinha/plugins/SuperClean/lang/no.js 1.2 1.3 +882 -1169 appdb/xinha/plugins/TableOperations/table-operations.js 1.1 1.2 +2 -2 appdb/xinha/plugins/TableOperations/img/cell-delete.gif 1.1 1.2 +2 -2 appdb/xinha/plugins/TableOperations/img/cell-insert-after.gif 1.1 1.2 +4 -3 appdb/xinha/plugins/TableOperations/img/cell-insert-before.gif 1.1 1.2 +6 -3 appdb/xinha/plugins/TableOperations/img/cell-merge.gif 1.1 1.2 +3 -3 appdb/xinha/plugins/TableOperations/img/cell-prop.gif 1.1 1.2 +4 -2 appdb/xinha/plugins/TableOperations/img/cell-split.gif 1.1 1.2 +1 -1 appdb/xinha/plugins/TableOperations/img/col-delete.gif 1.1 1.2 +2 -3 appdb/xinha/plugins/TableOperations/img/col-insert-after.gif 1.1 1.2 +3 -3 appdb/xinha/plugins/TableOperations/img/col-insert-before.gif 1.1 1.2 +6 -1 appdb/xinha/plugins/TableOperations/img/col-split.gif 1.1 1.2 +2 -2 appdb/xinha/plugins/TableOperations/img/row-delete.gif 1.1 1.2 +2 -2 appdb/xinha/plugins/TableOperations/img/row-insert-above.gif 1.1 1.2 +5 -3 appdb/xinha/plugins/TableOperations/img/row-insert-under.gif 1.1 1.2 +4 -2 appdb/xinha/plugins/TableOperations/img/row-prop.gif 1.1 1.2 +1 -2 appdb/xinha/plugins/TableOperations/img/row-split.gif 1.1 1.2 +4 -1 appdb/xinha/plugins/TableOperations/img/table-prop.gif 1.2 1.3 +79 -79 appdb/xinha/plugins/TableOperations/lang/cz.js 1.2 1.3 +79 -79 appdb/xinha/plugins/TableOperations/lang/da.js 1.2 1.3 +81 -81 appdb/xinha/plugins/TableOperations/lang/de.js 1.2 1.3 +79 -79 appdb/xinha/plugins/TableOperations/lang/el.js 1.2 1.3 +68 -68 appdb/xinha/plugins/TableOperations/lang/fi.js 1.2 1.3 +77 -77 appdb/xinha/plugins/TableOperations/lang/fr.js 1.2 1.3 +79 -79 appdb/xinha/plugins/TableOperations/lang/he.js 1.2 1.3 +79 -79 appdb/xinha/plugins/TableOperations/lang/it.js 1.2 1.3 +79 -79 appdb/xinha/plugins/TableOperations/lang/nl.js 1.2 1.3 +79 -79 appdb/xinha/plugins/TableOperations/lang/ro.js Added 1.1 +0 -0 appdb/xinha/plugins/TableOperations/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/TableOperations/lang/nb.js Added 1.1 +0 -0 appdb/xinha/plugins/TableOperations/lang/ru.js Added 1.1 +0 -0 appdb/xinha/plugins/TableOperations/lang/sv.js 1.2 Removed +0 -0 appdb/xinha/plugins/TableOperations/lang/no.js Added 1.1 +0 -0 appdb/xinha/plugins/TableOperations/popups/merge_cells.html 1.1 1.2 +1 -2 appdb/xinha/plugins/UnFormat/img/unformat.gif Added 1.1 +0 -0 appdb/xinha/plugins/UnFormat/lang/ja.js Added 1.1 +0 -0 appdb/xinha/plugins/UnFormat/lang/nb.js 1.2 Removed +0 -0 appdb/xinha/plugins/UnFormat/lang/no.js 1.2 1.3 +296 -296 appdb/xinha/popups/about.html 1.1 1.2 +1 -1 appdb/xinha/popups/blank.html 1.2 1.3 +61 -60 appdb/xinha/popups/editor_help.html 1.1 1.2 +11 -4 appdb/xinha/popups/popup.css 1.2 1.3 +101 -121 appdb/xinha/popups/popup.js 1.1 1.2 +358 -358 appdb/xinha/popups/select_color.html 1.2 Removed +0 -0 appdb/xinha/popups/color_picker.js 1.1 Removed +0 -0 appdb/xinha/popups/custom2.html 1.2 Removed +0 -0 appdb/xinha/popups/insert_image.html 1.2 Removed +0 -0 appdb/xinha/popups/insert_table.html 1.2 Removed +0 -0 appdb/xinha/popups/link.html 1.1 Removed +0 -0 appdb/xinha/popups/old_insert_image.html 1.1 1.2 +1 -3 appdb/xinha/skins/blue-metallic/separator.gif 1.1 1.2 +1 -1 appdb/xinha/skins/green-look/button-background.gif 1.1 1.2 +1 -2 appdb/xinha/skins/green-look/separator.gif

16 years, 11 months

tools/. winegecko.php

by Jeremy Newman

ChangeSet ID: 31153 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman(a)winehq.org 2007/05/31 10:01:36 Modified files: . : winegecko.php Log message: Jacek Caban <jacek(a)codeweavers.com> Added support for different Gecko package versions. Patch: http://cvs.winehq.org/patch.py?id=31153 Old revision New revision Changes Path 1.2 1.3 +12 -2 tools/winegecko.php Index: tools/winegecko.php diff -u -p tools/winegecko.php:1.2 tools/winegecko.php:1.3 --- tools/winegecko.php:1.2 31 May 2007 15: 1:36 -0000 +++ tools/winegecko.php 31 May 2007 15: 1:36 -0000 @@ -12,12 +12,22 @@ * Copyright (c) 2006 Jonathan Ernst */ +// Chek if a specific version was passed +if(isset($_GET['v'])) + $sVersion = $_GET['v']; // Name of the file -$sFileName = "wine_gecko.cab"; +$sFileName = "wine_gecko".($sVersion?'-'.$sVersion:'').".cab"; + +// Size array +$aFileSizes = array( + 'default'=>5219822, + '0.0.1'=>5219822, + '0.1.0'=>5746895 +); // Exact size of the file: -$iFileSize = 5219822; +$iFileSize = ($sVersion?$aFileSizes[$sVersion]:$aFileSizes['default']); // List of additional locations (commonly used locations are already in download.inc.php) $aList = array();

16 years, 11 months

appdb/include user.php

by WineHQ

ChangeSet ID: 31152 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/05/31 09:55:36 Modified files: include : user.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> user: don't make links when userId is not set Patch: http://cvs.winehq.org/patch.py?id=31152 Old revision New revision Changes Path 1.93 1.94 +6 -0 appdb/include/user.php Index: appdb/include/user.php diff -u -p appdb/include/user.php:1.93 appdb/include/user.php:1.94 --- appdb/include/user.php:1.93 31 May 2007 14:55:36 -0000 +++ appdb/include/user.php 31 May 2007 14:55:36 -0000 @@ -794,12 +794,18 @@ class User { function objectMakeUrl() { + if(!$this->iUserId) + return; + $sUrl = BASE."contact.php?iRecipientId=$this->iUserId"; return $sUrl; } function objectMakeLink() { + if(!$this->iUserId) + return $this->sRealname; + $sLink = "<a href=\"".$this->objectMakeUrl()."\">$this->sRealname</a>"; return $sLink; }

16 years, 11 months

Huw Davies : gdi32: Pass an lpDx array to the driver if the escapement is non-zero, so that the driver has access to the unrotated advance widths.

by Alexandre Julliard

Module: wine Branch: master Commit: 3739b5f9950dae89f93bbe8fa9c370659aee6f7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3739b5f9950dae89f93bbe8fa… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 31 12:47:19 2007 +0100 gdi32: Pass an lpDx array to the driver if the escapement is non-zero, so that the driver has access to the unrotated advance widths. --- dlls/gdi32/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 17fcfe6..fa9954d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1993,7 +1993,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, y = pt.y; char_extra = GetTextCharacterExtra(hdc); - if(char_extra || dc->breakExtra || breakRem || lpDx) + if(char_extra || dc->breakExtra || breakRem || lpDx || lf.lfEscapement != 0) { UINT i; SIZE tmpsz;

16 years, 11 months

Francois Gouget : d3drm/tests: Fix the Visual C++ double to float conversion warnings.

by Alexandre Julliard

Module: wine Branch: master Commit: cacf37f0ebaf2edbe9f94c972b37711b2bda17fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cacf37f0ebaf2edbe9f94c972… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 31 13:59:16 2007 +0200 d3drm/tests: Fix the Visual C++ double to float conversion warnings. --- dlls/d3drm/tests/vector.c | 120 ++++++++++++++++++++++---------------------- 1 files changed, 60 insertions(+), 60 deletions(-) diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 7e2690c..e900361 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -23,8 +23,8 @@ #include "wine/test.h" -#define PI (4*atan(1.0)) -#define admit_error 0.000001 +#define PI (4.0f*atanf(1.0f)) +#define admit_error 0.000001f #define expect_mat( expectedmat, gotmat)\ { \ @@ -132,69 +132,69 @@ static void VectorTest(void) D3DVALUE mod,par,theta; D3DVECTOR e,r,u,v,w,axis,casnul,norm,ray; - U1(u).x=2.0;U2(u).y=2.0;U3(u).z=1.0; - U1(v).x=4.0;U2(v).y=4.0;U3(v).z=0.0; + U1(u).x=2.0f; U2(u).y=2.0f; U3(u).z=1.0f; + U1(v).x=4.0f; U2(v).y=4.0f; U3(v).z=0.0f; /*______________________VectorAdd_________________________________*/ pD3DRMVectorAdd(&r,&u,&v); - U1(e).x=6.0;U2(e).y=6.0;U3(e).z=1.0; + U1(e).x=6.0f; U2(e).y=6.0f; U3(e).z=1.0f; expect_vec(e,r); /*_______________________VectorSubtract__________________________*/ pD3DRMVectorSubtract(&r,&u,&v); - U1(e).x=-2.0;U2(e).y=-2.0;U3(e).z=1.0; + U1(e).x=-2.0f; U2(e).y=-2.0f; U3(e).z=1.0f; expect_vec(e,r); /*_______________________VectorCrossProduct_______________________*/ pD3DRMVectorCrossProduct(&r,&u,&v); - U1(e).x=-4.0;U2(e).y=4.0;U3(e).z=0.0; + U1(e).x=-4.0f; U2(e).y=4.0f; U3(e).z=0.0f; expect_vec(e,r); /*_______________________VectorDotProduct__________________________*/ mod=pD3DRMVectorDotProduct(&u,&v); - ok((mod == 16.0), "Expected 16.0, Got %f\n",mod); + ok((mod == 16.0f), "Expected 16.0f, Got %f\n", mod); /*_______________________VectorModulus_____________________________*/ mod=pD3DRMVectorModulus(&u); - ok((mod == 3.0), "Expected 3.0, Got %f\n",mod); + ok((mod == 3.0f), "Expected 3.0f, Got %f\n", mod); /*_______________________VectorNormalize___________________________*/ pD3DRMVectorNormalize(&u); - U1(e).x=2.0/3.0;U2(e).y=2.0/3.0;U3(e).z=1.0/3.0; + U1(e).x=2.0f/3.0f; U2(e).y=2.0f/3.0f; U3(e).z=1.0f/3.0f; expect_vec(e,u); /* If u is the NULL vector, MSDN says that the return vector is NULL. In fact, the returned vector is (1,0,0). The following test case prove it. */ - U1(casnul).x=0.0; U2(casnul).y=0.0; U3(casnul).z=0.0; + U1(casnul).x=0.0f; U2(casnul).y=0.0f; U3(casnul).z=0.0f; pD3DRMVectorNormalize(&casnul); - U1(e).x=1.0; U2(e).y=0.0; U3(e).z=0.0; + U1(e).x=1.0f; U2(e).y=0.0f; U3(e).z=0.0f; expect_vec(e,casnul); /*____________________VectorReflect_________________________________*/ - U1(ray).x=3.0; U2(ray).y=-4.0; U3(ray).z=5.0; - U1(norm).x=1.0; U2(norm).y=-2.0; U3(norm).z=6.0; - U1(e).x=79.0; U2(e).y=-160.0; U3(e).z=487.0; + U1(ray).x=3.0f; U2(ray).y=-4.0f; U3(ray).z=5.0f; + U1(norm).x=1.0f; U2(norm).y=-2.0f; U3(norm).z=6.0f; + U1(e).x=79.0f; U2(e).y=-160.0f; U3(e).z=487.0f; pD3DRMVectorReflect(&r,&ray,&norm); expect_vec(e,r); /*_______________________VectorRotate_______________________________*/ - U1(w).x=3.0; U2(w).y=4.0; U3(w).z=0.0; - U1(axis).x=0.0; U2(axis).y=0.0; U3(axis).z=1.0; - theta=2.0*PI/3.0; + U1(w).x=3.0f; U2(w).y=4.0f; U3(w).z=0.0f; + U1(axis).x=0.0f; U2(axis).y=0.0f; U3(axis).z=1.0f; + theta=2.0f*PI/3.0f; pD3DRMVectorRotate(&r,&w,&axis,theta); - U1(e).x=-0.3-0.4*sqrt(3.0); U2(e).y=0.3*sqrt(3.0)-0.4; U3(e).z=0.0; + U1(e).x=-0.3f-0.4f*sqrtf(3.0f); U2(e).y=0.3f*sqrtf(3.0f)-0.4f; U3(e).z=0.0f; expect_vec(e,r); /* The same formula gives D3DRMVectorRotate, for theta in [-PI/2;+PI/2] or not. The following test proves this fact.*/ - theta=-PI/4.0; - pD3DRMVectorRotate(&r,&w,&axis,-PI/4); - U1(e).x=1.4/sqrt(2.0); U2(e).y=0.2/sqrt(2.0); U3(e).z=0.0; + theta=-PI/4.0f; + pD3DRMVectorRotate(&r,&w,&axis,theta); + U1(e).x=1.4f/sqrtf(2.0f); U2(e).y=0.2f/sqrtf(2.0f); U3(e).z=0.0f; expect_vec(e,r); /*_______________________VectorScale__________________________*/ - par=2.5; + par=2.5f; pD3DRMVectorScale(&r,&v,par); - U1(e).x=10.0; U2(e).y=10.0; U3(e).z=0.0; + U1(e).x=10.0f; U2(e).y=10.0f; U3(e).z=0.0f; expect_vec(e,r); } @@ -203,11 +203,11 @@ static void MatrixTest(void) D3DRMQUATERNION q; D3DRMMATRIX4D exp,mat; - exp[0][0]=-49.0; exp[0][1]=4.0; exp[0][2]=22.0; exp[0][3]=0.0; - exp[1][0]=20.0; exp[1][1]=-39.0; exp[1][2]=20.0; exp[1][3]=0.0; - exp[2][0]=10.0; exp[2][1]=28.0; exp[2][2]=-25.0; exp[2][3]=0.0; - exp[3][0]=0.0; exp[3][1]=0.0; exp[3][2]=0.0; exp[3][3]=1.0; - q.s=1.0; U1(q.v).x=2.0; U2(q.v).y=3.0; U3(q.v).z=4.0; + exp[0][0]=-49.0f; exp[0][1]=4.0f; exp[0][2]=22.0f; exp[0][3]=0.0f; + exp[1][0]=20.0f; exp[1][1]=-39.0f; exp[1][2]=20.0f; exp[1][3]=0.0f; + exp[2][0]=10.0f; exp[2][1]=28.0f; exp[2][2]=-25.0f; exp[2][3]=0.0f; + exp[3][0]=0.0f; exp[3][1]=0.0f; exp[3][2]=0.0f; exp[3][3]=1.0f; + q.s=1.0f; U1(q.v).x=2.0f; U2(q.v).y=3.0f; U3(q.v).z=4.0f; pD3DRMMatrixFromQuaternion(mat,&q); expect_mat(exp,mat); @@ -220,10 +220,10 @@ static void QuaternionTest(void) D3DRMQUATERNION q,q1,q2,r; /*_________________QuaternionFromRotation___________________*/ - U1(axis).x=1.0; U2(axis).y=1.0; U3(axis).z=1.0; - theta=2.0*PI/3.0; + U1(axis).x=1.0f; U2(axis).y=1.0f; U3(axis).z=1.0f; + theta=2.0f*PI/3.0f; pD3DRMQuaternionFromRotation(&r,&axis,theta); - q.s=0.5; U1(q.v).x=0.5; U2(q.v).y=0.5; U3(q.v).z=0.5; + q.s=0.5f; U1(q.v).x=0.5f; U2(q.v).y=0.5f; U3(q.v).z=0.5f; expect_quat(q,r); /*_________________QuaternionSlerp_________________________*/ @@ -231,12 +231,12 @@ static void QuaternionTest(void) * interpolation. Moreover, if the angle of the two quaternions is in ]PI/2;3PI/2[, QuaternionSlerp * interpolates between the first quaternion and the opposite of the second one. The test proves * these two facts. */ - par=0.31; - q1.s=1.0; U1(q1.v).x=2.0; U2(q1.v).y=3.0; U3(q1.v).z=50.0; - q2.s=-4.0; U1(q2.v).x=6.0; U2(q2.v).y=7.0; U3(q2.v).z=8.0; + par=0.31f; + q1.s=1.0f; U1(q1.v).x=2.0f; U2(q1.v).y=3.0f; U3(q1.v).z=50.0f; + q2.s=-4.0f; U1(q2.v).x=6.0f; U2(q2.v).y=7.0f; U3(q2.v).z=8.0f; /* The angle between q1 and q2 is in [-PI/2,PI/2]. So, one interpolates between q1 and q2. */ - epsilon=1.0; - g=1.0-par; h=epsilon*par; + epsilon=1.0f; + g=1.0f-par; h=epsilon*par; /* Part of the test proving that the interpolation is linear. */ q.s=g*q1.s+h*q2.s; U1(q.v).x=g*U1(q1.v).x+h*U1(q2.v).x; @@ -245,11 +245,11 @@ static void QuaternionTest(void) pD3DRMQuaternionSlerp(&r,&q1,&q2,par); expect_quat(q,r); - q1.s=1.0; U1(q1.v).x=2.0; U2(q1.v).y=3.0; U3(q1.v).z=50.0; - q2.s=-94.0; U1(q2.v).x=6.0; U2(q2.v).y=7.0; U3(q2.v).z=-8.0; + q1.s=1.0f; U1(q1.v).x=2.0f; U2(q1.v).y=3.0f; U3(q1.v).z=50.0f; + q2.s=-94.0f; U1(q2.v).x=6.0f; U2(q2.v).y=7.0f; U3(q2.v).z=-8.0f; /* The angle between q1 and q2 is not in [-PI/2,PI/2]. So, one interpolates between q1 and -q2. */ - epsilon=-1.0; - g=1.0-par; h=epsilon*par; + epsilon=-1.0f; + g=1.0f-par; h=epsilon*par; q.s=g*q1.s+h*q2.s; U1(q.v).x=g*U1(q1.v).x+h*U1(q2.v).x; U2(q.v).y=g*U2(q1.v).y+h*U2(q2.v).y; @@ -264,61 +264,61 @@ static void ColorTest(void) D3DVALUE expected, got, red, green, blue, alpha; /*___________D3DRMCreateColorRGB_________________________*/ - red=0.8; - green=0.3; - blue=0.55; + red=0.8f; + green=0.3f; + blue=0.55f; expected_color=0xffcc4c8c; got_color=pD3DRMCreateColorRGB(red,green,blue); ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); /*___________D3DRMCreateColorRGBA________________________*/ - red=0.1; - green=0.4; - blue=0.7; - alpha=0.58; + red=0.1f; + green=0.4f; + blue=0.7f; + alpha=0.58f; expected_color=0x931966b2; got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); /* if a component is <0 then, then one considers this compenent as 0. The following test proves this fact (test only with the red component). */ - red=-0.88; - green=0.4; - blue=0.6; - alpha=0.41; + red=-0.88f; + green=0.4f; + blue=0.6f; + alpha=0.41f; expected_color=0x68006699; got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); /* if a component is >1 then, then one considers this compenent as 1. The following test proves this fact (test only with the red component). */ - red=2.37; - green=0.4; - blue=0.6; - alpha=0.41; + red=2.37f; + green=0.4f; + blue=0.6f; + alpha=0.41f; expected_color=0x68ff6699; got_color=pD3DRMCreateColorRGBA(red,green,blue,alpha); ok((expected_color==got_color),"Expected color=%x, Got color=%x\n",expected_color,got_color); /*___________D3DRMColorGetAlpha_________________________*/ color=0x0e4921bf; - expected=14.0/255.0; + expected=14.0f/255.0f; got=pD3DRMColorGetAlpha(color); ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); /*___________D3DRMColorGetBlue__________________________*/ color=0xc82a1455; - expected=1.0/3.0; + expected=1.0f/3.0f; got=pD3DRMColorGetBlue(color); ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); /*___________D3DRMColorGetGreen_________________________*/ color=0xad971203; - expected=6.0/85.0; + expected=6.0f/85.0f; got=pD3DRMColorGetGreen(color); ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); /*___________D3DRMColorGetRed__________________________*/ color=0xb62d7a1c; - expected=3.0/17.0; + expected=3.0f/17.0f; got=pD3DRMColorGetRed(color); ok((fabs(expected-got)<admit_error),"Expected=%f, Got=%f\n",expected,got); }

16 years, 11 months

Francois Gouget : version: Fix the VerQueryValueA/W() prototypes.

by Alexandre Julliard

Module: wine Branch: master Commit: ab91c21636530172a6bc24bb0fc6e19dc002b799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab91c21636530172a6bc24bb0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 31 13:59:05 2007 +0200 version: Fix the VerQueryValueA/W() prototypes. --- dlls/version/info.c | 36 +++++++++++++++++++++--------------- include/winver.h | 4 ++-- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 72eac8d..171783f 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -206,7 +206,7 @@ typedef struct } VS_VERSION_INFO_STRUCT32; #define VersionInfoIs16( ver ) \ - ( ((VS_VERSION_INFO_STRUCT16 *)ver)->szKey[0] >= ' ' ) + ( ((const VS_VERSION_INFO_STRUCT16 *)ver)->szKey[0] >= ' ' ) #define DWORD_ALIGN( base, ptr ) \ ( (LPBYTE)(base) + ((((LPBYTE)(ptr) - (LPBYTE)(base)) + 3) & ~3) ) @@ -217,10 +217,10 @@ typedef struct DWORD_ALIGN( (ver), (ver)->szKey + strlenW((ver)->szKey) + 1 ) #define VersionInfo16_Children( ver ) \ - (VS_VERSION_INFO_STRUCT16 *)( VersionInfo16_Value( ver ) + \ + (const VS_VERSION_INFO_STRUCT16 *)( VersionInfo16_Value( ver ) + \ ( ( (ver)->wValueLength + 3 ) & ~3 ) ) #define VersionInfo32_Children( ver ) \ - (VS_VERSION_INFO_STRUCT32 *)( VersionInfo32_Value( ver ) + \ + (const VS_VERSION_INFO_STRUCT32 *)( VersionInfo32_Value( ver ) + \ ( ( (ver)->wValueLength * \ ((ver)->wType? 2 : 1) + 3 ) & ~3 ) ) @@ -632,10 +632,10 @@ BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, /*********************************************************************** * VersionInfo16_FindChild [internal] */ -static VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( VS_VERSION_INFO_STRUCT16 *info, +static const VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( const VS_VERSION_INFO_STRUCT16 *info, LPCSTR szKey, UINT cbKey ) { - VS_VERSION_INFO_STRUCT16 *child = VersionInfo16_Children( info ); + const VS_VERSION_INFO_STRUCT16 *child = VersionInfo16_Children( info ); while ((char *)child < (char *)info + info->wLength ) { @@ -652,10 +652,10 @@ static VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( VS_VERSION_INFO_STRUCT /*********************************************************************** * VersionInfo32_FindChild [internal] */ -static VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( VS_VERSION_INFO_STRUCT32 *info, +static const VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( const VS_VERSION_INFO_STRUCT32 *info, LPCWSTR szKey, UINT cbKey ) { - VS_VERSION_INFO_STRUCT32 *child = VersionInfo32_Children( info ); + const VS_VERSION_INFO_STRUCT32 *child = VersionInfo32_Children( info ); while ((char *)child < (char *)info + info->wLength ) { @@ -673,7 +673,7 @@ static VS_VERSION_INFO_STRUCT32 *VersionInfo32_FindChild( VS_VERSION_INFO_STRUCT * * Gets a value from a 16-bit NE resource */ -static BOOL WINAPI VersionInfo16_QueryValue( VS_VERSION_INFO_STRUCT16 *info, LPCSTR lpSubBlock, +static BOOL WINAPI VersionInfo16_QueryValue( const VS_VERSION_INFO_STRUCT16 *info, LPCSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { while ( *lpSubBlock ) @@ -717,7 +717,7 @@ static BOOL WINAPI VersionInfo16_QueryValue( VS_VERSION_INFO_STRUCT16 *info, LPC * * Gets a value from a 32-bit PE resource */ -static BOOL WINAPI VersionInfo32_QueryValue( VS_VERSION_INFO_STRUCT32 *info, LPCWSTR lpSubBlock, +static BOOL WINAPI VersionInfo32_QueryValue( const VS_VERSION_INFO_STRUCT32 *info, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { TRACE("lpSubBlock : (%s)\n", debugstr_w(lpSubBlock)); @@ -761,12 +761,12 @@ static BOOL WINAPI VersionInfo32_QueryValue( VS_VERSION_INFO_STRUCT32 *info, LPC /*********************************************************************** * VerQueryValueA [VERSION.@] */ -BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, +BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { static const char rootA[] = "\\"; static const char varfileinfoA[] = "\\VarFileInfo\\Translation"; - VS_VERSION_INFO_STRUCT16 *info = (VS_VERSION_INFO_STRUCT16 *)pBlock; + const VS_VERSION_INFO_STRUCT16 *info = (const VS_VERSION_INFO_STRUCT16 *)pBlock; TRACE("(%p,%s,%p,%p)\n", pBlock, debugstr_a(lpSubBlock), lplpBuffer, puLen ); @@ -791,8 +791,11 @@ BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, if (ret && strcasecmp( lpSubBlock, rootA ) && strcasecmp( lpSubBlock, varfileinfoA )) { + /* Set lpBuffer so it points to the 'empty' area where we store + * the converted strings + */ LPSTR lpBufferA = (LPSTR)pBlock + info->wLength + 4; - DWORD pos = (LPSTR)*lplpBuffer - (LPSTR)pBlock; + DWORD pos = (LPCSTR)*lplpBuffer - (LPCSTR)pBlock; len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)*lplpBuffer, -1, lpBufferA + pos, info->wLength - pos, NULL, NULL); @@ -808,14 +811,14 @@ BOOL WINAPI VerQueryValueA( LPVOID pBlock, LPCSTR lpSubBlock, /*********************************************************************** * VerQueryValueW [VERSION.@] */ -BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock, +BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, LPVOID *lplpBuffer, UINT *puLen ) { static const WCHAR rootW[] = { '\\', 0 }; static const WCHAR varfileinfoW[] = { '\\','V','a','r','F','i','l','e','I','n','f','o', '\\','T','r','a','n','s','l','a','t','i','o','n', 0 }; - VS_VERSION_INFO_STRUCT32 *info = (VS_VERSION_INFO_STRUCT32 *)pBlock; + const VS_VERSION_INFO_STRUCT32 *info = (const VS_VERSION_INFO_STRUCT32 *)pBlock; TRACE("(%p,%s,%p,%p)\n", pBlock, debugstr_w(lpSubBlock), lplpBuffer, puLen ); @@ -840,8 +843,11 @@ BOOL WINAPI VerQueryValueW( LPVOID pBlock, LPCWSTR lpSubBlock, if (ret && strcmpiW( lpSubBlock, rootW ) && strcmpiW( lpSubBlock, varfileinfoW )) { + /* Set lpBuffer so it points to the 'empty' area where we store + * the converted strings + */ LPWSTR lpBufferW = (LPWSTR)((LPSTR)pBlock + info->wLength); - DWORD pos = (LPSTR)*lplpBuffer - (LPSTR)pBlock; + DWORD pos = (LPCSTR)*lplpBuffer - (LPCSTR)pBlock; DWORD max = (info->wLength - sizeof(VS_FIXEDFILEINFO)) * 4 - info->wLength; len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)*lplpBuffer, -1, diff --git a/include/winver.h b/include/winver.h index ff4233a..c38ad38 100644 --- a/include/winver.h +++ b/include/winver.h @@ -159,8 +159,8 @@ DWORD WINAPI VerInstallFileW(UINT,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWSTR,LPWST DWORD WINAPI VerLanguageNameA(UINT,LPSTR,UINT); DWORD WINAPI VerLanguageNameW(UINT,LPWSTR,UINT); #define VerLanguageName WINELIB_NAME_AW(VerLanguageName) -BOOL WINAPI VerQueryValueA(LPVOID,LPCSTR,LPVOID*,UINT*); -BOOL WINAPI VerQueryValueW(LPVOID,LPCWSTR,LPVOID*,UINT*); +BOOL WINAPI VerQueryValueA(LPCVOID,LPCSTR,LPVOID*,UINT*); +BOOL WINAPI VerQueryValueW(LPCVOID,LPCWSTR,LPVOID*,UINT*); #define VerQueryValue WINELIB_NAME_AW(VerQueryValue) DWORD WINAPI GetFileVersionInfoSizeA(LPCSTR,LPDWORD); DWORD WINAPI GetFileVersionInfoSizeW(LPCWSTR,LPDWORD);

16 years, 11 months

Francois Gouget : oleaut32/tests: Convert some macros to functions.

by Alexandre Julliard

Module: wine Branch: master Commit: d252693a04b147681e633cb63646bc417a6c5f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d252693a04b147681e633cb63… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 31 14:02:48 2007 +0200 oleaut32/tests: Convert some macros to functions. --- dlls/oleaut32/tests/vartest.c | 154 +++++++++++++++++++++++++--------------- 1 files changed, 96 insertions(+), 58 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d75b4fa..389ae35 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -99,13 +99,23 @@ static INT (WINAPI *pVariantTimeToDosDateTime)(double,USHORT*,USHORT *); #define R8_MAX DBL_MAX #define R8_MIN DBL_MIN -/* Macros to set a DECIMAL */ -#define SETDEC(dec, scl, sgn, hi, lo) S(U(dec)).scale = (BYTE)scl; \ - S(U(dec)).sign = (BYTE)sgn; dec.Hi32 = (ULONG)hi; \ - U1(dec).Lo64 = (ULONG64)lo -#define SETDEC64(dec, scl, sgn, hi, mid, lo) S(U(dec)).scale = (BYTE)scl; \ - S(U(dec)).sign = (BYTE)sgn; dec.Hi32 = (ULONG)hi; \ - S1(U1(dec)).Mid32 = mid; S1(U1(dec)).Lo32 = lo +/* Functions to set a DECIMAL */ +static void setdec(DECIMAL* dec, BYTE scl, BYTE sgn, ULONG hi32, ULONG64 lo64) +{ + S(U(*dec)).scale = scl; + S(U(*dec)).sign = sgn; + dec->Hi32 = hi32; + U1(*dec).Lo64 = lo64; +} + +static void setdec64(DECIMAL* dec, BYTE scl, BYTE sgn, ULONG hi32, ULONG mid32, ULONG lo32) +{ + S(U(*dec)).scale = scl; + S(U(*dec)).sign = sgn; + dec->Hi32 = hi32; + S1(U1(*dec)).Mid32 = mid32; + S1(U1(*dec)).Lo32 = lo32; +} static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) { @@ -1650,19 +1660,29 @@ static void test_VarDateFromUdate(void) UD2T(1,13,1980,0,0,0,0,2,1,0,S_OK,29587.0); /* Rolls fwd to 1/1/1981 */ } -#define ST2DT(d,m,y,h,mn,s,ms,r,dt) \ - st.wYear = y; st.wMonth = m; st.wDay = d; st.wHour = h; st.wMinute = mn; \ - st.wSecond = s; st.wMilliseconds = ms; st.wDayOfWeek = 0; \ - res = pSystemTimeToVariantTime(&st, &out); \ - ok(r == res && (!r || EQ_DOUBLE(out, dt)), \ - "expected %d, %.16g, got %d, %.16g\n", r, dt, res, out) +static void test_st2dt(int line, WORD d, WORD m, WORD y, WORD h, WORD mn, + WORD s, WORD ms, INT r, double dt) +{ + SYSTEMTIME st; + double out; + INT res; + + st.wYear = y; + st.wMonth = m; + st.wDay = d; + st.wHour = h; + st.wMinute = mn; + st.wSecond = s; + st.wMilliseconds = ms; + st.wDayOfWeek = 0; + res = pSystemTimeToVariantTime(&st, &out); + ok_(__FILE__,line)(r == res && (!r || EQ_DOUBLE(out, dt)), + "expected %d, %.16g, got %d, %.16g\n", r, dt, res, out); +} +#define ST2DT(d,m,y,h,mn,s,ms,r,dt) test_st2dt(__LINE__,d,m,y,h,mn,s,ms,r,dt) static void test_SystemTimeToVariantTime(void) { - SYSTEMTIME st; - double out; - int res; - CHECKPTR(SystemTimeToVariantTime); ST2DT(1,1,1980,0,0,0,0,TRUE,29221.0); ST2DT(2,1,1980,0,0,0,0,TRUE,29222.0); @@ -1671,21 +1691,27 @@ static void test_SystemTimeToVariantTime(void) ST2DT(31,12,90,0,0,0,0,TRUE,33238.0); /* year < 100 is 1900+year! */ } -#define DT2ST(dt,r,d,m,y,h,mn,s,ms) \ - memset(&st, 0, sizeof(st)); \ - res = pVariantTimeToSystemTime(dt, &st); \ - ok(r == res && (!r || (st.wYear == y && st.wMonth == m && st.wDay == d && \ - st.wHour == h && st.wMinute == mn && st.wSecond == s && \ - st.wMilliseconds == ms)), \ - "%.16g expected %d, %d,%d,%d,%d,%d,%d,%d, got %d, %d,%d,%d,%d,%d,%d,%d\n", \ - dt, r, d, m, y, h, mn, s, ms, res, st.wDay, st.wMonth, st.wYear, \ - st.wHour, st.wMinute, st.wSecond, st.wMilliseconds) - -static void test_VariantTimeToSystemTime(void) +static void test_dt2st(int line, double dt, INT r, WORD d, WORD m, WORD y, + WORD h, WORD mn, WORD s, WORD ms) { SYSTEMTIME st; - int res; + INT res; + memset(&st, 0, sizeof(st)); + res = pVariantTimeToSystemTime(dt, &st); + ok_(__FILE__,line)(r == res && + (!r || (st.wYear == y && st.wMonth == m && st.wDay == d && + st.wHour == h && st.wMinute == mn && + st.wSecond == s && st.wMilliseconds == ms)), + "%.16g expected %d, %d,%d,%d,%d,%d,%d,%d, got %d, %d,%d,%d,%d,%d,%d,%d\n", + dt, r, d, m, y, h, mn, s, ms, res, st.wDay, st.wMonth, + st.wYear, st.wHour, st.wMinute, st.wSecond, + st.wMilliseconds); +} +#define DT2ST(dt,r,d,m,y,h,mn,s,ms) test_dt2st(__LINE__,dt,r,d,m,y,h,mn,s,ms) + +static void test_VariantTimeToSystemTime(void) +{ CHECKPTR(VariantTimeToSystemTime); DT2ST(29221.0,1,1,1,1980,0,0,0,0); DT2ST(29222.0,1,2,1,1980,0,0,0,0); @@ -1694,20 +1720,24 @@ static void test_VariantTimeToSystemTime(void) #define MKDOSDATE(d,m,y) ((d & 0x1f) | ((m & 0xf) << 5) | (((y-1980) & 0x7f) << 9)) #define MKDOSTIME(h,m,s) (((s>>1) & 0x1f) | ((m & 0x3f) << 5) | ((h & 0x1f) << 11)) -static const char *szDosDateToVarTimeFail = "expected %d, %.16g, got %d, %.16g\n"; -#define DOS2DT(d,m,y,h,mn,s,r,dt) out = 0.0; \ - dosDate = MKDOSDATE(d,m,y); \ - dosTime = MKDOSTIME(h,mn,s); \ - res = pDosDateTimeToVariantTime(dosDate, dosTime, &out); \ - ok(r == res && (!r || EQ_DOUBLE(out, dt)), \ - szDosDateToVarTimeFail, r, dt, res, out) +static void test_dos2dt(int line, WORD d, WORD m, WORD y, WORD h, WORD mn, + WORD s, INT r, double dt) +{ + unsigned short dosDate, dosTime; + double out; + INT res; + + out = 0.0; + dosDate = MKDOSDATE(d, m, y); + dosTime = MKDOSTIME(h, mn, s); + res = pDosDateTimeToVariantTime(dosDate, dosTime, &out); + ok_(__FILE__,line)(r == res && (!r || EQ_DOUBLE(out, dt)), + "expected %d, %.16g, got %d, %.16g\n", r, dt, res, out); +} +#define DOS2DT(d,m,y,h,mn,s,r,dt) test_dos2dt(__LINE__,d,m,y,h,mn,s,r,dt) static void test_DosDateTimeToVariantTime(void) { - USHORT dosDate, dosTime; - double out; - INT res; - CHECKPTR(DosDateTimeToVariantTime); /* Date */ @@ -1736,22 +1766,30 @@ static void test_DosDateTimeToVariantTime(void) DOS2DT(1,1,1980,24,0,0,0,0.0); /* Invalid hours */ } -#define DT2DOS(dt,r,d,m,y,h,mn,s) dosTime = dosDate = 0; \ - expDosDate = MKDOSDATE(d,m,y); \ - expDosTime = MKDOSTIME(h,mn,s); \ - res = pVariantTimeToDosDateTime(dt, &dosDate, &dosTime); \ - ok(r == res && (!r || (dosTime == expDosTime && dosDate == expDosDate)), \ - "%g: expected %d,%d(%d/%d/%d),%d(%d:%d:%d) got %d,%d(%d/%d/%d),%d(%d:%d:%d)\n", \ - dt, r, expDosDate, expDosDate & 0x1f, (expDosDate >> 5) & 0xf, 1980 + (expDosDate >> 9), \ - expDosTime, expDosTime >> 11, (expDosTime >> 5) & 0x3f, (expDosTime & 0x1f), \ - res, dosDate, dosDate & 0x1f, (dosDate >> 5) & 0xf, 1980 + (dosDate >> 9), \ - dosTime, dosTime >> 11, (dosTime >> 5) & 0x3f, (dosTime & 0x1f)) +static void test_dt2dos(int line, double dt, INT r, WORD d, WORD m, WORD y, + WORD h, WORD mn, WORD s) +{ + unsigned short dosDate, dosTime, expDosDate, expDosTime; + INT res; + + dosTime = dosDate = 0; + expDosDate = MKDOSDATE(d,m,y); + expDosTime = MKDOSTIME(h,mn,s); + res = pVariantTimeToDosDateTime(dt, &dosDate, &dosTime); + ok_(__FILE__,line)(r == res && (!r || (dosTime == expDosTime && dosDate == expDosDate)), + "%g: expected %d,%d(%d/%d/%d),%d(%d:%d:%d) got %d,%d(%d/%d/%d),%d(%d:%d:%d)\n", + dt, r, expDosDate, expDosDate & 0x1f, + (expDosDate >> 5) & 0xf, 1980 + (expDosDate >> 9), + expDosTime, expDosTime >> 11, (expDosTime >> 5) & 0x3f, + (expDosTime & 0x1f), + res, dosDate, dosDate & 0x1f, (dosDate >> 5) & 0xf, + 1980 + (dosDate >> 9), dosTime, dosTime >> 11, + (dosTime >> 5) & 0x3f, (dosTime & 0x1f)); +} +#define DT2DOS(dt,r,d,m,y,h,mn,s) test_dt2dos(__LINE__,dt,r,d,m,y,h,mn,s) static void test_VariantTimeToDosDateTime(void) { - USHORT dosDate, dosTime, expDosDate, expDosTime; - INT res; - CHECKPTR(VariantTimeToDosDateTime); /* Date */ @@ -6320,14 +6358,14 @@ static void test_VarCmp(void) VARCMP(BSTR,bstr42,BSTR,bstr7,VARCMP_LT); /* DECIMAL handling */ - SETDEC(dec,0,0,0,0); + setdec(&dec,0,0,0,0); VARCMPEX(DECIMAL,dec,BSTR,bstr0,VARCMP_LT,VARCMP_EQ,VARCMP_EQ,VARCMP_LT); - SETDEC64(dec,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); /* max DECIMAL */ + setdec64(&dec,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); /* max DECIMAL */ VARCMP(DECIMAL,dec,R8,R8_MAX,VARCMP_LT); /* R8 has bigger range */ VARCMP(DECIMAL,dec,DATE,R8_MAX,VARCMP_LT); /* DATE has bigger range */ - SETDEC64(dec,0,0x80,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); + setdec64(&dec,0,0x80,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); VARCMP(DECIMAL,dec,R8,-R8_MAX,VARCMP_GT); - SETDEC64(dec,20,0,0x5,0x6BC75E2D,0x63100001); /* 1+1e-20 */ + setdec64(&dec,20,0,0x5,0x6BC75E2D,0x63100001); /* 1+1e-20 */ VARCMP(DECIMAL,dec,R8,1,VARCMP_GT); /* DECIMAL has higher precision */ /* Show that DATE is handled just as a R8 */ @@ -6349,7 +6387,7 @@ static void test_VarCmp(void) VARCMP(R4,R4_MAX,R8,R8_MAX,VARCMP_LT); VARCMP(R4,1,DATE,1+1e-8,VARCMP_EQ); VARCMP(R4,1,BSTR,bstr1few,VARCMP_LT); /* bstr1few == 1+1e-8 */ - SETDEC(dec,8,0,0,0x5F5E101); /* 1+1e-8 */ + setdec(&dec,8,0,0,0x5F5E101); /* 1+1e-8 */ VARCMP(R4,1,DECIMAL,dec,VARCMP_LT); SysFreeString(bstrhuh);

16 years, 11 months

Francois Gouget : oleaut32/tests: Fix the EQ_DOUBLE() and EQ_FLOAT() macros so they work no matter how large the values to compare are.

by Alexandre Julliard

Module: wine Branch: master Commit: fbb892c604c3dfcf92c6946a2b9b8730333ca3fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbb892c604c3dfcf92c6946a2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 31 14:02:19 2007 +0200 oleaut32/tests: Fix the EQ_DOUBLE() and EQ_FLOAT() macros so they work no matter how large the values to compare are. Use them everywhere. --- dlls/oleaut32/tests/vartest.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f7c2b04..d75b4fa 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -66,8 +66,8 @@ static INT (WINAPI *pVariantTimeToDosDateTime)(double,USHORT*,USHORT *); /* When comparing floating point values we cannot expect an exact match * because the rounding errors depend on the exact algorithm. */ -#define EQ_DOUBLE(a,b) (fabs((a)-(b))<1e-14) -#define EQ_FLOAT(a,b) (fabs((a)-(b))<1e-7) +#define EQ_DOUBLE(a,b) (fabs((a)-(b)) / (1.0+fabs(a)+fabs(b)) < 1e-14) +#define EQ_FLOAT(a,b) (fabs((a)-(b)) / (1.0+fabs(a)+fabs(b)) < 1e-7) #define SKIPTESTS(a) if((a > VT_CLSID+10) && (a < VT_BSTR_BLOB-10)) continue @@ -1627,7 +1627,7 @@ static void test_DateFromUDate( int line, WORD d, WORD m, WORD y, WORD h, WORD m ud.st.wDayOfWeek = dw; ud.wDayOfYear = dy; res = pVarDateFromUdate(&ud, flags, &out); - ok_(__FILE__,line)(r == res && (FAILED(r) || fabs(out-dt) < 1.0e-11), + ok_(__FILE__,line)(r == res && (FAILED(r) || EQ_DOUBLE(out, dt)), "expected %x, %.16g, got %x, %.16g\n", r, dt, res, out); } #define UD2T(d,m,y,h,mn,s,ms,dw,dy,flags,r,dt) test_DateFromUDate(__LINE__,d,m,y,h,mn,s,ms,dw,dy,flags,r,dt) @@ -1654,7 +1654,7 @@ static void test_VarDateFromUdate(void) st.wYear = y; st.wMonth = m; st.wDay = d; st.wHour = h; st.wMinute = mn; \ st.wSecond = s; st.wMilliseconds = ms; st.wDayOfWeek = 0; \ res = pSystemTimeToVariantTime(&st, &out); \ - ok(r == res && (!r || fabs(out-dt) < 1.0e-11), \ + ok(r == res && (!r || EQ_DOUBLE(out, dt)), \ "expected %d, %.16g, got %d, %.16g\n", r, dt, res, out) static void test_SystemTimeToVariantTime(void) @@ -1699,7 +1699,7 @@ static const char *szDosDateToVarTimeFail = "expected %d, %.16g, got %d, %.16g\n dosDate = MKDOSDATE(d,m,y); \ dosTime = MKDOSTIME(h,mn,s); \ res = pDosDateTimeToVariantTime(dosDate, dosTime, &out); \ - ok(r == res && (!r || fabs(out-dt) < 1.0e-11), \ + ok(r == res && (!r || EQ_DOUBLE(out, dt)), \ szDosDateToVarTimeFail, r, dt, res, out) static void test_DosDateTimeToVariantTime(void)

16 years, 11 months

Francois Gouget : oleaut32/tests: Remove unneeded parentheses.

by Alexandre Julliard

Module: wine Branch: master Commit: 82a7753058d5a50d1838d585c3c775fe915b6de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a7753058d5a50d1838d585c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 31 14:01:41 2007 +0200 oleaut32/tests: Remove unneeded parentheses. --- dlls/oleaut32/tests/vartest.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index ccab122..f7c2b04 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1617,17 +1617,17 @@ static void test_DateFromUDate( int line, WORD d, WORD m, WORD y, WORD h, WORD m double out; HRESULT res; - ud.st.wYear = (y); - ud.st.wMonth = (m); - ud.st.wDay = (d); - ud.st.wHour = (h); - ud.st.wMinute = (mn); - ud.st.wSecond = (s); - ud.st.wMilliseconds = (ms); - ud.st.wDayOfWeek = (dw); - ud.wDayOfYear = (dy); + ud.st.wYear = y; + ud.st.wMonth = m; + ud.st.wDay = d; + ud.st.wHour = h; + ud.st.wMinute = mn; + ud.st.wSecond = s; + ud.st.wMilliseconds = ms; + ud.st.wDayOfWeek = dw; + ud.wDayOfYear = dy; res = pVarDateFromUdate(&ud, flags, &out); - ok_(__FILE__,line)((r) == res && (FAILED(r) || fabs(out-(dt)) < 1.0e-11), + ok_(__FILE__,line)(r == res && (FAILED(r) || fabs(out-dt) < 1.0e-11), "expected %x, %.16g, got %x, %.16g\n", r, dt, res, out); } #define UD2T(d,m,y,h,mn,s,ms,dw,dy,flags,r,dt) test_DateFromUDate(__LINE__,d,m,y,h,mn,s,ms,dw,dy,flags,r,dt)

16 years, 11 months

Francois Gouget : oleaut32/tests: Remove redundant semi-colons.

by Alexandre Julliard

Module: wine Branch: master Commit: c2d24fdba9f5edfc8be0a907624965a1f24988c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d24fdba9f5edfc8be0a9076… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 31 14:00:45 2007 +0200 oleaut32/tests: Remove redundant semi-colons. --- dlls/oleaut32/tests/vartest.c | 62 ++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2d24fdba9f5edfc8be0a…

16 years, 11 months

Jump to page:

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 May 2007