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

Nikolay Sivov : msxml3: Silence a warning in ::get_baseName() for document nodes.
by Alexandre Julliard 23 Jun '10

23 Jun '10

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 23 Jun '10

23 Jun '10

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

Nikolay Sivov : msxml3: Don't free namespace data tracked in a tree.
by Alexandre Julliard 23 Jun '10

23 Jun '10

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

Michael Stefaniuc : serialui: Add the Romanian translation.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: ea8313b1c1e9bb44253e0889893f2e6b89bf4385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8313b1c1e9bb44253e08898… Author: Michael Stefaniuc <mstefani(a)redhat.com> Date: Wed Jun 23 01:14:16 2010 +0200 serialui: Add the Romanian translation. Translations by Claudia Cotună and Paul Chitescu. --- dlls/serialui/Makefile.in | 1 + dlls/serialui/Ro.rc | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 95a04f3..b293921 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -28,6 +28,7 @@ RC_SRCS = \ No.rc \ Pl.rc \ Pt.rc \ + Ro.rc \ Ru.rc \ Si.rc \ Sv.rc \ diff --git a/dlls/serialui/Ro.rc b/dlls/serialui/Ro.rc new file mode 100644 index 0000000..1fe3981 --- /dev/null +++ b/dlls/serialui/Ro.rc @@ -0,0 +1,45 @@ +/* + * Copyright 2000 Mike McCormack + * Copyright 2010 Claudia Cotună + * Paul Chitescu + * Michael Stefaniuc + * + * 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 + */ + +#include "serialui.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_SERIALUICONFIG DIALOG DISCARDABLE 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Proprietăți pentru " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Rata de transfer", -1,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Paritate", -1,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Controlul fluxului", -1,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Biţi de date", -1,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Biţi de stop", -1,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK,30,138,50,14 + PUSHBUTTON "Renunță", IDCANCEL,85,138,50,14 +END

1 0

Francois Gouget : d3d10/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: 7d66375fba780ae43c03720363f95bf6f0ff82ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d66375fba780ae43c0372036… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:49:15 2010 +0200 d3d10/tests: Add a trailing '\n' to ok() calls. --- dlls/d3d10/tests/effect.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a8c5886..eab6d6d 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -3536,7 +3536,7 @@ static void test_effect_get_variable_by(ID3D10Device *device) /* variable f1 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 0); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "f1"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); @@ -3546,7 +3546,7 @@ static void test_effect_get_variable_by(ID3D10Device *device) /* variable f2 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 1); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "f2"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); @@ -3556,18 +3556,18 @@ static void test_effect_get_variable_by(ID3D10Device *device) /* variable f3 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 2); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "f3"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); variable = effect->lpVtbl->GetVariableBySemantic(effect, "SV_POSITION"); - ok(variable != null_variable, "GetVariableBySemantic failed %p", variable); - ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable); + ok(variable != null_variable, "GetVariableBySemantic failed %p\n", variable); + ok(variable != variable_by_index, "GetVariableBySemantic failed %p\n", variable); /* variable f4 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 3); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "f4"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); @@ -3577,7 +3577,7 @@ static void test_effect_get_variable_by(ID3D10Device *device) /* variable tex1 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 4); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "tex1"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); @@ -3587,14 +3587,14 @@ static void test_effect_get_variable_by(ID3D10Device *device) /* variable tex2 */ variable_by_index = effect->lpVtbl->GetVariableByIndex(effect, 5); - ok(null_variable != variable_by_index, "GetVariableByIndex failed %p", variable_by_index); + ok(null_variable != variable_by_index, "GetVariableByIndex failed %p\n", variable_by_index); variable = effect->lpVtbl->GetVariableByName(effect, "tex2"); ok(variable_by_index == variable, "GetVariableByName got %p, expected %p\n", variable, variable_by_index); variable = effect->lpVtbl->GetVariableBySemantic(effect, "COLOR1"); - ok(variable != null_variable, "GetVariableBySemantic failed %p", variable); - ok(variable != variable_by_index, "GetVariableBySemantic failed %p", variable); + ok(variable != null_variable, "GetVariableBySemantic failed %p\n", variable); + ok(variable != variable_by_index, "GetVariableBySemantic failed %p\n", variable); effect->lpVtbl->Release(effect); }

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 23 Jun '10

23 Jun '10

Module: wine Branch: master Commit: eb8ce091cb7b1e94726f47f30c31723cbb5471ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8ce091cb7b1e94726f47f30… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 22 17:49:41 2010 +0200 msvcrt/tests: Add a trailing '\n' to an ok() call. --- dlls/msvcrt/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1a362a1..b70d777 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -975,7 +975,7 @@ static void test__strtoi64(void) ok(res == 123, "res != 123\n"); ok(endpos == oct+strlen(oct), "Incorrect endpos (%p-%p)\n", oct, endpos); res = p_strtoi64(blanks, &endpos, 10); - ok(res == 12, "res != 12"); + ok(res == 12, "res != 12\n"); ok(endpos == blanks+10, "Incorrect endpos (%p-%p)\n", blanks, endpos); ok(errno == 0xdeadbeef, "errno = %x\n", errno);

1 0

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

23 Jun '10

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 : usp10/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 23 Jun '10

23 Jun '10

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 23 Jun '10

23 Jun '10

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

Francois Gouget : shlwapi/tests: Make the XXX_Construct() functions static.
by Alexandre Julliard 23 Jun '10

23 Jun '10

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