wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Alexandre Julliard : Wine release 1.5.1
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: website Branch: master Commit: 307cad9cd1b48edb008d7f97f69d4d1d753f4638 URL: http://source.winehq.org/git/website.git/?a=commit;h=307cad9cd1b48edb008d7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 20:32:36 2012 +0200 Wine release 1.5.1 --- news/en/2012033001.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2012033001.xml b/news/en/2012033001.xml new file mode 100644 index 0000000..46101e0 --- /dev/null +++ b/news/en/2012033001.xml @@ -0,0 +1,16 @@ +<news> +<date>March 30, 2012</date> +<title>Wine 1.5.1 Released</title> +<body> + The Wine development release 1.5.1 is now available. + <a href="{$root}/announce/1.5.1">What's new</a> in this release: +<ul> + <li>Built-in JavaScript now preferred over Gecko in most cases.</li> + <li>Support for scalable font resources.</li> + <li>Fixes for audio and video playback.</li> + <li>Support for script decoding in JScript.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.1.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.1 : Alexandre Julliard : Release 1.5.1
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: refs/tags/wine-1.5.1 Tag: 40dcd0d0d02d0f36a3355c67264cbd38730e719e URL: http://source.winehq.org/git/wine.git/?a=tag;h=40dcd0d0d02d0f36a3355c67264c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 20:17:56 2012 +0200 Release 1.5.1

1 0

Alexandre Julliard : Release 1.5.1.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: e7a3392d50340ef3b9dd06b8db9d6f7b52ef7df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a3392d50340ef3b9dd06b8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 20:17:55 2012 +0200 Release 1.5.1. --- ANNOUNCE | 865 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 395 insertions(+), 490 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7a3392d50340ef3b9dd0…

1 0

Vincent Povirk : gdiplus: Support bitmap creation from 16-bit ddb's.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 93a089766097338c88af511dd9bea5c512f2b575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a089766097338c88af511dd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 29 14:18:15 2012 -0500 gdiplus: Support bitmap creation from 16-bit ddb's. --- dlls/gdiplus/image.c | 71 ++++++++++++++++++++++++++++++------------------- 1 files changed, 43 insertions(+), 28 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index aba8366..3b70b25 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3520,13 +3520,53 @@ GpStatus WINGDIPAPI GdipGetEncoderParameterListSize(GpImage *image, return NotImplemented; } +static PixelFormat get_16bpp_format(HBITMAP hbm) +{ + BITMAPV4HEADER bmh; + HDC hdc; + PixelFormat result; + + hdc = CreateCompatibleDC(NULL); + + memset(&bmh, 0, sizeof(bmh)); + bmh.bV4Size = sizeof(bmh); + bmh.bV4Width = 1; + bmh.bV4Height = 1; + bmh.bV4V4Compression = BI_BITFIELDS; + bmh.bV4BitCount = 16; + + GetDIBits(hdc, hbm, 0, 0, NULL, (BITMAPINFO*)&bmh, DIB_RGB_COLORS); + + if (bmh.bV4RedMask == 0x7c00 && + bmh.bV4GreenMask == 0x3e0 && + bmh.bV4BlueMask == 0x1f) + { + result = PixelFormat16bppRGB555; + } + else if (bmh.bV4RedMask == 0xf800 && + bmh.bV4GreenMask == 0x7e0 && + bmh.bV4BlueMask == 0x1f) + { + result = PixelFormat16bppRGB565; + } + else + { + FIXME("unrecognized bitfields %x,%x,%x\n", bmh.bV4RedMask, + bmh.bV4GreenMask, bmh.bV4BlueMask); + result = PixelFormatUndefined; + } + + DeleteDC(hdc); + + return result; +} + /***************************************************************************** * GdipCreateBitmapFromHBITMAP [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBitmap** bitmap) { BITMAP bm; - DIBSECTION dib; GpStatus retval; PixelFormat format; BitmapData lockeddata; @@ -3552,35 +3592,10 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi format = PixelFormat8bppIndexed; break; case 16: - { - if (GetObjectA(hbm, sizeof(dib), &dib) == sizeof(dib)) - { - if (dib.dsBitfields[0] == 0x7c00 && - dib.dsBitfields[1] == 0x3e0 && - dib.dsBitfields[2] == 0x1f) - { - format = PixelFormat16bppRGB555; - } - else if (dib.dsBitfields[0] == 0xf800 && - dib.dsBitfields[1] == 0x7e0 && - dib.dsBitfields[2] == 0x1f) - { - format = PixelFormat16bppRGB565; - } - else - { - FIXME("unrecognized bitfields %x,%x,%x\n", dib.dsBitfields[0], - dib.dsBitfields[1], dib.dsBitfields[2]); - return InvalidParameter; - } - } - else - { - FIXME("unimplemented for 16-bit ddb\n"); + format = get_16bpp_format(hbm); + if (format == PixelFormatUndefined) return InvalidParameter; - } break; - } case 24: format = PixelFormat24bppRGB; break;

1 0

Christian Costa : dmusic: Don't use method implementation directly. Pass through vtable with related macro instead.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 4829fcd9b2f7ced07daeba758929bef96c36edcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4829fcd9b2f7ced07daeba758… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Mar 30 01:08:48 2012 +0200 dmusic: Don't use method implementation directly. Pass through vtable with related macro instead. --- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/dmusic_private.h | 2 -- dlls/dmusic/port.c | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 80c5d4b..a36682c 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -193,7 +193,7 @@ static HRESULT WINAPI IDirectMusic8Impl_Activate (LPDIRECTMUSIC8 iface, BOOL fEn FIXME("(%p, %d): stub\n", This, fEnable); for (i = 0; i < This->nrofports; i++) { - IDirectMusicPortImpl_Activate(This->ppPorts[i], fEnable); + IDirectMusicPort_Activate(This->ppPorts[i], fEnable); } return S_OK; diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 1aa0536..c05adf0 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -151,8 +151,6 @@ struct IDirectMusicPortImpl { DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; }; -extern HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive) DECLSPEC_HIDDEN; - /** Internal factory */ extern HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) DECLSPEC_HIDDEN; diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 6cb5634..d0bbd9a 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -157,7 +157,8 @@ static HRESULT WINAPI IDirectMusicPortImpl_GetNumChannelGroups (LPDIRECTMUSICPOR return S_OK; } -HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive) { +static HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive) +{ IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface; TRACE("(%p, %d)\n", This, fActive); This->fActive = fActive;

1 0

Andrew Eikum : dmusic: Reimplement instrument loading.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: ed54e52590fb640ab7e72613c0081d5c6e168af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed54e52590fb640ab7e72613c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 30 08:38:41 2012 -0500 dmusic: Reimplement instrument loading. --- dlls/dmusic/instrument.c | 441 +++++++++++++++++----------------------------- 1 files changed, 159 insertions(+), 282 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed54e52590fb640ab7e72…

1 0

Andrew Eikum : dmusic: Support creating default ports with GUID_NULL.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 47ce8c9755ae67c23dcc485b226540227d719794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ce8c9755ae67c23dcc485b2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Mar 30 08:38:20 2012 -0500 dmusic: Support creating default ports with GUID_NULL. --- dlls/dmime/tests/performance.c | 173 +++++++++++++++++++++++++++++++++------- dlls/dmusic/dmusic.c | 30 +++++-- dlls/dmusic/tests/dmusic.c | 2 +- 3 files changed, 166 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47ce8c9755ae67c23dcc4…

1 0

Huw Davies : winspool: Keep track of any supplied devmode.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: b74c9a64728353b98e68376b12f92abd6cb1c999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74c9a64728353b98e68376b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 30 14:39:42 2012 +0100 winspool: Keep track of any supplied devmode. --- dlls/winspool.drv/info.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 24e5a97..d832b4b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -96,6 +96,7 @@ typedef struct { HANDLE backend_printer; jobqueue_t *queue; started_doc_t *doc; + DEVMODEW *devmode; } opened_printer_t; typedef struct { @@ -778,6 +779,7 @@ static void free_printer_entry( opened_printer_t *printer ) /* the queue is shared, so don't free that here */ HeapFree( GetProcessHeap(), 0, printer->printername ); HeapFree( GetProcessHeap(), 0, printer->name ); + HeapFree( GetProcessHeap(), 0, printer->devmode ); HeapFree( GetProcessHeap(), 0, printer ); } @@ -872,6 +874,9 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault goto end; } + if (pDefault && pDefault->pDevMode) + printer->devmode = dup_devmode( pDefault->pDevMode ); + if(queue) printer->queue = queue; else

1 0

Huw Davies : winspool: Add a helper to free a printer entry.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 736fdbdec5fa17f117082b3d4e8d44179f2b2d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=736fdbdec5fa17f117082b3d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 30 14:39:41 2012 +0100 winspool: Add a helper to free a printer entry. --- dlls/winspool.drv/info.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7fbede2..24e5a97 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -773,6 +773,14 @@ static LPCWSTR get_basename_from_name(LPCWSTR name) return name; } +static void free_printer_entry( opened_printer_t *printer ) +{ + /* the queue is shared, so don't free that here */ + HeapFree( GetProcessHeap(), 0, printer->printername ); + HeapFree( GetProcessHeap(), 0, printer->name ); + HeapFree( GetProcessHeap(), 0, printer ); +} + /****************************************************************** * get_opened_printer_entry * Get the first place empty in the opened printer table @@ -883,11 +891,8 @@ static HANDLE get_opened_printer_entry(LPWSTR name, LPPRINTER_DEFAULTSW pDefault end: LeaveCriticalSection(&printer_handles_cs); if (!handle && printer) { - /* Something failed: Free all resources */ - HeapFree(GetProcessHeap(), 0, printer->printername); - HeapFree(GetProcessHeap(), 0, printer->name); if (!queue) HeapFree(GetProcessHeap(), 0, printer->queue); - HeapFree(GetProcessHeap(), 0, printer); + free_printer_entry( printer ); } return (HANDLE)handle; @@ -2722,9 +2727,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) HeapFree(GetProcessHeap(), 0, printer->queue); } - HeapFree(GetProcessHeap(), 0, printer->printername); - HeapFree(GetProcessHeap(), 0, printer->name); - HeapFree(GetProcessHeap(), 0, printer); + free_printer_entry( printer ); printer_handles[i - 1] = NULL; ret = TRUE; }

1 0

Huw Davies : winspool: Add a helper to duplicate a devmode.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 2f78666a010a25f77f614affb875289581dbb877 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f78666a010a25f77f614affb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 30 14:39:40 2012 +0100 winspool: Add a helper to duplicate a devmode. --- dlls/winspool.drv/info.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9bb8915..7fbede2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -338,6 +338,16 @@ static LPSTR strdupWtoA( LPCWSTR str ) return ret; } +static DEVMODEW *dup_devmode( const DEVMODEW *dm ) +{ + DEVMODEW *ret; + + if (!dm) return NULL; + ret = HeapAlloc( GetProcessHeap(), 0, dm->dmSize + dm->dmDriverExtra ); + if (ret) memcpy( ret, dm, dm->dmSize + dm->dmDriverExtra ); + return ret; +} + /****************************************************************** * verify, that the filename is a local file * @@ -2888,7 +2898,6 @@ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, { BOOL ret = FALSE; job_t *job; - DWORD size; TRACE("(%p, %d, %d, %p, %d)\n", hPrinter, JobId, Level, pJob, Command); FIXME("Ignoring everything other than document title\n"); @@ -2915,14 +2924,7 @@ BOOL WINAPI SetJobW(HANDLE hPrinter, DWORD JobId, DWORD Level, HeapFree(GetProcessHeap(), 0, job->document_title); job->document_title = strdupW(info2->pDocument); HeapFree(GetProcessHeap(), 0, job->devmode); - if (info2->pDevMode) - { - size = info2->pDevMode->dmSize + info2->pDevMode->dmDriverExtra; - job->devmode = HeapAlloc(GetProcessHeap(), 0, size); - memcpy(job->devmode, info2->pDevMode, size); - } - else - job->devmode = NULL; + job->devmode = dup_devmode( info2->pDevMode ); break; } case 3:

1 0

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 March 2012