January 2012 - Wine-commits

Vincent Povirk : windowscodecs: Implement IWICMetadataWriter::LoadEx.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 60e6653561897238ef22727f5fc7ed618230a410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e6653561897238ef22727f5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 16:36:49 2012 -0600 windowscodecs: Implement IWICMetadataWriter::LoadEx. --- dlls/windowscodecs/metadatahandler.c | 92 ++++++++++++++++++++++++++++++++-- dlls/windowscodecs/tests/metadata.c | 2 +- 2 files changed, 89 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 9dd6cca..0e916f2 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -39,6 +39,9 @@ typedef struct MetadataHandler { LONG ref; IWICPersistStream IWICPersistStream_iface; const MetadataHandlerVtbl *vtable; + MetadataItem *items; + DWORD item_count; + CRITICAL_SECTION lock; } MetadataHandler; static inline MetadataHandler *impl_from_IWICMetadataWriter(IWICMetadataWriter *iface) @@ -51,6 +54,20 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if return CONTAINING_RECORD(iface, MetadataHandler, IWICPersistStream_iface); } +static void MetadataHandler_FreeItems(MetadataHandler *This) +{ + int i; + + for (i=0; i<This->item_count; i++) + { + PropVariantClear(&This->items[i].schema); + PropVariantClear(&This->items[i].id); + PropVariantClear(&This->items[i].value); + } + + HeapFree(GetProcessHeap(), 0, This->items); +} + static HRESULT WINAPI MetadataHandler_QueryInterface(IWICMetadataWriter *iface, REFIID iid, void **ppv) { @@ -100,6 +117,9 @@ static ULONG WINAPI MetadataHandler_Release(IWICMetadataWriter *iface) if (ref == 0) { + MetadataHandler_FreeItems(This); + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, This); } @@ -248,8 +268,28 @@ static HRESULT WINAPI MetadataHandler_GetSizeMax(IWICPersistStream *iface, static HRESULT WINAPI MetadataHandler_LoadEx(IWICPersistStream *iface, IStream *pIStream, const GUID *pguidPreferredVendor, DWORD dwPersistOptions) { - FIXME("(%p,%p,%s,%x): stub\n", iface, pIStream, debugstr_guid(pguidPreferredVendor), dwPersistOptions); - return E_NOTIMPL; + MetadataHandler *This = impl_from_IWICPersistStream(iface); + HRESULT hr; + MetadataItem *new_items=NULL; + DWORD item_count=0; + + TRACE("(%p,%p,%s,%x)\n", iface, pIStream, debugstr_guid(pguidPreferredVendor), dwPersistOptions); + + EnterCriticalSection(&This->lock); + + hr = This->vtable->fnLoad(pIStream, pguidPreferredVendor, dwPersistOptions, + &new_items, &item_count); + + if (SUCCEEDED(hr)) + { + MetadataHandler_FreeItems(This); + This->items = new_items; + This->item_count = item_count; + } + + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI MetadataHandler_SaveEx(IWICPersistStream *iface, @@ -290,6 +330,11 @@ HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkO This->IWICPersistStream_iface.lpVtbl = &MetadataHandler_PersistStream_Vtbl; This->ref = 1; This->vtable = vtable; + This->items = NULL; + This->item_count = 0; + + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MetadataHandler.lock"); hr = IWICMetadataWriter_QueryInterface(&This->IWICMetadataWriter_iface, iid, ppv); @@ -301,8 +346,47 @@ HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkO static HRESULT LoadUnknownMetadata(IStream *input, const GUID *preferred_vendor, DWORD persist_options, MetadataItem **items, DWORD *item_count) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hr; + MetadataItem *result; + STATSTG stat; + BYTE *data; + ULONG bytesread; + + TRACE("\n"); + + hr = IStream_Stat(input, &stat, STATFLAG_NONAME); + if (FAILED(hr)) + return hr; + + data = HeapAlloc(GetProcessHeap(), 0, stat.cbSize.QuadPart); + if (!data) return E_OUTOFMEMORY; + + hr = IStream_Read(input, data, stat.cbSize.QuadPart, &bytesread); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, data); + return hr; + } + + result = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataItem)); + if (FAILED(hr)) + { + HeapFree(GetProcessHeap(), 0, data); + return E_OUTOFMEMORY; + } + + PropVariantInit(&result[0].schema); + PropVariantInit(&result[0].id); + PropVariantInit(&result[0].value); + + result[0].value.vt = VT_BLOB; + result[0].value.blob.cbSize = bytesread; + result[0].value.blob.pBlobData = data; + + *items = result; + *item_count = 1; + + return S_OK; } static const MetadataHandlerVtbl UnknownMetadataReader_Vtbl = { diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 06b8e89..43c6f48 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -100,7 +100,7 @@ static void load_stream(IUnknown *reader, const char *data, int data_size) if (SUCCEEDED(hr)) { hr = IWICPersistStream_LoadEx(persist, stream, NULL, WICPersistOptionsDefault); - todo_wine ok(hr == S_OK, "LoadEx failed, hr=%x\n", hr); + ok(hr == S_OK, "LoadEx failed, hr=%x\n", hr); IWICPersistStream_Release(persist); }

1 0

Vincent Povirk : windowscodecs: Implement IWICMetadataWriter::GetEnumerator .
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 31be8a19d97682dbd633cef50d9d6fdcbeee8e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31be8a19d97682dbd633cef50… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 17:16:41 2012 -0600 windowscodecs: Implement IWICMetadataWriter::GetEnumerator. --- dlls/windowscodecs/metadatahandler.c | 191 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 2 +- 2 files changed, 190 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 0e916f2..23854d8 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -68,6 +68,9 @@ static void MetadataHandler_FreeItems(MetadataHandler *This) HeapFree(GetProcessHeap(), 0, This->items); } +static HRESULT MetadataHandlerEnum_Create(MetadataHandler *parent, DWORD index, + IWICEnumMetadataItem **ppIEnumMetadataItem); + static HRESULT WINAPI MetadataHandler_QueryInterface(IWICMetadataWriter *iface, REFIID iid, void **ppv) { @@ -164,8 +167,9 @@ static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, static HRESULT WINAPI MetadataHandler_GetEnumerator(IWICMetadataWriter *iface, IWICEnumMetadataItem **ppIEnumMetadata) { - FIXME("(%p,%p): stub\n", iface, ppIEnumMetadata); - return E_NOTIMPL; + MetadataHandler *This = impl_from_IWICMetadataWriter(iface); + TRACE("(%p,%p)\n", iface, ppIEnumMetadata); + return MetadataHandlerEnum_Create(This, 0, ppIEnumMetadata); } static HRESULT WINAPI MetadataHandler_SetValue(IWICMetadataWriter *iface, @@ -343,6 +347,189 @@ HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkO return hr; } +typedef struct MetadataHandlerEnum { + IWICEnumMetadataItem IWICEnumMetadataItem_iface; + LONG ref; + MetadataHandler *parent; + DWORD index; +} MetadataHandlerEnum; + +static inline MetadataHandlerEnum *impl_from_IWICEnumMetadataItem(IWICEnumMetadataItem *iface) +{ + return CONTAINING_RECORD(iface, MetadataHandlerEnum, IWICEnumMetadataItem_iface); +} + +static HRESULT WINAPI MetadataHandlerEnum_QueryInterface(IWICEnumMetadataItem *iface, REFIID iid, + void **ppv) +{ + MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICEnumMetadataItem, iid)) + { + *ppv = &This->IWICEnumMetadataItem_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI MetadataHandlerEnum_AddRef(IWICEnumMetadataItem *iface) +{ + MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI MetadataHandlerEnum_Release(IWICEnumMetadataItem *iface) +{ + MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + IWICMetadataWriter_Release(&This->parent->IWICMetadataWriter_iface); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface, + ULONG celt, PROPVARIANT *rgeltSchema, PROPVARIANT *rgeltId, + PROPVARIANT *rgeltValue, ULONG *pceltFetched) +{ + MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); + ULONG new_index; + HRESULT hr=S_FALSE; + int i; + + TRACE("(%p,%i)\n", iface, celt); + + EnterCriticalSection(&This->parent->lock); + + if (This->index >= This->parent->item_count) + { + *pceltFetched = 0; + LeaveCriticalSection(&This->parent->lock); + return S_FALSE; + } + + new_index = min(This->parent->item_count, This->index + celt); + *pceltFetched = new_index - This->index; + + if (rgeltSchema) + { + for (i=0; SUCCEEDED(hr) && i < *pceltFetched; i++) + hr = PropVariantCopy(&rgeltSchema[i], &This->parent->items[i+This->index].schema); + } + + for (i=0; SUCCEEDED(hr) && i < *pceltFetched; i++) + hr = PropVariantCopy(&rgeltId[i], &This->parent->items[i+This->index].id); + + if (rgeltValue) + { + for (i=0; SUCCEEDED(hr) && i < *pceltFetched; i++) + hr = PropVariantCopy(&rgeltValue[i], &This->parent->items[i+This->index].value); + } + + if (SUCCEEDED(hr)) + { + This->index = new_index; + } + + LeaveCriticalSection(&This->parent->lock); + + return hr; +} + +static HRESULT WINAPI MetadataHandlerEnum_Skip(IWICEnumMetadataItem *iface, + ULONG celt) +{ + MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); + + EnterCriticalSection(&This->parent->lock); + + This->index += celt; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; +} + +static HRESULT WINAPI MetadataHandlerEnum_Reset(IWICEnumMetadataItem *iface) +{ + MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); + + EnterCriticalSection(&This->parent->lock); + + This->index = 0; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; +} + +static HRESULT WINAPI MetadataHandlerEnum_Clone(IWICEnumMetadataItem *iface, + IWICEnumMetadataItem **ppIEnumMetadataItem) +{ + MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); + HRESULT hr; + + EnterCriticalSection(&This->parent->lock); + + hr = MetadataHandlerEnum_Create(This->parent, This->index, ppIEnumMetadataItem); + + LeaveCriticalSection(&This->parent->lock); + + return hr; +} + +static const IWICEnumMetadataItemVtbl MetadataHandlerEnum_Vtbl = { + MetadataHandlerEnum_QueryInterface, + MetadataHandlerEnum_AddRef, + MetadataHandlerEnum_Release, + MetadataHandlerEnum_Next, + MetadataHandlerEnum_Skip, + MetadataHandlerEnum_Reset, + MetadataHandlerEnum_Clone +}; + +static HRESULT MetadataHandlerEnum_Create(MetadataHandler *parent, DWORD index, + IWICEnumMetadataItem **ppIEnumMetadataItem) +{ + MetadataHandlerEnum *This; + + *ppIEnumMetadataItem = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(MetadataHandlerEnum)); + if (!This) return E_OUTOFMEMORY; + + IWICMetadataWriter_AddRef(&parent->IWICMetadataWriter_iface); + + This->IWICEnumMetadataItem_iface.lpVtbl = &MetadataHandlerEnum_Vtbl; + This->ref = 1; + This->parent = parent; + This->index = index; + + *ppIEnumMetadataItem = &This->IWICEnumMetadataItem_iface; + + return S_OK; +} + static HRESULT LoadUnknownMetadata(IStream *input, const GUID *preferred_vendor, DWORD persist_options, MetadataItem **items, DWORD *item_count) { diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 43c6f48..4cfc53c 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -124,7 +124,7 @@ static void test_metadata_unknown(void) load_stream((IUnknown*)reader, metadata_unknown, sizeof(metadata_unknown)); hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); - todo_wine ok(hr == S_OK, "GetEnumerator failed, hr=%x\n", hr); + ok(hr == S_OK, "GetEnumerator failed, hr=%x\n", hr); if (SUCCEEDED(hr)) {

1 0

Alistair Leslie-Hughes : include: Add missing DB_E_BAD defines.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 654e0722d805a0c1590b6b983ffc057bd93e7131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=654e0722d805a0c1590b6b983… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 12 16:21:29 2012 +1100 include: Add missing DB_E_BAD defines. --- include/oledberr.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/oledberr.h b/include/oledberr.h index e25e40e..94db602 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -29,6 +29,10 @@ #define DB_E_ERRORSOCCURRED 0x80040e21 +#define DB_E_BADSTORAGEFLAG 0x80040e26 +#define DB_E_BADCOMPAREOP 0x80040e27 +#define DB_E_BADSTATUSVALUE 0x80040e28 + #define DB_E_DATAOVERFLOW 0x80040e57 #define DB_S_ERRORSOCCURRED 0x00040eda

1 0

Piotr Caban : msvcp90: Fix mistakes in spec file.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: c2a08d6d0f886294129701225f615f02824d518b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a08d6d0f886294129701225… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 12 11:19:31 2012 +0100 msvcp90: Fix mistakes in spec file. --- dlls/msvcp90/msvcp90.spec | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2a08d6d0f88629412970…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 2932b42a60eaad3d4dafcb46287b31537c605353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2932b42a60eaad3d4dafcb462… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Fri Dec 2 19:06:48 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index b8eb932..f105366 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-30 19:55+0300\n" +"PO-Revision-Date: 2012-01-07 09:29+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -79,7 +79,8 @@ msgstr "Gerai" #: appwiz.rc:76 msgid "The following information can be used to get technical support for %s:" msgstr "" -"Ši informacija gali būti panaudota programos „%s“ techninei priežiūrai gauti:" +"Ši informacija gali būti panaudota programos „%s“ techninei priežiūrai " +"gauti:" #: appwiz.rc:77 msgid "Publisher:" @@ -8396,9 +8397,8 @@ msgid "The specified device handle is invalid." msgstr "Nurodyta įrenginio rodyklė yra netinkama." #: winmm.rc:34 -#, fuzzy msgid "There is no driver installed on your system!" -msgstr "Sistemoje nėra įdiegta tvarkyklė!\n" +msgstr "Sistemoje nėra įdiegta tvarkyklė!" #: winmm.rc:35 winmm.rc:61 msgid "" @@ -13055,9 +13055,8 @@ msgid "&Color" msgstr "&Spalva" #: wineconsole.rc:97 -#, fuzzy msgid "Configuration" -msgstr " Konfigūracija " +msgstr "Konfigūracija" #: wineconsole.rc:100 msgid "Buffer zone"

1 0

Alexandre Julliard : winex11: Don' t cache text and background pixel values to support PALETTEINDEX properly.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 98dd61e2f3127d60bbcb0ba804bbabdc1f6440de URL: http://source.winehq.org/git/wine.git/?a=commit;h=98dd61e2f3127d60bbcb0ba80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 11 20:55:35 2012 +0100 winex11: Don't cache text and background pixel values to support PALETTEINDEX properly. --- dlls/winex11.drv/bitblt.c | 18 ++++++++++++------ dlls/winex11.drv/graphics.c | 35 ++++++----------------------------- dlls/winex11.drv/init.c | 4 ++-- dlls/winex11.drv/text.c | 7 +++++-- dlls/winex11.drv/x11drv.h | 4 ---- 5 files changed, 25 insertions(+), 43 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index a54ca49..801ea08 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -850,9 +850,12 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } if (physDevSrc->depth == 1) { + int text_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetTextColor(physDevDst->dev.hdc) ); + int bkgnd_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetBkColor(physDevDst->dev.hdc) ); + wine_tsx11_lock(); - XSetBackground( gdi_display, physDevDst->gc, physDevDst->textPixel ); - XSetForeground( gdi_display, physDevDst->gc, physDevDst->backgroundPixel ); + XSetBackground( gdi_display, physDevDst->gc, text_pixel ); + XSetForeground( gdi_display, physDevDst->gc, bkgnd_pixel ); XSetFunction( gdi_display, physDevDst->gc, OP_ROP(*opcode) ); XCopyPlane( gdi_display, physDevSrc->drawable, physDevDst->drawable, physDevDst->gc, @@ -881,15 +884,18 @@ BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, to color or vice versa, the foreground and background color of the device context are used. In fact, it also applies to the case when it is converted from mono to mono. */ + int text_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetTextColor(physDevDst->dev.hdc) ); + int bkgnd_pixel = X11DRV_PALETTE_ToPhysical( physDevDst, GetBkColor(physDevDst->dev.hdc) ); + if (X11DRV_PALETTE_XPixelToPalette && physDevDst->depth != 1) { - XSetBackground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->textPixel] ); - XSetForeground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[physDevDst->backgroundPixel]); + XSetBackground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[text_pixel] ); + XSetForeground( gdi_display, gc, X11DRV_PALETTE_XPixelToPalette[bkgnd_pixel]); } else { - XSetBackground( gdi_display, gc, physDevDst->textPixel ); - XSetForeground( gdi_display, gc, physDevDst->backgroundPixel ); + XSetBackground( gdi_display, gc, text_pixel ); + XSetForeground( gdi_display, gc, bkgnd_pixel ); } XCopyPlane( gdi_display, physDevSrc->drawable, src_pixmap, gc, physDevSrc->dc_rect.left + src->visrect.left, diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index e317eb9..910dfea 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -274,13 +274,13 @@ BOOL X11DRV_SetupGCForPatBlt( X11DRV_PDEVICE *physDev, GC gc, BOOL fMapColors ) * We need to swap foreground and background because * Windows does it the wrong way... */ - val.foreground = physDev->backgroundPixel; - val.background = physDev->textPixel; + val.foreground = X11DRV_PALETTE_ToPhysical( physDev, GetBkColor(physDev->dev.hdc) ); + val.background = X11DRV_PALETTE_ToPhysical( physDev, GetTextColor(physDev->dev.hdc) ); } else { val.foreground = physDev->brush.pixel; - val.background = physDev->backgroundPixel; + val.background = X11DRV_PALETTE_ToPhysical( physDev, GetBkColor(physDev->dev.hdc) ); } if (fMapColors && X11DRV_PALETTE_XPixelToPalette) { @@ -399,7 +399,7 @@ static BOOL X11DRV_SetupGCForPen( X11DRV_PDEVICE *physDev ) val.foreground = physDev->pen.pixel; val.function = X11DRV_XROPfunction[rop2-1]; } - val.background = physDev->backgroundPixel; + val.background = X11DRV_PALETTE_ToPhysical( physDev, GetBkColor(physDev->dev.hdc) ); val.fill_style = FillSolid; val.line_width = physDev->pen.width; if (val.line_width <= 1) { @@ -463,8 +463,8 @@ BOOL X11DRV_SetupGCForText( X11DRV_PDEVICE *physDev ) XGCValues val; val.function = GXcopy; /* Text is always GXcopy */ - val.foreground = physDev->textPixel; - val.background = physDev->backgroundPixel; + val.foreground = X11DRV_PALETTE_ToPhysical( physDev, GetTextColor(physDev->dev.hdc) ); + val.background = X11DRV_PALETTE_ToPhysical( physDev, GetBkColor(physDev->dev.hdc) ); val.fill_style = FillSolid; val.font = xfs->fid; @@ -1493,29 +1493,6 @@ fallback: return dev->funcs->pGradientFill( dev, vert_array, nvert, grad_array, ngrad, mode ); } -/********************************************************************** - * X11DRV_SetBkColor - */ -COLORREF X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) -{ - X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - - physDev->backgroundPixel = X11DRV_PALETTE_ToPhysical( physDev, color ); - return color; -} - -/********************************************************************** - * X11DRV_SetTextColor - */ -COLORREF X11DRV_SetTextColor( PHYSDEV dev, COLORREF color ) -{ - X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - - physDev->textPixel = X11DRV_PALETTE_ToPhysical( physDev, color ); - return color; -} - - static unsigned char *get_icm_profile( unsigned long *size ) { Atom type; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 0530e31..de0d029 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -550,7 +550,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pSelectPalette */ X11DRV_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */ - X11DRV_SetBkColor, /* pSetBkColor */ + NULL, /* pSetBkColor */ NULL, /* pSetBkMode */ X11DRV_SetDCBrushColor, /* pSetDCBrushColor */ X11DRV_SetDCPenColor, /* pSetDCPenColor */ @@ -568,7 +568,7 @@ static const struct gdi_dc_funcs x11drv_funcs = NULL, /* pSetStretchBltMode */ NULL, /* pSetTextAlign */ NULL, /* pSetTextCharacterExtra */ - X11DRV_SetTextColor, /* pSetTextColor */ + NULL, /* pSetTextColor */ NULL, /* pSetTextJustification */ NULL, /* pSetViewportExt */ NULL, /* pSetViewportOrg */ diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index f0197b6..22a6353 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -43,6 +43,7 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); BOOL restore_region = FALSE; unsigned int i; + int pixel; fontObject* pfo = XFONT_GetFontObject( physDev->font ); XFontStruct* font; BOOL rotated = FALSE; @@ -70,8 +71,9 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, if (flags & ETO_OPAQUE) { + pixel = X11DRV_PALETTE_ToPhysical( physDev, GetBkColor(physDev->dev.hdc) ); wine_tsx11_lock(); - XSetForeground( gdi_display, physDev->gc, physDev->backgroundPixel ); + XSetForeground( gdi_display, physDev->gc, pixel ); XFillRectangle( gdi_display, physDev->drawable, physDev->gc, physDev->dc_rect.left + lprect->left, physDev->dc_rect.top + lprect->top, lprect->right - lprect->left, lprect->bottom - lprect->top ); @@ -97,8 +99,9 @@ BOOL X11DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, goto END; } + pixel = X11DRV_PALETTE_ToPhysical( physDev, GetTextColor(physDev->dev.hdc) ); wine_tsx11_lock(); - XSetForeground( gdi_display, physDev->gc, physDev->textPixel ); + XSetForeground( gdi_display, physDev->gc, pixel ); wine_tsx11_unlock(); if(!rotated) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0f155ee..32f51d7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -141,8 +141,6 @@ typedef struct X_PHYSBRUSH brush; X_PHYSBITMAP *bitmap; /* currently selected bitmap for memory DCs */ BOOL has_gdi_font; /* is current font a GDI font? */ - int backgroundPixel; - int textPixel; int depth; /* bit depth of the DC */ ColorShifts *color_shifts; /* color shifts of the DC */ int exposures; /* count of graphics exposures operations */ @@ -210,14 +208,12 @@ extern HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) DECLSPEC_HIDD extern HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern HFONT X11DRV_SelectFont( PHYSDEV dev, HFONT hfont ) DECLSPEC_HIDDEN; extern HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *pattern ) DECLSPEC_HIDDEN; -extern COLORREF X11DRV_SetBkColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetDCBrushColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_HIDDEN; extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) DECLSPEC_HIDDEN; -extern COLORREF X11DRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32: Don' t access past the file size when loading a cursor/icon.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 8407559167457c0420be40b0577ff43cd20b1eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8407559167457c0420be40b05… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 12 12:18:15 2012 +0100 user32: Don't access past the file size when loading a cursor/icon. --- dlls/user32/cursoricon.c | 63 ++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8407559167457c0420be4…

1 0

Alexandre Julliard : comctl32/syslink: Fix painting of background color for transparent controls.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: e0cc9a798b0b9be5adca70b86b43382de4b781c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0cc9a798b0b9be5adca70b86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 12 12:20:46 2012 +0100 comctl32/syslink: Fix painting of background color for transparent controls. --- dlls/comctl32/syslink.c | 36 ++++++++++++++++++++++++------------ 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 42fb987..a5ba3dd 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -94,7 +94,6 @@ typedef struct COLORREF TextColor; /* Color of the text */ COLORREF LinkColor; /* Color of links */ COLORREF VisitedColor; /* Color of visited links */ - COLORREF BackColor; /* Background color, set on creation */ WCHAR BreakChar; /* Break Character for the current font */ BOOL IgnoreReturn; /* (infoPtr->Style & LWS_IGNORERETURN) on creation */ } SYSLINK_INFO; @@ -819,11 +818,13 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) HFONT hOldFont; COLORREF OldTextColor, OldBkColor; HBRUSH hBrush; + UINT text_flags = ETO_CLIPPED; + UINT mode = GetBkMode( hdc ); hOldFont = SelectObject(hdc, infoPtr->Font); OldTextColor = SetTextColor(hdc, infoPtr->TextColor); - OldBkColor = SetBkColor(hdc, infoPtr->BackColor); - + OldBkColor = SetBkColor(hdc, comctl32_color.clrWindow); + GetClientRect(infoPtr->Self, &rc); rc.right -= SL_RIGHTMARGIN + SL_LEFTMARGIN; rc.bottom -= SL_BOTTOMMARGIN + SL_TOPMARGIN; @@ -832,9 +833,13 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) hBrush = (HBRUSH)SendMessageW(infoPtr->Notify, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)infoPtr->Self); - if (!hBrush) - hBrush = CreateSolidBrush(infoPtr->BackColor); - FillRect(hdc, &rc, hBrush); + if (!(infoPtr->Style & LWS_TRANSPARENT)) + { + FillRect(hdc, &rc, hBrush); + if (GetBkMode( hdc ) == OPAQUE) text_flags |= ETO_OPAQUE; + } + else SetBkMode( hdc, TRANSPARENT ); + DeleteObject(hBrush); for(Current = infoPtr->Items; Current != NULL; Current = Current->Next) @@ -863,7 +868,7 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) while(n > 0) { tx += bl->nSkip; - ExtTextOutW(hdc, bl->rc.left, bl->rc.top, ETO_OPAQUE | ETO_CLIPPED, &bl->rc, tx, bl->nChars, NULL); + ExtTextOutW(hdc, bl->rc.left, bl->rc.top, text_flags, &bl->rc, tx, bl->nChars, NULL); if((Current->Type == slLink) && (Current->u.Link.state & LIS_FOCUSED) && infoPtr->HasFocus) { COLORREF PrevTextColor; @@ -881,7 +886,7 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) SetBkColor(hdc, OldBkColor); SetTextColor(hdc, OldTextColor); SelectObject(hdc, hOldFont); - + SetBkMode(hdc, mode); return 0; } @@ -1549,6 +1554,17 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, return SYSLINK_Paint (infoPtr, (HDC)wParam); case WM_ERASEBKGND: + if (!(infoPtr->Style & LWS_TRANSPARENT)) + { + HDC hdc = (HDC)wParam; + HBRUSH brush = CreateSolidBrush( comctl32_color.clrWindow ); + RECT rect; + + GetClipBox( hdc, &rect ); + FillRect( hdc, &rect, brush ); + DeleteObject( brush ); + return 1; + } return 0; case WM_SETCURSOR: @@ -1731,8 +1747,6 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->TextColor = comctl32_color.clrWindowText; infoPtr->LinkColor = comctl32_color.clrHighlight; infoPtr->VisitedColor = comctl32_color.clrHighlight; - infoPtr->BackColor = infoPtr->Style & LWS_TRANSPARENT ? - comctl32_color.clrWindow : comctl32_color.clrBtnFace; infoPtr->BreakChar = ' '; infoPtr->IgnoreReturn = infoPtr->Style & LWS_IGNORERETURN; TRACE("SysLink Ctrl creation, hwnd=%p\n", hwnd); @@ -1750,8 +1764,6 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); - if (infoPtr->Style & LWS_TRANSPARENT) - infoPtr->BackColor = comctl32_color.clrWindow; return 0; default:

1 0

Austin English : comctl32: Fix a grammar error in comment.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 913fb67a5b2a9c2138c6202976ae548650fb4d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=913fb67a5b2a9c2138c620297… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 11 11:44:11 2012 -0800 comctl32: Fix a grammar error in comment. --- dlls/comctl32/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 41c1017..ccc594f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -775,7 +775,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, if (cGrow > 256) { - /* Windows doesn't limit the size here, but X11 doesn't let use allocate such huge bitmaps */ + /* Windows doesn't limit the size here, but X11 doesn't let us allocate such huge bitmaps */ WARN( "grow %d too large, limiting to 256\n", cGrow ); cGrow = 256; }

1 0

Vincent Povirk : gdiplus: Implement GdipDrawImagePoints.
by Alexandre Julliard 11 Jan '12

11 Jan '12

Module: wine Branch: master Commit: aba9ddc4a0b895ee7958625ce2a36214414f91ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba9ddc4a0b895ee7958625ce… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 11:23:09 2012 -0600 gdiplus: Implement GdipDrawImagePoints. --- dlls/gdiplus/graphics.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 50d2f7c..65a3815 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2528,15 +2528,38 @@ GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics *graphics, GpImage *image GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *dstpoints, INT count) { - FIXME("(%p, %p, %p, %d): stub\n", graphics, image, dstpoints, count); - return NotImplemented; + UINT width, height; + + TRACE("(%p, %p, %p, %d)\n", graphics, image, dstpoints, count); + + if(!image) + return InvalidParameter; + + GdipGetImageWidth(image, &width); + GdipGetImageHeight(image, &height); + + return GdipDrawImagePointsRect(graphics, image, dstpoints, count, 0, 0, + width, height, UnitPixel, NULL, NULL, NULL); } GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics *graphics, GpImage *image, GDIPCONST GpPoint *dstpoints, INT count) { - FIXME("(%p, %p, %p, %d): stub\n", graphics, image, dstpoints, count); - return NotImplemented; + GpPointF ptf[3]; + + TRACE("(%p, %p, %p, %d)\n", graphics, image, dstpoints, count); + + if (count != 3 || !dstpoints) + return InvalidParameter; + + ptf[0].X = (REAL)dstpoints[0].X; + ptf[0].Y = (REAL)dstpoints[0].Y; + ptf[1].X = (REAL)dstpoints[1].X; + ptf[1].Y = (REAL)dstpoints[1].Y; + ptf[2].X = (REAL)dstpoints[2].X; + ptf[2].Y = (REAL)dstpoints[2].Y; + + return GdipDrawImagePoints(graphics, image, ptf, count); } GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image,

1 0