January 2011 - Wine-commits

Jacek Caban : shdocvw: Separate DocHost ref count from InternetExplorer ref count.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 967561f8eae15cd3586fb97e8865685060344894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=967561f8eae15cd3586fb97e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 7 19:03:23 2011 +0100 shdocvw: Separate DocHost ref count from InternetExplorer ref count. --- dlls/shdocvw/client.c | 4 +- dlls/shdocvw/ie.c | 21 ++++++-- dlls/shdocvw/iexplore.c | 116 +++++++++++++++++++++++++++++++++------------ dlls/shdocvw/shdocvw.h | 14 +++++- dlls/shdocvw/webbrowser.c | 14 +++++ 5 files changed, 130 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=967561f8eae15cd3586fb…

1 0

Jacek Caban : shdocvw: Added InternetExplorer object tests.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 74ccbf0083db5aef3821a51c823cbf7e9f6d1221 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ccbf0083db5aef3821a51c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 7 19:04:07 2011 +0100 shdocvw: Added InternetExplorer object tests. --- dlls/shdocvw/tests/Makefile.in | 1 + dlls/shdocvw/tests/ie.c | 59 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/Makefile.in b/dlls/shdocvw/tests/Makefile.in index 10474a1..53f2130 100644 --- a/dlls/shdocvw/tests/Makefile.in +++ b/dlls/shdocvw/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = shdocvw.dll IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 C_SRCS = \ + ie.c \ intshcut.c \ shdocvw.c \ shortcut.c \ diff --git a/dlls/shdocvw/tests/ie.c b/dlls/shdocvw/tests/ie.c new file mode 100644 index 0000000..e7b5ead --- /dev/null +++ b/dlls/shdocvw/tests/ie.c @@ -0,0 +1,59 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <wine/test.h> +#include <stdarg.h> +#include <stdio.h> + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "exdisp.h" + +static void test_InternetExplorer(void) +{ + IWebBrowser2 *wb; + IUnknown *unk; + ULONG ref; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_InternetExplorer, NULL, CLSCTX_SERVER, + &IID_IUnknown, (void**)&unk); + if(FAILED(hres)) { + win_skip("Could not create InternetExplorer object\n"); + return; + } + + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); + ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); + + IWebBrowser2_Release(wb); + ref = IUnknown_Release(unk); + ok(!ref, "object not destroyed, ref=%u\n", ref); +} + +START_TEST(ie) +{ + CoInitialize(NULL); + + test_InternetExplorer(); + + CoUninitialize(); +}

1 0

Jacek Caban : shdocvw: Added InternetExplorer::get_Visible implementation.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: f48fa4b945bebfbab5f4980c175e9a5915625c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48fa4b945bebfbab5f4980c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 7 19:05:16 2011 +0100 shdocvw: Added InternetExplorer::get_Visible implementation. --- dlls/shdocvw/ie.c | 7 +++++-- dlls/shdocvw/tests/ie.c | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index f968302..7b59839 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -372,8 +372,11 @@ static HRESULT WINAPI InternetExplorer_get_Path(IWebBrowser2 *iface, BSTR *Path) static HRESULT WINAPI InternetExplorer_get_Visible(IWebBrowser2 *iface, VARIANT_BOOL *pBool) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pBool); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pBool); + + *pBool = IsWindowVisible(This->frame_hwnd) ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI InternetExplorer_put_Visible(IWebBrowser2 *iface, VARIANT_BOOL Value) diff --git a/dlls/shdocvw/tests/ie.c b/dlls/shdocvw/tests/ie.c index e7b5ead..336a62e 100644 --- a/dlls/shdocvw/tests/ie.c +++ b/dlls/shdocvw/tests/ie.c @@ -27,6 +27,28 @@ #include "ole2.h" #include "exdisp.h" +static void test_visible(IWebBrowser2 *wb) +{ + VARIANT_BOOL b; + HRESULT hres; + + b = 0x100; + hres = IWebBrowser2_get_Visible(wb, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_FALSE, "Visible = %x\n", hres); + + hres = IWebBrowser2_put_Visible(wb, VARIANT_TRUE); + ok(hres == S_OK, "put_Visible failed: %08x\n", hres); + + b = 0x100; + hres = IWebBrowser2_get_Visible(wb, &b); + ok(hres == S_OK, "get_Visible failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "Visible = %x\n", hres); + + hres = IWebBrowser2_put_Visible(wb, VARIANT_FALSE); + ok(hres == S_OK, "put_Visible failed: %08x\n", hres); +} + static void test_InternetExplorer(void) { IWebBrowser2 *wb; @@ -44,6 +66,8 @@ static void test_InternetExplorer(void) hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); ok(hres == S_OK, "Could not get IWebBrowser2 interface: %08x\n", hres); + test_visible(wb); + IWebBrowser2_Release(wb); ref = IUnknown_Release(unk); ok(!ref, "object not destroyed, ref=%u\n", ref);

1 0

Alexandre Julliard : configure: Update libgettextpo check to detect too old versions.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 88155ca8c8596a0570e2ccec5bb9eaaf1a32982d URL: http://source.winehq.org/git/wine.git/?a=commit;h=88155ca8c8596a0570e2ccec5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 8 15:53:26 2011 +0100 configure: Update libgettextpo check to detect too old versions. --- configure | 24 ++++++++++++------------ configure.ac | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 60d5d49..9892e45 100755 --- a/configure +++ b/configure @@ -10591,9 +10591,9 @@ if test "x$enable_tools" != xno then if test "$ac_cv_header_gettext_po_h" = "yes" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for po_file_write in -lgettextpo" >&5 -$as_echo_n "checking for po_file_write in -lgettextpo... " >&6; } -if test "${ac_cv_lib_gettextpo_po_file_write+set}" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for po_message_msgctxt in -lgettextpo" >&5 +$as_echo_n "checking for po_message_msgctxt in -lgettextpo... " >&6; } +if test "${ac_cv_lib_gettextpo_po_message_msgctxt+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -10607,27 +10607,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char po_file_write (); +char po_message_msgctxt (); int main () { -return po_file_write (); +return po_message_msgctxt (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_gettextpo_po_file_write=yes + ac_cv_lib_gettextpo_po_message_msgctxt=yes else - ac_cv_lib_gettextpo_po_file_write=no + ac_cv_lib_gettextpo_po_message_msgctxt=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gettextpo_po_file_write" >&5 -$as_echo "$ac_cv_lib_gettextpo_po_file_write" >&6; } -if test "x$ac_cv_lib_gettextpo_po_file_write" = x""yes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gettextpo_po_message_msgctxt" >&5 +$as_echo "$ac_cv_lib_gettextpo_po_message_msgctxt" >&6; } +if test "x$ac_cv_lib_gettextpo_po_message_msgctxt" = x""yes; then : $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h @@ -10638,9 +10638,9 @@ fi fi if test "x$LIBGETTEXTPO" = "x"; then : case "x$with_gettextpo" in - x) as_fn_append wine_warnings "|GetText ${notice_platform}development files not found. Internationalization won't be fully supported." ;; + x) as_fn_append wine_warnings "|GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported." ;; xno) ;; - *) as_fn_error $? "GetText ${notice_platform}development files not found. Internationalization won't be fully supported. + *) as_fn_error $? "GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported. This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 9865974..caa4303 100644 --- a/configure.ac +++ b/configure.ac @@ -1414,11 +1414,11 @@ if test "x$enable_tools" != xno then if test "$ac_cv_header_gettext_po_h" = "yes" then - AC_CHECK_LIB(gettextpo,po_file_write, + AC_CHECK_LIB(gettextpo,po_message_msgctxt, [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).]) AC_SUBST(LIBGETTEXTPO,"-lgettextpo")]) fi - WINE_WARNING_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"],[GetText ${notice_platform}development files not found. Internationalization won't be fully supported.]) + WINE_WARNING_WITH(gettextpo,[test "x$LIBGETTEXTPO" = "x"],[GetText ${notice_platform}development files not found (or too old). Internationalization won't be fully supported.]) fi dnl **** Check for EsounD ****

1 0

Alexandre Julliard : notepad: Convert menu and string table resources to po files.
by Alexandre Julliard 10 Jan '11

10 Jan '11

1 0

Alexandre Julliard : progman: Convert menu and string table resources to po files.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 8a4daaba737df23f5a4bc41d7e0dbbdb293532b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4daaba737df23f5a4bc41d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 8 16:19:06 2011 +0100 progman: Convert menu and string table resources to po files. --- configure | 2 +- configure.ac | 2 +- po/ar.po | 168 ++++++++++++++++++++++++++++++++-- po/bg.po | 169 ++++++++++++++++++++++++++++++++-- po/cs.po | 168 +++++++++++++++++++++++++++++++-- po/da.po | 189 +++++++++++++++++++++++++++++++++++--- po/de.po | 182 ++++++++++++++++++++++++++++++++++-- po/el.po | 165 +++++++++++++++++++++++++++++++-- po/en.po | 174 +++++++++++++++++++++++++++++++++-- po/en_US.po | 166 +++++++++++++++++++++++++++++++-- po/eo.po | 168 ++++++++++++++++++++++++++++++++-- po/es.po | 184 +++++++++++++++++++++++++++++++++---- po/fa.po | 168 ++++++++++++++++++++++++++++++++-- po/fi.po | 170 ++++++++++++++++++++++++++++++++-- po/fr.po | 189 ++++++++++++++++++++++++++++++++++---- po/he.po | 168 +++++++++++++++++++++++++++++++-- po/hi.po | 164 +++++++++++++++++++++++++++++++-- po/hu.po | 202 ++++++++++++++++++++++++++++++++++++---- po/it.po | 187 +++++++++++++++++++++++++++++++++++--- po/ja.po | 175 +++++++++++++++++++++++++++++++++-- po/ko.po | 180 +++++++++++++++++++++++++++++++++--- po/lt.po | 166 +++++++++++++++++++++++++++++++-- po/ml.po | 164 +++++++++++++++++++++++++++++++-- po/nb_NO.po | 166 +++++++++++++++++++++++++++++++-- po/nl.po | 174 ++++++++++++++++++++++++++++++++--- po/or.po | 164 +++++++++++++++++++++++++++++++-- po/pa.po | 164 +++++++++++++++++++++++++++++++-- po/pl.po | 186 ++++++++++++++++++++++++++++++++++--- po/pt_BR.po | 195 +++++++++++++++++++++++++++++++++++---- po/pt_PT.po | 202 ++++++++++++++++++++++++++++++++++++---- po/ro.po | 209 ++++++++++++++++++++++++++++++++++++++---- po/ru.po | 175 +++++++++++++++++++++++++++++++++-- po/sk.po | 164 +++++++++++++++++++++++++++++++-- po/sl.po | 175 ++++++++++++++++++++++++++++++++--- po/sr_RS(a)cyrillic.po | 172 ++++++++++++++++++++++++++++++++-- po/sr_RS(a)latin.po | 172 ++++++++++++++++++++++++++++++++-- po/sv.po | 166 +++++++++++++++++++++++++++++++-- po/te.po | 164 +++++++++++++++++++++++++++++++-- po/th.po | 168 ++++++++++++++++++++++++++++++++-- po/tr.po | 175 ++++++++++++++++++++++++++++++++--- po/uk.po | 173 ++++++++++++++++++++++++++++++++-- po/wa.po | 168 ++++++++++++++++++++++++++++++++-- po/wine.pot | 164 +++++++++++++++++++++++++++++++-- po/zh_CN.po | 168 +++++++++++++++++++++++++++++++-- po/zh_TW.po | 189 ++++++++++++++++++++++++++++++++++---- programs/progman/Cs.rc | 68 -------------- programs/progman/Da.rc | 68 -------------- programs/progman/De.rc | 66 ------------- programs/progman/En.rc | 68 -------------- programs/progman/Es.rc | 68 -------------- programs/progman/Fr.rc | 69 -------------- programs/progman/He.rc | 68 -------------- programs/progman/Hu.rc | 68 -------------- programs/progman/It.rc | 68 -------------- programs/progman/Ko.rc | 66 ------------- programs/progman/Lt.rc | 64 ------------- programs/progman/Makefile.in | 4 +- programs/progman/Nl.rc | 68 -------------- programs/progman/No.rc | 68 -------------- programs/progman/Pl.rc | 67 -------------- programs/progman/Pt.rc | 138 ---------------------------- programs/progman/Ro.rc | 66 ------------- programs/progman/Ru.rc | 68 -------------- programs/progman/Si.rc | 68 -------------- programs/progman/Sv.rc | 68 -------------- programs/progman/Tr.rc | 68 -------------- programs/progman/Uk.rc | 68 -------------- programs/progman/Zh.rc | 132 -------------------------- programs/progman/accel.rc | 25 ----- programs/progman/progman.rc | 94 +++++++++++++++++++ 70 files changed, 7119 insertions(+), 2147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a4daaba737df23f5a4bc…

1 0

Alexandre Julliard : makefiles: Generate dependencies for rsrc.pot.
by Alexandre Julliard 10 Jan '11

10 Jan '11

Module: wine Branch: master Commit: 7e6c75f1d1cc595b9be0646ae789289111c415a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6c75f1d1cc595b9be0646ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 8 12:23:48 2011 +0100 makefiles: Generate dependencies for rsrc.pot. --- Make.rules.in | 2 +- tools/makedep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index eea8e8e..f5b2456 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -179,7 +179,7 @@ install install-lib install-dev uninstall:: all: @MAINTAINER_MODE@ $(PO_SRCS:%=rsrc.pot) -$(PO_SRCS:%=rsrc.pot): $(WRC) $(PO_SRCS) +rsrc.pot: $(WRC) $(LDPATH) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS) $(MC_SRCS:.mc=.mc.rc): $(WMC) diff --git a/tools/makedep.c b/tools/makedep.c index 32b7f05..27eb1e5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -854,7 +854,7 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) } else if (!strcmp( ext, "rc" )) /* resource file */ { - *column += fprintf( file, "%s.res: %s", obj, pFile->filename ); + *column += fprintf( file, "rsrc.pot %s.res: %s", obj, pFile->filename ); } else if (!strcmp( ext, "mc" )) /* message file */ {

1 0

Alexandre Julliard : Wine release 1.3.11
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: website Branch: master Commit: 1efd402723eaf5d344c5db333aa45d23d41d654e URL: http://source.winehq.org/git/website.git/?a=commit;h=1efd402723eaf5d344c5db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 7 19:38:02 2011 +0100 Wine release 1.3.11 --- news/en/2011010701.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2011010701.xml b/news/en/2011010701.xml new file mode 100644 index 0000000..fae6bd1 --- /dev/null +++ b/news/en/2011010701.xml @@ -0,0 +1,16 @@ +<news> +<date>January 7, 2011</date> +<title>Wine 1.3.11 Released</title> +<body> + The Wine development release 1.3.11 is now available. + <a href="{$root}/announce/1.3.11">What's new</a> in this release: +<ul> + <li>PO files now used for translations.</li> + <li>Various JavaScript improvements.</li> + <li>Some fixes to the Wine debugger.</li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.11.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.11.
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: master Commit: fe6735b184d0067424647fdb69eba4a2a67a6165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe6735b184d0067424647fdb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 7 19:27:53 2011 +0100 Release 1.3.11. --- ANNOUNCE | 960 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 505 insertions(+), 475 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe6735b184d0067424647…

1 0

Tag wine-1.3.11 : Alexandre Julliard : Release 1.3.11
by Alexandre Julliard 07 Jan '11

07 Jan '11

Module: wine Branch: refs/tags/wine-1.3.11 Tag: 0fdff3e1e6caf5336e80d43d5fa985980e02bb84 URL: http://source.winehq.org/git/wine.git/?a=tag;h=0fdff3e1e6caf5336e80d43d5fa9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 7 19:27:57 2011 +0100 Release 1.3.11

1 0