April 2010 - Wine-commits - list.winehq.org

Nikolay Sivov : ole32: Use LoadCursorW instead of -A version.
by Alexandre Julliard 28 Apr '10

28 Apr '10

Module: wine Branch: master Commit: 5ac7b165e69387163a5b08fa2d9180822b34b17d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac7b165e69387163a5b08fa2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 28 01:32:37 2010 +0400 ole32: Use LoadCursorW instead of -A version. --- dlls/ole32/ole2.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 0bb7437..45f2220 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2119,24 +2119,28 @@ static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) * when that's the case, we must display the standard drag and drop * cursors. */ - if (hr==DRAGDROP_S_USEDEFAULTCURSORS) + if (hr == DRAGDROP_S_USEDEFAULTCURSORS) { + HCURSOR hCur; + if (*trackerInfo->pdwEffect & DROPEFFECT_MOVE) { - SetCursor(LoadCursorA(hProxyDll, MAKEINTRESOURCEA(1))); + hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(1)); } else if (*trackerInfo->pdwEffect & DROPEFFECT_COPY) { - SetCursor(LoadCursorA(hProxyDll, MAKEINTRESOURCEA(2))); + hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(2)); } else if (*trackerInfo->pdwEffect & DROPEFFECT_LINK) { - SetCursor(LoadCursorA(hProxyDll, MAKEINTRESOURCEA(3))); + hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(3)); } else { - SetCursor(LoadCursorA(hProxyDll, MAKEINTRESOURCEA(0))); + hCur = LoadCursorW(hProxyDll, MAKEINTRESOURCEW(0)); } + + SetCursor(hCur); } }

1 0

Ing. Simone. Giustetti : Slackware download description line updated to latest package binary format
by Jeremy Newman 28 Apr '10

28 Apr '10

Module: website Branch: master Commit: deed0159eb4b3576249b95bc0a9bf1bfd9f38114 URL: http://source.winehq.org/git/website.git/?a=commit;h=deed0159eb4b3576249b95… Author: Ing. Simone. Giustetti <studiosg(a)giustetti.net> Date: Wed Apr 28 16:51:41 2010 +0200 Slackware download description line updated to latest package binary format Try 2 Hope this one behaves better than first try. Cheers Simone > This patch does not apply against the current git tree. Please always > submit patches using "git format-patch". > > Also, it helps if you prefix the subject with [website] so I can tell > which patches are meant for the website without scanning the body. > > -Newman > > Ing. Simone. Giustetti wrote: > > Hi all, > > > > The download page description for Slackware was updated because someone > pointed > > to me it was not clear if the new txz package format was supported or not. > > The attached patch contains the updated line for the template in 3 > languages. > > > > Bye > > Simone > > > > > > > > ------------------------------------------------------------------------ > > > > > > -- Ing. Simone Giustetti Tel: 340-3425647 e-mail: studiosg(a)giustetti.net ------------------------------------------------- This mail sent through IMP: http://horde.org/imp/ >From 79bf77cde5eecf7a4ef349272ac0157803f48833 Mon Sep 17 00:00:00 2001 From: twinstar <studiosg(a)giustetti.net> Date: Wed, 28 Apr 2010 16:23:59 +0200 Subject: Updated Slackware download description string with current package format MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.6.5" This is a multi-part message in MIME format. --------------1.6.5 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit --- templates/de/download.template | 2 +- templates/en/download.template | 2 +- templates/pl/download.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/download.template b/templates/de/download.template index 6642219..c1e9e00 100644 --- a/templates/de/download.template +++ b/templates/de/download.template @@ -127,7 +127,7 @@ erbeten hat, dass sie die Wine-Website hosten. <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> - binär .tgz für Slackware 10.2</td> + binär txz (Slackware 13.0), und tgz (für ältere Versionen)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/en/download.template b/templates/en/download.template index 5f2d51f..dd50dae 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -114,7 +114,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Download Slackware packages</a> - - binary .tgz for Slackware 10.2</td> + - binary txz (Slackware 13.0), and tgz (for older versions)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr> diff --git a/templates/pl/download.template b/templates/pl/download.template index a96e606..140759b 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -111,7 +111,7 @@ <img src="{$root}/images/distro/slackware.png" width="50" height="50" alt="Slackware linux" border="0"></a> </td> <td> <a href="http://sourceforge.net/project/showfiles.php?group_id=6241&package_id=6…">Slackware</a> - binarne .tgz dla Slackware 10.2</td> + binarne: txz (dla Slackware 13.0), i tgz (dla starszych wersji)</td> <td><a href="mailto:studiosg(a)giustetti.net">Simone Giustetti</a></td> </tr>

1 0

Nikolay Sivov : t2embed: Add TTIsEmbeddingEnabled stub.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: b9391933a66dfdbf231fc9383e3d9dc6ee155e6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9391933a66dfdbf231fc9383… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 27 22:37:57 2010 +0400 t2embed: Add TTIsEmbeddingEnabled stub. --- dlls/t2embed/main.c | 7 +++++++ dlls/t2embed/t2embed.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index a0abc57..6d12eff 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -66,3 +66,10 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) if (status) *status = EMBED_NOEMBEDDING; return E_API_NOTIMPL; } + +LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) +{ + FIXME("(%p %p) stub\n", hDC, enabled); + if (enabled) *enabled = FALSE; + return E_API_NOTIMPL; +} diff --git a/dlls/t2embed/t2embed.spec b/dlls/t2embed/t2embed.spec index 828501c..12f8a6a 100644 --- a/dlls/t2embed/t2embed.spec +++ b/dlls/t2embed/t2embed.spec @@ -5,7 +5,7 @@ @ stub TTEnableEmbeddingForFacename @ stub TTGetEmbeddedFontInfo @ stdcall TTGetEmbeddingType(ptr ptr) -@ stub TTIsEmbeddingEnabled +@ stdcall TTIsEmbeddingEnabled(ptr ptr) @ stub TTIsEmbeddingEnabledForFacename @ stdcall TTLoadEmbeddedFont(ptr long ptr long ptr ptr ptr wstr str ptr) @ stub TTRunValidationTests

1 0

Vincent Povirk : include: Add definitions for IWICBitmapFlipRotator.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 6c480cb160aefe32dbe874ce658ab46470c07b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c480cb160aefe32dbe874ce6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 10:55:12 2010 -0500 include: Add definitions for IWICBitmapFlipRotator. --- include/wincodec.idl | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index b1fb41a..9d3fee1 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -98,6 +98,16 @@ typedef enum WICBitmapPaletteType { WICBITMAPPALETTETYPE_FORCE_DWORD = CODEC_FORCE_DWORD } WICBitmapPaletteType; +typedef enum WICBitmapTransformOptions { + WICBitmapTransformRotate0 = 0x00000000, + WICBitmapTransformRotate90 = 0x00000001, + WICBitmapTransformRotate180 = 0x00000002, + WICBitmapTransformRotate270 = 0x00000003, + WICBitmapTransformFlipHorizontal = 0x00000008, + WICBitmapTransformFlipVertical = 0x00000010, + WICBITMAPTRANSFORMOPTIONS_FORCE_DWORD = CODEC_FORCE_DWORD +} WICBitmapTransformOptions; + typedef enum WICComponentType { WICDecoder = 0x00000001, WICEncoder = 0x00000002, @@ -178,7 +188,6 @@ cpp_quote("#define WINCODEC_ERR_UNSUPPORTEDOPERATION 0x88982f81") cpp_quote("#define WINCODEC_ERR_INSUFFICIENTBUFFER 0x88982f8c") interface IWICPalette; -interface IWICBitmapFlipRotator; interface IWICColorContext; interface IWICColorTransform; interface IWICFastMetadataEncoder; @@ -235,6 +244,17 @@ interface IWICBitmapLock : IUnknown [ object, + uuid(5009834f-2d6a-41ce-9e1b-17c5aff7a782) +] +interface IWICBitmapFlipRotator : IWICBitmapSource +{ + HRESULT Initialize( + [in] IWICBitmapSource *pISource, + [in] WICBitmapTransformOptions options); +} + +[ + object, uuid(00000121-a8f2-4877-ba0a-fd2b6645fb94) ] interface IWICBitmap : IWICBitmapSource

1 0

Vincent Povirk : windowscodecs: Add a stub implementation of IWICBitmapFlipRotator.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 7a254fc4d807418fa6242f5bd2b9a4300e26807f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a254fc4d807418fa6242f5bd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 11:12:34 2010 -0500 windowscodecs: Add a stub implementation of IWICBitmapFlipRotator. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/fliprotate.c | 167 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 171 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 0516161..44e17c9 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ bmpencode.c \ clsfactory.c \ converter.c \ + fliprotate.c \ gifformat.c \ icoformat.c \ imgfactory.c \ diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c new file mode 100644 index 0000000..19a00de --- /dev/null +++ b/dlls/windowscodecs/fliprotate.c @@ -0,0 +1,167 @@ +/* + * Copyright 2010 Vincent Povirk 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 "config.h" + +#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 FlipRotator { + const IWICBitmapFlipRotatorVtbl *lpVtbl; + LONG ref; + CRITICAL_SECTION lock; /* must be held when initialized */ +} FlipRotator; + +static HRESULT WINAPI FlipRotator_QueryInterface(IWICBitmapFlipRotator *iface, REFIID iid, + void **ppv) +{ + FlipRotator *This = (FlipRotator*)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_IWICBitmapFlipRotator, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI FlipRotator_AddRef(IWICBitmapFlipRotator *iface) +{ + FlipRotator *This = (FlipRotator*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI FlipRotator_Release(IWICBitmapFlipRotator *iface) +{ + FlipRotator *This = (FlipRotator*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI FlipRotator_GetSize(IWICBitmapFlipRotator *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FlipRotator_GetPixelFormat(IWICBitmapFlipRotator *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%p): stub\n", iface, pPixelFormat); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FlipRotator_GetResolution(IWICBitmapFlipRotator *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FlipRotator_CopyPalette(IWICBitmapFlipRotator *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return E_NOTIMPL; +} + +static HRESULT WINAPI FlipRotator_CopyPixels(IWICBitmapFlipRotator *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI FlipRotator_Initialize(IWICBitmapFlipRotator *iface, + IWICBitmapSource *pISource, WICBitmapTransformOptions options) +{ + FIXME("(%p,%p,%u): stub\n", iface, pISource, options); + + return E_NOTIMPL; +} + +static const IWICBitmapFlipRotatorVtbl FlipRotator_Vtbl = { + FlipRotator_QueryInterface, + FlipRotator_AddRef, + FlipRotator_Release, + FlipRotator_GetSize, + FlipRotator_GetPixelFormat, + FlipRotator_GetResolution, + FlipRotator_CopyPalette, + FlipRotator_CopyPixels, + FlipRotator_Initialize +}; + +HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) +{ + FlipRotator *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(FlipRotator)); + if (!This) return E_OUTOFMEMORY; + + This->lpVtbl = &FlipRotator_Vtbl; + This->ref = 1; + InitializeCriticalSection(&This->lock); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FlipRotator.lock"); + + *fliprotator = (IWICBitmapFlipRotator*)This; + + return S_OK; +} diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 3f51493..5c81b98 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -267,8 +267,8 @@ static HRESULT WINAPI ImagingFactory_CreateBitmapClipper(IWICImagingFactory *ifa static HRESULT WINAPI ImagingFactory_CreateBitmapFlipRotator(IWICImagingFactory *iface, IWICBitmapFlipRotator **ppIBitmapFlipRotator) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapFlipRotator); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIBitmapFlipRotator); + return FlipRotator_Create(ppIBitmapFlipRotator); } static HRESULT WINAPI ImagingFactory_CreateStream(IWICImagingFactory *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 0e72793..059d8e7 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -30,6 +30,7 @@ extern HRESULT IcoDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** extern HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); extern HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv); +extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator); extern HRESULT PaletteImpl_Create(IWICPalette **palette); extern HRESULT StreamImpl_Create(IWICStream **stream);

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapFlipRotator_Initialize.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: dbdf1ef8b64fc9705665b5e141c42e627764d6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbdf1ef8b64fc9705665b5e14… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 11:40:25 2010 -0500 windowscodecs: Implement IWICBitmapFlipRotator_Initialize. --- dlls/windowscodecs/fliprotate.c | 48 +++++++++++++++++++++++++++++++++++++- 1 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index 19a00de..6db7fea 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -36,6 +36,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct FlipRotator { const IWICBitmapFlipRotatorVtbl *lpVtbl; LONG ref; + IWICBitmapSource *source; + int flip_x; + int flip_y; + int swap_xy; CRITICAL_SECTION lock; /* must be held when initialized */ } FlipRotator; @@ -84,6 +88,7 @@ static ULONG WINAPI FlipRotator_Release(IWICBitmapFlipRotator *iface) { This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); + if (This->source) IWICBitmapSource_Release(This->source); HeapFree(GetProcessHeap(), 0, This); } @@ -132,9 +137,44 @@ static HRESULT WINAPI FlipRotator_CopyPixels(IWICBitmapFlipRotator *iface, static HRESULT WINAPI FlipRotator_Initialize(IWICBitmapFlipRotator *iface, IWICBitmapSource *pISource, WICBitmapTransformOptions options) { - FIXME("(%p,%p,%u): stub\n", iface, pISource, options); + FlipRotator *This = (FlipRotator*)iface; + HRESULT hr=S_OK; - return E_NOTIMPL; + TRACE("(%p,%p,%u)\n", iface, pISource, options); + + EnterCriticalSection(&This->lock); + + if (This->source) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + if (options&WICBitmapTransformRotate90) + { + This->swap_xy = 1; + This->flip_x = !This->flip_x; + } + + if (options&WICBitmapTransformRotate180) + { + This->flip_x = !This->flip_x; + This->flip_y = !This->flip_y; + } + + if (options&WICBitmapTransformFlipHorizontal) + This->flip_x = !This->flip_x; + + if (options&WICBitmapTransformFlipVertical) + This->flip_y = !This->flip_y; + + IWICBitmapSource_AddRef(pISource); + This->source = pISource; + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static const IWICBitmapFlipRotatorVtbl FlipRotator_Vtbl = { @@ -158,6 +198,10 @@ HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) This->lpVtbl = &FlipRotator_Vtbl; This->ref = 1; + This->source = NULL; + This->flip_x = 0; + This->flip_y = 0; + This->swap_xy = 0; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FlipRotator.lock");

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapFlipRotator_GetSize.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 0e992fccc5bb081e93e41781cf2a933bc9da4068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e992fccc5bb081e93e41781c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 11:40:44 2010 -0500 windowscodecs: Implement IWICBitmapFlipRotator_GetSize. --- dlls/windowscodecs/fliprotate.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index 6db7fea..7bbaf99 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -98,9 +98,15 @@ static ULONG WINAPI FlipRotator_Release(IWICBitmapFlipRotator *iface) static HRESULT WINAPI FlipRotator_GetSize(IWICBitmapFlipRotator *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + FlipRotator *This = (FlipRotator*)iface; + TRACE("(%p,%p,%p)\n", iface, puiWidth, puiHeight); - return E_NOTIMPL; + if (!This->source) + return WINCODEC_ERR_WRONGSTATE; + else if (This->swap_xy) + return IWICBitmapSource_GetSize(This->source, puiHeight, puiWidth); + else + return IWICBitmapSource_GetSize(This->source, puiWidth, puiHeight); } static HRESULT WINAPI FlipRotator_GetPixelFormat(IWICBitmapFlipRotator *iface,

1 0

Vincent Povirk : windowscodecs: Partially implement IWICBitmapFlipRotator_CopyPixels.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: 4f4812b447c3d6f41a77db648992ac49cbb63666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4812b447c3d6f41a77db648… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 13:15:33 2010 -0500 windowscodecs: Partially implement IWICBitmapFlipRotator_CopyPixels. --- dlls/windowscodecs/fliprotate.c | 42 +++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/fliprotate.c b/dlls/windowscodecs/fliprotate.c index 7bbaf99..7dac252 100644 --- a/dlls/windowscodecs/fliprotate.c +++ b/dlls/windowscodecs/fliprotate.c @@ -135,9 +135,47 @@ static HRESULT WINAPI FlipRotator_CopyPalette(IWICBitmapFlipRotator *iface, static HRESULT WINAPI FlipRotator_CopyPixels(IWICBitmapFlipRotator *iface, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) { - FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + FlipRotator *This = (FlipRotator*)iface; + HRESULT hr; + UINT y; + UINT srcy, srcwidth, srcheight; + WICRect rc; - return E_NOTIMPL; + TRACE("(%p,%p,%u,%u,%p)\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + if (!This->source) return WINCODEC_ERR_WRONGSTATE; + + if (This->swap_xy || This->flip_x) + { + /* This requires knowledge of the pixel format. */ + FIXME("flipping x and rotating are not implemented\n"); + return E_NOTIMPL; + } + + hr = IWICBitmapSource_GetSize(This->source, &srcwidth, &srcheight); + if (FAILED(hr)) return hr; + + for (y=prc->Y; y - prc->Y < prc->Height; y++) + { + if (This->flip_y) + srcy = srcheight - 1 - y; + else + srcy = y; + + rc.X = prc->X; + rc.Y = srcy; + rc.Width = prc->Width; + rc.Height = 1; + + hr = IWICBitmapSource_CopyPixels(This->source, &rc, cbStride, cbStride, + pbBuffer); + + if (FAILED(hr)) break; + + pbBuffer += cbStride; + } + + return hr; } static HRESULT WINAPI FlipRotator_Initialize(IWICBitmapFlipRotator *iface,

1 0

Nikolay Sivov : shell32/shlview: Remove redundant message sent on every iteration, fix a helper interface leak.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: fc59d0b2f89f656c409332ef03bee622f6d359bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc59d0b2f89f656c409332ef0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 27 01:17:47 2010 +0400 shell32/shlview: Remove redundant message sent on every iteration, fix a helper interface leak. --- dlls/shell32/shlview.c | 136 +++++++++++++++++++++++------------------------- 1 files changed, 65 insertions(+), 71 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index d3322e4..01fee47 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1517,98 +1517,92 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn case LVN_KEYDOWN: { - /* MSG msg; - msg.hwnd = This->hWnd; - msg.message = WM_KEYDOWN; - msg.wParam = plvKeyDown->wVKey; - msg.lParam = 0; - msg.time = 0; - msg.pt = 0;*/ - LPNMLVKEYDOWN plvKeyDown = (LPNMLVKEYDOWN) lpnmh; /* initiate a rename of the selected file or directory */ - if(plvKeyDown->wVKey == VK_F2) + switch (plvKeyDown->wVKey) { - /* see how many files are selected */ - int i = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0); - - /* get selected item */ - if(i == 1) + case VK_F2: { - /* get selected item */ - i = SendMessageW(This->hWndList, LVM_GETNEXTITEM, -1, MAKELPARAM (LVNI_SELECTED, 0)); + INT i = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0); - SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); - SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); + if (i == 1) + { + /* get selected item */ + i = SendMessageW(This->hWndList, LVM_GETNEXTITEM, -1, MAKELPARAM (LVNI_SELECTED, 0)); + + SendMessageW(This->hWndList, LVM_ENSUREVISIBLE, i, 0); + SendMessageW(This->hWndList, LVM_EDITLABELW, i, 0); + } } - } -#if 0 - TranslateAccelerator(This->hWnd, This->hAccel, &msg) -#endif - else if(plvKeyDown->wVKey == VK_DELETE) - { - UINT i; - int item_index; - LVITEMA item; - LPITEMIDLIST* pItems; - ISFHelper *psfhlp; + break; + case VK_DELETE: + { + UINT i, count; + int item_index; + LVITEMW item; + LPITEMIDLIST* pItems; + ISFHelper *psfhlp; + HRESULT hr; - IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, - (LPVOID*)&psfhlp); + hr = IShellFolder_QueryInterface(This->pSFParent, &IID_ISFHelper, (void**)&psfhlp); + if (hr != S_OK) return 0; - if (psfhlp == NULL) - break; + if(!(count = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0))) + { + ISFHelper_Release(psfhlp); + return 0; + } - if(!(i = SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0))) - break; + /* allocate memory for the pidl array */ + pItems = HeapAlloc(GetProcessHeap(), 0, sizeof(LPITEMIDLIST) * count); - /* allocate memory for the pidl array */ - pItems = HeapAlloc(GetProcessHeap(), 0, - sizeof(LPITEMIDLIST) * i); + /* retrieve all selected items */ + i = 0; + item_index = -1; - /* retrieve all selected items */ - i = 0; - item_index = -1; - while(SendMessageW(This->hWndList, LVM_GETSELECTEDCOUNT, 0, 0) > i) - { - /* get selected item */ - item_index = SendMessageW(This->hWndList, LVM_GETNEXTITEM, item_index, - MAKELPARAM (LVNI_SELECTED, 0)); - item.iItem = item_index; - item.mask = LVIF_PARAM; - SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM) &item); + while (count > i) + { + /* get selected item */ + item_index = SendMessageW(This->hWndList, LVM_GETNEXTITEM, item_index, + MAKELPARAM (LVNI_SELECTED, 0)); + item.iItem = item_index; + item.mask = LVIF_PARAM; + SendMessageW(This->hWndList, LVM_GETITEMW, 0, (LPARAM)&item); - /* get item pidl */ - pItems[i] = (LPITEMIDLIST)item.lParam; + /* get item pidl */ + pItems[i] = (LPITEMIDLIST)item.lParam; - i++; - } + i++; + } - /* perform the item deletion */ - ISFHelper_DeleteItems(psfhlp, i, (LPCITEMIDLIST*)pItems); + /* perform the item deletion */ + ISFHelper_DeleteItems(psfhlp, i, (LPCITEMIDLIST*)pItems); + ISFHelper_Release(psfhlp); - /* free pidl array memory */ - HeapFree(GetProcessHeap(), 0, pItems); - } + /* free pidl array memory */ + HeapFree(GetProcessHeap(), 0, pItems); + } + break; - /* Initiate a refresh */ - else if(plvKeyDown->wVKey == VK_F5) - { + case VK_F5: + /* Initiate a refresh */ IShellView_Refresh((IShellView*)This); - } + break; - else if(plvKeyDown->wVKey == VK_BACK) - { - LPSHELLBROWSER lpSb; - if((lpSb = (LPSHELLBROWSER)SendMessageW(This->hWndParent, CWM_GETISHELLBROWSER, 0, 0))) + case VK_BACK: { - IShellBrowser_BrowseObject(lpSb, NULL, SBSP_PARENT); - } - } + LPSHELLBROWSER lpSb; + if((lpSb = (LPSHELLBROWSER)SendMessageW(This->hWndParent, CWM_GETISHELLBROWSER, 0, 0))) + { + IShellBrowser_BrowseObject(lpSb, NULL, SBSP_PARENT); + } + } + break; - else - FIXME("LVN_KEYDOWN key=0x%08x\n",plvKeyDown->wVKey); + default: + FIXME("LVN_KEYDOWN key=0x%08x\n", plvKeyDown->wVKey); + } } break;

1 0

Nikolay Sivov : comctl32/listview: Rework item selection with letter keys, fix some glitches.
by Alexandre Julliard 27 Apr '10

27 Apr '10

Module: wine Branch: master Commit: d57247ce396c4a71918fb9bc41b99a350063fdb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57247ce396c4a71918fb9bc4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 24 19:19:40 2010 +0400 comctl32/listview: Rework item selection with letter keys, fix some glitches. --- dlls/comctl32/listview.c | 144 ++++++++++++++++++++++++--------------------- 1 files changed, 77 insertions(+), 67 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 09c731a..4c24a67 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1751,14 +1751,15 @@ static inline INT LISTVIEW_GetCountPerColumn(const LISTVIEW_INFO *infoPtr) */ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, LPARAM keyData) { - INT nItem; - INT endidx,idx; - LVITEMW item; WCHAR buffer[MAX_PATH]; - DWORD lastKeyPressTimestamp = infoPtr->lastKeyPressTimestamp; + INT endidx, startidx; + DWORD prevTime; + LVITEMW item; + INT nItem; + INT diff; /* simple parameter checking */ - if (!charCode || !keyData) return 0; + if (!charCode || !keyData || infoPtr->nItemCount == 0) return 0; /* only allow the valid WM_CHARs through */ if (!isalnumW(charCode) && @@ -1773,86 +1774,95 @@ static INT LISTVIEW_ProcessLetterKeys(LISTVIEW_INFO *infoPtr, WPARAM charCode, L charCode != '<' && charCode != ',' && charCode != '~') return 0; - /* if there's one item or less, there is no where to go */ - if (infoPtr->nItemCount <= 1) return 0; - /* update the search parameters */ + prevTime = infoPtr->lastKeyPressTimestamp; infoPtr->lastKeyPressTimestamp = GetTickCount(); - if (infoPtr->lastKeyPressTimestamp - lastKeyPressTimestamp < KEY_DELAY) { - if (infoPtr->nSearchParamLength < MAX_PATH-1) - infoPtr->szSearchParam[infoPtr->nSearchParamLength++]=charCode; + diff = infoPtr->lastKeyPressTimestamp - prevTime; + + if (diff >= 0 && diff < KEY_DELAY) + { + if (infoPtr->nSearchParamLength < MAX_PATH - 1) + infoPtr->szSearchParam[infoPtr->nSearchParamLength++] = charCode; + if (infoPtr->charCode != charCode) infoPtr->charCode = charCode = 0; - } else { - infoPtr->charCode=charCode; - infoPtr->szSearchParam[0]=charCode; - infoPtr->nSearchParamLength=1; - /* Redundant with the 1 char string */ - charCode=0; + } + else + { + infoPtr->charCode = charCode; + infoPtr->szSearchParam[0] = charCode; + infoPtr->nSearchParamLength = 1; + /* redundant with the 1 char string */ + charCode = 0; } /* and search from the current position */ - nItem=-1; - if (infoPtr->nFocusedItem >= 0) { - endidx=infoPtr->nFocusedItem; - idx=endidx; - /* if looking for single character match, - * then we must always move forward - */ - if (infoPtr->nSearchParamLength == 1) - idx++; - } else { - endidx=infoPtr->nItemCount; - idx=0; - } + nItem = -1; + endidx = infoPtr->nItemCount; + + /* should start from next after focused item, so next item that matches + will be selected, if there isn't any and focused matches it will be selected + on second search stage from beginning of the list */ + if (infoPtr->nFocusedItem >= 0 && infoPtr->nItemCount > 1) + startidx = infoPtr->nFocusedItem + 1; + else + startidx = 0; - /* Let application handle this for virtual listview */ + /* let application handle this for virtual listview */ if (infoPtr->dwStyle & LVS_OWNERDATA) { NMLVFINDITEMW nmlv; - LVFINDINFOW lvfi; - ZeroMemory(&lvfi, sizeof(lvfi)); - lvfi.flags = (LVFI_WRAP | LVFI_PARTIAL); - infoPtr->szSearchParam[infoPtr->nSearchParamLength] = '\0'; - lvfi.psz = infoPtr->szSearchParam; - nmlv.iStart = idx; - nmlv.lvfi = lvfi; + memset(&nmlv.lvfi, 0, sizeof(nmlv.lvfi)); + nmlv.lvfi.flags = (LVFI_WRAP | LVFI_PARTIAL); + nmlv.lvfi.psz = infoPtr->szSearchParam; + nmlv.iStart = startidx; + + infoPtr->szSearchParam[infoPtr->nSearchParamLength] = 0; nItem = notify_hdr(infoPtr, LVN_ODFINDITEMW, (LPNMHDR)&nmlv.hdr); + } + else + { + INT i = startidx; - if (nItem != -1) - LISTVIEW_KeySelection(infoPtr, nItem, FALSE); + /* first search in [startidx, endidx), on failure continue in [0, startidx) */ + while (1) + { + /* start from first item if not found with >= startidx */ + if (i == infoPtr->nItemCount && startidx > 0) + { + endidx = startidx; + startidx = 0; + } - return 0; - } + for (i = startidx; i < endidx; i++) + { + /* retrieve text */ + item.mask = LVIF_TEXT; + item.iItem = i; + item.iSubItem = 0; + item.pszText = buffer; + item.cchTextMax = MAX_PATH; + if (!LISTVIEW_GetItemW(infoPtr, &item)) return 0; + + if (lstrncmpiW(item.pszText, infoPtr->szSearchParam, infoPtr->nSearchParamLength) == 0) + { + nItem = i; + break; + } + else if (nItem == -1 && lstrncmpiW(item.pszText, infoPtr->szSearchParam, 1) == 0) + { + /* this would work but we must keep looking for a longer match */ + nItem = i; + } + } - do { - if (idx == infoPtr->nItemCount) { - if (endidx == infoPtr->nItemCount || endidx == 0) + /* found something or second search completed with any result */ + if (nItem != -1 || endidx != infoPtr->nItemCount) break; - idx=0; - } - - /* get item */ - item.mask = LVIF_TEXT; - item.iItem = idx; - item.iSubItem = 0; - item.pszText = buffer; - item.cchTextMax = MAX_PATH; - if (!LISTVIEW_GetItemW(infoPtr, &item)) return 0; - - /* check for a match */ - if (lstrncmpiW(item.pszText,infoPtr->szSearchParam,infoPtr->nSearchParamLength) == 0) { - nItem=idx; - break; - } else if ( (charCode != 0) && (nItem == -1) && (nItem != infoPtr->nFocusedItem) && - (lstrncmpiW(item.pszText,infoPtr->szSearchParam,1) == 0) ) { - /* This would work but we must keep looking for a longer match */ - nItem=idx; - } - idx++; - } while (idx != endidx); + }; + } if (nItem != -1) LISTVIEW_KeySelection(infoPtr, nItem, FALSE);

1 0