October 2010 - Wine-commits

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

21 Oct '10

Module: wine Branch: master Commit: 53a0bbbbf5caca91fc562a7590d769770e75f160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a0bbbbf5caca91fc562a759… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 24 15:15:39 2010 -0500 include: Add definition for IWICFastMetadataEncoder. --- include/wincodec.idl | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 1a7e6bf..c338429 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 IWICFastMetadataEncoder; interface IWICMetadataQueryReader; interface IWICMetadataQueryWriter; @@ -724,6 +723,18 @@ interface IWICColorTransform : IWICBitmapSource [in] REFWICPixelFormatGUID pixelFmtDest); } +[ + object, + uuid(b84e2c09-78c9-4ac4-8bd3-524ae1663a2f) +] +interface IWICFastMetadataEncoder : IUnknown +{ + HRESULT Commit(); + + HRESULT GetMetadataQueryWriter( + [out] IWICMetadataQueryWriter **ppIMetadataQueryWriter); +} + cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") [

1 0

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

21 Oct '10

Module: wine Branch: master Commit: add681ecf5d5071b2bcc0f4c49383b56d78fe50d URL: http://source.winehq.org/git/wine.git/?a=commit;h=add681ecf5d5071b2bcc0f4c4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 24 15:35:23 2010 -0500 include: Add definition for IWICMetadataQueryReader. --- include/wincodec.idl | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index c338429..379ece8 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 IWICMetadataQueryReader; interface IWICMetadataQueryWriter; [ @@ -391,6 +390,28 @@ interface IWICComponentInfo : IUnknown [ object, + uuid(30989668-e1c9-4597-b395-458eedb808df) +] +interface IWICMetadataQueryReader : IUnknown +{ + HRESULT GetContainerFormat( + [out] GUID *pguidContainerFormat); + + HRESULT GetLocation( + [in] UINT cchMaxLength, + [in, out, unique, size_is(cchMaxLength)] WCHAR *wzNamespace, + [out] UINT *pcchActualLength); + + HRESULT GetMetadataByName( + [in] LPCWSTR wzName, + [in, out, unique] PROPVARIANT *pvarValue); + + HRESULT GetEnumerator( + [out] IEnumString **ppIEnumString); +} + +[ + object, uuid(3b16811b-6a43-4ec9-a813-3d930c13b940) ] interface IWICBitmapFrameDecode : IWICBitmapSource

1 0

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

21 Oct '10

Module: wine Branch: master Commit: f5a8d96dc0d4d419b21c487674bda130c4cb2ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5a8d96dc0d4d419b21c48767… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 24 15:40:12 2010 -0500 include: Add definition for IWICMetadataQueryWriter. --- include/wincodec.idl | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 379ece8..8cc6500 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 IWICMetadataQueryWriter; [ object, @@ -412,6 +411,20 @@ interface IWICMetadataQueryReader : IUnknown [ object, + uuid(a721791a-0def-4d06-bd91-2118bf1db10b) +] +interface IWICMetadataQueryWriter : IWICMetadataQueryReader +{ + HRESULT SetMetadataByName( + [in] LPCWSTR wzName, + [in] const PROPVARIANT *pvarValue); + + HRESULT RemoveMetadataByName( + [in] LPCWSTR wzName); +} + +[ + object, uuid(3b16811b-6a43-4ec9-a813-3d930c13b940) ] interface IWICBitmapFrameDecode : IWICBitmapSource

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameDecode_CopyPalette.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 0ce1c796e4adda517727bd54fb96363e611c8be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce1c796e4adda517727bd54f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 12:09:56 2010 -0500 windowscodecs: Implement TiffFrameDecode_CopyPalette. --- dlls/windowscodecs/tiffformat.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 1256110..f48d734 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -692,8 +692,34 @@ static HRESULT WINAPI TiffFrameDecode_GetResolution(IWICBitmapFrameDecode *iface static HRESULT WINAPI TiffFrameDecode_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p)\n", iface, pIPalette); - return E_NOTIMPL; + TiffFrameDecode *This = (TiffFrameDecode*)iface; + uint16 *red, *green, *blue; + WICColor colors[256]; + int color_count, ret, i; + + TRACE("(%p,%p)\n", iface, pIPalette); + + color_count = 1<<This->decode_info.bps; + + EnterCriticalSection(&This->parent->lock); + ret = pTIFFGetField(This->parent->tiff, TIFFTAG_COLORMAP, &red, &green, &blue); + LeaveCriticalSection(&This->parent->lock); + + if (!ret) + { + WARN("Couldn't read color map\n"); + return E_FAIL; + } + + for (i=0; i<color_count; i++) + { + colors[i] = 0xff000000 | + ((red[i]<<8) & 0xff0000) | + (green[i] & 0xff00) | + ((blue[i]>>8) & 0xff); + } + + return IWICPalette_InitializeCustom(pIPalette, colors, color_count); } static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT tile_y)

1 0

Vincent Povirk : windowscodecs: Support TIFF images with alpha data.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: b9beb9227da3a7df882d83d484572b7851e8c5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9beb9227da3a7df882d83d48… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 12:32:32 2010 -0500 windowscodecs: Support TIFF images with alpha data. --- dlls/windowscodecs/regsvr.c | 2 + dlls/windowscodecs/tiffformat.c | 51 ++++++++++++++++++++++++++++++++++---- include/wincodec.idl | 1 + 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index ac84368..b9e85cb 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1083,6 +1083,8 @@ static GUID const * const tiff_formats[] = { &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, &GUID_WICPixelFormat48bppRGB, + &GUID_WICPixelFormat64bppRGBA, + &GUID_WICPixelFormat64bppPRGBA, NULL }; diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index f48d734..f45e03d 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -227,6 +227,7 @@ static const IWICBitmapFrameDecodeVtbl TiffFrameDecode_Vtbl; static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { uint16 photometric, bps, samples, planar; + uint16 extra_sample_count, *extra_samples; int ret; decode_info->indexed = 0; @@ -293,7 +294,16 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) case 2: /* RGB */ decode_info->bpp = bps * samples; - if (samples != 3) + if (samples == 4) + { + ret = pTIFFGetField(tiff, TIFFTAG_EXTRASAMPLES, &extra_sample_count, &extra_samples); + if (!ret) + { + WARN("Cannot get extra sample type for RGB data, ret=%i count=%i\n", ret, extra_sample_count); + return E_FAIL; + } + } + else if (samples != 3) { FIXME("unhandled RGB sample count %u\n", samples); return E_FAIL; @@ -303,10 +313,38 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { case 8: decode_info->reverse_bgr = 1; - decode_info->format = &GUID_WICPixelFormat24bppBGR; + if (samples == 3) + decode_info->format = &GUID_WICPixelFormat24bppBGR; + else + switch(extra_samples[0]) + { + case 1: /* Associated (pre-multiplied) alpha data */ + decode_info->format = &GUID_WICPixelFormat32bppPBGRA; + break; + case 2: /* Unassociated alpha data */ + decode_info->format = &GUID_WICPixelFormat32bppBGRA; + break; + default: + FIXME("unhandled extra sample type %i\n", extra_samples[0]); + return E_FAIL; + } break; case 16: - decode_info->format = &GUID_WICPixelFormat48bppRGB; + if (samples == 3) + decode_info->format = &GUID_WICPixelFormat48bppRGB; + else + switch(extra_samples[0]) + { + case 1: /* Associated (pre-multiplied) alpha data */ + decode_info->format = &GUID_WICPixelFormat64bppPRGBA; + break; + case 2: /* Unassociated alpha data */ + decode_info->format = &GUID_WICPixelFormat64bppRGBA; + break; + default: + FIXME("unhandled extra sample type %i\n", extra_samples[0]); + return E_FAIL; + } break; default: FIXME("unhandled RGB bit count %u\n", bps); @@ -745,19 +783,20 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT if (hr == S_OK && This->decode_info.reverse_bgr) { - if (This->decode_info.format == &GUID_WICPixelFormat24bppBGR) + if (This->decode_info.bps == 8) { - UINT i, total_pixels; + UINT i, total_pixels, sample_count; BYTE *pixel, temp; total_pixels = This->decode_info.tile_width * This->decode_info.tile_height; pixel = This->cached_tile; + sample_count = This->decode_info.samples; for (i=0; i<total_pixels; i++) { temp = pixel[2]; pixel[2] = pixel[0]; pixel[0] = temp; - pixel += 3; + pixel += sample_count; } } } diff --git a/include/wincodec.idl b/include/wincodec.idl index 76aac1b..04fb212 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -165,6 +165,7 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppPBGRA, 0x6fddc324,0x4e03,0x4bfe,0 cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x15);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x17);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4fbe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);")

1 0

Vincent Povirk : windowscodecs: Add stub TGA decoder.
by Alexandre Julliard 21 Oct '10

21 Oct '10

Module: wine Branch: master Commit: 7bf6ad916bb7876162f9cde1e247cdf563f5ea2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf6ad916bb7876162f9cde1e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 7 14:36:35 2010 -0500 windowscodecs: Add stub TGA decoder. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/regsvr.c | 48 +++++- dlls/windowscodecs/tgaformat.c | 317 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 5 + 5 files changed, 371 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7bf6ad916bb7876162f9c…

1 0

Aric Stewart : strmbase: Begin implementations of AMovieDllRegisterServer2 and AMovieSetupRegisterFilter2 .
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: 6a00d78b394f780a78ecd32ac12bc0f087f8f048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a00d78b394f780a78ecd32ac… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 19 13:23:38 2010 -0500 strmbase: Begin implementations of AMovieDllRegisterServer2 and AMovieSetupRegisterFilter2. --- dlls/qcap/dllsetup.c | 44 +++------------------ dlls/qcap/dllsetup.h | 28 +------------ dlls/qcap/qcap_main.c | 20 +++++----- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/dllfunc.c | 93 +++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 27 +++++++++++++ 6 files changed, 139 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a00d78b394f780a78ecd…

1 0

Aric Stewart : strmbase: Define STRMBASE_DllMain.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: 58468ef15285d932dd403a5ea67c47bb3d66d2e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58468ef15285d932dd403a5ea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 19 13:24:03 2010 -0500 strmbase: Define STRMBASE_DllMain. --- dlls/qcap/dllsetup.c | 22 ---------------------- dlls/qcap/dllsetup.h | 13 ------------- dlls/qcap/qcap_main.c | 12 +----------- dlls/strmbase/dllfunc.c | 37 +++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 3 +++ 5 files changed, 41 insertions(+), 46 deletions(-) diff --git a/dlls/qcap/dllsetup.c b/dlls/qcap/dllsetup.c index 8d27d91..0791749 100644 --- a/dlls/qcap/dllsetup.c +++ b/dlls/qcap/dllsetup.c @@ -159,25 +159,3 @@ HRESULT SetupRegisterServers(const FactoryTemplate * pList, int num, hr = SetupRegisterAllClasses(pList, num, szFileName, FALSE); return hr; } - -/**************************************************************************** - * SetupInitializeServers - * - * This function is table driven using the static members of the - * CFactoryTemplate class defined in the Dll. - * - * It calls the initialize function for any class in CFactoryTemplate with - * one defined. - * - ****************************************************************************/ -void SetupInitializeServers(const FactoryTemplate * pList, int num, - BOOL bLoading) -{ - int i; - - for (i = 0; i < num; i++, pList++) - { - if (pList->m_lpfnInit) - pList->m_lpfnInit(bLoading, pList->m_ClsID); - } -} diff --git a/dlls/qcap/dllsetup.h b/dlls/qcap/dllsetup.h index 8edb144..43950d8 100644 --- a/dlls/qcap/dllsetup.h +++ b/dlls/qcap/dllsetup.h @@ -35,17 +35,4 @@ ****************************************************************************/ extern HRESULT SetupRegisterServers(const FactoryTemplate * pList, int num, BOOL bRegister); -/**************************************************************************** - * SetupInitializeServers - * - * This function is table driven using the static members of the - * CFactoryTemplate class defined in the Dll. - * - * It calls the initialize function for any class in CFactoryTemplate with - * one defined. - * - ****************************************************************************/ -extern void SetupInitializeServers(const FactoryTemplate * pList, int num, - BOOL bLoading); - #endif /* _QCAP_DLLSETUP_H_DEFINED */ diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index fcc55f2..7465bb4 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -154,17 +154,7 @@ int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]); */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - SetupInitializeServers(g_Templates, g_cTemplates, TRUE); - break; - case DLL_PROCESS_DETACH: - SetupInitializeServers(g_Templates, g_cTemplates, FALSE); - break; - } - return TRUE; + return STRMBASE_DllMain(hInstDLL,fdwReason,lpv); } /*********************************************************************** diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 16a126e..cac93b6 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -91,3 +91,40 @@ HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister) return hr; } + +/**************************************************************************** + * SetupInitializeServers + * + * This function is table driven using the static members of the + * CFactoryTemplate class defined in the Dll. + * + * It calls the initialize function for any class in CFactoryTemplate with + * one defined. + * + ****************************************************************************/ +static void SetupInitializeServers(const FactoryTemplate * pList, int num, + BOOL bLoading) +{ + int i; + + for (i = 0; i < num; i++, pList++) + { + if (pList->m_lpfnInit) + pList->m_lpfnInit(bLoading, pList->m_ClsID); + } +} + +BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + SetupInitializeServers(g_Templates, g_cTemplates, TRUE); + break; + case DLL_PROCESS_DETACH: + SetupInitializeServers(g_Templates, g_cTemplates, FALSE); + break; + } + return TRUE; +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d34457a..581643e 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -312,3 +312,6 @@ typedef struct tagFactoryTemplate { HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister); HRESULT WINAPI AMovieSetupRegisterFilter2( const AMOVIESETUP_FILTER const * pFilter, IFilterMapper2 *pIFM2, BOOL bRegister); + +/* Dll Functions */ +BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv);

1 0

Aric Stewart : strmbase: Implement OLE registration in AMovieDllRegisterServer2.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: e479273acabff0d1773109cdd6482fffbf949f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e479273acabff0d1773109cdd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 20 09:25:37 2010 -0500 strmbase: Implement OLE registration in AMovieDllRegisterServer2. --- dlls/qcap/Makefile.in | 1 - dlls/qcap/dllsetup.c | 161 ----------------------------------------------- dlls/qcap/dllsetup.h | 38 ----------- dlls/qcap/qcap_main.c | 7 +-- dlls/strmbase/dllfunc.c | 105 ++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e479273acabff0d177310…

1 0

Aric Stewart : strmbase: Implement STRMBASE_DllGetClassObject and STRMBASE_DllCanUnloadNow.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: 2c3bc2cf569b877f1452cc6d480f0fa076df8ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3bc2cf569b877f1452cc6d4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 19 13:24:29 2010 -0500 strmbase: Implement STRMBASE_DllGetClassObject and STRMBASE_DllCanUnloadNow. --- dlls/qcap/qcap.spec | 2 +- dlls/qcap/qcap_main.c | 153 +-------------------------------------------- dlls/strmbase/dllfunc.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 2 + 4 files changed, 166 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c3bc2cf569b877f1452c…

1 0