January 2012 - Wine-Commits

Henri Verbeet : winecfg: Remove the Direct3D settings.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: e960aa783f78d65feb1d4a93e008d06b0a65fc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e960aa783f78d65feb1d4a93e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 11 21:27:29 2012 +0100 winecfg: Remove the Direct3D settings. There should really be no reason to set any of these. --- po/ar.po | 254 +++++++++++++++++++---------------------- po/bg.po | 255 +++++++++++++++++++---------------------- po/ca.po | 254 +++++++++++++++++++---------------------- po/cs.po | 259 +++++++++++++++++++----------------------- po/da.po | 255 +++++++++++++++++++---------------------- po/de.po | 253 +++++++++++++++++++---------------------- po/el.po | 255 +++++++++++++++++++---------------------- po/en.po | 253 +++++++++++++++++++---------------------- po/en_US.po | 253 +++++++++++++++++++---------------------- po/eo.po | 255 +++++++++++++++++++---------------------- po/es.po | 259 +++++++++++++++++++----------------------- po/fa.po | 254 +++++++++++++++++++---------------------- po/fi.po | 254 +++++++++++++++++++---------------------- po/fr.po | 253 +++++++++++++++++++---------------------- po/he.po | 256 +++++++++++++++++++----------------------- po/hi.po | 253 +++++++++++++++++++---------------------- po/hu.po | 259 +++++++++++++++++++----------------------- po/it.po | 253 +++++++++++++++++++---------------------- po/ja.po | 254 +++++++++++++++++++---------------------- po/ko.po | 253 +++++++++++++++++++---------------------- po/lt.po | 256 +++++++++++++++++++---------------------- po/ml.po | 253 +++++++++++++++++++---------------------- po/nb_NO.po | 255 +++++++++++++++++++---------------------- po/nl.po | 254 +++++++++++++++++++---------------------- po/or.po | 253 +++++++++++++++++++---------------------- po/pa.po | 253 +++++++++++++++++++---------------------- po/pl.po | 254 +++++++++++++++++++---------------------- po/pt_BR.po | 259 +++++++++++++++++++----------------------- po/pt_PT.po | 259 +++++++++++++++++++----------------------- po/rm.po | 254 +++++++++++++++++++---------------------- po/ro.po | 259 +++++++++++++++++++----------------------- po/ru.po | 253 +++++++++++++++++++---------------------- po/sk.po | 255 +++++++++++++++++++---------------------- po/sl.po | 255 +++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 255 +++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 259 +++++++++++++++++++----------------------- po/sv.po | 255 +++++++++++++++++++---------------------- po/te.po | 253 +++++++++++++++++++---------------------- po/th.po | 255 +++++++++++++++++++---------------------- po/tr.po | 255 +++++++++++++++++++---------------------- po/uk.po | 254 +++++++++++++++++++---------------------- po/wa.po | 254 +++++++++++++++++++---------------------- po/wine.pot | 253 +++++++++++++++++++---------------------- po/zh_CN.po | 259 +++++++++++++++++++----------------------- po/zh_TW.po | 259 +++++++++++++++++++----------------------- programs/winecfg/resource.h | 4 - programs/winecfg/winecfg.rc | 21 +--- programs/winecfg/x11drvdlg.c | 53 --------- 48 files changed, 5226 insertions(+), 6329 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e960aa783f78d65feb1d4…

1 0

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

Jan. 12, 2012

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 Jan. 12, 2012

Jan. 12, 2012

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 Jan. 12, 2012

Jan. 12, 2012

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

Nikolay Sivov : shell32: Unix folder COM cleanup.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: e8a6ca7d37fc8139c1503005af0b25fe8fb9125b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8a6ca7d37fc8139c1503005a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 14:52:39 2012 +0300 shell32: Unix folder COM cleanup. --- dlls/shell32/shfldr_unixfs.c | 614 ++++++++++++++++++++++-------------------- 1 files changed, 315 insertions(+), 299 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8a6ca7d37fc8139c1503…

1 0

Vincent Povirk : windowscodecs: Add a stub IWICMetadataReader/ Writer implementation.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 6b2d1ce1300a1392f602fbf2d3c7f50a86c9efcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b2d1ce1300a1392f602fbf2d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 16:03:24 2012 -0600 windowscodecs: Add a stub IWICMetadataReader/Writer implementation. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clsfactory.c | 2 + dlls/windowscodecs/metadatahandler.c | 317 +++++++++++++++++++++++++ dlls/windowscodecs/tests/metadata.c | 6 +- dlls/windowscodecs/wincodecs_private.h | 23 ++ dlls/windowscodecs/windowscodecs_wincodec.idl | 7 + 6 files changed, 353 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b2d1ce1300a1392f602f…

1 0

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

Jan. 12, 2012

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 : gdiplus: Implement GdipCreateBitmapFromHBITMAP for 16-bit dibs.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 2540049777311b95d6857faf058f04aac1174758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2540049777311b95d6857faf0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 13:41:19 2012 -0600 gdiplus: Implement GdipCreateBitmapFromHBITMAP for 16-bit dibs. --- dlls/gdiplus/image.c | 31 +++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 6 +++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0e3848f..aba8366 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3526,6 +3526,7 @@ GpStatus WINGDIPAPI GdipGetEncoderParameterListSize(GpImage *image, GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBitmap** bitmap) { BITMAP bm; + DIBSECTION dib; GpStatus retval; PixelFormat format; BitmapData lockeddata; @@ -3550,6 +3551,36 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi case 8: 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"); + return InvalidParameter; + } + break; + } case 24: format = PixelFormat24bppRGB; break; diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 78a73c9..b6262d1 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -949,7 +949,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) bits[0] = 0; stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) { @@ -979,7 +979,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) bits[0] = 0; stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) { @@ -1007,7 +1007,7 @@ static void test_GdipCreateBitmapFromHBITMAP(void) bits[0] = 0; stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); - todo_wine expect(Ok, stat); + expect(Ok, stat); if (stat == Ok) {

1 0

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

Jan. 12, 2012

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

Vincent Povirk : gdiplus: Test GdipCreateBitmapFromHBITMAP with 16-bit dib' s.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 52150d21942f34b9afe98107bdab8e7f74209747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52150d21942f34b9afe98107b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 11 13:34:27 2012 -0600 gdiplus: Test GdipCreateBitmapFromHBITMAP with 16-bit dib's. --- dlls/gdiplus/tests/image.c | 120 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 110 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6e4aca5..78a73c9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -831,6 +831,18 @@ static void test_LockBits_UserBuf(void) expect(Ok, stat); } +struct BITMAPINFOWITHBITFIELDS +{ + BITMAPINFOHEADER bmiHeader; + DWORD masks[3]; +}; + +union BITMAPINFOUNION +{ + BITMAPINFO bi; + struct BITMAPINFOWITHBITFIELDS bf; +}; + static void test_GdipCreateBitmapFromHBITMAP(void) { GpBitmap* gpbm = NULL; @@ -845,8 +857,9 @@ static void test_GdipCreateBitmapFromHBITMAP(void) const REAL WIDTH2 = 10; const REAL HEIGHT2 = 20; HDC hdc; - BITMAPINFO bmi; + union BITMAPINFOUNION bmi; BYTE *bits; + PixelFormat format; stat = GdipCreateBitmapFromHBITMAP(NULL, NULL, NULL); expect(InvalidParameter, stat); @@ -880,15 +893,15 @@ static void test_GdipCreateBitmapFromHBITMAP(void) hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); - bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); - bmi.bmiHeader.biHeight = HEIGHT1; - bmi.bmiHeader.biWidth = WIDTH1; - bmi.bmiHeader.biBitCount = 24; - bmi.bmiHeader.biPlanes = 1; - bmi.bmiHeader.biCompression = BI_RGB; - bmi.bmiHeader.biClrUsed = 0; - - hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + bmi.bi.bmiHeader.biSize = sizeof(bmi.bi.bmiHeader); + bmi.bi.bmiHeader.biHeight = HEIGHT1; + bmi.bi.bmiHeader.biWidth = WIDTH1; + bmi.bi.bmiHeader.biBitCount = 24; + bmi.bi.bmiHeader.biPlanes = 1; + bmi.bi.bmiHeader.biCompression = BI_RGB; + bmi.bi.bmiHeader.biClrUsed = 0; + + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); ok(hbm != NULL, "CreateDIBSection failed\n"); bits[0] = 0; @@ -925,6 +938,93 @@ static void test_GdipCreateBitmapFromHBITMAP(void) DeleteObject(hpal); DeleteObject(hbm); + + /* 16-bit 555 dib, rgb */ + bmi.bi.bmiHeader.biBitCount = 16; + bmi.bi.bmiHeader.biCompression = BI_RGB; + + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + bits[0] = 0; + + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageDimension((GpImage*) gpbm, &width, &height); + expect(Ok, stat); + expectf(WIDTH1, width); + expectf(HEIGHT1, height); + + stat = GdipGetImagePixelFormat((GpImage*) gpbm, &format); + expect(Ok, stat); + expect(PixelFormat16bppRGB555, format); + + GdipDisposeImage((GpImage*)gpbm); + } + DeleteObject(hbm); + + /* 16-bit 555 dib, with bitfields */ + bmi.bi.bmiHeader.biSize = sizeof(bmi); + bmi.bi.bmiHeader.biCompression = BI_BITFIELDS; + bmi.bf.masks[0] = 0x7c00; + bmi.bf.masks[1] = 0x3e0; + bmi.bf.masks[2] = 0x1f; + + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + bits[0] = 0; + + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageDimension((GpImage*) gpbm, &width, &height); + expect(Ok, stat); + expectf(WIDTH1, width); + expectf(HEIGHT1, height); + + stat = GdipGetImagePixelFormat((GpImage*) gpbm, &format); + expect(Ok, stat); + expect(PixelFormat16bppRGB555, format); + + GdipDisposeImage((GpImage*)gpbm); + } + DeleteObject(hbm); + + /* 16-bit 565 dib, with bitfields */ + bmi.bf.masks[0] = 0xf800; + bmi.bf.masks[1] = 0x7e0; + bmi.bf.masks[2] = 0x1f; + + hbm = CreateDIBSection(hdc, &bmi.bi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + ok(hbm != NULL, "CreateDIBSection failed\n"); + + bits[0] = 0; + + stat = GdipCreateBitmapFromHBITMAP(hbm, NULL, &gpbm); + todo_wine expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipGetImageDimension((GpImage*) gpbm, &width, &height); + expect(Ok, stat); + expectf(WIDTH1, width); + expectf(HEIGHT1, height); + + stat = GdipGetImagePixelFormat((GpImage*) gpbm, &format); + expect(Ok, stat); + expect(PixelFormat16bppRGB565, format); + + GdipDisposeImage((GpImage*)gpbm); + } + DeleteObject(hbm); + + DeleteDC(hdc); } static void test_GdipGetImageFlags(void)

1 0