February 2008 - Wine-Commits

Paul Vriens : gdi32/tests: Skip functions that are available but not implemented.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: e9ccee0501b8a9d60a9d24dfdea8c0f37957ca82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ccee0501b8a9d60a9d24dfd… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Feb 26 17:00:33 2008 +0100 gdi32/tests: Skip functions that are available but not implemented. --- dlls/gdi32/tests/icm.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index bbd5574..5cd4bcf 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -35,7 +35,13 @@ static void test_GetICMProfileA( HDC dc ) DWORD size, error; char filename[MAX_PATH]; + SetLastError( 0xdeadbeef ); ret = GetICMProfileA( NULL, NULL, NULL ); + if ( !ret && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) + { + skip( "GetICMProfileA is not implemented\n" ); + return; + } ok( !ret, "GetICMProfileA succeeded\n" ); ret = GetICMProfileA( dc, NULL, NULL ); @@ -73,7 +79,13 @@ static void test_GetICMProfileW( HDC dc ) DWORD size, error; WCHAR filename[MAX_PATH]; + SetLastError( 0xdeadbeef ); ret = GetICMProfileW( NULL, NULL, NULL ); + if ( !ret && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) + { + skip( "GetICMProfileW is not implemented\n" ); + return; + } ok( !ret, "GetICMProfileW succeeded\n" ); ret = GetICMProfileW( dc, NULL, NULL ); @@ -107,6 +119,7 @@ static void test_SetICMMode( HDC dc ) { INT ret, knob, save; + SetLastError( 0xdeadbeef ); ret = SetICMMode( NULL, 0 ); ok( !ret, "SetICMMode succeeded (%d)\n", GetLastError() ); @@ -127,7 +140,13 @@ static void test_SetICMMode( HDC dc ) ret = SetICMMode( dc, save ); ok( ret, "SetICMMode failed (%d)\n", GetLastError() ); + SetLastError( 0xdeadbeef ); dc = CreateDCW( displayW, NULL, NULL, NULL ); + if ( !dc && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) + { + skip( "CreateDCW is not implemented\n" ); + return; + } ok( dc != NULL, "CreateDCW failed (%d)\n", GetLastError() ); ret = SetICMMode( dc, ICM_QUERY );

1 0

Paul Vriens : kernel32/tests: Win9x doesn't change last error.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: ad697ecdc4cfe3ad26eb143d3234be99eea5a8ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad697ecdc4cfe3ad26eb143d3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Feb 26 10:32:24 2008 +0100 kernel32/tests: Win9x doesn't change last error. --- dlls/kernel32/tests/version.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 8aec42a..07d35da 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -59,22 +59,28 @@ static void test_GetVersionEx(void) memset(&infoA,0,sizeof infoA); ret = GetVersionExA(&infoA); ok(!ret, "Expected GetVersionExA to fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || + GetLastError() == 0xdeadbeef /* Win9x */, + "Expected ERROR_INSUFFICIENT_BUFFER or 0xdeadbeef (Win9x), got %d\n", + GetLastError()); SetLastError(0xdeadbeef); infoA.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA) / 2; ret = GetVersionExA(&infoA); ok(!ret, "Expected GetVersionExA to fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || + GetLastError() == 0xdeadbeef /* Win9x */, + "Expected ERROR_INSUFFICIENT_BUFFER or 0xdeadbeef (Win9x), got %d\n", + GetLastError()); SetLastError(0xdeadbeef); infoA.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA) * 2; ret = GetVersionExA(&infoA); ok(!ret, "Expected GetVersionExA to fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || + GetLastError() == 0xdeadbeef /* Win9x */, + "Expected ERROR_INSUFFICIENT_BUFFER or 0xdeadbeef (Win9x), got %d\n", + GetLastError()); SetLastError(0xdeadbeef); infoA.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA);

1 0

Aric Stewart : imm32: Correct offset of text in default IME window when using not default window position .
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: f9e5296c7d795c0accd22d92a8e33ff5782987e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e5296c7d795c0accd22d92a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 26 09:37:53 2008 -0600 imm32: Correct offset of text in default IME window when using not default window position. --- dlls/imm32/imm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 5872bc8..436c126 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2101,7 +2101,6 @@ static void PaintDefaultIMEWnd(HWND hwnd) rect.top = cpt.y; rect.right = rect.left + pt.x; rect.bottom = rect.top + pt.y; - offX=offY=10; monitor = MonitorFromPoint(cpt, MONITOR_DEFAULTTOPRIMARY); } else /* CFS_DEFAULT */

1 0

Francois Gouget : shell32/tests: Use the IShellLinkDataList's standard 'C' interface.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: e98a468ebe1ac026153b2e8a970412ae158cd813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98a468ebe1ac026153b2e8a9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 26 16:28:10 2008 +0100 shell32/tests: Use the IShellLinkDataList's standard 'C' interface. --- dlls/shell32/tests/shelllink.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index f5a0dac..9b61c38 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -650,12 +650,12 @@ static void test_datalink(void) } flags = 0; - r = dl->lpVtbl->GetFlags( dl, &flags ); + r = IShellLinkDataList_GetFlags( dl, &flags ); ok( r == S_OK, "GetFlags failed\n"); ok( flags == 0, "GetFlags returned wrong flags\n"); dar = (void*)-1; - r = dl->lpVtbl->CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar ); + r = IShellLinkDataList_CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar ); ok( r == E_FAIL, "CopyDataBlock failed\n"); ok( dar == NULL, "should be null\n"); @@ -664,17 +664,17 @@ static void test_datalink(void) /* * The following crashes: - * r = dl->lpVtbl->GetFlags( dl, NULL ); + * r = IShellLinkDataList_GetFlags( dl, NULL ); */ flags = 0; - r = dl->lpVtbl->GetFlags( dl, &flags ); + r = IShellLinkDataList_GetFlags( dl, &flags ); ok( r == S_OK, "GetFlags failed\n"); ok( flags == (SLDF_HAS_DARWINID|SLDF_HAS_LOGO3ID), "GetFlags returned wrong flags\n"); dar = NULL; - r = dl->lpVtbl->CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar ); + r = IShellLinkDataList_CopyDataBlock( dl, EXP_DARWIN_ID_SIG, (LPVOID*) &dar ); ok( r == S_OK, "CopyDataBlock failed\n"); ok( dar && ((DATABLOCK_HEADER*)dar)->dwSignature == EXP_DARWIN_ID_SIG, "signature wrong\n");

1 0

Francois Gouget : opengl32/tests: Add the trailing '\n' to an ok() call and make a spelling fix.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 31137aa19753e7e154ac8bb7150173e9fbec2161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31137aa19753e7e154ac8bb71… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 26 15:16:23 2008 +0100 opengl32/tests: Add the trailing '\n' to an ok() call and make a spelling fix. --- dlls/opengl32/tests/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 3836ba7..0200dfd 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -384,9 +384,9 @@ START_TEST(opengl) /* We shouldn't be able to create a context from a hdc which doesn't have a pixel format set */ hglrc = wglCreateContext(hdc); - ok(hglrc == NULL, "wglCreateContext should fail when no pixel format has been set, but it passed"); + ok(hglrc == NULL, "wglCreateContext should fail when no pixel format has been set, but it passed\n"); error = GetLastError(); - ok(error == ERROR_INVALID_PIXEL_FORMAT, "expected ERROR_INVALID_PIXEL_FORMAT for wglCreateContext without a pixelformat set, but recevied %#x", error); + ok(error == ERROR_INVALID_PIXEL_FORMAT, "expected ERROR_INVALID_PIXEL_FORMAT for wglCreateContext without a pixelformat set, but received %#x\n", error); res = SetPixelFormat(hdc, iPixelFormat, &pfd); ok(res, "SetPixelformat failed: %x\n", GetLastError());

1 0

Francois Gouget : msxml3: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 39844efc5f212f4e5d2210f5be9a1ba5979ef8a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39844efc5f212f4e5d2210f5b… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 26 11:17:05 2008 +0100 msxml3: Add a trailing '\n' to a Wine trace. --- dlls/msxml3/node.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 12a53a9..23734ab 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -288,7 +288,7 @@ static HRESULT WINAPI xmlnode_put_nodeValue( HRESULT hr = S_FALSE; xmlChar *str = NULL; - TRACE("%p type(%d)", This, This->node->type); + TRACE("%p type(%d)\n", This, This->node->type); /* Document, Document Fragment, Document Type, Element, Entity, Entity Reference, Notation arent supported. */

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMComment_get_length.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: be435c47cbbbf9b4811f3330cbcfe28f517638da URL: http://source.winehq.org/git/wine.git/?a=commit;h=be435c47cbbbf9b4811f3330c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 26 20:21:11 2008 +1100 msxml3: Implement IXMLDOMComment_get_length. --- dlls/msxml3/comment.c | 22 ++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 7 +++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 3b09502..8c86f4b 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -500,8 +500,26 @@ static HRESULT WINAPI domcomment_get_length( IXMLDOMComment *iface, long *len) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( This->node ); + xmlChar *pContent; + long nLength = 0; + + TRACE("%p\n", iface); + + if(!len) + return E_INVALIDARG; + + pContent = xmlNodeGetContent(pDOMNode->node); + if(pContent) + { + nLength = xmlStrlen(pContent); + xmlFree(pContent); + } + + *len = nLength; + + return S_OK; } static HRESULT WINAPI domcomment_substringData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 16a7e77..11fe378 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2,6 +2,7 @@ * XML test * * Copyright 2005 Mike McCormack for CodeWeavers + * Copyright 2007 Alistair Leslie-Hughes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1949,6 +1950,7 @@ static void test_xmlTypes(void) BSTR str; IXMLDOMNode *pNextChild = (IXMLDOMNode *)0x1; /* Used for testing Siblings */ VARIANT v; + long len = 0; hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); if( hr != S_OK ) @@ -2108,6 +2110,11 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect xml string\n"); SysFreeString(str); + /* test length property */ + hr = IXMLDOMComment_get_length(pComment, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 21, "expected 21 got %ld\n", len); + IXMLDOMComment_Release(pComment); }

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLDOMCDATASection_get_length.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 0d4db95d994a629a8c17e631defae1c3b6b86803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4db95d994a629a8c17e631d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 26 20:21:43 2008 +1100 msxml3: Implement IXMLDOMCDATASection_get_length. --- dlls/msxml3/cdata.c | 22 ++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e9203b1..ce25bd8 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -501,8 +501,26 @@ static HRESULT WINAPI domcdata_get_length( IXMLDOMCDATASection *iface, long *len) { - FIXME("\n"); - return E_NOTIMPL; + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + xmlnode *pDOMNode = impl_from_IXMLDOMNode( (IXMLDOMNode*)This->element ); + xmlChar *pContent; + long nLength = 0; + + TRACE("%p\n", iface); + + if(!len) + return E_INVALIDARG; + + pContent = xmlNodeGetContent(pDOMNode->node); + if(pContent) + { + nLength = xmlStrlen(pContent); + xmlFree(pContent); + } + + *len = nLength; + + return S_OK; } static HRESULT WINAPI domcdata_substringData( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 11fe378..efaae79 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2315,6 +2315,11 @@ static void test_xmlTypes(void) ok( !lstrcmpW( str, _bstr_("This &is a ; test <>\\") ), "incorrect text string\n"); SysFreeString(str); + /* test length property */ + hr = IXMLDOMCDATASection_get_length(pComment, &len); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(len == 21, "expected 21 got %ld\n", len); + IXMLDOMCDATASection_Release(pCDataSec); }

1 0

Francois Gouget : d3dx9_*: Fix the D3DXMatrixDeterminant() forwards.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: 50b6e12833b27545d1d742015ad8737fbcf54c1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=50b6e12833b27545d1d742015… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 26 11:15:42 2008 +0100 d3dx9_*: Fix the D3DXMatrixDeterminant() forwards. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50b6e12833b27545d1d74…

1 0

Jeff Zaroyko : position text below image - last patch missed this case
by Chris Morgan Feb. 27, 2008

Feb. 27, 2008

Module: appdb Branch: master Commit: 448b0018a9aaa6fd866fd60a3a82b1b9d51898f1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=448b0018a9aaa6fd866fd60a… Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com> Date: Wed Feb 27 12:00:45 2008 +1100 position text below image - last patch missed this case --- include/screenshot.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 8a8d0e9..d2208ce 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -518,7 +518,7 @@ class screenshot if($iVersionId) $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>View/Submit Screenshot</a></div>"; else - $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."View Screenshot</a></div>"; + $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>View Screenshot</a></div>"; } else if($iVersionId) /* we are asking for a specific app version but it has no screenshots */ { $sImg .= "<div class=\"imgarea\"><a href='screenshots.php?iAppId=$iAppId&iVersionId=$iVersionId'>".$sImgFile.$sZoomIcon."<br>Submit Screenshot</a></div>";

1 0