wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Nikolay Sivov : msxml3: Some tests to show that leading spaces are not allowed for xml stream.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 674fb3c096b2be0e5976575efa7cc5c3e27297d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=674fb3c096b2be0e5976575ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 5 12:04:18 2011 +0300 msxml3: Some tests to show that leading spaces are not allowed for xml stream. --- dlls/msxml3/tests/domdoc.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 197a5ac..54ec8fc 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1737,6 +1737,15 @@ static const char xpath_simple_list[] = " <d/>" "</root>"; +static const char* leading_spaces[] = { + "\n<?xml version=\"1.0\"?><root/>", + " <?xml version=\"1.0\"?><root/>", + "\t<?xml version=\"1.0\"?><root/>", + "\r\n<?xml version=\"1.0\"?><root/>", + "\r<?xml version=\"1.0\"?><root/>", + 0 +}; + static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; @@ -1999,7 +2008,7 @@ static char *list_to_string(IXMLDOMNodeList *list) static void test_domdoc( void ) { - HRESULT r; + HRESULT r, hr; IXMLDOMDocument *doc; IXMLDOMParseError *error; IXMLDOMElement *element = NULL; @@ -2016,6 +2025,7 @@ static void test_domdoc( void ) LONG code; LONG nLength = 0; WCHAR buff[100]; + const char **ptr; doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; @@ -2027,14 +2037,27 @@ if (0) } /* try some stupid things */ - r = IXMLDOMDocument_loadXML( doc, NULL, NULL ); - ok( r == S_FALSE, "loadXML succeeded\n"); + hr = IXMLDOMDocument_loadXML( doc, NULL, NULL ); + EXPECT_HR(hr, S_FALSE); b = VARIANT_TRUE; - r = IXMLDOMDocument_loadXML( doc, NULL, &b ); - ok( r == S_FALSE, "loadXML succeeded\n"); + hr = IXMLDOMDocument_loadXML( doc, NULL, &b ); + EXPECT_HR(hr, S_FALSE); ok( b == VARIANT_FALSE, "failed to load XML string\n"); + /* load document with leading spaces */ + ptr = leading_spaces; + while (*ptr) + { + b = VARIANT_TRUE; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = _bstr_(*ptr); + hr = IXMLDOMDocument_load( doc, var, &b); + EXPECT_HR(hr, S_FALSE); + ok( b == VARIANT_FALSE, "got %x\n", b); + ptr++; + } + /* try to load a document from a nonexistent file */ b = VARIANT_TRUE; str = SysAllocString( szNonExistentFile );

1 0

Nikolay Sivov : msxml3: Implement get_srcText().
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 9397fb2ad76f4ea581313f3b28e90dc7eb5eb909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9397fb2ad76f4ea581313f3b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 23:27:39 2011 +0300 msxml3: Implement get_srcText(). --- dlls/msxml3/parseerror.c | 10 ++++++++-- dlls/msxml3/tests/domdoc.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index c461095..3d32b32 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -243,8 +243,14 @@ static HRESULT WINAPI parseError_get_srcText( BSTR *srcText ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); - FIXME("(%p)->(%p)\n", This, srcText); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, srcText); + + if (!srcText) return E_INVALIDARG; + + *srcText = SysAllocString(This->srcText); + + return S_OK; } static HRESULT WINAPI parseError_get_line( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index eeff419..197a5ac 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10767,7 +10767,7 @@ static void test_parseerror(void) EXPECT_HR(hr, E_INVALIDARG); hr = IXMLDOMParseError_get_srcText(error, NULL); - todo_wine EXPECT_HR(hr, E_INVALIDARG); + EXPECT_HR(hr, E_INVALIDARG); hr = IXMLDOMParseError_get_linepos(error, NULL); EXPECT_HR(hr, E_INVALIDARG);

1 0

Nikolay Sivov : msxml3: Implement get_line() and get_linepos().
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 945dccb7d60afd636bca380e80e14f7aa3f107c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=945dccb7d60afd636bca380e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 4 23:26:53 2011 +0300 msxml3: Implement get_line() and get_linepos(). --- dlls/msxml3/parseerror.c | 23 +++++++++++++++-------- dlls/msxml3/tests/domdoc.c | 26 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index b8cc381..c461095 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -135,13 +135,10 @@ static HRESULT WINAPI parseError_GetTypeInfo( ITypeInfo** ppTInfo ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); - HRESULT hr; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - hr = get_typeinfo(IXMLDOMParseError_tid, ppTInfo); - - return hr; + return get_typeinfo(IXMLDOMParseError_tid, ppTInfo); } static HRESULT WINAPI parseError_GetIDsOfNames( @@ -255,8 +252,13 @@ static HRESULT WINAPI parseError_get_line( LONG *line ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); - FIXME("(%p)->(%p)\n", This, line); - return E_NOTIMPL; + + TRACE("(%p)->(%p): stub\n", This, line); + + if (!line) return E_INVALIDARG; + + *line = This->line; + return S_OK; } static HRESULT WINAPI parseError_get_linepos( @@ -264,8 +266,13 @@ static HRESULT WINAPI parseError_get_linepos( LONG *linepos ) { parse_error_t *This = impl_from_IXMLDOMParseError( iface ); - FIXME("(%p)->(%p)\n", This, linepos); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, linepos); + + if (!linepos) return E_INVALIDARG; + + *linepos = This->linepos; + return S_OK; } static HRESULT WINAPI parseError_get_filepos( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a883da0..eeff419 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10752,6 +10752,31 @@ static void test_dispex(void) free_bstrs(); } +static void test_parseerror(void) +{ + IXMLDOMParseError *error; + IXMLDOMDocument *doc; + HRESULT hr; + + doc = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument_get_parseError(doc, &error); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMParseError_get_line(error, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + hr = IXMLDOMParseError_get_srcText(error, NULL); + todo_wine EXPECT_HR(hr, E_INVALIDARG); + + hr = IXMLDOMParseError_get_linepos(error, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + IXMLDOMParseError_Release(error); + + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -10824,6 +10849,7 @@ START_TEST(domdoc) test_selection(); test_load(); test_dispex(); + test_parseerror(); test_xsltemplate();

1 0

Francois Gouget : winecoreaudio.drv: Give a name to the midi and mmdevapi critical sections.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: cfce8ab45961b974a01a4745ee4e8b41f539a666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfce8ab45961b974a01a4745e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 17:10:26 2011 +0100 winecoreaudio.drv: Give a name to the midi and mmdevapi critical sections. --- dlls/winecoreaudio.drv/midi.c | 2 ++ dlls/winecoreaudio.drv/mmdevdrv.c | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index a50fc78..55d04b5 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -126,6 +126,7 @@ LONG CoreAudio_MIDIInit(void) if (MIDIIn_NumDevs > 0) { InitializeCriticalSection(&midiInLock); + midiInLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": midiInLock"); MIDIInThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); CreateThread(NULL, 0, MIDIIn_MessageThread, NULL, 0, NULL); @@ -207,6 +208,7 @@ LONG CoreAudio_MIDIRelease(void) CFMessagePortSendRequest(messagePort, 1, NULL, 0.0, 0.0, NULL, NULL); CFRelease(messagePort); + midiInLock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&midiInLock); } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index a35f18c..c6f2382 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -172,6 +172,13 @@ typedef struct _SessionMgr { static HANDLE g_timer_q; static CRITICAL_SECTION g_sessions_lock; +static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = +{ + 0, 0, &g_sessions_lock, + { &g_sessions_lock_debug.ProcessLocksList, &g_sessions_lock_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": g_sessions_lock") } +}; +static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, UINT64 *pos, @@ -231,14 +238,19 @@ static inline SessionMgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { - if(reason == DLL_PROCESS_ATTACH){ + switch (reason) + { + case DLL_PROCESS_ATTACH: g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; + break; - InitializeCriticalSection(&g_sessions_lock); + case DLL_PROCESS_DETACH: + g_sessions_lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&g_sessions_lock); + break; } - return TRUE; } @@ -777,6 +789,7 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device, list_add_head(&g_sessions, &ret->entry); InitializeCriticalSection(&ret->lock); + ret->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": AudioSession.lock"); session_init_vols(ret, num_channels);

1 0

Francois Gouget : winealsa.drv: Delete the g_sessions_lock critical section when unloading the dll.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 9b55cc9e6fdd33c4c9a11ea21e0683b0952fe666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b55cc9e6fdd33c4c9a11ea21… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 16:52:40 2011 +0100 winealsa.drv: Delete the g_sessions_lock critical section when unloading the dll. --- dlls/winealsa.drv/mmdevdrv.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 25693c0..bc1ca94 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -219,12 +219,19 @@ static inline SessionMgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { - if(reason == DLL_PROCESS_ATTACH){ + switch (reason) + { + case DLL_PROCESS_ATTACH: g_timer_q = CreateTimerQueue(); if(!g_timer_q) return FALSE; - } + break; + case DLL_PROCESS_DETACH: + g_sessions_lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&g_sessions_lock); + break; + } return TRUE; }

1 0

Francois Gouget : include: Move the language and sort macros to winnt.rh.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 5f6a8c2b6090fe57f9389afca3664a8d85b522e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f6a8c2b6090fe57f9389afca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 7 16:42:25 2011 +0100 include: Move the language and sort macros to winnt.rh. --- include/Makefile.in | 1 + include/winnt.h | 406 +----------------------------------------------- include/winnt.rh | 437 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/winresrc.h | 2 +- 4 files changed, 440 insertions(+), 406 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f6a8c2b6090fe57f9389…

1 0

Alexandre Julliard : gdi32: Return the original brush data in GetObject.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: b47debddf533db275d19dbad9b230a283cef1cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47debddf533db275d19dbad9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 20:18:59 2011 +0100 gdi32: Return the original brush data in GetObject. --- dlls/gdi32/brush.c | 5 ++--- dlls/gdi32/tests/brush.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 19372d1..5cbae61 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -161,7 +161,6 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) case BS_PATTERN: ptr->bitmap = BITMAP_CopyBitmap( (HBITMAP)ptr->logbrush.lbHatch ); if (!ptr->bitmap) goto error; - ptr->logbrush.lbHatch = (ULONG_PTR)ptr->bitmap; ptr->logbrush.lbColor = 0; break; @@ -176,7 +175,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) if (!ptr->info) goto error; ptr->bits.ptr = (char *)ptr->info + bitmap_info_size( ptr->info, ptr->usage ); ptr->logbrush.lbStyle = BS_DIBPATTERN; - ptr->logbrush.lbHatch = (ULONG_PTR)ptr->info; + ptr->logbrush.lbColor = 0; break; case BS_DIBPATTERN8X8: @@ -446,7 +445,7 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) if(pattern_dev == dc->dibdrv) pattern_dev = GET_NEXT_PHYSDEV( physdev, pSelectBrush ); - BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, pattern_dev ); + BITMAP_SetOwnerDC( bitmap, pattern_dev ); } info = brush->info; diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index a02209f..f0ef2df 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -100,7 +100,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); DeleteObject( brush ); br.lbStyle = BS_PATTERN8X8; @@ -113,7 +113,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); ret = GetObjectW( bitmap, sizeof(dib), &dib ); ok( ret == sizeof(dib.dsBm), "wrong size %u\n", ret ); DeleteObject( bitmap ); @@ -139,7 +139,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); ret = GetObjectW( bitmap, sizeof(dib), &dib ); ok( ret == sizeof(dib), "wrong size %u\n", ret ); DeleteObject( brush ); @@ -152,7 +152,7 @@ static void test_pattern_brush(void) ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ + ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ "wrong handle %p/%p\n", (BITMAPINFO *)br.lbHatch, info ); DeleteObject( brush ); @@ -165,8 +165,8 @@ static void test_pattern_brush(void) ret = GetObjectW( brush, sizeof(br), &br ); ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); - todo_wine ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); - todo_wine ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( (BITMAPINFO *)br.lbHatch == info || broken(!br.lbHatch), /* nt4 */ "wrong handle %p/%p\n", (BITMAPINFO *)br.lbHatch, info ); mem = GlobalAlloc( GMEM_MOVEABLE, sizeof(buffer) ); @@ -181,10 +181,10 @@ static void test_pattern_brush(void) ret = GetObjectW( brush, sizeof(br), &br ); ok( ret == sizeof(br), "wrong size %u\n", ret ); ok( br.lbStyle == BS_DIBPATTERN, "wrong style %u\n", br.lbStyle ); - todo_wine ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); ok( (HGLOBAL)br.lbHatch != mem, "wrong handle %p/%p\n", (HGLOBAL)br.lbHatch, mem ); bits = GlobalLock( mem ); - todo_wine ok( (HGLOBAL)br.lbHatch == bits || broken(!br.lbHatch), /* nt4 */ + ok( (HGLOBAL)br.lbHatch == bits || broken(!br.lbHatch), /* nt4 */ "wrong handle %p/%p\n", (HGLOBAL)br.lbHatch, bits ); ret = GlobalFlags( mem ); ok( ret == 2, "wrong flags %x\n", ret );

1 0

Alexandre Julliard : winex11: Implement a SelectBrush entry point in the XRender driver.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: a16dbbe3d8f74012b53c2bdcb1a136554a5c357e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16dbbe3d8f74012b53c2bdcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 17:40:47 2011 +0100 winex11: Implement a SelectBrush entry point in the XRender driver. --- dlls/winex11.drv/brush.c | 18 +++---- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xrender.c | 123 +++++++++++++++++++++++++++----------------- 3 files changed, 85 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a16dbbe3d8f74012b53c2…

1 0

Alexandre Julliard : winex11: Use the brush information passed in SelectBrush for pattern brushes.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 265068974d26bd2bf6e36a5f47329695f250cf00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=265068974d26bd2bf6e36a5f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 12:03:19 2011 +0100 winex11: Use the brush information passed in SelectBrush for pattern brushes. --- dlls/winex11.drv/brush.c | 67 +++++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 7b7f8cf..c628d7e 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -209,15 +209,21 @@ static void BRUSH_SelectSolidBrush( X11DRV_PDEVICE *physDev, COLORREF color ) /*********************************************************************** * BRUSH_SelectPatternBrush */ -static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) +static void BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, X_PHYSBITMAP *physBitmap ) { BITMAP bitmap; - X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( hbitmap ); - if (!physBitmap || !GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return FALSE; + GetObjectW( hbitmap, sizeof(bitmap), &bitmap ); X11DRV_DIB_Lock( physBitmap, DIB_Status_GdiMod ); + if (physDev->brush.pixmap) + { + wine_tsx11_lock(); + XFreePixmap( gdi_display, physDev->brush.pixmap ); + wine_tsx11_unlock(); + } + if ((physDev->depth == 1) && (physBitmap->depth != 1)) { wine_tsx11_lock(); @@ -247,33 +253,26 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) physDev->brush.fillStyle = FillOpaqueStippled; physDev->brush.pixel = -1; /* Special case (see DC_SetupGCForBrush) */ } - return TRUE; } - -/*********************************************************************** - * BRUSH_SelectDIBPatternBrush - */ -static BOOL BRUSH_SelectDIBPatternBrush( X11DRV_PDEVICE *physDev, const BITMAPINFO *info ) +/* create a bitmap appropriate for the given DIB pattern brush */ +HBITMAP create_brush_bitmap( X11DRV_PDEVICE *physDev, const BITMAPINFO *info, void *bits, UINT usage ) { - BOOL ret; HDC memdc; - HBITMAP bitmap = CreateDIBitmap( physDev->dev.hdc, &info->bmiHeader, CBM_INIT, - (LPBYTE)info + bitmap_info_size( info, DIB_RGB_COLORS ), - info, DIB_RGB_COLORS ); + int bpp = screen_bpp; + HBITMAP bitmap; + + if (physDev->depth == 1 || info->bmiHeader.biBitCount == 1) bpp = 1; + bitmap = CreateBitmap( info->bmiHeader.biWidth, abs(info->bmiHeader.biHeight), 1, bpp, NULL ); + if (!bitmap) return 0; /* make sure it's owned by x11drv */ memdc = CreateCompatibleDC( physDev->dev.hdc ); SelectObject( memdc, bitmap ); DeleteDC( memdc ); - if ((ret = BRUSH_SelectPatternBrush( physDev, bitmap ))) - { - X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( bitmap ); - physBitmap->pixmap = 0; /* so it doesn't get freed */ - } - DeleteObject( bitmap ); - return ret; + SetDIBits( physDev->dev.hdc, bitmap, 0, abs(info->bmiHeader.biHeight), bits, info, usage ); + return bitmap; } @@ -286,6 +285,24 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); LOGBRUSH logbrush; + if (bitmap || info) /* pattern brush */ + { + X_PHYSBITMAP *physbitmap; + BOOL delete_bitmap = FALSE; + + if (!bitmap || !(physbitmap = X11DRV_get_phys_bitmap( bitmap ))) + { + if (!(bitmap = create_brush_bitmap( physDev, info, bits, usage ))) return 0; + physbitmap = X11DRV_get_phys_bitmap( bitmap ); + delete_bitmap = TRUE; + } + BRUSH_SelectPatternBrush( physDev, bitmap, physbitmap ); + TRACE("BS_PATTERN\n"); + physDev->brush.style = BS_PATTERN; + if (delete_bitmap) DeleteObject( bitmap ); + return hbrush; + } + if (!GetObjectA( hbrush, sizeof(logbrush), &logbrush )) return 0; TRACE("hdc=%p hbrush=%p\n", dev->hdc, hbrush); @@ -321,16 +338,6 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, wine_tsx11_unlock(); physDev->brush.fillStyle = FillStippled; break; - - case BS_PATTERN: - TRACE("BS_PATTERN\n"); - if (!BRUSH_SelectPatternBrush( physDev, (HBITMAP)logbrush.lbHatch )) return 0; - break; - - case BS_DIBPATTERN: - TRACE("BS_DIBPATTERN\n"); - if (!BRUSH_SelectDIBPatternBrush( physDev, (BITMAPINFO *)logbrush.lbHatch )) return 0; - break; } return hbrush; }

1 0

Alexandre Julliard : wineps: Use the brush information passed in SelectBrush for pattern brushes.
by Alexandre Julliard 08 Nov '11

08 Nov '11

Module: wine Branch: master Commit: 0a189ffaf06db8e3b3d235bf872093ec2330e6a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a189ffaf06db8e3b3d235bf8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 3 19:56:48 2011 +0100 wineps: Use the brush information passed in SelectBrush for pattern brushes. --- dlls/wineps.drv/brush.c | 48 ++++++++++------------------------------ dlls/wineps.drv/ps.c | 55 ++-------------------------------------------- dlls/wineps.drv/psdrv.h | 6 +++- 3 files changed, 19 insertions(+), 90 deletions(-) diff --git a/dlls/wineps.drv/brush.c b/dlls/wineps.drv/brush.c index 624e1b1..706af2f 100644 --- a/dlls/wineps.drv/brush.c +++ b/dlls/wineps.drv/brush.c @@ -55,6 +55,9 @@ HBRUSH PSDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, HBITMAP bitmap, case BS_PATTERN: case BS_DIBPATTERN: + physDev->brush.info = info; + physDev->brush.bits = bits; + physDev->brush.usage = usage; break; default: @@ -232,43 +235,16 @@ BOOL PSDRV_Brush(PHYSDEV dev, BOOL EO) break; case BS_PATTERN: - { - BITMAP bm; - BYTE *bits; - GetObjectA( (HBITMAP)logbrush.lbHatch, sizeof(BITMAP), &bm); - TRACE("BS_PATTERN %dx%d %d bpp\n", bm.bmWidth, bm.bmHeight, - bm.bmBitsPixel); - bits = HeapAlloc(PSDRV_Heap, 0, bm.bmWidthBytes * bm.bmHeight); - GetBitmapBits( (HBITMAP)logbrush.lbHatch, bm.bmWidthBytes * bm.bmHeight, bits); - - if(physDev->pi->ppd->LanguageLevel > 1) { - PSDRV_WriteGSave(dev); - PSDRV_WritePatternDict(dev, &bm, bits); - PSDRV_Fill(dev, EO); - PSDRV_WriteGRestore(dev); - } else { - FIXME("Trying to set a pattern brush on a level 1 printer\n"); - ret = FALSE; - } - HeapFree(PSDRV_Heap, 0, bits); - } - break; - case BS_DIBPATTERN: - { - BITMAPINFO *bmi = (BITMAPINFO *)logbrush.lbHatch; - UINT usage = logbrush.lbColor; - TRACE("size %dx%dx%d\n", bmi->bmiHeader.biWidth, - bmi->bmiHeader.biHeight, bmi->bmiHeader.biBitCount); - if(physDev->pi->ppd->LanguageLevel > 1) { - PSDRV_WriteGSave(dev); - ret = PSDRV_WriteDIBPatternDict(dev, bmi, usage); - PSDRV_Fill(dev, EO); - PSDRV_WriteGRestore(dev); - } else { - FIXME("Trying to set a pattern brush on a level 1 printer\n"); - ret = FALSE; - } + if(physDev->pi->ppd->LanguageLevel > 1) { + PSDRV_WriteGSave(dev); + ret = PSDRV_WriteDIBPatternDict(dev, physDev->brush.info, + physDev->brush.bits, physDev->brush.usage ); + PSDRV_Fill(dev, EO); + PSDRV_WriteGRestore(dev); + } else { + FIXME("Trying to set a pattern brush on a level 1 printer\n"); + ret = FALSE; } break; diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index a456253..19784f3 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -843,74 +843,25 @@ BOOL PSDRV_WriteRectClip2(PHYSDEV dev, CHAR *pszArrayName) return PSDRV_WriteSpool(dev, buf, strlen(buf)); } -BOOL PSDRV_WritePatternDict(PHYSDEV dev, BITMAP *bm, BYTE *bits) +BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, UINT usage) { static const char mypat[] = "/mypat\n"; static const char do_pattern[] = "<<\n /PaintType 1\n /PatternType 1\n /TilingType 1\n " "/BBox [0 0 %d %d]\n /XStep %d\n /YStep %d\n /PaintProc {\n begin\n 0 0 translate\n" " %d %d scale\n mypat image\n end\n }\n>>\n matrix makepattern setpattern\n"; - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); char *buf, *ptr; INT w, h, x, y, w_mult, h_mult; COLORREF map[2]; - w = bm->bmWidth & ~0x7; - h = bm->bmHeight & ~0x7; - - buf = HeapAlloc(PSDRV_Heap, 0, sizeof(do_pattern) + 100); - ptr = buf; - for(y = h-1; y >= 0; y--) { - for(x = 0; x < w/8; x++) { - sprintf(ptr, "%02x", *(bits + x/8 + y * bm->bmWidthBytes)); - ptr += 2; - } - } - PSDRV_WriteSpool(dev, mypat, sizeof(mypat) - 1); - PSDRV_WriteImageDict(dev, 1, 8, 8, buf, FALSE); - PSDRV_WriteSpool(dev, "def\n", 4); - - PSDRV_WriteIndexColorSpaceBegin(dev, 1); - map[0] = GetTextColor( dev->hdc ); - map[1] = GetBkColor( dev->hdc ); - PSDRV_WriteRGB(dev, map, 2); - PSDRV_WriteIndexColorSpaceEnd(dev); - - /* Windows seems to scale patterns so that a one pixel corresponds to 1/300" */ - w_mult = (physDev->logPixelsX + 150) / 300; - h_mult = (physDev->logPixelsY + 150) / 300; - sprintf(buf, do_pattern, w * w_mult, h * h_mult, w * w_mult, h * h_mult, w * w_mult, h * h_mult); - PSDRV_WriteSpool(dev, buf, strlen(buf)); - - HeapFree(PSDRV_Heap, 0, buf); - return TRUE; -} - -BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, BITMAPINFO *bmi, UINT usage) -{ - static const char mypat[] = "/mypat\n"; - static const char do_pattern[] = "<<\n /PaintType 1\n /PatternType 1\n /TilingType 1\n " - "/BBox [0 0 %d %d]\n /XStep %d\n /YStep %d\n /PaintProc {\n begin\n 0 0 translate\n" - " %d %d scale\n mypat image\n end\n }\n>>\n matrix makepattern setpattern\n"; - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - char *buf, *ptr; - BYTE *bits; - INT w, h, x, y, colours, w_mult, h_mult; - COLORREF map[2]; + TRACE( "size %dx%dx%d\n", + bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight, bmi->bmiHeader.biBitCount); if(bmi->bmiHeader.biBitCount != 1) { FIXME("dib depth %d not supported\n", bmi->bmiHeader.biBitCount); return FALSE; } - bits = (LPBYTE)bmi + bmi->bmiHeader.biSize; - colours = bmi->bmiHeader.biClrUsed; - if (colours > 256) colours = 256; - if(!colours && bmi->bmiHeader.biBitCount <= 8) - colours = 1 << bmi->bmiHeader.biBitCount; - bits += colours * ((usage == DIB_RGB_COLORS) ? - sizeof(RGBQUAD) : sizeof(WORD)); - w = bmi->bmiHeader.biWidth & ~0x7; h = bmi->bmiHeader.biHeight & ~0x7; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 1b3bb61..b86f527 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -327,6 +327,9 @@ typedef struct { typedef struct { PSCOLOR color; BOOL set; + const BITMAPINFO *info; + void *bits; + UINT usage; } PSBRUSH; #define MAX_DASHLEN 16 @@ -531,8 +534,7 @@ extern BOOL PSDRV_WriteImage(PHYSDEV dev, WORD depth, INT xDst, INT yDst, extern BOOL PSDRV_WriteBytes(PHYSDEV dev, const BYTE *bytes, DWORD number) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteData(PHYSDEV dev, const BYTE *byte, DWORD number) DECLSPEC_HIDDEN; extern DWORD PSDRV_WriteSpool(PHYSDEV dev, LPCSTR lpData, DWORD cch) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WritePatternDict(PHYSDEV dev, BITMAP *bm, BYTE *bits) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, BITMAPINFO *bmi, UINT usage) DECLSPEC_HIDDEN; +extern BOOL PSDRV_WriteDIBPatternDict(PHYSDEV dev, const BITMAPINFO *bmi, BYTE *bits, UINT usage) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteArrayPut(PHYSDEV dev, CHAR *pszArrayName, INT nIndex, LONG lCoord) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteArrayDef(PHYSDEV dev, CHAR *pszArrayName, INT nSize) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011