June 2012 - Wine-commits - list.winehq.org

Erich Hoover : hhctrl.ocx: Fix displaying the first page for some help files.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: e412c8c7b815271f248936e0a07a1fdc0970129c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e412c8c7b815271f248936e0a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jun 14 09:44:08 2012 -0600 hhctrl.ocx: Fix displaying the first page for some help files. --- dlls/hhctrl.ocx/chm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index af4fb19..f040e5d 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -251,6 +251,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) HRESULT hr; DWORD cbRead; + static const WCHAR null[] = {0}; static const WCHAR toc_extW[] = {'h','h','c',0}; static const WCHAR index_extW[] = {'h','h','k',0}; static const WCHAR windowsW[] = {'#','W','I','N','D','O','W','S',0}; @@ -260,7 +261,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) { /* no defined window types so use (hopefully) sane defaults */ static const WCHAR defaultwinW[] = {'d','e','f','a','u','l','t','w','i','n','\0'}; - static const WCHAR null[] = {0}; memset((void*)&(info->WinType), 0, sizeof(info->WinType)); info->WinType.cbStruct=sizeof(info->WinType); info->WinType.fUniCodeStrings=TRUE; @@ -292,13 +292,16 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) info->WinType.pszType = info->pszType = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszType)); info->WinType.pszCaption = info->pszCaption = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszCaption)); - info->WinType.pszFile = info->pszFile = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszFile)); info->WinType.pszHome = info->pszHome = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszHome)); info->WinType.pszJump1 = info->pszJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump1)); info->WinType.pszJump2 = info->pszJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszJump2)); info->WinType.pszUrlJump1 = info->pszUrlJump1 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump1)); info->WinType.pszUrlJump2 = info->pszUrlJump2 = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszUrlJump2)); + if (info->WinType.pszFile) + info->WinType.pszFile = info->pszFile = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszFile)); + else + info->WinType.pszFile = strdupW(info->pCHMInfo->defTopic ? info->pCHMInfo->defTopic : null); if (info->WinType.pszToc) info->WinType.pszToc = info->pszToc = strdupAtoW(GetChmString(info->pCHMInfo, (DWORD_PTR)info->WinType.pszToc)); else

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 9588617d616242eec5714958a6e9f02b6b06e7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9588617d616242eec5714958a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 14 15:37:54 2012 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 22 +++--- dlls/msvcp70/msvcp70.spec | 130 ++++++++++++++++---------------- dlls/msvcp71/msvcp71.spec | 158 ++++++++++++++++++++-------------------- dlls/msvcp80/msvcp80.spec | 170 +++++++++++++++++++++--------------------- 4 files changed, 240 insertions(+), 240 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9588617d616242eec5714…

1 0

Vincent Povirk : include: Add IWICPixelFormatInfo definition.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 2c5ef84544e4b6baabef292b39f4d445a5830f54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5ef84544e4b6baabef292b3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 24 12:30:02 2012 -0500 include: Add IWICPixelFormatInfo definition. --- include/wincodec.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 9284499..afb0207 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -140,6 +140,16 @@ typedef enum WICComponentEnumerateOptions { WICComponentEnumerateDisabled = 0x80000000 } WICComponentEnumerateOptions; +typedef enum WICPixelFormatNumericRepresentation { + WICPixelFormatNumericRepresentationUnspecified = 0x00000000, + WICPixelFormatNumericRepresentationIndexed = 0x00000001, + WICPixelFormatNumericRepresentationUnsignedInteger = 0x00000002, + WICPixelFormatNumericRepresentationSignedInteger = 0x00000003, + WICPixelFormatNumericRepresentationFixed = 0x00000004, + WICPixelFormatNumericRepresentationFloat = 0x00000005, + WICPIXELFORMATNUMERICREPRESENTATION_FORCE_DWORD = CODEC_FORCE_DWORD +} WICPixelFormatNumericRepresentation; + typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID; @@ -446,6 +456,44 @@ interface IWICBitmapFrameDecode : IWICBitmapSource [ object, + uuid(e8eda601-3d48-431a-ab44-69059be88bbe) +] +interface IWICPixelFormatInfo : IWICComponentInfo +{ + HRESULT GetFormatGUID( + [out] GUID* pFormat); + + HRESULT GetColorContext( + [out] IWICColorContext **ppIColorContext); + + HRESULT GetBitsPerPixel( + [out] UINT *puiBitsPerPixel); + + HRESULT GetChannelCount( + [out] UINT *puiChannelCount); + + HRESULT GetChannelMask( + [in] UINT uiChannelIndex, + [in] UINT cbMaskBuffer, + [in, out, unique, size_is(cbMaskBuffer)] BYTE *pbMaskBuffer, + [out] UINT *pcbActual); +} + +[ + object, + uuid(a9db33a2-af5f-43c7-b679-74f5984b5aa4) +] +interface IWICPixelFormatInfo2 : IWICPixelFormatInfo +{ + HRESULT SupportsTransparency( + [out] BOOL *pfSupportsTransparency); + + HRESULT GetNumericRepresentation( + [out] WICPixelFormatNumericRepresentation *pNumericRepresentation); +} + +[ + object, uuid(e87a44c4-b76e-4c47-8b09-298eb12a2714) ] interface IWICBitmapCodecInfo : IWICComponentInfo

1 0

Vincent Povirk : windowscodecs: Add test for IWICComponentInfo.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: f557fa692bc64e6044395876eff0386ef213c6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f557fa692bc64e6044395876e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 24 13:17:33 2012 -0500 windowscodecs: Add test for IWICComponentInfo. --- dlls/windowscodecs/tests/info.c | 147 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 138 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index cd89a40..3d7ecc8 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include <stdarg.h> #include <math.h> @@ -27,9 +28,43 @@ #include "wincodecsdk.h" #include "wine/test.h" -static void test_decoder_info(void) +#include "initguid.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + +static const char *debugstr_guid(GUID *guid) +{ + static char buf[50]; + + if(!guid) + return "(null)"; + + sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7]); + + return buf; +} + +static HRESULT get_component_info(const GUID *clsid, IWICComponentInfo **result) { IWICImagingFactory *factory; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return hr; + + hr = IWICImagingFactory_CreateComponentInfo(factory, clsid, result); + + IWICImagingFactory_Release(factory); + + return hr; +} + +static void test_decoder_info(void) +{ IWICComponentInfo *info; IWICBitmapDecoderInfo *decoder_info; HRESULT hr; @@ -38,13 +73,7 @@ static void test_decoder_info(void) const WCHAR expected_mimetype[] = {'i','m','a','g','e','/','b','m','p',0}; CLSID clsid; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void**)&factory); - ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); - if (FAILED(hr)) return; - - hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICBmpDecoder, &info); - ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + hr = get_component_info(&CLSID_WICBmpDecoder, &info); hr = IWICComponentInfo_QueryInterface(info, &IID_IWICBitmapDecoderInfo, (void**)&decoder_info); ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); @@ -88,8 +117,107 @@ static void test_decoder_info(void) IWICBitmapDecoderInfo_Release(decoder_info); IWICComponentInfo_Release(info); +} - IWICImagingFactory_Release(factory); +static void test_pixelformat_info(void) +{ + IWICComponentInfo *info; + HRESULT hr; + ULONG len, known_len; + WCHAR value[256]; + GUID guid; + WICComponentType componenttype; + DWORD signing; + + hr = get_component_info(&GUID_WICPixelFormat32bppBGRA, &info); + todo_wine ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + + if (FAILED(hr)) + return; + + hr = IWICComponentInfo_GetAuthor(info, 0, NULL, 0); + ok(hr == E_INVALIDARG, "GetAuthor failed, hr=%x\n", hr); + + len = 0xdeadbeef; + hr = IWICComponentInfo_GetAuthor(info, 0, NULL, &len); + ok(hr == S_OK, "GetAuthor failed, hr=%x\n", hr); + ok(len < 255 && len > 0, "invalid length 0x%x\n", len); + known_len = len; + + memset(value, 0xaa, 256 * sizeof(WCHAR)); + hr = IWICComponentInfo_GetAuthor(info, len-1, value, NULL); + ok(hr == E_INVALIDARG, "GetAuthor failed, hr=%x\n", hr); + ok(value[0] = 0xaaaa, "string modified\n"); + + len = 0xdeadbeef; + memset(value, 0xaa, 256 * sizeof(WCHAR)); + hr = IWICComponentInfo_GetAuthor(info, known_len-1, value, &len); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetAuthor failed, hr=%x\n", hr); + ok(len == known_len, "got length of 0x%x, expected 0x%x\n", len, known_len); + ok(value[known_len-1] == 0xaaaa, "string modified past given length\n"); + ok(value[0] == 0xaaaa, "string modified\n"); + + len = 0xdeadbeef; + memset(value, 0xaa, 256 * sizeof(WCHAR)); + hr = IWICComponentInfo_GetAuthor(info, known_len, value, &len); + ok(hr == S_OK, "GetAuthor failed, hr=%x\n", hr); + ok(len == known_len, "got length of 0x%x, expected 0x%x\n", len, known_len); + ok(value[known_len-1] == 0, "string not terminated at expected length\n"); + ok(value[known_len-2] != 0xaaaa, "string not modified at given length\n"); + + len = 0xdeadbeef; + memset(value, 0xaa, 256 * sizeof(WCHAR)); + hr = IWICComponentInfo_GetAuthor(info, known_len+1, value, &len); + ok(hr == S_OK, "GetAuthor failed, hr=%x\n", hr); + ok(len == known_len, "got length of 0x%x, expected 0x%x\n", len, known_len); + ok(value[known_len] == 0xaaaa, "string modified past end\n"); + ok(value[known_len-1] == 0, "string not terminated at expected length\n"); + ok(value[known_len-2] != 0xaaaa, "string not modified at given length\n"); + + hr = IWICComponentInfo_GetCLSID(info, NULL); + ok(hr == E_INVALIDARG, "GetCLSID failed, hr=%x\n", hr); + + memset(&guid, 0xaa, sizeof(guid)); + hr = IWICComponentInfo_GetCLSID(info, &guid); + ok(hr == S_OK, "GetCLSID failed, hr=%x\n", hr); + ok(IsEqualGUID(&guid, &GUID_WICPixelFormat32bppBGRA), "unexpected CLSID %s\n", debugstr_guid(&guid)); + + hr = IWICComponentInfo_GetComponentType(info, NULL); + ok(hr == E_INVALIDARG, "GetComponentType failed, hr=%x\n", hr); + + hr = IWICComponentInfo_GetComponentType(info, &componenttype); + ok(hr == S_OK, "GetComponentType failed, hr=%x\n", hr); + ok(componenttype == WICPixelFormat, "unexpected component type 0x%x\n", componenttype); + + len = 0xdeadbeef; + hr = IWICComponentInfo_GetFriendlyName(info, 0, NULL, &len); + ok(hr == S_OK, "GetFriendlyName failed, hr=%x\n", hr); + ok(len < 255 && len > 0, "invalid length 0x%x\n", len); + + hr = IWICComponentInfo_GetSigningStatus(info, NULL); + ok(hr == E_INVALIDARG, "GetSigningStatus failed, hr=%x\n", hr); + + hr = IWICComponentInfo_GetSigningStatus(info, &signing); + ok(hr == S_OK, "GetSigningStatus failed, hr=%x\n", hr); + ok(signing == WICComponentSigned, "unexpected signing status 0x%x\n", signing); + + len = 0xdeadbeef; + hr = IWICComponentInfo_GetSpecVersion(info, 0, NULL, &len); + ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr); + ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */ + + memset(&guid, 0xaa, sizeof(guid)); + hr = IWICComponentInfo_GetVendorGUID(info, &guid); + ok(hr == S_OK, "GetVendorGUID failed, hr=%x\n", hr); + ok(IsEqualGUID(&guid, &GUID_VendorMicrosoft) || + broken(IsEqualGUID(&guid, &GUID_NULL)) /* XP */, "unexpected GUID %s\n", debugstr_guid(&guid)); + + len = 0xdeadbeef; + hr = IWICComponentInfo_GetVersion(info, 0, NULL, &len); + ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + ok(len == 0, "invalid length 0x%x\n", len); /* version does not apply to pixel formats */ + + IWICComponentInfo_Release(info); } static void test_reader_info(void) @@ -239,6 +367,7 @@ START_TEST(info) test_decoder_info(); test_reader_info(); + test_pixelformat_info(); CoUninitialize(); }

1 0

Vincent Povirk : windowscodecs: Register pixel formats.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 9b7dca84536481d2b13cfdfbce77292278c0a41f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7dca84536481d2b13cfdfbc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 14:31:09 2012 -0500 windowscodecs: Register pixel formats. --- dlls/windowscodecs/regsvr.c | 461 +++++++++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 2 files changed, 462 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b7dca84536481d2b13cf…

1 0

Vincent Povirk : windowscodecs: Add stub IWICPixelFormatInfo implementation .
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 1ceb2f2a48ba43d0893374d7b0c7ee264dec4463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ceb2f2a48ba43d0893374d7b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 14:50:00 2012 -0500 windowscodecs: Add stub IWICPixelFormatInfo implementation. --- dlls/windowscodecs/info.c | 215 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 215 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 86f0adb..5eab27e 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1006,6 +1006,220 @@ static HRESULT FormatConverterInfo_Constructor(HKEY classkey, REFCLSID clsid, IW return S_OK; } +typedef struct { + IWICPixelFormatInfo2 IWICPixelFormatInfo2_iface; + LONG ref; + HKEY classkey; + CLSID clsid; +} PixelFormatInfo; + +static inline PixelFormatInfo *impl_from_IWICPixelFormatInfo2(IWICPixelFormatInfo2 *iface) +{ + return CONTAINING_RECORD(iface, PixelFormatInfo, IWICPixelFormatInfo2_iface); +} + +static HRESULT WINAPI PixelFormatInfo_QueryInterface(IWICPixelFormatInfo2 *iface, REFIID iid, + void **ppv) +{ + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICComponentInfo, iid) || + IsEqualIID(&IID_IWICPixelFormatInfo, iid) || + IsEqualIID(&IID_IWICPixelFormatInfo2 ,iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI PixelFormatInfo_AddRef(IWICPixelFormatInfo2 *iface) +{ + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI PixelFormatInfo_Release(IWICPixelFormatInfo2 *iface) +{ + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + RegCloseKey(This->classkey); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI PixelFormatInfo_GetComponentType(IWICPixelFormatInfo2 *iface, + WICComponentType *pType) +{ + TRACE("(%p,%p)\n", iface, pType); + *pType = WICPixelFormat; + return S_OK; +} + +static HRESULT WINAPI PixelFormatInfo_GetCLSID(IWICPixelFormatInfo2 *iface, CLSID *pclsid) +{ + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + TRACE("(%p,%p)\n", iface, pclsid); + + if (!pclsid) + return E_INVALIDARG; + + memcpy(pclsid, &This->clsid, sizeof(CLSID)); + + return S_OK; +} + +static HRESULT WINAPI PixelFormatInfo_GetSigningStatus(IWICPixelFormatInfo2 *iface, DWORD *pStatus) +{ + FIXME("(%p,%p): stub\n", iface, pStatus); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetAuthor(IWICPixelFormatInfo2 *iface, UINT cchAuthor, + WCHAR *wzAuthor, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetVendorGUID(IWICPixelFormatInfo2 *iface, GUID *pguidVendor) +{ + FIXME("(%p,%p): stub\n", iface, pguidVendor); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetVersion(IWICPixelFormatInfo2 *iface, UINT cchVersion, + WCHAR *wzVersion, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchVersion, wzVersion, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetSpecVersion(IWICPixelFormatInfo2 *iface, UINT cchSpecVersion, + WCHAR *wzSpecVersion, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchSpecVersion, wzSpecVersion, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetFriendlyName(IWICPixelFormatInfo2 *iface, UINT cchFriendlyName, + WCHAR *wzFriendlyName, UINT *pcchActual) +{ + FIXME("(%p,%u,%p,%p): stub\n", iface, cchFriendlyName, wzFriendlyName, pcchActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetFormatGUID(IWICPixelFormatInfo2 *iface, + GUID *pFormat) +{ + FIXME("(%p,%p): stub\n", iface, pFormat); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetColorContext(IWICPixelFormatInfo2 *iface, + IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%p): stub\n", iface, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetBitsPerPixel(IWICPixelFormatInfo2 *iface, + UINT *puiBitsPerPixel) +{ + FIXME("(%p,%p): stub\n", iface, puiBitsPerPixel); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetChannelCount(IWICPixelFormatInfo2 *iface, + UINT *puiChannelCount) +{ + FIXME("(%p,%p): stub\n", iface, puiChannelCount); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetChannelMask(IWICPixelFormatInfo2 *iface, + UINT uiChannelIndex, UINT cbMaskBuffer, BYTE *pbMaskBuffer, UINT *pcbActual) +{ + FIXME("(%p,%u,%u,%p,%p): stub\n", iface, uiChannelIndex, cbMaskBuffer, pbMaskBuffer, pcbActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 *iface, + BOOL *pfSupportsTransparency) +{ + FIXME("(%p,%p): stub\n", iface, pfSupportsTransparency); + return E_NOTIMPL; +} + +static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface, + WICPixelFormatNumericRepresentation *pNumericRepresentation) +{ + FIXME("(%p,%p): stub\n", iface, pNumericRepresentation); + return E_NOTIMPL; +} + +static const IWICPixelFormatInfo2Vtbl PixelFormatInfo_Vtbl = { + PixelFormatInfo_QueryInterface, + PixelFormatInfo_AddRef, + PixelFormatInfo_Release, + PixelFormatInfo_GetComponentType, + PixelFormatInfo_GetCLSID, + PixelFormatInfo_GetSigningStatus, + PixelFormatInfo_GetAuthor, + PixelFormatInfo_GetVendorGUID, + PixelFormatInfo_GetVersion, + PixelFormatInfo_GetSpecVersion, + PixelFormatInfo_GetFriendlyName, + PixelFormatInfo_GetFormatGUID, + PixelFormatInfo_GetColorContext, + PixelFormatInfo_GetBitsPerPixel, + PixelFormatInfo_GetChannelCount, + PixelFormatInfo_GetChannelMask, + PixelFormatInfo_SupportsTransparency, + PixelFormatInfo_GetNumericRepresentation +}; + +static HRESULT PixelFormatInfo_Constructor(HKEY classkey, REFCLSID clsid, IWICComponentInfo **ppIInfo) +{ + PixelFormatInfo *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(PixelFormatInfo)); + if (!This) + { + RegCloseKey(classkey); + return E_OUTOFMEMORY; + } + + This->IWICPixelFormatInfo2_iface.lpVtbl = &PixelFormatInfo_Vtbl; + This->ref = 1; + This->classkey = classkey; + memcpy(&This->clsid, clsid, sizeof(CLSID)); + + *ppIInfo = (IWICComponentInfo*)This; + return S_OK; +} + static const WCHAR clsid_keyname[] = {'C','L','S','I','D',0}; static const WCHAR instance_keyname[] = {'I','n','s','t','a','n','c','e',0}; @@ -1019,6 +1233,7 @@ static const struct category categories[] = { {WICDecoder, &CATID_WICBitmapDecoders, BitmapDecoderInfo_Constructor}, {WICEncoder, &CATID_WICBitmapEncoders, BitmapEncoderInfo_Constructor}, {WICPixelFormatConverter, &CATID_WICFormatConverters, FormatConverterInfo_Constructor}, + {WICPixelFormat, &CATID_WICPixelFormats, PixelFormatInfo_Constructor}, {0} };

1 0

Vincent Povirk : windowscodecs: Implement IWICComponentInfo::GetAuthor.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: 387d1e9790278325757061b95f90059ae5e5c269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387d1e9790278325757061b95… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 14:55:30 2012 -0500 windowscodecs: Implement IWICComponentInfo::GetAuthor. --- dlls/windowscodecs/info.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 5eab27e..2677ca7 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0}; +static const WCHAR author_valuename[] = {'A','u','t','h','o','r',0}; static const WCHAR pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e','r','F','o','r','m','a','t',0}; @@ -186,8 +187,12 @@ static HRESULT WINAPI BitmapDecoderInfo_GetSigningStatus(IWICBitmapDecoderInfo * static HRESULT WINAPI BitmapDecoderInfo_GetAuthor(IWICBitmapDecoderInfo *iface, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchAuthor, wzAuthor, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, author_valuename, + cchAuthor, wzAuthor, pcchActual); } static HRESULT WINAPI BitmapDecoderInfo_GetVendorGUID(IWICBitmapDecoderInfo *iface, GUID *pguidVendor) @@ -631,8 +636,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetSigningStatus(IWICBitmapEncoderInfo * static HRESULT WINAPI BitmapEncoderInfo_GetAuthor(IWICBitmapEncoderInfo *iface, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchAuthor, wzAuthor, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, author_valuename, + cchAuthor, wzAuthor, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_GetVendorGUID(IWICBitmapEncoderInfo *iface, GUID *pguidVendor) @@ -901,8 +910,12 @@ static HRESULT WINAPI FormatConverterInfo_GetSigningStatus(IWICFormatConverterIn static HRESULT WINAPI FormatConverterInfo_GetAuthor(IWICFormatConverterInfo *iface, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); - return E_NOTIMPL; + FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchAuthor, wzAuthor, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, author_valuename, + cchAuthor, wzAuthor, pcchActual); } static HRESULT WINAPI FormatConverterInfo_GetVendorGUID(IWICFormatConverterInfo *iface, GUID *pguidVendor) @@ -1099,8 +1112,12 @@ static HRESULT WINAPI PixelFormatInfo_GetSigningStatus(IWICPixelFormatInfo2 *ifa static HRESULT WINAPI PixelFormatInfo_GetAuthor(IWICPixelFormatInfo2 *iface, UINT cchAuthor, WCHAR *wzAuthor, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchAuthor, wzAuthor, pcchActual); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchAuthor, wzAuthor, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, author_valuename, + cchAuthor, wzAuthor, pcchActual); } static HRESULT WINAPI PixelFormatInfo_GetVendorGUID(IWICPixelFormatInfo2 *iface, GUID *pguidVendor)

1 0

Vincent Povirk : gdiplus: Check for NULL image in GdipImageRotateFlip.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: b5ef70c5836b33a9d469c71e20bff516eed45b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ef70c5836b33a9d469c71e2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 13:39:35 2012 -0500 gdiplus: Check for NULL image in GdipImageRotateFlip. --- dlls/gdiplus/image.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ce04c72..dd4dcea 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3889,6 +3889,9 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) TRACE("(%p, %u)\n", image, type); + if (!image) + return InvalidParameter; + rotate_90 = type&1; flip_x = (type&6) == 2 || (type&6) == 4; flip_y = (type&3) == 1 || (type&3) == 2;

1 0

Dmitry Timoshkov : gdiplus: Accept wider range of fonts.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: ac38e69a92a443759cc8fb3291c50dce3bc5a83c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac38e69a92a443759cc8fb329… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 14 14:12:40 2012 +0900 gdiplus: Accept wider range of fonts. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 51733f4..f4b75ef 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -644,7 +644,7 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - if (type != TRUETYPE_FONTTYPE) + if (type & RASTER_FONTTYPE) return 1; *(LOGFONTW *)lParam = *elf;

1 0

Nozomi Kodama : d3dx9_36: Implementation of D3DXQuaternionSquadSetup.
by Alexandre Julliard 14 Jun '12

14 Jun '12

Module: wine Branch: master Commit: ed7c28353dd9bdf2b49cba6ddae09f0dde6fb5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7c28353dd9bdf2b49cba6dd… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Thu Jun 14 10:37:04 2012 +0800 d3dx9_36: Implementation of D3DXQuaternionSquadSetup. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 67 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 42 +++++++++++++++++++++++++++ include/d3dx9math.h | 1 + 4 files changed, 111 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 20a8abf..d8fcaa4 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -252,7 +252,7 @@ @ stdcall D3DXQuaternionRotationYawPitchRoll(ptr float float float) @ stdcall D3DXQuaternionSlerp(ptr ptr ptr float) @ stdcall D3DXQuaternionSquad(ptr ptr ptr ptr ptr float) -@ stub D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall D3DXQuaternionSquadSetup(ptr ptr ptr ptr ptr ptr ptr) @ stdcall D3DXQuaternionToAxisAngle(ptr ptr ptr) @ stub D3DXRectPatchSize(ptr ptr ptr) @ stub D3DXSaveMeshHierarchyToFileA(ptr long ptr ptr ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 5c6530a..499d368 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1366,6 +1366,73 @@ D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATE return pout; } +static D3DXQUATERNION add_diff(CONST D3DXQUATERNION *q1, CONST D3DXQUATERNION *q2, CONST FLOAT add) +{ + D3DXQUATERNION temp; + + temp.x = q1->x + add * q2->x; + temp.y = q1->y + add * q2->y; + temp.z = q1->z + add * q2->z; + temp.w = q1->w + add * q2->w; + + return temp; +} + +void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbout, D3DXQUATERNION *pcout, CONST D3DXQUATERNION *pq0, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3) +{ + D3DXQUATERNION q, temp1, temp2, temp3, zero; + + TRACE("(%p, %p, %p, %p, %p, %p, %p)\n", paout, pbout, pcout, pq0, pq1, pq2, pq3); + + zero.x = 0.0f; + zero.y = 0.0f; + zero.z = 0.0f; + zero.w = 0.0f; + + if ( D3DXQuaternionDot(pq0, pq1) < 0.0f ) + temp2 = add_diff(&zero, pq0, -1.0f); + else + temp2 = *pq0; + + if ( D3DXQuaternionDot(pq1, pq2) < 0.0f ) + *pcout = add_diff(&zero, pq2, -1.0f); + else + *pcout = *pq2; + + if ( D3DXQuaternionDot(pcout, pq3) < 0.0f ) + temp3 = add_diff(&zero, pq3, -1.0f); + else + temp3 = *pq3; + + D3DXQuaternionInverse(&temp1, pq1); + D3DXQuaternionMultiply(&temp2, &temp1, &temp2); + D3DXQuaternionLn(&temp2, &temp2); + D3DXQuaternionMultiply(&q, &temp1, pcout); + D3DXQuaternionLn(&q, &q); + temp1 = add_diff(&temp2, &q, 1.0f); + temp1.x *= -0.25f; + temp1.y *= -0.25f; + temp1.z *= -0.25f; + temp1.w *= -0.25f; + D3DXQuaternionExp(&temp1, &temp1); + D3DXQuaternionMultiply(paout, pq1, &temp1); + + D3DXQuaternionInverse(&temp1, pcout); + D3DXQuaternionMultiply(&temp2, &temp1, pq1); + D3DXQuaternionLn(&temp2, &temp2); + D3DXQuaternionMultiply(&q, &temp1, &temp3); + D3DXQuaternionLn(&q, &q); + temp1 = add_diff(&temp2, &q, 1.0f); + temp1.x *= -0.25f; + temp1.y *= -0.25f; + temp1.z *= -0.25f; + temp1.w *= -0.25f; + D3DXQuaternionExp(&temp1, &temp1); + D3DXQuaternionMultiply(pbout, pcout, &temp1); + + return; +} + void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle) { paxis->x = pq->x; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c93044d..e732691 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -940,6 +940,48 @@ static void D3DXQuaternionTest(void) D3DXQuaternionSquad(&gotquat,&q,&r,&t,&u,scale); expect_vec4(expectedquat,gotquat); +/*_______________D3DXQuaternionSquadSetup___________________*/ + r.x = 1.0f, r.y = 2.0f; r.z = 4.0f; r.w = 10.0f; + s.x = -3.0f; s.y = 4.0f; s.z = -5.0f; s.w = 7.0; + t.x = -1111.0f, t.y = 111.0f; t.z = -11.0f; t.w = 1.0f; + u.x = 91.0f; u.y = - 82.0f; u.z = 7.3f; u.w = -6.4f; + D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&t,&u); + expectedquat.x = 7.121285f; expectedquat.y = 2.159964f; expectedquat.z = -3.855094f; expectedquat.w = 5.362844f; + expect_vec4(expectedquat,gotquat); + expectedquat.x = -1113.492920f; expectedquat.y = 82.679260f; expectedquat.z = -6.696645f; expectedquat.w = -4.090050f; + expect_vec4(expectedquat,Nq); + expectedquat.x = -1111.0f; expectedquat.y = 111.0f; expectedquat.z = -11.0f; expectedquat.w = 1.0f; + expect_vec4(expectedquat,Nq1); + r.x = 0.2f; r.y = 0.3f; r.z = 1.3f; r.w = -0.6f; + s.x = -3.0f; s.y =-2.0f; s.z = 4.0f; s.w = 0.2f; + t.x = 0.4f; t.y = 8.3f; t.z = -3.1f; t.w = -2.7f; + u.x = 1.1f; u.y = -0.7f; u.z = 9.2f; u.w = 0.0f; + D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&u,&t); + expectedquat.x = -4.139569f; expectedquat.y = -2.469115f; expectedquat.z = 2.364477f; expectedquat.w = 0.465494f; + expect_vec4(expectedquat,gotquat); + expectedquat.x = 2.342533f; expectedquat.y = 2.365127f; expectedquat.z = 8.628538f; expectedquat.w = -0.898356f; + expect_vec4(expectedquat,Nq); + expectedquat.x = 1.1f; expectedquat.y = -0.7f; expectedquat.z = 9.2f; expectedquat.w = 0.0f; + expect_vec4(expectedquat,Nq1); + D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&t,&u); + expectedquat.x = -3.754567f; expectedquat.y = -0.586085f; expectedquat.z = 3.815818f; expectedquat.w = -0.198150f; + expect_vec4(expectedquat,gotquat); + expectedquat.x = 0.140773f; expectedquat.y = -8.737090f; expectedquat.z = -0.516593f; expectedquat.w = 3.053942f; + expect_vec4(expectedquat,Nq); + expectedquat.x = -0.4f; expectedquat.y = -8.3f; expectedquat.z = 3.1f; expectedquat.w = 2.7f; + expect_vec4(expectedquat,Nq1); + r.x = -1.0f; r.y = 0.0f; r.z = 0.0f; r.w = 0.0f; + s.x = 1.0f; s.y =0.0f; s.z = 0.0f; s.w = 0.0f; + t.x = 1.0f; t.y = 0.0f; t.z = 0.0f; t.w = 0.0f; + u.x = -1.0f; u.y = 0.0f; u.z = 0.0f; u.w = 0.0f; + D3DXQuaternionSquadSetup(&gotquat,&Nq,&Nq1,&r,&s,&t,&u); + expectedquat.x = 1.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; + expect_vec4(expectedquat,gotquat); + expectedquat.x = 1.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; + expect_vec4(expectedquat,Nq); + expectedquat.x = 1.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; + expect_vec4(expectedquat,Nq1); + /*_______________D3DXQuaternionToAxisAngle__________________*/ Nq.x = 1.0f/22.0f; Nq.y = 2.0f/22.0f; Nq.z = 4.0f/22.0f; Nq.w = 10.0f/22.0f; expectedvec.x = 1.0f/22.0f; expectedvec.y = 2.0f/22.0f; expectedvec.z = 4.0f/22.0f; diff --git a/include/d3dx9math.h b/include/d3dx9math.h index c31b652..a1fd70a 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -337,6 +337,7 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, FLOAT yaw, FLOAT pitch, FLOAT roll); D3DXQUATERNION* WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, FLOAT t); D3DXQUATERNION* WINAPI D3DXQuaternionSquad(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3, CONST D3DXQUATERNION *pq4, FLOAT t); +void WINAPI D3DXQuaternionSquadSetup(D3DXQUATERNION *paout, D3DXQUATERNION *pbout, D3DXQUATERNION *pcout, CONST D3DXQUATERNION *pq0, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2, CONST D3DXQUATERNION *pq3); void WINAPI D3DXQuaternionToAxisAngle(CONST D3DXQUATERNION *pq, D3DXVECTOR3 *paxis, FLOAT *pangle); D3DXVECTOR2* WINAPI D3DXVec2BaryCentric(D3DXVECTOR2 *pout, CONST D3DXVECTOR2 *pv1, CONST D3DXVECTOR2 *pv2, CONST D3DXVECTOR2 *pv3, FLOAT f, FLOAT g);

1 0