April 2008 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msxml3: Corrected IXMLDOMComment appendData with a broken xmlTextConcat function.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: c3e9780d223786acf838f2824b19104b4bd707cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e9780d223786acf838f2824… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Apr 20 00:09:58 2008 +1000 msxml3: Corrected IXMLDOMComment appendData with a broken xmlTextConcat function. --- dlls/msxml3/comment.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index c4d37f2..eb273b4 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -597,10 +597,32 @@ static HRESULT WINAPI domcomment_appendData( pContent = xmlChar_from_wchar( (WCHAR*)p ); if(pContent) { + /* Older versions of libxml < 2.6.27 didn't correctly support + xmlTextConcat on Comment nodes. Fallback to setting the + contents directly if xmlTextConcat fails. + + NOTE: if xmlTextConcat fails, pContent is destroyed. + */ if(xmlTextConcat(pDOMNode->node, pContent, SysStringLen(p) ) == 0) hr = S_OK; else - hr = E_FAIL; + { + xmlChar *pNew; + pContent = xmlChar_from_wchar( (WCHAR*)p ); + if(pContent) + { + pNew = xmlStrcat(xmlNodeGetContent(pDOMNode->node), pContent); + if(pNew) + { + xmlNodeSetContent(pDOMNode->node, pNew); + hr = S_OK; + } + else + hr = E_FAIL; + } + else + hr = E_FAIL; + } } else hr = E_FAIL;

1 0

Alistair Leslie-Hughes : msxml3: Implement get_prefix.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 38634f0eb9ce3d346fd670b5b8543f4844da00c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38634f0eb9ce3d346fd670b5b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 18 21:23:22 2008 +1000 msxml3: Implement get_prefix. --- dlls/msxml3/node.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 092c360..246598d 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1169,8 +1169,26 @@ static HRESULT WINAPI xmlnode_get_prefix( IXMLDOMNode *iface, BSTR* prefixString) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + HRESULT hr = S_FALSE; + xmlNsPtr *pNSList; + + TRACE("%p %p\n", This, prefixString ); + + if(!prefixString) + return E_INVALIDARG; + + *prefixString = NULL; + + pNSList = xmlGetNsList(This->node->doc, This->node); + if(pNSList) + { + *prefixString = bstr_from_xmlChar( pNSList[0]->prefix ); + + hr = S_OK; + } + + return hr; } static HRESULT WINAPI xmlnode_get_baseName(

1 0

Alistair Leslie-Hughes : msxml3: Add tests for get_prefix and get_namespaceURI.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: a430b37355b3f627b2d579f6e9eb92d8aa24421d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a430b37355b3f627b2d579f6e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 19 21:26:53 2008 +1000 msxml3: Add tests for get_prefix and get_namespaceURI. --- dlls/msxml3/tests/domdoc.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 32d3b93..9d84435 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3204,6 +3204,65 @@ static void test_testTransforms(void) free_bstrs(); } +static void test_Namespaces(void) +{ + IXMLDOMDocument2 *doc = NULL; + IXMLDOMNode *pNode; + IXMLDOMNode *pNode2 = NULL; + VARIANT_BOOL bSucc; + HRESULT hr; + BSTR str; + static const CHAR szNamespacesXML[] = +"<?xml version=\"1.0\"?>\n" +"<root xmlns:WEB='http://www.winehq.org'>\n" +"<WEB:Site version=\"1.0\" />\n" +"</root>"; + + hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); + if( hr != S_OK ) + return; + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szNamespacesXML), &bSucc); + ok(hr == S_OK, "ret %08x\n", hr ); + ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE"); + + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("root"), &pNode ); + ok(hr == S_OK, "ret %08x\n", hr ); + if(hr == S_OK) + { + hr = IXMLDOMNode_get_firstChild( pNode, &pNode2 ); + ok( hr == S_OK, "ret %08x\n", hr ); + ok( pNode2 != NULL, "pNode2 == NULL\n"); + + /* Test get_prefix */ + hr = IXMLDOMNode_get_prefix(pNode2, NULL); + ok( hr == E_INVALIDARG, "ret %08x\n", hr ); + /* NOTE: Need to test that arg2 gets cleared on Error. */ + + hr = IXMLDOMNode_get_prefix(pNode2, &str); + ok( hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("WEB")), "incorrect prefix string\n"); + SysFreeString(str); + + /* Test get_namespaceURI */ + hr = IXMLDOMNode_get_namespaceURI(pNode2, NULL); + ok( hr == E_INVALIDARG, "ret %08x\n", hr ); + /* NOTE: Need to test that arg2 gets cleared on Error. */ + + hr = IXMLDOMNode_get_namespaceURI(pNode2, &str); + ok( hr == S_OK, "ret %08x\n", hr ); + ok( !lstrcmpW( str, _bstr_("http://www.winehq.org")), "incorrect namespaceURI string\n"); + SysFreeString(str); + + IXMLDOMNode_Release(pNode2); + IXMLDOMNode_Release(pNode); + } + + IXMLDOMDocument2_Release(doc); + + free_bstrs(); +} + START_TEST(domdoc) { HRESULT r; @@ -3227,6 +3286,7 @@ START_TEST(domdoc) test_nodeTypeTests(); test_DocumentSaveToDocument(); test_testTransforms(); + test_Namespaces(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : msxml3: Implement get_namespaceURI.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 8842ccb63632ac856e34b210a470ead4137c1d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8842ccb63632ac856e34b210a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 18 21:29:59 2008 +1000 msxml3: Implement get_namespaceURI. --- dlls/msxml3/node.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7506460..092c360 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1143,8 +1143,26 @@ static HRESULT WINAPI xmlnode_get_namespaceURI( IXMLDOMNode *iface, BSTR* namespaceURI) { - FIXME("\n"); - return E_NOTIMPL; + xmlnode *This = impl_from_IXMLDOMNode( iface ); + HRESULT hr = S_FALSE; + xmlNsPtr *pNSList; + + TRACE("%p %p\n", This, namespaceURI ); + + if(!namespaceURI) + return E_INVALIDARG; + + *namespaceURI = NULL; + + pNSList = xmlGetNsList(This->node->doc, This->node); + if(pNSList) + { + *namespaceURI = bstr_from_xmlChar( pNSList[0]->href ); + + hr = S_OK; + } + + return hr; } static HRESULT WINAPI xmlnode_get_prefix(

1 0

Alexandre Julliard : gdi32: Return bitmask for 32-bit bitmaps too in GetDIBits.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: baceb8d07e0ae08a00aaaac39c15b14f872c9d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baceb8d07e0ae08a00aaaac39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 11:57:30 2008 +0200 gdi32: Return bitmask for 32-bit bitmaps too in GetDIBits. --- dlls/gdi32/dib.c | 18 +++++++++++++----- dlls/gdi32/tests/bitmap.c | 6 ++++-- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index caf3e6c..de5a5a4 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -640,19 +640,17 @@ INT WINAPI GetDIBits( DIB_GetDIBImageBytes( bmp->bitmap.bmWidth, bmp->bitmap.bmHeight, bmp->bitmap.bmBitsPixel ); + info->bmiHeader.biCompression = (bmp->bitmap.bmBitsPixel > 8) ? BI_BITFIELDS : BI_RGB; switch(bmp->bitmap.bmBitsPixel) { case 15: info->bmiHeader.biBitCount = 16; - info->bmiHeader.biCompression = BI_RGB; break; - case 16: - info->bmiHeader.biBitCount = 16; - info->bmiHeader.biCompression = BI_BITFIELDS; + case 24: + info->bmiHeader.biBitCount = 32; break; default: info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - info->bmiHeader.biCompression = BI_RGB; break; } info->bmiHeader.biXPelsPerMeter = 0; @@ -824,6 +822,16 @@ INT WINAPI GetDIBits( ((PDWORD)info->bmiColors)[2] = 0x001f; } break; + + case 24: + case 32: + if (info->bmiHeader.biCompression == BI_BITFIELDS) + { + ((PDWORD)info->bmiColors)[0] = 0xff0000; + ((PDWORD)info->bmiColors)[1] = 0x00ff00; + ((PDWORD)info->bmiColors)[2] = 0x0000ff; + } + break; } if (bits && lines) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 15a463b..f7bfdfd 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1623,11 +1623,13 @@ static void test_GetDIBits_BI_BITFIELDS(void) /* Call GetDIBits to fill in bmiHeader. */ ret = GetDIBits(hdc, hbm, 0, 1, NULL, dibinfo, DIB_RGB_COLORS); ok(ret == 1, "GetDIBits failed\n"); - if (dibinfo->bmiHeader.biBitCount == 16 && - dibinfo->bmiHeader.biCompression == BI_BITFIELDS) + if (dibinfo->bmiHeader.biBitCount > 8) { DWORD *bitmasks = (DWORD *)dibinfo->bmiColors; + ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, + "compression is %u\n", dibinfo->bmiHeader.biCompression ); + ok( !bitmasks[0], "red mask is set\n" ); ok( !bitmasks[1], "green mask is set\n" ); ok( !bitmasks[2], "blue mask is set\n" );

1 0

Alexandre Julliard : user32: Remove redundant LocalUnlock calls.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: fe4706940c0d43a2c4c294698ac6a3f2ace09c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe4706940c0d43a2c4c294698… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 11:58:20 2008 +0200 user32: Remove redundant LocalUnlock calls. --- dlls/user32/edit.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index dba946b..6178b20 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4254,11 +4254,9 @@ static LRESULT EDIT_WM_Destroy(EDITSTATE *es) LINEDEF *pc, *pp; if (es->hloc32W) { - while (LocalUnlock(es->hloc32W)) ; LocalFree(es->hloc32W); } if (es->hloc32A) { - while (LocalUnlock(es->hloc32A)) ; LocalFree(es->hloc32A); } if (es->hloc16) {

1 0

Andrew Talbot : mciavi32: Remove unused variables.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 6bb85256304caa0b028b4f350a6738e3ca8d80fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb85256304caa0b028b4f350… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 19 15:17:39 2008 +0100 mciavi32: Remove unused variables. --- dlls/mciavi32/mmoutput.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index d1ed699..8c8bdc2 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -599,8 +599,6 @@ LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) { void* pBitmapData; LPBITMAPINFO pBitmapInfo; - int nWidth; - int nHeight; if (!hDC || !wma->inbih) return TRUE; @@ -633,15 +631,9 @@ LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) if (wma->hic) { pBitmapData = wma->outdata; pBitmapInfo = (LPBITMAPINFO)wma->outbih; - - nWidth = wma->outbih->biWidth; - nHeight = wma->outbih->biHeight; } else { pBitmapData = wma->indata; pBitmapInfo = (LPBITMAPINFO)wma->inbih; - - nWidth = wma->inbih->biWidth; - nHeight = wma->inbih->biHeight; } StretchDIBits(hDC,

1 0

Andrew Talbot : mcicda: Remove unused variable.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 22d2abbacb176c2186125fb3cdb36e6cbd75037f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d2abbacb176c2186125fb3c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 19 15:17:42 2008 +0100 mcicda: Remove unused variable. --- dlls/mcicda/mcicda.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index 3273ecd..6e4a835 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -518,7 +518,6 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) { WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - DWORD idx; DWORD ret = 0; CDROM_SUB_Q_DATA_FORMAT fmt; SUB_Q_CHANNEL_DATA data; @@ -558,7 +557,6 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm TRACE("MCI_TRACK #%u LENGTH=??? !\n", lpParms->dwTrack); if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) return MCIERR_OUTOFRANGE; - idx = lpParms->dwTrack - toc.FirstTrack; lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack + 1) - FRAME_OF_TOC(toc, lpParms->dwTrack); /* Windows returns one frame less than the total track length for the

1 0

Andrew Talbot : mciseq: Remove unused variable.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 87532fdae6ff5b9f7b47d80fc40f518598c359a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87532fdae6ff5b9f7b47d80fc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 19 15:17:47 2008 +0100 mciseq: Remove unused variable. --- dlls/mciseq/mcimidi.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 171142d..b69f0ac 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1190,7 +1190,6 @@ static DWORD MIDI_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar { int start, end; MIDIHDR midiHdr; - DWORD dwRet; WINE_MCIMIDI* wmm = MIDI_mciGetOpenDev(wDevID); TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); @@ -1216,7 +1215,7 @@ static DWORD MIDI_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar midiHdr.dwBufferLength = 1024; midiHdr.dwUser = 0L; midiHdr.dwFlags = 0L; - dwRet = midiInPrepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); + midiInPrepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); TRACE("After MIDM_PREPARE\n"); wmm->dwStatus = MCI_MODE_RECORD; /* FIXME: there is no buffer added */ @@ -1224,12 +1223,12 @@ static DWORD MIDI_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar TRACE("wmm->dwStatus=%p %d\n", &wmm->dwStatus, wmm->dwStatus); midiHdr.dwBytesRecorded = 0; - dwRet = midiInStart((HMIDIIN)wmm->hMidi); + midiInStart((HMIDIIN)wmm->hMidi); TRACE("midiInStart => dwBytesRecorded=%u\n", midiHdr.dwBytesRecorded); if (midiHdr.dwBytesRecorded == 0) break; } TRACE("Before MIDM_UNPREPARE\n"); - dwRet = midiInUnprepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); + midiInUnprepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); TRACE("After MIDM_UNPREPARE\n"); HeapFree(GetProcessHeap(), 0, midiHdr.lpData); midiHdr.lpData = NULL;

1 0

Andrew Talbot : kernel32: Remove unused variables.
by Alexandre Julliard 21 Apr '08

21 Apr '08

Module: wine Branch: master Commit: 7d2c11e3a481bf0fc13097ce0f167a0b616193de URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2c11e3a481bf0fc13097ce0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 19 15:17:36 2008 +0100 kernel32: Remove unused variables. --- dlls/kernel32/local16.c | 3 +-- dlls/kernel32/ne_module.c | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/local16.c b/dlls/kernel32/local16.c index e250d84..48bc6c3 100644 --- a/dlls/kernel32/local16.c +++ b/dlls/kernel32/local16.c @@ -572,7 +572,7 @@ static HLOCAL16 LOCAL_FreeArena( WORD ds, WORD arena ) { char *ptr = MapSL( MAKESEGPTR( ds, 0 ) ); LOCALHEAPINFO *pInfo; - LOCALARENA *pArena, *pPrev, *pNext; + LOCALARENA *pArena, *pPrev; TRACE("%04x ds=%04x\n", arena, ds ); if (!(pInfo = LOCAL_GetHeap( ds ))) return arena; @@ -590,7 +590,6 @@ static HLOCAL16 LOCAL_FreeArena( WORD ds, WORD arena ) /* Check if we can merge with the previous block */ pPrev = ARENA_PTR( ptr, pArena->prev & ~3 ); - pNext = ARENA_PTR( ptr, pArena->next ); if ((pPrev->prev & 3) == LOCAL_ARENA_FREE) { arena = pArena->prev & ~3; diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 27a0abc..dae1a0d 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -998,10 +998,8 @@ static HMODULE16 NE_DoLoadBuiltinModule( const IMAGE_DOS_HEADER *mz_header, cons HMODULE16 hModule; HINSTANCE16 hInstance; OSVERSIONINFOW versionInfo; - const IMAGE_OS2_HEADER *ne_header; SIZE_T mapping_size = ~0UL; /* assume builtins don't contain invalid offsets... */ - ne_header = (const IMAGE_OS2_HEADER *)((const BYTE *)mz_header + mz_header->e_lfanew); hModule = build_module( mz_header, mapping_size, file_name ); if (hModule < 32) return hModule; pModule = GlobalLock16( hModule );

1 0