June 2010 - Wine-Commits - list.winehq.org

Nikolay Sivov : msxml3: Don't free namespace data tracked in a tree.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 16e465c7ae1710a51b0fa156304e277d158dbab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e465c7ae1710a51b0fa1563… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 23 02:33:02 2010 +0400 msxml3: Don't free namespace data tracked in a tree. Fixes regression from ea9a6a4b4e33cc8f56bc7835f7f05146487fb5d2. --- dlls/msxml3/xmlelem.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c index 0327604..a71b18b 100644 --- a/dlls/msxml3/xmlelem.c +++ b/dlls/msxml3/xmlelem.c @@ -262,7 +262,6 @@ static HRESULT WINAPI xmlelem_getAttribute(IXMLElement *iface, BSTR name, xmlNsPtr ns; ns = xmlSearchNs(This->node->doc, This->node, (xmlChar*)"xml"); val = xmlGetNsProp(This->node, (xmlChar*)"lang", ns->href); - xmlFreeNs(ns); } else {

1 0

Sven Baars : oledlg: Fix Dutch translation.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 9aa71a1fc664763076aadab3ace4ef39395bc558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa71a1fc664763076aadab3a… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jun 22 21:19:43 2010 +0200 oledlg: Fix Dutch translation. --- dlls/oledlg/oledlg_Nl.rc | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/oledlg/oledlg_Nl.rc b/dlls/oledlg/oledlg_Nl.rc index 58a63da..e81b010 100644 --- a/dlls/oledlg/oledlg_Nl.rc +++ b/dlls/oledlg/oledlg_Nl.rc @@ -22,6 +22,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL +#pragma code_page(65001) + UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Object invoegen" @@ -36,12 +38,12 @@ BEGIN GROUPBOX "Resultaat",IDC_RESULT,7,103,208,41 CONTROL "Nieuw",IDC_CREATENEW,"Button",BS_AUTORADIOBUTTON | WS_GROUP,7,20,62,10 - CONTROL "Cre�ren",IDC_CREATECONTROL,"Button", + CONTROL "Creëren",IDC_CREATECONTROL,"Button", BS_AUTORADIOBUTTON | NOT WS_VISIBLE,7,54,62,10 CONTROL "Bestand gebruiken",IDC_CREATEFROMFILE,"Button", BS_AUTORADIOBUTTON,7,37,67,10 LTEXT "",IDC_RESULTDESC,49,112,159,23 - PUSHBUTTON "Toevoegen...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE + PUSHBUTTON "&Toevoegen...",IDC_ADDCONTROL,81,88,63,14,NOT WS_VISIBLE CONTROL "Als pictogram weergeven",IDC_ASICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | NOT WS_VISIBLE,223,58,64,10 PUSHBUTTON "Bladeren...",IDC_BROWSE,83,53,50,14,NOT WS_VISIBLE @@ -51,10 +53,10 @@ END STRINGTABLE DISCARDABLE { - IDS_RESULTOBJDESC "Voeg een nieuw %s object in uw document" - IDS_RESULTFILEOBJDESC "Voeg de inhoud van het bestand als object in uw document zodat u het later kunt bewerken met het programma waarmee u het heeft gemaakt." + IDS_RESULTOBJDESC "Voeg een nieuw %s object in uw document in" + IDS_RESULTFILEOBJDESC "Voeg de inhoud van het bestand als object in uw document in, zodat u het later kunt bewerken met het programma waarmee u het heeft gemaakt." IDS_BROWSE "Bladeren" - IDS_NOTOLEMOD "Het bestand is geen geldig OLE bestand. Registratie is mislukt." + IDS_NOTOLEMOD "Het bestand is geen geldig OLE bestand. De registratie is mislukt." IDS_NOTOLEMODCAPTION "Toevoegen" } @@ -66,7 +68,7 @@ BEGIN LTEXT "Bron:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP CONTROL "&Plakken", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 6, 38, 55, 10 - CONTROL "Plakken &Verwijzing", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + CONTROL "Plak &verwijzing", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, 6, 63, 55, 10 LTEXT "&Als:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE @@ -75,25 +77,25 @@ BEGIN CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 CONTROL "Annuleren", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 CONTROL "&Help", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 - CONTROL "&Toon Als Icoon", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "Als pictogram &weergeven", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 - CONTROL "Verander &Icoon...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "Wijzig p&ictogram...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 - CONTROL "<< resultaat tekst komt hier >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "<< resultaattekst komt hier >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 CONTROL "Resultaat", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 END STRINGTABLE DISCARDABLE { - IDS_PS_PASTE_DATA "Voegt de inhoud van het clipbord in uw document als %s." - IDS_PS_PASTE_OBJECT "Voegt de inhoud van het clipbord in uw document zodat u het kan activeren met %s." - IDS_PS_PASTE_OBJECT_AS_ICON "Voegt de inhoud van het clipbord in uw document zodat u het kan activeren met %s. Het zal getoond worden als een icoon." - IDS_PS_PASTE_LINK_DATA "Voegt de inhoud van het clipbord in uw document als %s. De data is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document." - IDS_PS_PASTE_LINK_OBJECT "Voegt een afbeelding vanuit het clipbord in uw document. De afbeelding is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document." - IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Voegt een verwijzing in die wijst naar de locatie van de inhoud van het clipbord. De verwijzing is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document." - IDS_PS_NON_OLE "Voegt de inhoud van het clipbord in uw document." - IDS_PS_UNKNOWN_TYPE "Onbekend Type" - IDS_PS_UNKNOWN_SRC "Onbekende Bron" - IDS_PS_UNKNOWN_APP "het programma die het gecre�erd heeft" + IDS_PS_PASTE_DATA "Voegt de inhoud van het klembord in uw document in als %s." + IDS_PS_PASTE_OBJECT "Voegt de inhoud van het klembord in uw document in zodat u het kan activeren met %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Voegt de inhoud van het klembord in uw document in zodat u het kan activeren met %s. Het zal getoond worden als een icoon." + IDS_PS_PASTE_LINK_DATA "Voegt de inhoud van het klembord in uw document in als %s. De data is verbonden met het bron bestand zodat wijzigingen in dat bestand worden getoond in uw document." + IDS_PS_PASTE_LINK_OBJECT "Voegt een afbeelding vanuit het klembord in uw document in. De afbeelding is verbonden met het bronbestand, zodat wijzigingen in dat bestand worden getoond in uw document." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Voegt een verwijzing in die wijst naar de locatie van de inhoud van het klembord. De verwijzing is verbonden met het bronbestand, zodat wijzigingen in dat bestand worden getoond in uw document." + IDS_PS_NON_OLE "Voegt de inhoud van het klembord in uw document." + IDS_PS_UNKNOWN_TYPE "Onbekend type" + IDS_PS_UNKNOWN_SRC "Onbekende bron" + IDS_PS_UNKNOWN_APP "het programma die het gecreëerd heeft" }

1 0

Nikolay Sivov : msxml3: Silence a warning in ::get_baseName() for document nodes.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: d24d007fa5ef35abb5a83d9b399645243b242356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d24d007fa5ef35abb5a83d9b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 22 22:47:36 2010 +0400 msxml3: Silence a warning in ::get_baseName() for document nodes. --- dlls/msxml3/node.c | 1 + dlls/msxml3/tests/domdoc.c | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 31c6e46..135844f 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1632,6 +1632,7 @@ static HRESULT WINAPI xmlnode_get_baseName( break; case XML_TEXT_NODE: case XML_COMMENT_NODE: + case XML_DOCUMENT_NODE: break; default: ERR("Unhandled type %d\n", This->node->type ); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 605628f..d85e9fb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -656,6 +656,11 @@ if (0) r = IXMLDOMDocument_get_nodeName( doc, NULL ); ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); + str = (BSTR)0xdeadbeef; + r = IXMLDOMDocument_get_baseName( doc, &str ); + ok ( r == S_FALSE, "got 0x%08x\n", r); + ok (str == NULL, "got %p\n", str); + /* content doesn't matter here */ str = NULL; r = IXMLDOMDocument_get_nodeName( doc, &str );

1 0

Nikolay Sivov : msxml3: Accept CLSID_FreeThreadedDOMDocument30 in class factory.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 15720f8141231459138f1a0df7cafdc5b308cec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15720f8141231459138f1a0df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 23 00:47:04 2010 +0400 msxml3: Accept CLSID_FreeThreadedDOMDocument30 in class factory. --- dlls/msxml3/factory.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index af94d5c..3fd229c 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -162,7 +162,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) cf = (IClassFactory*) &xmldoccf.lpVtbl; } else if( IsEqualCLSID( rclsid, &CLSID_DOMFreeThreadedDocument ) || /* Version indep. v 2.x */ - IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) ) + IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument ) || + IsEqualCLSID( rclsid, &CLSID_FreeThreadedDOMDocument30 )) { cf = (IClassFactory*) &domdoccf.lpVtbl; }

1 0

André Hentschel : winemaker: Ignore the Global section .
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 61622fe8d1804e2fba8a7a57fda1650195411bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61622fe8d1804e2fba8a7a57f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 22 18:01:03 2010 +0200 winemaker: Ignore the Global section. --- tools/winemaker | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 23f800f..bed499d 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1163,6 +1163,8 @@ sub source_scan_workspace_file($) next; } elsif (/^#/) { # ignore Comments + } elsif (/^Global:/) { + # ignore the Global section } elsif (/\w:/) { print STDERR "unknown section $_\n"; } elsif (/^Microsoft(.*)Studio(.*)File,\sFormat Version\s(.*)/) {

1 0

Francois Gouget : opengl32/tests: Add a trailing '\n' to a skip() call.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 8e7ad1906450ccf0cbd1680c94441589752bb560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7ad1906450ccf0cbd1680c9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:50:05 2010 +0200 opengl32/tests: Add a trailing '\n' to a skip() call. --- dlls/opengl32/tests/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 7568f47..2b81dda 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -553,7 +553,7 @@ static void test_bitmap_rendering(void) if(!iPixelFormat) { - skip("Unable to find a suitable pixel format"); + skip("Unable to find a suitable pixel format\n"); } else {

1 0

Francois Gouget : shlwapi/tests: Make the XXX_Construct() functions static.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: aebbbcb06b3882fbd4f382951b7b2df7839564c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aebbbcb06b3882fbd4f382951… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:51:28 2010 +0200 shlwapi/tests: Make the XXX_Construct() functions static. --- dlls/shlwapi/tests/ordinal.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index cfc25e1..bf61418 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1960,7 +1960,7 @@ typedef struct { static const IOleCommandTargetVtbl IOleCommandTargetImpl_Vtbl; -IOleCommandTarget* IOleCommandTargetImpl_Construct(void) +static IOleCommandTarget* IOleCommandTargetImpl_Construct(void) { IOleCommandTargetImpl *obj; @@ -2050,7 +2050,7 @@ typedef struct { static const IServiceProviderVtbl IServiceProviderImpl_Vtbl; static const IProfferServiceVtbl IProfferServiceImpl_Vtbl; -IServiceProvider* IServiceProviderImpl_Construct(void) +static IServiceProvider* IServiceProviderImpl_Construct(void) { IServiceProviderImpl *obj; @@ -2061,7 +2061,7 @@ IServiceProvider* IServiceProviderImpl_Construct(void) return (IServiceProvider*)obj; } -IProfferService* IProfferServiceImpl_Construct(void) +static IProfferService* IProfferServiceImpl_Construct(void) { IProfferServiceImpl *obj;

1 0

Francois Gouget : msvcr90/tests: Make test_invalid_parameter_handler() static.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 31f7eb790fc2f10888bbffa482051367d2ab3d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f7eb790fc2f10888bbffa48… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:52:23 2010 +0200 msvcr90/tests: Make test_invalid_parameter_handler() static. --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 2b4fae4..9f6e47b 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -44,7 +44,7 @@ int cb_called[4]; /* ########## */ -void __cdecl test_invalid_parameter_handler(const wchar_t *expression, +static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, unsigned line, uintptr_t arg) {

1 0

Francois Gouget : usp10/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: e39b983f495eb49bdea9bcc33399e803fc4a385d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e39b983f495eb49bdea9bcc33… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:50:48 2010 +0200 usp10/tests: Add a trailing '\n' to an ok() call. --- dlls/usp10/tests/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 522e035..efc0569 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -148,7 +148,7 @@ static void test_ScriptItemize( void ) ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if pItems is NULL\n"); hr = ScriptItemize(test1, 4, 1, &Control, &State, items, NULL); - ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if cMaxItems < 2."); + ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if cMaxItems < 2.\n"); hr = ScriptItemize(test1, 0, 10, NULL, NULL, items, &nItems); ok (hr == E_INVALIDARG, "ScriptItemize should return E_INVALIDARG if cInChars is 0\n");

1 0

Francois Gouget : msvcrt/tests: Make test_dup2() static.
by Alexandre Julliard June 23, 2010

June 23, 2010

Module: wine Branch: master Commit: 1f07f583cf677cf666e2999c08cc269053444f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f07f583cf677cf666e2999c0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:51:13 2010 +0200 msvcrt/tests: Make test_dup2() static. --- dlls/msvcrt/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 3afc149..ef7b28d 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1414,7 +1414,7 @@ static void test_unlink(void) rmdir("test_unlink"); } -void test_dup2(void) +static void test_dup2(void) { ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); }

1 0