October 2011 - Wine-Commits

Alexandre Julliard : makefiles: Build the pot files with a separate pass from the top-level makefile.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: 9c98f6911b6ea991aee4cad18c16485fff0fedd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c98f6911b6ea991aee4cad18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 22 14:54:03 2011 +0200 makefiles: Build the pot files with a separate pass from the top-level makefile. --- Make.rules.in | 2 -- aclocal.m4 | 57 +++++++++++++++++++++++++++------------------------------ configure | 57 +++++++++++++++++++++++++++------------------------------ 3 files changed, 54 insertions(+), 62 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index c3409ac..a095666 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -180,8 +180,6 @@ install install-lib install-dev uninstall:: # Rules for resources -all: @MAINTAINER_MODE@ $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) - rsrc.pot: $(WRC) $(LDPATH) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS) diff --git a/aclocal.m4 b/aclocal.m4 index 41274ad..7a75fa9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -199,6 +199,31 @@ $ac_dir/__depend__: $ac_makedep dummy @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend" } +wine_fn_pot_rules () +{ + ac_dir=$[1] + ac_flags=$[2] + + test "x$enable_maintainer_mode" = xyes || return + + if wine_fn_has_flag mc $ac_flags + then + wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/msg.pot: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) msg.pot +$ac_dir/msg.pot: tools/wmc include" + fi + if wine_fn_has_flag po $ac_flags + then + wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/rsrc.pot: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) rsrc.pot +$ac_dir/srsrc.pot: tools/wrc include" + fi +} + wine_fn_config_makefile () { ac_dir=$[1] @@ -322,21 +347,7 @@ $ac_dir/__uninstall__:: fi fi - if test "x$enable_maintainer_mode" = xyes - then - if wine_fn_has_flag mc $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/msg.pot: $ac_dir" - fi - if wine_fn_has_flag po $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/rsrc.pot: $ac_dir" - fi - fi]) + wine_fn_pot_rules $ac_dir $ac_flags]) if wine_fn_has_flag staticimplib $ac_flags then @@ -432,21 +443,7 @@ wine_fn_config_program () AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir: __builddeps__" - if test "x$enable_maintainer_mode" = xyes - then - if wine_fn_has_flag mc $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/msg.pot: $ac_dir" - fi - if wine_fn_has_flag po $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/rsrc.pot: $ac_dir" - fi - fi + wine_fn_pot_rules $ac_dir $ac_flags wine_fn_has_flag install $ac_flags || return wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ diff --git a/configure b/configure index 8cfccff3..2163c84 100755 --- a/configure +++ b/configure @@ -14224,6 +14224,31 @@ $ac_dir/__depend__: $ac_makedep dummy @./config.status --file $ac_dir/Makefile:$ac_input && cd $ac_dir && \$(MAKE) depend" } +wine_fn_pot_rules () +{ + ac_dir=$1 + ac_flags=$2 + + test "x$enable_maintainer_mode" = xyes || return + + if wine_fn_has_flag mc $ac_flags + then + wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/msg.pot: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) msg.pot +$ac_dir/msg.pot: tools/wmc include" + fi + if wine_fn_has_flag po $ac_flags + then + wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"$ac_dir/rsrc.pot: $ac_dir/Makefile dummy + @cd $ac_dir && \$(MAKE) rsrc.pot +$ac_dir/srsrc.pot: tools/wrc include" + fi +} + wine_fn_config_makefile () { ac_dir=$1 @@ -14348,21 +14373,7 @@ $ac_dir/__uninstall__:: fi fi - if test "x$enable_maintainer_mode" = xyes - then - if wine_fn_has_flag mc $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/msg.pot: $ac_dir" - fi - if wine_fn_has_flag po $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/rsrc.pot: $ac_dir" - fi - fi + wine_fn_pot_rules $ac_dir $ac_flags fi if wine_fn_has_flag staticimplib $ac_flags @@ -14462,21 +14473,7 @@ else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "$ac_dir: __builddeps__" - if test "x$enable_maintainer_mode" = xyes - then - if wine_fn_has_flag mc $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/msg.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/msg.pot: $ac_dir" - fi - if wine_fn_has_flag po $ac_flags - then - wine_fn_append_file ALL_POT_FILES $ac_dir/rsrc.pot - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"$ac_dir/rsrc.pot: $ac_dir" - fi - fi + wine_fn_pot_rules $ac_dir $ac_flags wine_fn_has_flag install $ac_flags || return wine_fn_append_rule ALL_MAKEFILE_DEPENDS \

1 0

Aric Stewart : msctf: Increase buffer to have room for full key.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: d5090fd9757fbee2190eaa0f54ea39ebcfe657e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5090fd9757fbee2190eaa0f5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 21 20:26:40 2011 -0500 msctf: Increase buffer to have room for full key. --- dlls/msctf/categorymgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/categorymgr.c b/dlls/msctf/categorymgr.c index 7c19c12..a487404 100644 --- a/dlls/msctf/categorymgr.c +++ b/dlls/msctf/categorymgr.c @@ -203,7 +203,7 @@ static HRESULT WINAPI CategoryMgr_FindClosestCategory ( ITfCategoryMgr *iface, { static const WCHAR fmt[] = { '%','s','\\','%','s','\\','C','a','t','e','g','o','r','y','\\','I','t','e','m','\\','%','s',0}; - WCHAR fullkey[110]; + WCHAR fullkey[120]; WCHAR buf[39]; HKEY key; HRESULT hr = S_FALSE;

1 0

Juan Lang : wininet: Accept RFC 850 dates in HTTP headers.
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: aeca2f98fa6086b0a83d9acece336e91a6a6df6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeca2f98fa6086b0a83d9acec… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 21 22:55:14 2011 -0700 wininet: Accept RFC 850 dates in HTTP headers. --- dlls/wininet/http.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 134 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 50630ba..d1a870b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3989,7 +3989,7 @@ static void HTTP_InsertCookies(http_request_t *request) heap_free(cookies); } -static WORD HTTP_ParseDay(LPCWSTR day) +static WORD HTTP_ParseWkday(LPCWSTR day) { static const WCHAR days[7][4] = {{ 's','u','n',0 }, { 'm','o','n',0 }, @@ -4107,7 +4107,7 @@ static BOOL HTTP_ParseDateAsAsctime(LPCWSTR value, FILETIME *ft) dayPtr - day < sizeof(day) / sizeof(day[0]) - 1; ptr++, dayPtr++) *dayPtr = *ptr; *dayPtr = 0; - st.wDayOfWeek = HTTP_ParseDay(day); + st.wDayOfWeek = HTTP_ParseWkday(day); if (st.wDayOfWeek >= 7) { ERR("unexpected weekday %s\n", debugstr_w(day)); @@ -4186,15 +4186,15 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) return FALSE; if (ptr - value != 3) { - ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + WARN("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); return FALSE; } memcpy(day, value, (ptr - value) * sizeof(WCHAR)); day[3] = 0; - st.wDayOfWeek = HTTP_ParseDay(day); + st.wDayOfWeek = HTTP_ParseWkday(day); if (st.wDayOfWeek > 6) { - ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + WARN("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); return FALSE; } ptr++; @@ -4205,7 +4205,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) num = strtoulW(ptr, &nextPtr, 10); if (!nextPtr || nextPtr <= ptr || !num || num > 31) { - ERR("unexpected day %s\n", debugstr_w(value)); + WARN("unexpected day %s\n", debugstr_w(value)); return FALSE; } ptr = nextPtr; @@ -4222,7 +4222,7 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) st.wMonth = HTTP_ParseMonth(month); if (!st.wMonth || st.wMonth > 12) { - ERR("unexpected month %s\n", debugstr_w(month)); + WARN("unexpected month %s\n", debugstr_w(month)); return FALSE; } @@ -4252,11 +4252,125 @@ static BOOL HTTP_ParseRfc1123Date(LPCWSTR value, FILETIME *ft) return SystemTimeToFileTime(&st, ft); } -/* FIXME: only accepts dates in RFC 1123 format and asctime() format, - * which may not be the only formats actually seen in the wild. - * http://www.hackcraft.net/web/datetime/ suggests at least RFC 850 dates - * should be accepted as well. - */ +static WORD HTTP_ParseWeekday(LPCWSTR day) +{ + static const WCHAR days[7][10] = {{ 's','u','n','d','a','y',0 }, + { 'm','o','n','d','a','y',0 }, + { 't','u','e','s','d','a','y',0 }, + { 'w','e','d','n','e','s','d','a','y',0 }, + { 't','h','u','r','s','d','a','y',0 }, + { 'f','r','i','d','a','y',0 }, + { 's','a','t','u','r','d','a','y',0 }}; + int i; + for (i = 0; i < sizeof(days)/sizeof(*days); i++) + if (!strcmpiW(day, days[i])) + return i; + + /* Invalid */ + return 7; +} + +static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft) +{ + static const WCHAR gmt[]= { 'G','M','T',0 }; + WCHAR *nextPtr, day[10], month[4], *monthPtr; + LPCWSTR ptr; + unsigned long num; + SYSTEMTIME st = { 0 }; + + ptr = strchrW(value, ','); + if (!ptr) + return FALSE; + if (ptr - value == 3) + { + memcpy(day, value, (ptr - value) * sizeof(WCHAR)); + day[3] = 0; + st.wDayOfWeek = HTTP_ParseWkday(day); + if (st.wDayOfWeek > 6) + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + } + else if (ptr - value <= sizeof(day) / sizeof(day[0])) + { + memcpy(day, value, (ptr - value) * sizeof(WCHAR)); + day[ptr - value + 1] = 0; + st.wDayOfWeek = HTTP_ParseWeekday(day); + if (st.wDayOfWeek > 6) + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + } + else + { + ERR("unexpected weekday %s\n", debugstr_wn(value, ptr - value)); + return FALSE; + } + ptr++; + + while (isspaceW(*ptr)) + ptr++; + + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr || !num || num > 31) + { + ERR("unexpected day %s\n", debugstr_w(value)); + return FALSE; + } + ptr = nextPtr; + st.wDay = (WORD)num; + + if (*ptr != '-') + { + ERR("unexpected month format %s\n", debugstr_w(ptr)); + return FALSE; + } + ptr++; + + for (monthPtr = month; *ptr != '-' && + monthPtr - month < sizeof(month) / sizeof(month[0]) - 1; + monthPtr++, ptr++) + *monthPtr = *ptr; + *monthPtr = 0; + st.wMonth = HTTP_ParseMonth(month); + if (!st.wMonth || st.wMonth > 12) + { + ERR("unexpected month %s\n", debugstr_w(month)); + return FALSE; + } + + if (*ptr != '-') + { + ERR("unexpected year format %s\n", debugstr_w(ptr)); + return FALSE; + } + ptr++; + + num = strtoulW(ptr, &nextPtr, 10); + if (!nextPtr || nextPtr <= ptr || num < 1601 || num > 30827) + { + ERR("unexpected year %s\n", debugstr_w(value)); + return FALSE; + } + ptr = nextPtr; + st.wYear = (WORD)num; + + if (!HTTP_ParseTime(&st, &ptr)) + return FALSE; + + while (isspaceW(*ptr)) + ptr++; + + if (strcmpW(ptr, gmt)) + { + ERR("unexpected time zone %s\n", debugstr_w(ptr)); + return FALSE; + } + return SystemTimeToFileTime(&st, ft); +} + static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) { static const WCHAR zero[] = { '0',0 }; @@ -4268,7 +4382,15 @@ static BOOL HTTP_ParseDate(LPCWSTR value, FILETIME *ft) ret = TRUE; } else if (strchrW(value, ',')) + { ret = HTTP_ParseRfc1123Date(value, ft); + if (!ret) + { + ret = HTTP_ParseRfc850Date(value, ft); + if (!ret) + ERR("unexpected date format %s\n", debugstr_w(value)); + } + } else { ret = HTTP_ParseDateAsAsctime(value, ft);

1 0

André Hentschel : Wine 1.3.31 freigegeben
by Jeremy Newman Oct. 24, 2011

Oct. 24, 2011

Module: website Branch: master Commit: c8233db95169feb50210f8d3e0fdb3fccef76c28 URL: http://source.winehq.org/git/website.git/?a=commit;h=c8233db95169feb50210f8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Oct 23 18:09:04 2011 +0200 Wine 1.3.31 freigegeben --- news/de/2011102101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2011102101.xml b/news/de/2011102101.xml new file mode 100644 index 0000000..477b1e4 --- /dev/null +++ b/news/de/2011102101.xml @@ -0,0 +1,16 @@ +<news> +<date>21. Oktober 2011</date> +<title>Wine 1.3.31 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.31 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.31">Neuerungen (en)</a> in dieser Version: +<ul> + <li>BiDi Textunterstützung im einzeiligen Edit Control.</li> + <li>Unterstützung für StretchDIBits und AlphaBlend in der DIB Engine.</li> + <li>Ein paar Audio Fehlerbehebungen.</li> + <li>VBScript Verbesserungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.31.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.31
by Jeremy Newman Oct. 24, 2011

Oct. 24, 2011

Module: website Branch: master Commit: 071faa130e5d47d09aa46fb10603dff8e505bccb URL: http://source.winehq.org/git/website.git/?a=commit;h=071faa130e5d47d09aa46f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Oct 22 08:20:25 2011 +0200 Polish translation for release 1.3.31 --- news/pl/2011102101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pl/2011102101.xml b/news/pl/2011102101.xml new file mode 100644 index 0000000..c7d4305 --- /dev/null +++ b/news/pl/2011102101.xml @@ -0,0 +1,16 @@ +<news> +<date>Październik 21, 2011</date> +<title>Wydano Wine 1.3.31</title> +<body> + Wydanie rozwojowe Wine 1.3.31 jest już dostępne. + <a href="{$root}/announce/1.3.31">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie tekstu BiDi w jednowierszowej kontrolce edycji.</li> + <li>Wsparcie dla StretchDIBits i AlphaBlend w silniku DIB.</li> + <li>Kilka poprawek do dźwięku.</li> + <li>Ulepszenia w VBScript.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.31.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.31
by Jeremy Newman Oct. 24, 2011

Oct. 24, 2011

Module: website Branch: master Commit: 2f3b198aab6cf51607c28897ee18108345ab30ee URL: http://source.winehq.org/git/website.git/?a=commit;h=2f3b198aab6cf51607c288… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 21 22:01:06 2011 +0200 French translation for release 1.3.31 --- news/fr/2011102101.xml | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/news/fr/2011102101.xml b/news/fr/2011102101.xml new file mode 100644 index 0000000..9871acb --- /dev/null +++ b/news/fr/2011102101.xml @@ -0,0 +1,19 @@ +<news> +<date>21 octobre 2011</date> +<title>Sortie de Wine 1.3.31</title> +<body> + La version de développement 1.3.31 de Wine est disponible. + <a href="{$root}/announce/1.3.31">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de texte BiDi dans le contrôle d'édition monoligne.</li> + <li>Support de StretchDIBits et AlphaBlend dans le moteur DIB.</li> + <li>Quelques correctifs audio.</li> + <li>Améliorations VBScript.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.31.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.31
by Alexandre Julliard Oct. 21, 2011

Oct. 21, 2011

Module: website Branch: master Commit: c4d1119708443832b4835723f291bc154adb6b04 URL: http://source.winehq.org/git/website.git/?a=commit;h=c4d1119708443832b48357… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 20:48:30 2011 +0200 Wine release 1.3.31 --- news/en/2011102101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2011102101.xml b/news/en/2011102101.xml new file mode 100644 index 0000000..1832975 --- /dev/null +++ b/news/en/2011102101.xml @@ -0,0 +1,16 @@ +<news> +<date>October 21, 2011</date> +<title>Wine 1.3.31 Released</title> +<body> + The Wine development release 1.3.31 is now available. + <a href="{$root}/announce/1.3.31">What's new</a> in this release: +<ul> + <li>BiDi text support in the single-line edit control.</li> + <li>Support for StretchDIBits and AlphaBlend in the DIB engine.</li> + <li>A number of audio fixes.</li> + <li>VBScript improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.31.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

Tag wine-1.3.31 : Alexandre Julliard : Release 1.3.31
by Alexandre Julliard Oct. 21, 2011

Oct. 21, 2011

Module: wine Branch: refs/tags/wine-1.3.31 Tag: a6e549de1ca0f3c62356f8674d51c4284bcbeab5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=a6e549de1ca0f3c62356f8674d51… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 20:38:36 2011 +0200 Release 1.3.31

1 0

Alexandre Julliard : Release 1.3.31.
by Alexandre Julliard Oct. 21, 2011

Oct. 21, 2011

Module: wine Branch: master Commit: 29c16f62e8d89971ba361b2db372eec8e0fcd138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c16f62e8d89971ba361b2db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 20:38:36 2011 +0200 Release 1.3.31. --- ANNOUNCE | 1076 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 562 insertions(+), 534 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29c16f62e8d89971ba361…

1 0

Jacek Caban : hlink: Added TargetFrameName tests.
by Alexandre Julliard Oct. 21, 2011

Oct. 21, 2011

Module: wine Branch: master Commit: 28c94f5a53963773bf7fc8db9f56fb4625d43602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c94f5a53963773bf7fc8db9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 21 15:12:43 2011 +0200 hlink: Added TargetFrameName tests. --- dlls/hlink/tests/hlink.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 2b2cfaa..15191df 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1821,6 +1821,43 @@ static void test_HlinkClone(void) IMoniker_Release(dummy); } +static void test_StdHlink(void) +{ + IHlink *hlink; + WCHAR *str; + HRESULT hres; + + static const WCHAR testW[] = {'t','e','s','t',0}; + + hres = CoCreateInstance(&CLSID_StdHlink, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IHlink, (void**)&hlink); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHlink_GetTargetFrameName(hlink, &str); + ok(hres == S_FALSE, "GetTargetFrameName failed: %08x\n", hres); + ok(!str, "str = %s\n", wine_dbgstr_w(str)); + + hres = IHlink_SetTargetFrameName(hlink, testW); + ok(hres == S_OK, "SetTargetFrameName failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHlink_GetTargetFrameName(hlink, &str); + ok(hres == S_OK, "GetTargetFrameName failed: %08x\n", hres); + ok(!lstrcmpW(str, testW), "str = %s\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); + + hres = IHlink_SetTargetFrameName(hlink, NULL); + ok(hres == S_OK, "SetTargetFrameName failed: %08x\n", hres); + + str = (void*)0xdeadbeef; + hres = IHlink_GetTargetFrameName(hlink, &str); + ok(hres == S_FALSE, "GetTargetFrameName failed: %08x\n", hres); + ok(!str, "str = %s\n", wine_dbgstr_w(str)); + + IHlink_Release(hlink); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -1838,6 +1875,7 @@ START_TEST(hlink) test_HashLink(); test_HlinkSite(); test_HlinkClone(); + test_StdHlink(); CoUninitialize(); }

1 0