wine-commits July 2013

wine-commits@winehq.org

2 participants
447 discussions

Jacek Caban : mshtml: Better res protocol URL parsing.
by Alexandre Julliard 22 Jul '13

22 Jul '13

Module: wine Branch: master Commit: edf4e61891214039af9add7c2b0d8df9c36d62f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edf4e61891214039af9add7c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 19 17:59:30 2013 +0200 mshtml: Better res protocol URL parsing. --- dlls/mshtml/protocol.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 021ce55..c8f8d08 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -631,31 +631,27 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, } url_dll = url + sizeof(wszRes)/sizeof(wszRes[0]); - if(!(url_file = strrchrW(url_dll, '/'))) { + if(!(res_type = strchrW(url_dll, '/'))) { WARN("wrong url: %s\n", debugstr_w(url)); IInternetProtocolSink_ReportResult(pOIProtSink, MK_E_SYNTAX, 0, NULL); heap_free(url); return MK_E_SYNTAX; } - *url_file++ = 0; + *res_type++ = 0; + if ((url_file = strchrW(res_type, '/'))) { + *url_file++ = 0; + }else { + url_file = res_type; + res_type = MAKEINTRESOURCEW(RT_HTML); + } + hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); if(!hdll) { - if (!(res_type = strrchrW(url_dll, '/'))) { - WARN("Could not open dll: %s\n", debugstr_w(url_dll)); - IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); - heap_free(url); - return HRESULT_FROM_WIN32(GetLastError()); - } - *res_type++ = 0; - - hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); - if(!hdll) { - WARN("Could not open dll: %s\n", debugstr_w(url_dll)); - IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); - heap_free(url); - return HRESULT_FROM_WIN32(GetLastError()); - } + WARN("Could not open dll: %s\n", debugstr_w(url_dll)); + IInternetProtocolSink_ReportResult(pOIProtSink, HRESULT_FROM_WIN32(GetLastError()), 0, NULL); + heap_free(url); + return HRESULT_FROM_WIN32(GetLastError()); } TRACE("trying to find resource type %s, name %s\n", debugstr_w(res_type), debugstr_w(url_file)); @@ -665,7 +661,7 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, LPWSTR endpoint = NULL; DWORD file_id = strtolW(url_file, &endpoint, 10); if(endpoint == url_file+strlenW(url_file)) - src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), MAKEINTRESOURCEW(RT_HTML)); + src = FindResourceW(hdll, MAKEINTRESOURCEW(file_id), res_type); if(!src) { WARN("Could not find resource\n");

1 0

Frédéric Delanoy : Link to translated wiki homepage in French main help page (try 2)
by Jeremy Newman 22 Jul '13

22 Jul '13

Module: website Branch: master Commit: e56f002fdd299b4eac31a13a25338a19c48413af URL: http://source.winehq.org/git/website.git/?a=commit;h=e56f002fdd299b4eac31a1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jul 20 16:13:43 2013 +0200 Link to translated wiki homepage in French main help page (try 2) --- templates/fr/help.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/fr/help.template b/templates/fr/help.template index aa18446..493213e 100644 --- a/templates/fr/help.template +++ b/templates/fr/help.template @@ -50,7 +50,7 @@ payant pour Wine. <a href="http://wiki.winehq.org/"><img src="{$root}/images/moinmoin.png"> Wiki</a> </td> <td valign="top"> - Notre <a href="http://wiki.winehq.org/">wiki</a> peut aussi vous aider. + Notre <a href="http://wiki.winehq.org/PageD'Accueil">wiki</a> peut aussi vous aider. </td> </tr> @@ -93,7 +93,7 @@ intéressante. <a href="http://bugs.winehq.org/"><img src="{$root}/images/bugs.png"> Bugzilla</a> </td> <td valign="top"> - Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bogues</a> + Notre <a href="http://bugs.winehq.org/">système Bugzilla de suivi des bugs</a> présente tous les problèmes sur lesquels nous avons travaillé ou travaillons actuellement. </td> </tr>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.6
by Jeremy Newman 22 Jul '13

22 Jul '13

Module: website Branch: master Commit: e89ad557d2ad1894326235a9849ec17c77458880 URL: http://source.winehq.org/git/website.git/?a=commit;h=e89ad557d2ad1894326235… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jul 19 15:51:36 2013 +0200 Polish translation for release 1.6 --- news/pl/2013071801.xml | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/news/pl/2013071801.xml b/news/pl/2013071801.xml new file mode 100644 index 0000000..6bee54c --- /dev/null +++ b/news/pl/2013071801.xml @@ -0,0 +1,10 @@ +<news> +<date>Lipiec 18, 2013</date> +<title>Wydano Wine 1.6</title> +<body> + Zespół Wine z dumą ogłasza, że stabilne wydanie Wine 1.6 jest już dostępne. + Wydanie to stanowi 16 miesięcy pracy programistów, która przyniosła ponad 10,000 indywidualnych zmian w kodzie. Głównymi nowościami jest nowy sterownik Mac, pełne wsparcie dla przezroczystości okien i nowy pakiet Mono do wspierania aplikacji .NET. + Wydanie zostało ulepszone wzdłuż i wszerz, przez co pozwala na uruchomienie wielu nowych gier i programów. Obejrzyj poniższe <a href="{$root}/announce/1.6">uwagi o wydaniu</a> , aby zapoznać się z głównymi zmianami. +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.6.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Nikolay Sivov : windowscodecs: Implement GetResolution() for bitmap clipper .
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: fa12cffa9d6c17c63caa6fb307c7bda1e4eb344f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa12cffa9d6c17c63caa6fb30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 19 00:31:09 2013 +0400 windowscodecs: Implement GetResolution() for bitmap clipper. --- dlls/windowscodecs/clipper.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c index 91d234e..d8f4b32 100644 --- a/dlls/windowscodecs/clipper.c +++ b/dlls/windowscodecs/clipper.c @@ -131,10 +131,19 @@ static HRESULT WINAPI BitmapClipper_GetPixelFormat(IWICBitmapClipper *iface, } static HRESULT WINAPI BitmapClipper_GetResolution(IWICBitmapClipper *iface, - double *dpi_x, double *dpi_y) + double *dpiX, double *dpiY) { - FIXME("(%p,%p,%p): stub\n", iface, dpi_x, dpi_y); - return E_NOTIMPL; + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + + TRACE("(%p,%p,%p)\n", iface, dpiX, dpiY); + + if (!dpiX || !dpiY) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + return IWICBitmapSource_GetResolution(This->source, dpiX, dpiY); } static HRESULT WINAPI BitmapClipper_CopyPalette(IWICBitmapClipper *iface,

1 0

Nikolay Sivov : windowscodecs: Added GetPixelFormat() for bitmap clipper.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 4bbb285d5e100d3f2c1a9fc1a5726e8e6e5f28b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bbb285d5e100d3f2c1a9fc1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 19 00:29:18 2013 +0400 windowscodecs: Added GetPixelFormat() for bitmap clipper. --- dlls/windowscodecs/clipper.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c index f6d5e02..91d234e 100644 --- a/dlls/windowscodecs/clipper.c +++ b/dlls/windowscodecs/clipper.c @@ -118,8 +118,16 @@ static HRESULT WINAPI BitmapClipper_GetSize(IWICBitmapClipper *iface, static HRESULT WINAPI BitmapClipper_GetPixelFormat(IWICBitmapClipper *iface, WICPixelFormatGUID *format) { - FIXME("(%p,%p): stub\n", iface, format); - return E_NOTIMPL; + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + TRACE("(%p,%p)\n", iface, format); + + if (!format) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + return IWICBitmapSource_GetPixelFormat(This->source, format); } static HRESULT WINAPI BitmapClipper_GetResolution(IWICBitmapClipper *iface,

1 0

Nikolay Sivov : windowscodecs: Implement Initialize() and GetSize() for bitmap clipper.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 682ea785df053b0ec41e18b3f2b275b5b6362b7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=682ea785df053b0ec41e18b3f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 19 00:21:33 2013 +0400 windowscodecs: Implement Initialize() and GetSize() for bitmap clipper. --- dlls/windowscodecs/clipper.c | 60 +++++++++++++++++++++++++++++++++--- dlls/windowscodecs/tests/bitmap.c | 41 +++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c index cbbb255..f6d5e02 100644 --- a/dlls/windowscodecs/clipper.c +++ b/dlls/windowscodecs/clipper.c @@ -34,6 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct BitmapClipper { IWICBitmapClipper IWICBitmapClipper_iface; LONG ref; + IWICBitmapSource *source; + WICRect rect; + CRITICAL_SECTION lock; /* must be held when initialized */ } BitmapClipper; static inline BitmapClipper *impl_from_IWICBitmapClipper(IWICBitmapClipper *iface) @@ -84,6 +87,9 @@ static ULONG WINAPI BitmapClipper_Release(IWICBitmapClipper *iface) if (ref == 0) { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); + if (This->source) IWICBitmapSource_Release(This->source); HeapFree(GetProcessHeap(), 0, This); } @@ -91,10 +97,22 @@ static ULONG WINAPI BitmapClipper_Release(IWICBitmapClipper *iface) } static HRESULT WINAPI BitmapClipper_GetSize(IWICBitmapClipper *iface, - UINT *puiWidth, UINT *puiHeight) + UINT *width, UINT *height) { - FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + + TRACE("(%p,%p,%p)\n", iface, width, height); + + if (!width || !height) + return E_INVALIDARG; + + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + + *width = This->rect.Width; + *height = This->rect.Height; + + return S_OK; } static HRESULT WINAPI BitmapClipper_GetPixelFormat(IWICBitmapClipper *iface, @@ -128,8 +146,37 @@ static HRESULT WINAPI BitmapClipper_CopyPixels(IWICBitmapClipper *iface, static HRESULT WINAPI BitmapClipper_Initialize(IWICBitmapClipper *iface, IWICBitmapSource *source, const WICRect *rc) { - FIXME("(%p,%p,%p): stub\n", iface, source, rc); - return E_NOTIMPL; + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + UINT width, height; + HRESULT hr = S_OK; + + TRACE("(%p,%p,%p)\n", iface, source, rc); + + EnterCriticalSection(&This->lock); + + if (This->source) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + hr = IWICBitmapSource_GetSize(source, &width, &height); + if (FAILED(hr)) goto end; + + if ((rc->X + rc->Width > width) || (rc->Y + rc->Height > height)) + { + hr = E_INVALIDARG; + goto end; + } + + This->rect = *rc; + This->source = source; + IWICBitmapSource_AddRef(This->source); + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static const IWICBitmapClipperVtbl BitmapClipper_Vtbl = { @@ -153,6 +200,9 @@ HRESULT BitmapClipper_Create(IWICBitmapClipper **clipper) This->IWICBitmapClipper_iface.lpVtbl = &BitmapClipper_Vtbl; This->ref = 1; + This->source = NULL; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": BitmapClipper.lock"); *clipper = &This->IWICBitmapClipper_iface; diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 5b78bf9..0437c7d 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -769,6 +769,46 @@ todo_wine DeleteObject(hpal); } +static void test_clipper(void) +{ + IWICBitmapClipper *clipper; + UINT height, width; + IWICBitmap *bitmap; + WICRect rect; + HRESULT hr; + + hr = IWICImagingFactory_CreateBitmap(factory, 10, 10, &GUID_WICPixelFormat24bppBGR, + WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IWICImagingFactory_CreateBitmapClipper(factory, &clipper); + ok(hr == S_OK, "got 0x%08x\n", hr); + + rect.X = rect.Y = 0; + rect.Width = rect.Height = 11; + hr = IWICBitmapClipper_Initialize(clipper, (IWICBitmapSource*)bitmap, &rect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + rect.X = rect.Y = 5; + rect.Width = rect.Height = 6; + hr = IWICBitmapClipper_Initialize(clipper, (IWICBitmapSource*)bitmap, &rect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + rect.X = rect.Y = 5; + rect.Width = rect.Height = 5; + hr = IWICBitmapClipper_Initialize(clipper, (IWICBitmapSource*)bitmap, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + + width = height = 0; + hr = IWICBitmapClipper_GetSize(clipper, &width, &height); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(width == 5, "got %d\n", width); + ok(height == 5, "got %d\n", height); + + IWICBitmapClipper_Release(clipper); + IWICBitmap_Release(bitmap); +} + START_TEST(bitmap) { HRESULT hr; @@ -784,6 +824,7 @@ START_TEST(bitmap) test_CreateBitmapFromMemory(); test_CreateBitmapFromHICON(); test_CreateBitmapFromHBITMAP(); + test_clipper(); IWICImagingFactory_Release(factory);

1 0

Nikolay Sivov : windowscodecs: Added IWICBitmapClipper stub.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 5d4c614c05a950e3597243639954db0dca07f612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d4c614c05a950e3597243639… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 18 17:30:54 2013 +0400 windowscodecs: Added IWICBitmapClipper stub. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clipper.c | 160 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 164 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 8c06088..61f02c4 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ bitmap.c \ bmpdecode.c \ bmpencode.c \ + clipper.c \ clsfactory.c \ colorcontext.c \ colortransform.c \ diff --git a/dlls/windowscodecs/clipper.c b/dlls/windowscodecs/clipper.c new file mode 100644 index 0000000..cbbb255 --- /dev/null +++ b/dlls/windowscodecs/clipper.c @@ -0,0 +1,160 @@ +/* + * Copyright 2013 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct BitmapClipper { + IWICBitmapClipper IWICBitmapClipper_iface; + LONG ref; +} BitmapClipper; + +static inline BitmapClipper *impl_from_IWICBitmapClipper(IWICBitmapClipper *iface) +{ + return CONTAINING_RECORD(iface, BitmapClipper, IWICBitmapClipper_iface); +} + +static HRESULT WINAPI BitmapClipper_QueryInterface(IWICBitmapClipper *iface, REFIID iid, + void **ppv) +{ + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapClipper, iid)) + { + *ppv = &This->IWICBitmapClipper_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BitmapClipper_AddRef(IWICBitmapClipper *iface) +{ + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BitmapClipper_Release(IWICBitmapClipper *iface) +{ + BitmapClipper *This = impl_from_IWICBitmapClipper(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI BitmapClipper_GetSize(IWICBitmapClipper *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapClipper_GetPixelFormat(IWICBitmapClipper *iface, + WICPixelFormatGUID *format) +{ + FIXME("(%p,%p): stub\n", iface, format); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapClipper_GetResolution(IWICBitmapClipper *iface, + double *dpi_x, double *dpi_y) +{ + FIXME("(%p,%p,%p): stub\n", iface, dpi_x, dpi_y); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapClipper_CopyPalette(IWICBitmapClipper *iface, + IWICPalette *palette) +{ + FIXME("(%p,%p): stub\n", iface, palette); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapClipper_CopyPixels(IWICBitmapClipper *iface, + const WICRect *rc, UINT stride, UINT buffer_size, BYTE *buffer) +{ + FIXME("(%p,%p,%u,%u,%p): stub\n", iface, rc, stride, buffer_size, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapClipper_Initialize(IWICBitmapClipper *iface, + IWICBitmapSource *source, const WICRect *rc) +{ + FIXME("(%p,%p,%p): stub\n", iface, source, rc); + return E_NOTIMPL; +} + +static const IWICBitmapClipperVtbl BitmapClipper_Vtbl = { + BitmapClipper_QueryInterface, + BitmapClipper_AddRef, + BitmapClipper_Release, + BitmapClipper_GetSize, + BitmapClipper_GetPixelFormat, + BitmapClipper_GetResolution, + BitmapClipper_CopyPalette, + BitmapClipper_CopyPixels, + BitmapClipper_Initialize +}; + +HRESULT BitmapClipper_Create(IWICBitmapClipper **clipper) +{ + BitmapClipper *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapClipper)); + if (!This) return E_OUTOFMEMORY; + + This->IWICBitmapClipper_iface.lpVtbl = &BitmapClipper_Vtbl; + This->ref = 1; + + *clipper = &This->IWICBitmapClipper_iface; + + return S_OK; +} diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 9a6c818..e5f2125 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -437,8 +437,8 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapScaler(IWICComponentFactory * static HRESULT WINAPI ComponentFactory_CreateBitmapClipper(IWICComponentFactory *iface, IWICBitmapClipper **ppIBitmapClipper) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapClipper); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIBitmapClipper); + return BitmapClipper_Create(ppIBitmapClipper); } static HRESULT WINAPI ComponentFactory_CreateBitmapFlipRotator(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index dddb327..4a0263b 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -54,6 +54,7 @@ extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN; extern HRESULT StreamImpl_Create(IWICStream **stream) DECLSPEC_HIDDEN; extern HRESULT ColorContext_Create(IWICColorContext **context) DECLSPEC_HIDDEN; extern HRESULT ColorTransform_Create(IWICColorTransform **transform) DECLSPEC_HIDDEN; +extern HRESULT BitmapClipper_Create(IWICBitmapClipper **clipper) DECLSPEC_HIDDEN; extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride,

1 0

Dmitry Timoshkov : windowscodecs: Generate global GIF palette even a real one is missing.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 3738c6b05c8c130adf409c7c982b633fd058dc3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3738c6b05c8c130adf409c7c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 15:29:58 2013 +0900 windowscodecs: Generate global GIF palette even a real one is missing. --- dlls/windowscodecs/gifformat.c | 39 ++++++++++++++++++++++----------- dlls/windowscodecs/tests/gifformat.c | 1 - 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 8ebcf3d..39de709 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1180,26 +1180,39 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet GifDecoder *This = impl_from_IWICBitmapDecoder(iface); WICColor colors[256]; ColorMapObject *cm; - int i, trans; + int i, trans, count; ExtensionBlock *eb; TRACE("(%p,%p)\n", iface, palette); cm = This->gif->SColorMap; - if (!cm) return WINCODEC_ERR_FRAMEMISSING; - - if (cm->ColorCount > 256) + if (cm) { - ERR("GIF contains invalid number of colors: %d\n", cm->ColorCount); - return E_FAIL; - } + if (cm->ColorCount > 256) + { + ERR("GIF contains invalid number of colors: %d\n", cm->ColorCount); + return E_FAIL; + } - for (i = 0; i < cm->ColorCount; i++) + for (i = 0; i < cm->ColorCount; i++) + { + colors[i] = 0xff000000 | /* alpha */ + cm->Colors[i].Red << 16 | + cm->Colors[i].Green << 8 | + cm->Colors[i].Blue; + } + + count = cm->ColorCount; + } + else { - colors[i] = 0xff000000 | /* alpha */ - cm->Colors[i].Red << 16 | - cm->Colors[i].Green << 8 | - cm->Colors[i].Blue; + colors[0] = 0xff000000; + colors[1] = 0xffffffff; + + for (i = 2; i < 256; i++) + colors[i] = 0xff000000; + + count = 256; } /* look for the transparent color extension */ @@ -1217,7 +1230,7 @@ static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface, IWICPalet } } - return IWICPalette_InitializeCustom(palette, colors, cm->ColorCount); + return IWICPalette_InitializeCustom(palette, colors, count); } static HRESULT WINAPI GifDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 47a27dd..0ff0f61 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -284,7 +284,6 @@ static void test_local_gif_palette(void) /* global palette */ hr = IWICBitmapDecoder_CopyPalette(decoder, palette); -todo_wine ok(hr == S_OK || broken(hr == WINCODEC_ERR_FRAMEMISSING), "CopyPalette %#x\n", hr); if (hr == S_OK) {

1 0

Dmitry Timoshkov : windowscodecs/tests: Add a test for global GIF palette exposed by recent Windows versions.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: f6c73a227b0fa2422dd53ad9debfc76bd06809d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c73a227b0fa2422dd53ad9d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 19 15:26:31 2013 +0900 windowscodecs/tests: Add a test for global GIF palette exposed by recent Windows versions. --- dlls/windowscodecs/tests/gifformat.c | 32 +++++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 9ff1d90..47a27dd 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -271,8 +271,9 @@ static void test_local_gif_palette(void) IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *frame; IWICPalette *palette; + WICBitmapPaletteType type; GUID format; - UINT count, ret; + UINT count, ret, i; WICColor color[256]; decoder = create_decoder(gif_local_palette, sizeof(gif_local_palette)); @@ -283,8 +284,28 @@ static void test_local_gif_palette(void) /* global palette */ hr = IWICBitmapDecoder_CopyPalette(decoder, palette); - ok(hr == WINCODEC_ERR_FRAMEMISSING, - "expected WINCODEC_ERR_FRAMEMISSING, got %#x\n", hr); +todo_wine + ok(hr == S_OK || broken(hr == WINCODEC_ERR_FRAMEMISSING), "CopyPalette %#x\n", hr); + if (hr == S_OK) + { + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 256, "expected 256, got %u\n", count); + + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[0] == 0xff000000, "expected 0xff000000, got %#x\n", color[0]); + ok(color[1] == 0x00ffffff, "expected 0x00ffffff, got %#x\n", color[1]); + + for (i = 2; i < 256; i++) + ok(color[i] == 0xff000000, "expected 0xff000000, got %#x\n", color[i]); + } /* frame palette */ hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); @@ -302,6 +323,11 @@ static void test_local_gif_palette(void) ok(hr == S_OK, "GetColorCount error %#x\n", hr); ok(count == 4, "expected 4, got %u\n", count); + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + hr = IWICPalette_GetColors(palette, count, color, &ret); ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret);

1 0

Frédéric Delanoy : loader: Fix wine manpage formatting.
by Alexandre Julliard 19 Jul '13

19 Jul '13

Module: wine Branch: master Commit: 5cbf1736363b76b8882f1dde0d9c4a998ad6010c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cbf1736363b76b8882f1dde0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 19 14:59:14 2013 +0200 loader: Fix wine manpage formatting. --- loader/wine.man.in | 138 ++++++++++++++++++++++----------------------------- 1 files changed, 60 insertions(+), 78 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index 16b4ae3..6b60000 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -2,8 +2,8 @@ .SH NAME wine \- run Windows programs on Unix .SH SYNOPSIS -.BI "wine " program -[arguments ... ] +.B wine +.IR "program " [ arguments ] .br .B wine --help .br @@ -47,27 +47,25 @@ or in Unix format You may pass arguments to the program being executed by adding them to the end of the command line invoking .B wine -(such as: wine notepad C:\(rs\(rsTEMP\(rs\(rsREADME.TXT). +(such as: \fIwine notepad C:\(rs\(rsTEMP\(rs\(rsREADME.TXT\fR). Note that you need to '\(rs' escape special characters (and spaces) when invoking Wine via a shell, e.g. .PP wine C:\(rs\(rsProgram\(rs Files\(rs\(rsMyPrg\(rs\(rstest.exe .PP -.SH ENVIRONMENT VARIABLES -.B wine -makes the environment variables of the shell from which +.SH ENVIRONMENT .B wine -is started accessible to the windows/dos processes started. So use the +makes the environment variables of the shell from which it +is started accessible to the Windows/DOS processes started. So use the appropriate syntax for your shell to enter environment variables you need. .TP -.I WINEPREFIX -If set, the content of this variable is taken as the name of the directory where -.B wine -stores its data (the default is +.B WINEPREFIX +If set, the contents of this variable is taken as the name of the directory where +Wine stores its data (the default is .IR $HOME/.wine ). This directory is also used to identify the socket which is used to communicate with the -.IR wineserver . +.BR wineserver . All .B wine processes using the same @@ -75,34 +73,34 @@ processes using the same (i.e.: same user) share certain things like registry, shared memory, and config file. By setting -.I WINEPREFIX +.B WINEPREFIX to different values for different .B wine processes, it is possible to run a number of truly independent .B wine processes. .TP -.I WINESERVER +.B WINESERVER Specifies the path and name of the .B wineserver binary. If not set, Wine will try to load -.BR @bindir@/wineserver , +.IR @bindir@/wineserver , and if this doesn't exist it will then look for a file named "wineserver" in the path and in a few other likely locations. .TP -.I WINELOADER +.B WINELOADER Specifies the path and name of the .B wine binary to use to launch new Windows processes. If not set, Wine will try to load -.BR @bindir@/wine , +.IR @bindir@/wine , and if this doesn't exist it will then look for a file named "wine" in the path and in a few other likely locations. .TP -.I WINEDEBUG +.B WINEDEBUG Turns debugging messages on or off. The syntax of the variable is of the form -.RI [ class ][+/-] channel [,[ class2 ][+/-] channel2 ]. +.RI [ class ][\fB+\fR|\fB-\fR] channel [,[ class2 ][\fB+\fR|\fB-\fR] channel2 ] .RS +7 .PP .I class @@ -116,12 +114,11 @@ If .I class is not specified, all debugging messages for the specified channel are turned on. Each channel will print messages about a particular -component of -.BR wine . -The following character can be either + or - to switch the specified +component of Wine. +The following character can be either \fB+\fR or \fB-\fR to switch the specified channel on or off respectively. If there is no .I class -part before it, a leading + can be omitted. Note that spaces are not +part before it, a leading \fB+\fR\fR can be omitted. Note that spaces are not allowed anywhere in the string. .PP Examples: @@ -150,24 +147,21 @@ For more information on debugging messages, see the chapter of the Wine User Guide. .RE .TP -.I WINEDLLPATH +.B WINEDLLPATH Specifies the path(s) in which to search for builtin dlls and Winelib applications. This is a list of directories separated by ":". In addition to any directory specified in -.IR WINEDLLPATH , +.BR WINEDLLPATH , Wine will also look in -.BR @dlldir@ . +.IR @dlldir@ . .TP -.I WINEDLLOVERRIDES +.B WINEDLLOVERRIDES Defines the override type and load order of dlls used in the loading process for any dll. There are currently two types of libraries that can be loaded -into a process' address space: native windows dlls -.RI ( native ), -.B wine -internal dlls -.RI ( builtin ). +into a process address space: native windows dlls +.RI ( native ") and Wine internal dlls (" builtin ). The type may be abbreviated with the first letter of the type -.RI ( n ", " b ). +.RI ( n " or " b ). The library may also be disabled (''). Each sequence of orders must be separated by commas. .RS .PP @@ -181,9 +175,9 @@ different libraries by separating the entries by ";". The load order for a 16-bit dll is always defined by the load order of the 32-bit dll that contains it (which can be identified by looking at the symbolic link of the 16-bit .dll.so file). For instance if -ole32.dll is configured as builtin, storage.dll will be loaded as -builtin too, since the 32-bit ole32.dll contains the 16-bit -storage.dll. +\fIole32.dll\fR is configured as builtin, \fIstorage.dll\fR will be loaded as +builtin too, since the 32-bit \fIole32.dll\fR contains the 16-bit +\fIstorage.dll\fR. .PP Examples: .TP @@ -195,16 +189,16 @@ the builtin version if the native load fails. WINEDLLOVERRIDES="comdlg32,shell32=n;c:\(rs\(rsfoo\(rs\(rsbar\(rs\(rsbaz=b" .br Try to load the libraries comdlg32 and shell32 as native windows dlls. Furthermore, if -an application request to load c:\(rsfoo\(rsbar\(rsbaz.dll load the builtin library baz. +an application request to load \fIc:\(rsfoo\(rsbar\(rsbaz.dll\fR load the builtin library \fIbaz\fR. .TP WINEDLLOVERRIDES="comdlg32=b,n;shell32=b;comctl32=n;oleaut32=" .br Try to load comdlg32 as builtin first and try the native version if the builtin load fails; load shell32 always as builtin and comctl32 -always as native. Oleaut32 will be disabled. +always as native; oleaut32 will be disabled. .RE .TP -.I WINEARCH +.B WINEARCH Specifies the Windows architecture to support. It can be set either to .B win32 (support only 32-bit applications), or to @@ -214,76 +208,64 @@ Specifies the Windows architecture to support. It can be set either to The architecture supported by a given Wine prefix is set at prefix creation time and cannot be changed afterwards. When running with an existing prefix, Wine will refuse to start if -.I WINEARCH +.B WINEARCH doesn't match the prefix architecture. .TP -.I DISPLAY +.B DISPLAY Specifies the X11 display to use. .TP -OSS sound driver configuration variables +OSS sound driver configuration variables: .TP -.I AUDIODEV +.B AUDIODEV Set the device for audio input / output. Default -.BR /dev/dsp . +.IR /dev/dsp . .TP -.I MIXERDEV +.B MIXERDEV Set the device for mixer controls. Default -.BR /dev/mixer . +.IR /dev/mixer . .TP -.I MIDIDEV +.B MIDIDEV Set the MIDI (sequencer) device. Default -.BR /dev/sequencer . +.IR /dev/sequencer . .SH FILES .TP .I @bindir@/wine -The -.B wine -program loader. +The Wine program loader. .TP .I @bindir@/wineconsole -The -.B wine -program loader for CUI (console) applications. +The Wine program loader for CUI (console) applications. .TP .I @bindir@/wineserver -The -.B wine -server -.TP +The Wine server +.TP .I @bindir@/winedbg -The -.B wine -debugger -.TP +The Wine debugger +.TP .I @dlldir@ -Directory containing -.BR wine -shared libraries +Directory containing Wine shared libraries .TP .I $WINEPREFIX/dosdevices Directory containing the DOS device mappings. Each file in that directory is a symlink to the Unix device file implementing a given -device. For instance, if COM1 is mapped to /dev/ttyS0 you'd have a -symlink of the form $WINEPREFIX/dosdevices/com1 -> /dev/ttyS0. +device. For instance, if COM1 is mapped to \fI/dev/ttyS0\fR you'd have a +symlink of the form \fI$WINEPREFIX/dosdevices/com1\fR -> \fI/dev/ttyS0\fR. .br DOS drives are also specified with symlinks; for instance if drive D: -corresponds to the CDROM mounted at /mnt/cdrom, you'd have a symlink -$WINEPREFIX/dosdevices/d: -> /mnt/cdrom. The Unix device corresponding +corresponds to the CDROM mounted at \fI/mnt/cdrom\fR, you'd have a symlink +\fI$WINEPREFIX/dosdevices/d:\fR -> \fI/mnt/cdrom\fR. The Unix device corresponding to a DOS drive can be specified the same way, except with '::' instead of ':'. So for the previous example, if the CDROM device is mounted -from /dev/hdc, the corresponding symlink would be -$WINEPREFIX/dosdevices/d:: -> /dev/hdc. +from \fI/dev/hdc\fR, the corresponding symlink would be +\fI$WINEPREFIX/dosdevices/d::\fR -> \fI/dev/hdc\fR. .SH AUTHORS -.B wine -is available thanks to the work of many developers. For a listing -of the authors, please see the file -.B AUTHORS +Wine is available thanks to the work of many developers. For a listing +of the authors, please see the file +.I AUTHORS in the top-level directory of the source distribution. .SH COPYRIGHT -.B wine -can be distributed under the terms of the LGPL license. A copy of the +Wine can be distributed under the terms of the LGPL license. A copy of the license is in the file -.B COPYING.LIB +.I COPYING.LIB in the top-level directory of the source distribution. .SH BUGS .PP

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2013