September 2009 - Wine-commits

Jacek Caban : mshtml: Added IHTMLDOMNode2::get_ownerDocument implementation .
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 58d67c275863ed34cc476ed1447da5f9a4411962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d67c275863ed34cc476ed14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 20 18:59:57 2009 +0200 mshtml: Added IHTMLDOMNode2::get_ownerDocument implementation. --- dlls/mshtml/htmlnode.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 399355b..8c83e56 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -808,8 +808,12 @@ static HRESULT WINAPI HTMLDOMNode2_Invoke(IHTMLDOMNode2 *iface, DISPID dispIdMem static HRESULT WINAPI HTMLDOMNode2_get_ownerDocument(IHTMLDOMNode2 *iface, IDispatch **p) { HTMLDOMNode *This = HTMLDOMNODE2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = (IDispatch*)HTMLDOC(&This->doc->basedoc); + IDispatch_AddRef(*p); + return S_OK; } #undef HTMLDOMNODE2_THIS

1 0

Marcus Meissner : gdiplus: do not memcpy over NULL ptrs (Coverity).
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: e70e1249c31103af5779ca0928dca9332f8262da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70e1249c31103af5779ca092… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 20 18:48:39 2009 +0200 gdiplus: do not memcpy over NULL ptrs (Coverity). --- dlls/gdiplus/image.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f71bf9a..3dc41b8 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -413,8 +413,7 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) GdipDisposeImage(*cloneImage); *cloneImage = NULL; } - - memcpy(&(*cloneImage)->format, &image->format, sizeof(GUID)); + else memcpy(&(*cloneImage)->format, &image->format, sizeof(GUID)); return stat; }

1 0

Paul Vriens : msi/tests: Fix some test failures on Vista/W2K8.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: c6e7558cdac3de639505cc249a5b871b2508e9fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e7558cdac3de639505cc249… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Sep 19 09:34:07 2009 +0200 msi/tests: Fix some test failures on Vista/W2K8. --- dlls/msi/tests/package.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 5fb5b53..55d9bb3 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -746,7 +746,8 @@ static BOOL create_file_with_version(const CHAR *name, LONG ms, LONG ls) BOOL ret = FALSE; GetSystemDirectory(path, MAX_PATH); - lstrcatA(path, "\\kernel32.dll"); + /* Some dlls can't be updated on Vista/W2K8 */ + lstrcatA(path, "\\version.dll"); CopyFileA(path, name, FALSE);

1 0

Vincent Povirk : gdiplus: Accept version 2 in GdiplusStartup.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: e2615686529d335b07ade552d4c4cdfa32c06ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2615686529d335b07ade552d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 18 15:54:51 2009 -0500 gdiplus: Accept version 2 in GdiplusStartup. --- dlls/gdiplus/gdiplus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 3c13a28..0effc71 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -86,7 +86,7 @@ Status WINAPI GdiplusStartup(ULONG_PTR *token, const struct GdiplusStartupInput input->DebugEventCallback, input->SuppressBackgroundThread, input->SuppressExternalCodecs); - if(input->GdiplusVersion != 1) + if(input->GdiplusVersion < 1 || input->GdiplusVersion > 2) return UnsupportedGdiplusVersion; if(input->SuppressBackgroundThread){

1 0

Vincent Povirk : gdiplus/tests: Reject gdiplus versions greater than 2.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: ed059e117516642dc03e67acb1c178bc7ae9a47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed059e117516642dc03e67acb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 18 15:52:01 2009 -0500 gdiplus/tests: Reject gdiplus versions greater than 2. --- dlls/gdiplus/tests/pen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 707bafc..0bdf280 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -53,7 +53,7 @@ static void test_startup(void) } } - ok(gpversion > 0 && gpversion < 42, "unexpected gdiplus version %i\n", gpversion); + ok(gpversion > 0 && gpversion <= 2, "unexpected gdiplus version %i\n", gpversion); trace("gdiplus version is %i\n", gpversion); status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen);

1 0

Michael Stefaniuc : mapi32: Don't leak memory on an error path (Smatch).
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: eb2c74d5ffecd7b6ee7c8a96fe5d14759bc62264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2c74d5ffecd7b6ee7c8a96f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 18 21:42:51 2009 +0200 mapi32: Don't leak memory on an error path (Smatch). --- dlls/mapi32/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 6a6a5cd..4957941 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -1025,7 +1025,7 @@ void load_mapi_providers(void) /* Open the app's key */ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, appKey, 0, KEY_READ, &hkeyMail) != ERROR_SUCCESS) - return; + goto cleanUp; /* Try to load the providers */ load_mapi_provider(hkeyMail, regkey_dllpath, &mapi_provider);

1 0

Huw Davies : oledb32/tests: Skip tests on older versions of the conversion library.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: f4fb963e2c1b0e5e54ffdd2b337ce6d4ffb054b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4fb963e2c1b0e5e54ffdd2b3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 18 15:14:35 2009 +0100 oledb32/tests: Skip tests on older versions of the conversion library. --- dlls/oledb32/tests/convert.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index cc67ab2..8ff1609 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -213,6 +213,16 @@ static void test_canconvert(void) return; } + /* Some older versions of the library don't support several conversions, we'll skip + if we have such a library */ + hr = IDataConvert_CanConvert(convert, DBTYPE_EMPTY, DBTYPE_DBTIMESTAMP); + if(hr == S_FALSE) + { + win_skip("Doesn't handle DBTYPE_EMPTY -> DBTYPE_DBTIMESTAMP conversion so skipping\n"); + IDataConvert_Release(convert); + return; + } + for(src_idx = 0; src_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); src_idx++) for(dst_idx = 0; dst_idx < sizeof(simple_convert) / sizeof(simple_convert[0]); dst_idx++) {

1 0

Austin English : clock: Fix license in Swedish resources.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 2f44500b80e3a242111a48a445ac15e6dbb4c7b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f44500b80e3a242111a48a44… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 15 11:50:35 2009 -0500 clock: Fix license in Swedish resources. --- programs/clock/Sv.rc | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/programs/clock/Sv.rc b/programs/clock/Sv.rc index 732435c..33d8014 100644 --- a/programs/clock/Sv.rc +++ b/programs/clock/Sv.rc @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma code_page(65001) + #include "clock_res.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL @@ -35,7 +37,7 @@ MAIN_MENU MENU MENUITEM "&Sekunder", IDM_SECONDS MENUITEM "&Datum", IDM_DATE MENUITEM SEPARATOR - MENUITEM "&Alltid �verst", IDM_ONTOP + MENUITEM "&Alltid överst", IDM_ONTOP } POPUP "Inf&o" { MENUITEM "&Licens...", IDM_LICENSE @@ -53,22 +55,22 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL { IDS_LICENSE_CAPTION, "LICENS" IDS_LICENSE, -"Detta program �r fri programvara. Du kan distribuera det och/eller \ -modifiera det under villkoren i GNU General Public License, publicerad \ -av Free Software Foundation, antingen version 2.1 eller (om du s� vill) \ -n�gon senare version. Detta program distribueras i hopp om att det ska \ -vara anv�ndbart,men UTAN N�GON SOM HELST GARANTI, �ven utan \ -underf�rst�dd garanti om S�LJBARHET eller L�MPLIGHET F�R N�GOT \ -SPECIELLT �NDAM�L. Se GNU General Public License f�r ytterligare \ +"Detta program är fri programvara. Du kan distribuera det och/eller modifiera \ +det under villkoren i GNU Lesser General Public License, publicerad \ +av Free Software Foundation, antingen version 2.1 eller (om du så vill) \ +någon senare version. Detta program distribueras i hopp om att det ska \ +vara användbart,men UTAN NÅGON SOM HELST GARANTI, även utan \ +underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT \ +SPECIELLT ÄNDAMÅL. Se GNU Lesser General Public License för ytterligare \ information.\n\ -Du b�r ha f�tt en kopia av GNU General Public License tillsammans \ +Du bör ha fått en kopia av GNU Lesser General Public License tillsammans \ med detta program. Om inte, skriv till Free Software Foundation, \ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" IDS_WARRANTY_CAPTION, "INGEN GARANTI" IDS_WARRANTY, -"Detta program distribueras i hopp om att det ska vara anv�ndbart, \ -men UTAN N�GON SOM HELST GARANTI, �ven utan underf�rst�dd garanti \ -om S�LJBARHET eller L�MPLIGHET F�R N�GOT SPECIELLT �NDAM�L. \ -Se GNU General Public License f�r ytterligare information." +"Detta program distribueras i hopp om att det ska vara användbart, \ +men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti \ +om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. \ +Se GNU Lesser General Public License för ytterligare information." }

1 0

Austin English : progman: Fix license in Swedish resources.
by Alexandre Julliard 22 Sep '09

22 Sep '09

Module: wine Branch: master Commit: 7045cee3429f0e52f8fde9710dd53153646c8c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7045cee3429f0e52f8fde9710… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 15 11:50:55 2009 -0500 progman: Fix license in Swedish resources. --- programs/progman/Sv.rc | 90 ++++++++++++++++++++++++----------------------- 1 files changed, 46 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7045cee3429f0e52f8fde…

1 0

Jeremy Newman : rename and move to Sept 21
by Jeremy Newman 21 Sep '09

21 Sep '09

Module: website Branch: master Commit: a0cecae37f9ac03ae055931aeb604eb852e7234d URL: http://source.winehq.org/git/website.git/?a=commit;h=a0cecae37f9ac03ae05593… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Sep 21 09:33:06 2009 -0500 rename and move to Sept 21 --- news/en/{2009091801.xml => 2009092101.xml} | 2 +- wwn/en/{wn20090918_360.xml => wn20090921_360.xml} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/news/en/2009091801.xml b/news/en/2009092101.xml similarity index 94% rename from news/en/2009091801.xml rename to news/en/2009092101.xml index 22a2991..100fe4b 100644 --- a/news/en/2009091801.xml +++ b/news/en/2009092101.xml @@ -1,5 +1,5 @@ <news> - <date>September 18, 2009</date> + <date>September 21, 2009</date> <title>World Wine News Issue 360</title> <body> <a href="{$root}/wwn/360">WWN Issue 360</a> was released today. diff --git a/wwn/en/wn20090918_360.xml b/wwn/en/wn20090921_360.xml similarity index 99% rename from wwn/en/wn20090918_360.xml rename to wwn/en/wn20090921_360.xml index 0dedde7..042aa84 100644 --- a/wwn/en/wn20090918_360.xml +++ b/wwn/en/wn20090921_360.xml @@ -4,7 +4,7 @@ <title>Wine Traffic</title> <author contact="http://www.bluesata.com">Zachary Goldberg</author> -<issue num="360" date="09/18/2009" /> +<issue num="360" date="09/21/2009" /> <intro> <p>This is the 360 issue of the World Wine News publication. Its main goal is to introduce Wineconf 2009! It also serves to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a></p> </intro> <stats posts="75" size="91" contrib="33" multiples="18" lastweek="22">

1 0