October 2010 - Wine-commits

Davide Pizzetti : net: Italian translation update.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: ab3740afe6b07d8090fd8f8b1f842bd911325544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab3740afe6b07d8090fd8f8b1… Author: Davide Pizzetti <erpizzo(a)alice.it> Date: Wed Oct 20 21:09:49 2010 +0200 net: Italian translation update. --- programs/net/It.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/net/It.rc b/programs/net/It.rc index 15a78c3..8b30a8f 100644 --- a/programs/net/It.rc +++ b/programs/net/It.rc @@ -31,8 +31,8 @@ STRINGTABLE STRING_USAGE, "La sintassi di questo comando è:\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "Specificare il nome del servizio da avviare.\n" STRING_STOP_USAGE, "Specificare il nome del servizio da fermare.\n" - STRING_STOP_DEP, "Fermando il servizio dipendente: %s\n" - STRING_CANT_STOP, "Impossibile fermare il servizio %s\n" + STRING_STOP_DEP, "Interrompendo il servizio dipendente: %s\n" + STRING_CANT_STOP, "Impossibile interrompere il servizio %s\n" STRING_NO_SCM, "Impossibile ottenere l'handle del gestore del controllo del servizio.\n" STRING_NO_SVCHANDLE, "Impossibile ottenere l'handle del servizio.\n" STRING_START_SVC, "Il servizio %s sarà avviato.\n" @@ -44,6 +44,6 @@ STRINGTABLE STRING_HELP_USAGE, "La sintassi di questo comando è:\n\nNET HELP comando\n -o-\nNET comando /HELP\n\n"\ " Comandi disponibili:\n NET HELP NET START NET STOP NET USE\n" STRING_NO_ENTRIES, "Non ci sono elementi nella lista.\n" - STRING_USE_HEADER, "\nStato Locale Remoto\n---------------------------------------------------------------\n" + STRING_USE_HEADER, "\nStato locale remoto\n---------------------------------------------------------------\n" STRING_USE_ENTRY, "%s %S %S Risorse aperte: %lu\n" }

1 0

David Hedberg : ole32: Pass failures from delegate object's :: QueryInterface in default handler.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: a5caff3bac6b59250b21dedce306dad3d39a17f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5caff3bac6b59250b21dedce… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Wed Oct 20 23:59:36 2010 +0200 ole32: Pass failures from delegate object's ::QueryInterface in default handler. --- dlls/ole32/defaulthandler.c | 4 +-- dlls/ole32/tests/ole2.c | 82 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index b509bee..026df3a 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -230,9 +230,7 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface( } else if (This->inproc_server && This->pOleDelegate) { - HRESULT hr = IUnknown_QueryInterface(This->pOleDelegate, riid, ppvObject); - if (SUCCEEDED(hr)) - return hr; + return IUnknown_QueryInterface(This->pOleDelegate, riid, ppvObject); } /* Check that we obtained an interface. */ diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index d8c2bab..7fadb7d 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -44,7 +44,16 @@ static const CLSID CLSID_WineTest = {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe0} }; +static const IID IID_WineTest = +{ /* 9474ba1a-258b-490b-bc13-516e9239ace1 */ + 0x9474ba1a, + 0x258b, + 0x490b, + {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe1} +}; + #define TEST_OPTIONAL 0x1 +#define TEST_TODO 0x2 struct expected_method { @@ -58,18 +67,31 @@ static FORMATETC *g_expected_fetc = NULL; static BOOL g_showRunnable = TRUE; static BOOL g_isRunning = TRUE; static BOOL g_failGetMiscStatus; +static HRESULT g_QIFailsWith; #define CHECK_EXPECTED_METHOD(method_name) \ do { \ trace("%s\n", method_name); \ ok(expected_method_list->method != NULL, "Extra method %s called\n", method_name); \ + if (!strcmp(expected_method_list->method, "WINE_EXTRA")) \ + { \ + todo_wine ok(0, "Too many method calls.\n"); \ + break; \ + } \ if (expected_method_list->method) \ { \ while (expected_method_list->flags & TEST_OPTIONAL && \ strcmp(expected_method_list->method, method_name) != 0) \ expected_method_list++; \ - ok(!strcmp(expected_method_list->method, method_name), "Expected %s to be called instead of %s\n", \ - expected_method_list->method, method_name); \ + if (expected_method_list->flags & TEST_TODO) \ + todo_wine \ + ok(!strcmp(expected_method_list->method, method_name), \ + "Expected %s to be called instead of %s\n", \ + expected_method_list->method, method_name); \ + else \ + ok(!strcmp(expected_method_list->method, method_name), \ + "Expected %s to be called instead of %s\n", \ + expected_method_list->method, method_name); \ expected_method_list++; \ } \ } while(0) @@ -95,6 +117,8 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v *ppv = cache; else if (IsEqualIID(riid, &IID_IRunnableObject) && g_showRunnable) *ppv = runnable; + else if (IsEqualIID(riid, &IID_WineTest)) + return g_QIFailsWith; if(*ppv) { IUnknown_AddRef((IUnknown*)*ppv); @@ -1464,10 +1488,25 @@ static void test_default_handler(void) FORMATETC fmtetc; IOleInPlaceObject *pInPlaceObj; IEnumOLEVERB *pEnumVerbs; + DWORD dwRegister; static const WCHAR wszUnknown[] = {'U','n','k','n','o','w','n',0}; static const WCHAR wszHostName[] = {'W','i','n','e',' ','T','e','s','t',' ','P','r','o','g','r','a','m',0}; static const WCHAR wszDelim[] = {'!',0}; + static const struct expected_method methods_embeddinghelper[] = + { + { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObject_QueryInterface", TEST_TODO }, + { "OleObject_QueryInterface", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObject_QueryInterface", TEST_OPTIONAL }, /* Win95/98/NT4 */ + { "OleObject_Release", TEST_TODO }, + { "WINE_EXTRA", TEST_OPTIONAL }, + { NULL, 0 } + }; + hr = CoCreateInstance(&CLSID_WineTest, NULL, CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void **)&pObject); ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed with REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); @@ -1595,6 +1634,45 @@ static void test_default_handler(void) IRunnableObject_Release(pRunnableObject); IOleObject_Release(pObject); + + /* Test failure propagation from delegate ::QueryInterface */ + hr = CoRegisterClassObject(&CLSID_WineTest, (IUnknown*)&OleObjectCF, + CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &dwRegister); + ok_ole_success(hr, "CoRegisterClassObject"); + if(SUCCEEDED(hr)) + { + expected_method_list = methods_embeddinghelper; + hr = OleCreateEmbeddingHelper(&CLSID_WineTest, NULL, EMBDHLP_INPROC_SERVER, + &OleObjectCF, &IID_IOleObject, (void**)&pObject); + ok_ole_success(hr, "OleCreateEmbeddingHelper"); + if(SUCCEEDED(hr)) + { + IUnknown *punk; + + g_QIFailsWith = E_FAIL; + hr = IOleObject_QueryInterface(pObject, &IID_WineTest, (void**)&punk); + ok(hr == E_FAIL, "Got 0x%08x\n", hr); + + g_QIFailsWith = E_NOINTERFACE; + hr = IOleObject_QueryInterface(pObject, &IID_WineTest, (void**)&punk); + ok(hr == E_NOINTERFACE, "Got 0x%08x\n", hr); + + g_QIFailsWith = CO_E_OBJNOTCONNECTED; + hr = IOleObject_QueryInterface(pObject, &IID_WineTest, (void**)&punk); + ok(hr == CO_E_OBJNOTCONNECTED, "Got 0x%08x\n", hr); + + g_QIFailsWith = 0x87654321; + hr = IOleObject_QueryInterface(pObject, &IID_WineTest, (void**)&punk); + ok(hr == 0x87654321, "Got 0x%08x\n", hr); + + IOleObject_Release(pObject); + } + + CHECK_NO_EXTRA_METHODS(); + + hr = CoRevokeClassObject(dwRegister); + ok_ole_success(hr, "CoRevokeClassObject"); + } } static void test_runnable(void)

1 0

André Hentschel : winedump: Fix typo in code generation.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 27c01617973e39da6f80e8850cd55b2e0c669541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c01617973e39da6f80e8850… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 20 23:38:52 2010 +0200 winedump: Fix typo in code generation. --- tools/winedump/output.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 5b0e1f5..69c7eed 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -248,7 +248,7 @@ void output_c_preamble (void) if (globals.forward_dll) fprintf (cfile, - " DLL = LoadLibraryA(\"%s\");\n" + " hDLL = LoadLibraryA(\"%s\");\n" " TRACE(\"Forwarding DLL (%s) loaded (%%p)\\n\", hDLL);\n", globals.forward_dll, globals.forward_dll); else

1 0

Nikolay Sivov : msxml3: Partially implement ::setAttributeNode().
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 88adaa06179703c567427f6bc744a658df60cd29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88adaa06179703c567427f6bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 21 02:07:20 2010 +0400 msxml3: Partially implement ::setAttributeNode(). --- dlls/msxml3/element.c | 57 +++++++++++++++++++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 19 ++++++++++---- 2 files changed, 65 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index a3834ff..8e33dd2 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -50,7 +50,7 @@ static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) return (domelem *)((char*)iface - FIELD_OFFSET(domelem, lpVtbl)); } -static inline xmlNodePtr get_element( domelem *This ) +static inline xmlNodePtr get_element( const domelem *This ) { return This->node.node; } @@ -705,16 +705,61 @@ static HRESULT WINAPI domelem_getAttributeNode( static HRESULT WINAPI domelem_setAttributeNode( IXMLDOMElement *iface, - IXMLDOMAttribute* domAttribute, - IXMLDOMAttribute** attributeNode) + IXMLDOMAttribute* attribute, + IXMLDOMAttribute** old) { domelem *This = impl_from_IXMLDOMElement( iface ); + xmlChar *name, *value; + BSTR nameW, prefix; + xmlAttrPtr attr; + VARIANT valueW; + HRESULT hr; - FIXME("(%p)->(%p %p)\n", This, domAttribute, attributeNode); + FIXME("(%p)->(%p %p): semi-stub\n", This, attribute, old); - if(!domAttribute) return E_INVALIDARG; + if (!attribute) return E_INVALIDARG; - return E_NOTIMPL; + if (old) *old = NULL; + + hr = IXMLDOMAttribute_get_nodeName(attribute, &nameW); + if (hr != S_OK) return hr; + + hr = IXMLDOMAttribute_get_nodeValue(attribute, &valueW); + if (hr != S_OK) + { + SysFreeString(nameW); + return hr; + } + + TRACE("attribute: %s=%s\n", debugstr_w(nameW), debugstr_w(V_BSTR(&valueW))); + + hr = IXMLDOMAttribute_get_prefix(attribute, &prefix); + if (hr == S_OK) + { + FIXME("namespaces not supported: %s\n", debugstr_w(prefix)); + SysFreeString(prefix); + } + + name = xmlChar_from_wchar(nameW); + value = xmlChar_from_wchar(V_BSTR(&valueW)); + + if (!name || !value) + { + SysFreeString(nameW); + VariantClear(&valueW); + heap_free(name); + heap_free(value); + return E_OUTOFMEMORY; + } + + attr = xmlSetNsProp(get_element(This), NULL, name, value); + + SysFreeString(nameW); + VariantClear(&valueW); + heap_free(name); + heap_free(value); + + return attr ? S_OK : E_FAIL; } static HRESULT WINAPI domelem_removeAttributeNode( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fd56c61..d7d94e6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6853,20 +6853,29 @@ static void test_setAttributeNode(void) ret_attr = (void*)0xdeadbeef; hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); - todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok( ret_attr == NULL, "got %p\n", ret_attr); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( ret_attr == NULL, "got %p\n", ret_attr); attr2 = NULL; hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attr"), &attr2); - todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); - if (attr2) IXMLDOMAttribute_Release(attr2); + ok( hr == S_OK, "got 0x%08x\n", hr); + IXMLDOMAttribute_Release(attr2); /* try to add it another time */ ret_attr = (void*)0xdeadbeef; hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr); - ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + todo_wine ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + + IXMLDOMElement_Release(elem); + /* initialy used element is released, attribute still 'has' a container */ + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + ok( hr == S_OK, "got 0x%08x\n", hr); + ret_attr = (void*)0xdeadbeef; + hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); + todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr); + todo_wine ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); IXMLDOMElement_Release(elem); /* add attribute already attached to another document */

1 0

Vincent Povirk : windowscodecs: Implement Initialize for the TGA decoder.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 6d20f775171546f3905c6e307f5dfe3b3a22ae04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d20f775171546f3905c6e307… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 7 16:14:59 2010 -0500 windowscodecs: Implement Initialize for the TGA decoder. --- dlls/windowscodecs/tgaformat.c | 121 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 119 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index b2fd32c..65d9d3e 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -35,10 +35,44 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "pshpack1.h" + +typedef struct { + BYTE id_length; + BYTE colormap_type; + BYTE image_type; + /* Colormap Specification */ + WORD colormap_firstentry; + WORD colormap_length; + BYTE colormap_entrysize; + /* Image Specification */ + WORD xorigin; + WORD yorigin; + WORD width; + WORD height; + BYTE depth; + BYTE image_descriptor; +} tga_header; + +#define IMAGETYPE_COLORMAPPED 1 +#define IMAGETYPE_TRUECOLOR 2 +#define IMAGETYPE_GRAYSCALE 3 +#define IMAGETYPE_RLE 8 + +#define IMAGE_ATTRIBUTE_BITCOUNT_MASK 0xf +#define IMAGE_RIGHTTOLEFT 0x10 +#define IMAGE_TOPTOBOTTOM 0x20 + +#include "poppack.h" + typedef struct { const IWICBitmapDecoderVtbl *lpVtbl; const IWICBitmapFrameDecodeVtbl *lpFrameVtbl; LONG ref; + BOOL initialized; + IStream *stream; + tga_header header; + CRITICAL_SECTION lock; } TgaDecoder; static inline TgaDecoder *decoder_from_frame(IWICBitmapFrameDecode *iface) @@ -87,6 +121,10 @@ static ULONG WINAPI TgaDecoder_Release(IWICBitmapDecoder *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); + if (This->stream) + IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); } @@ -103,8 +141,83 @@ static HRESULT WINAPI TgaDecoder_QueryCapability(IWICBitmapDecoder *iface, IStre static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, WICDecodeOptions cacheOptions) { - FIXME("(%p,%p,%u): stub\n", iface, pIStream, cacheOptions); - return E_NOTIMPL; + TgaDecoder *This = (TgaDecoder*)iface; + HRESULT hr=S_OK; + DWORD bytesread; + LARGE_INTEGER seek; + + TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); + + EnterCriticalSection(&This->lock); + + if (This->initialized) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + seek.QuadPart = 0; + hr = IStream_Seek(pIStream, seek, STREAM_SEEK_SET, NULL); + if (FAILED(hr)) goto end; + + hr = IStream_Read(pIStream, &This->header, sizeof(tga_header), &bytesread); + if (SUCCEEDED(hr) && bytesread != sizeof(tga_header)) + { + TRACE("got only %u bytes\n", bytesread); + hr = E_FAIL; + } + if (FAILED(hr)) goto end; + + TRACE("imagetype=%u, colormap type=%u, depth=%u, image descriptor=0x%x\n", + This->header.image_type, This->header.colormap_type, + This->header.depth, This->header.image_descriptor); + + /* Sanity checking. Since TGA has no clear identifying markers, we need + * to be careful to not load a non-TGA image. */ + switch (This->header.image_type) + { + case IMAGETYPE_COLORMAPPED: + case IMAGETYPE_COLORMAPPED|IMAGETYPE_RLE: + if (This->header.colormap_type != 1) + hr = E_FAIL; + break; + case IMAGETYPE_TRUECOLOR: + case IMAGETYPE_TRUECOLOR|IMAGETYPE_RLE: + if (This->header.colormap_type != 0 && This->header.colormap_type != 1) + hr = E_FAIL; + break; + case IMAGETYPE_GRAYSCALE: + case IMAGETYPE_GRAYSCALE|IMAGETYPE_RLE: + if (This->header.colormap_type != 0) + hr = E_FAIL; + break; + default: + hr = E_FAIL; + } + + if (This->header.depth != 8 && This->header.depth != 16 && + This->header.depth != 24 && This->header.depth != 32) + hr = E_FAIL; + + if ((This->header.image_descriptor & IMAGE_ATTRIBUTE_BITCOUNT_MASK) > 8 || + (This->header.image_descriptor & 0xc0) != 0) + hr = E_FAIL; + + if (FAILED(hr)) + { + WARN("bad tga header\n"); + goto end; + } + + /* FIXME: Read footer if there is one. */ + + IStream_AddRef(pIStream); + This->stream = pIStream; + This->initialized = TRUE; + +end: + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI TgaDecoder_GetContainerFormat(IWICBitmapDecoder *iface, @@ -309,6 +422,10 @@ HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->lpVtbl = &TgaDecoder_Vtbl; This->lpFrameVtbl = &TgaDecoder_Frame_Vtbl; This->ref = 1; + This->initialized = FALSE; + This->stream = NULL; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": TgaDecoder.lock"); ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); IUnknown_Release((IUnknown*)This);

1 0

Vincent Povirk : windowscodecs: Implement GetFrame for the TGA decoder.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: bb6d9eaffbaa5543838e027e45b9212a3b3e497a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb6d9eaffbaa5543838e027e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 7 16:20:04 2010 -0500 windowscodecs: Implement GetFrame for the TGA decoder. --- dlls/windowscodecs/tgaformat.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 65d9d3e..2e15e37 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -279,8 +279,17 @@ static HRESULT WINAPI TgaDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI TgaDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapFrame); - return E_NOTIMPL; + TgaDecoder *This = (TgaDecoder*)iface; + TRACE("(%p,%p)\n", iface, ppIBitmapFrame); + + if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; + + if (index != 0) return E_INVALIDARG; + + IWICBitmapDecoder_AddRef(iface); + *ppIBitmapFrame = (IWICBitmapFrameDecode*)&This->lpFrameVtbl; + + return S_OK; } static const IWICBitmapDecoderVtbl TgaDecoder_Vtbl = {

1 0

Vincent Povirk : windowscodecs: Implement GetPixelFormat for the TGA decoder.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: df5a150b4f7415dee97cf884ffd5777b952db21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5a150b4f7415dee97cf884f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 7 16:36:27 2010 -0500 windowscodecs: Implement GetPixelFormat for the TGA decoder. --- dlls/windowscodecs/tgaformat.c | 62 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 2e15e37..3606128 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -354,8 +354,66 @@ static HRESULT WINAPI TgaDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, static HRESULT WINAPI TgaDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface, WICPixelFormatGUID *pPixelFormat) { - TRACE("(%p,%p): stub\n", iface, pPixelFormat); - return E_NOTIMPL; + TgaDecoder *This = decoder_from_frame(iface); + int attribute_bitcount; + + TRACE("(%p,%p)\n", iface, pPixelFormat); + + attribute_bitcount = This->header.image_descriptor & IMAGE_ATTRIBUTE_BITCOUNT_MASK; + + if (attribute_bitcount) + { + FIXME("Need to read footer to find meaning of attribute bits\n"); + return E_NOTIMPL; + } + + switch (This->header.image_type & ~IMAGETYPE_RLE) + { + case IMAGETYPE_COLORMAPPED: + switch (This->header.depth) + { + case 8: + memcpy(pPixelFormat, &GUID_WICPixelFormat8bppIndexed, sizeof(GUID)); + break; + default: + FIXME("Unhandled indexed color depth %u\n", This->header.depth); + return E_NOTIMPL; + } + break; + case IMAGETYPE_TRUECOLOR: + switch (This->header.depth) + { + case 16: + memcpy(pPixelFormat, &GUID_WICPixelFormat16bppBGR555, sizeof(GUID)); + break; + case 24: + memcpy(pPixelFormat, &GUID_WICPixelFormat24bppBGR, sizeof(GUID)); + break; + default: + FIXME("Unhandled truecolor depth %u\n", This->header.depth); + return E_NOTIMPL; + } + break; + case IMAGETYPE_GRAYSCALE: + switch (This->header.depth) + { + case 8: + memcpy(pPixelFormat, &GUID_WICPixelFormat8bppGray, sizeof(GUID)); + break; + case 16: + memcpy(pPixelFormat, &GUID_WICPixelFormat16bppGray, sizeof(GUID)); + break; + default: + FIXME("Unhandled grayscale depth %u\n", This->header.depth); + return E_NOTIMPL; + } + break; + default: + ERR("Unknown image type %u\n", This->header.image_type); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI TgaDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Implement GetSize for the TGA decoder.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: a044639deebc731533458503311ddf50065eefdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a044639deebc7315334585033… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 7 16:39:34 2010 -0500 windowscodecs: Implement GetSize for the TGA decoder. --- dlls/windowscodecs/tgaformat.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 3606128..f778cd4 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -347,8 +347,14 @@ static ULONG WINAPI TgaDecoder_Frame_Release(IWICBitmapFrameDecode *iface) static HRESULT WINAPI TgaDecoder_Frame_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p)\n", iface); - return E_NOTIMPL; + TgaDecoder *This = decoder_from_frame(iface); + + *puiWidth = This->header.width; + *puiHeight = This->header.height; + + TRACE("(%p)->(%u,%u)\n", iface, *puiWidth, *puiHeight); + + return S_OK; } static HRESULT WINAPI TgaDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : windowscodecs: Seek to start of stream when opening TIFF files.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 631d9860adad82183a0174afb0f74ffee83e8686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=631d9860adad82183a0174afb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 20 12:54:08 2010 -0500 windowscodecs: Seek to start of stream when opening TIFF files. --- dlls/windowscodecs/tiffformat.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f45e03d..742d963 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -183,6 +183,11 @@ static void tiff_stream_unmap(thandle_t client_data, tdata_t addr, toff_t size) static TIFF* tiff_open_stream(IStream *stream, const char *mode) { + LARGE_INTEGER zero; + + zero.QuadPart = 0; + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + return pTIFFClientOpen("<IStream object>", mode, stream, tiff_stream_read, tiff_stream_write, tiff_stream_seek, tiff_stream_close, tiff_stream_size, tiff_stream_map, tiff_stream_unmap);

1 0

Vincent Povirk : include: Add definition for IWICColorTransform.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 0454e046c21f4bbd874009e67e134ac06d6df1ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0454e046c21f4bbd874009e67… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 24 15:09:09 2010 -0500 include: Add definition for IWICColorTransform. --- include/wincodec.idl | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 04fb212..1a7e6bf 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -198,7 +198,6 @@ cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") interface IWICPalette; -interface IWICColorTransform; interface IWICFastMetadataEncoder; interface IWICMetadataQueryReader; interface IWICMetadataQueryWriter; @@ -712,6 +711,19 @@ interface IWICBitmapClipper : IWICBitmapSource [in] const WICRect *prc); } +[ + object, + uuid(b66f034f-d0e2-40ab-b436-6de39e321a94) +] +interface IWICColorTransform : IWICBitmapSource +{ + HRESULT Initialize( + [in] IWICBitmapSource *pIBitmapSource, + [in] IWICColorContext *pIContextSource, + [in] IWICColorContext *pIContextDest, + [in] REFWICPixelFormatGUID pixelFmtDest); +} + cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") [

1 0