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

Nikolay Sivov : ole32: Use -W versions of window/message calls.
by Alexandre Julliard April 28, 2010

April 28, 2010

Module: wine Branch: master Commit: d819f13911deae2b1c14b34ab0d444f78e08de71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d819f13911deae2b1c14b34ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 27 23:41:04 2010 +0400 ole32: Use -W versions of window/message calls. --- dlls/ole32/ole2.c | 54 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 6bf79fd..6c0f8c1 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -110,7 +110,14 @@ static LONG OLE_moduleLockCount = 0; /* * Name of our registered window class. */ -static const char OLEDD_DRAGTRACKERCLASS[] = "WineDragDropTracker32"; +static const WCHAR OLEDD_DRAGTRACKERCLASS[] = + {'W','i','n','e','D','r','a','g','D','r','o','p','T','r','a','c','k','e','r','3','2',0}; + +/* + * Name of menu descriptor property. + */ +static const WCHAR prop_olemenuW[] = + {'P','R','O','P','_','O','L','E','M','e','n','u','D','e','s','c','r','i','p','t','o','r',0}; /* * This is the head of the Drop target container. @@ -478,6 +485,7 @@ HRESULT WINAPI DoDragDrop ( DWORD dwOKEffect, /* [in] effects allowed by the source */ DWORD *pdwEffect) /* [out] ptr to effects of the source */ { + static const WCHAR trackerW[] = {'T','r','a','c','k','e','r','W','i','n','d','o','w',0}; TrackerWindowInfo trackerInfo; HWND hwndTrackWindow; MSG msg; @@ -500,12 +508,12 @@ HRESULT WINAPI DoDragDrop ( trackerInfo.curTargetHWND = 0; trackerInfo.curDragTarget = 0; - hwndTrackWindow = CreateWindowA(OLEDD_DRAGTRACKERCLASS, "TrackerWindow", + hwndTrackWindow = CreateWindowW(OLEDD_DRAGTRACKERCLASS, trackerW, WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, 0, &trackerInfo); - if (hwndTrackWindow!=0) + if (hwndTrackWindow) { /* * Capture the mouse input @@ -517,7 +525,7 @@ HRESULT WINAPI DoDragDrop ( /* * Pump messages. All mouse input should go to the capture window. */ - while (!trackerInfo.trackingDone && GetMessageA(&msg, 0, 0, 0) ) + while (!trackerInfo.trackingDone && GetMessageW(&msg, 0, 0, 0) ) { trackerInfo.curMousePos.x = msg.pt.x; trackerInfo.curMousePos.y = msg.pt.y; @@ -548,7 +556,7 @@ HRESULT WINAPI DoDragDrop ( /* * Dispatch the messages only when it's not a keyboard message. */ - DispatchMessageA(&msg); + DispatchMessageW(&msg); } } @@ -1180,7 +1188,7 @@ static void OLEMenu_UnInitialize(void) */ static BOOL OLEMenu_InstallHooks( DWORD tid ) { - OleMenuHookItem *pHookItem = NULL; + OleMenuHookItem *pHookItem; /* Create an entry for the hook table */ if ( !(pHookItem = HeapAlloc(GetProcessHeap(), 0, @@ -1191,13 +1199,13 @@ static BOOL OLEMenu_InstallHooks( DWORD tid ) pHookItem->hHeap = GetProcessHeap(); /* Install a thread scope message hook for WH_GETMESSAGE */ - pHookItem->GetMsg_hHook = SetWindowsHookExA( WH_GETMESSAGE, OLEMenu_GetMsgProc, + pHookItem->GetMsg_hHook = SetWindowsHookExW( WH_GETMESSAGE, OLEMenu_GetMsgProc, 0, GetCurrentThreadId() ); if ( !pHookItem->GetMsg_hHook ) goto CLEANUP; /* Install a thread scope message hook for WH_CALLWNDPROC */ - pHookItem->CallWndProc_hHook = SetWindowsHookExA( WH_CALLWNDPROC, OLEMenu_CallWndProc, + pHookItem->CallWndProc_hHook = SetWindowsHookExW( WH_CALLWNDPROC, OLEMenu_CallWndProc, 0, GetCurrentThreadId() ); if ( !pHookItem->CallWndProc_hHook ) goto CLEANUP; @@ -1271,7 +1279,7 @@ CLEANUP: */ static OleMenuHookItem * OLEMenu_IsHookInstalled( DWORD tid ) { - OleMenuHookItem *pHookItem = NULL; + OleMenuHookItem *pHookItem; /* Do a simple linear search for an entry whose tid matches ours. * We really need a map but efficiency is not a concern here. */ @@ -1376,7 +1384,7 @@ static BOOL OLEMenu_SetIsServerMenu( HMENU hmenu, OleMenuDescriptor *pOleMenuDes */ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lParam) { - LPCWPSTRUCT pMsg = NULL; + LPCWPSTRUCT pMsg; HOLEMENU hOleMenu = 0; OleMenuDescriptor *pOleMenuDescriptor = NULL; OleMenuHookItem *pHookItem = NULL; @@ -1395,7 +1403,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar * If the window has an OLEMenu property we may need to dispatch * the menu message to its active objects window instead. */ - hOleMenu = GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); + hOleMenu = GetPropW( pMsg->hwnd, prop_olemenuW ); if ( !hOleMenu ) goto NEXTHOOK; @@ -1413,7 +1421,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar pOleMenuDescriptor->bIsServerItem = FALSE; /* Send this message to the server as well */ - SendMessageA( pOleMenuDescriptor->hwndActiveObject, + SendMessageW( pOleMenuDescriptor->hwndActiveObject, pMsg->message, pMsg->wParam, pMsg->lParam ); goto NEXTHOOK; } @@ -1454,7 +1462,7 @@ static LRESULT CALLBACK OLEMenu_CallWndProc(INT code, WPARAM wParam, LPARAM lPar /* If the message was for the server dispatch it accordingly */ if ( pOleMenuDescriptor->bIsServerItem ) { - SendMessageA( pOleMenuDescriptor->hwndActiveObject, + SendMessageW( pOleMenuDescriptor->hwndActiveObject, pMsg->message, pMsg->wParam, pMsg->lParam ); } @@ -1481,7 +1489,7 @@ NEXTHOOK: */ static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lParam) { - LPMSG pMsg = NULL; + LPMSG pMsg; HOLEMENU hOleMenu = 0; OleMenuDescriptor *pOleMenuDescriptor = NULL; OleMenuHookItem *pHookItem = NULL; @@ -1500,7 +1508,7 @@ static LRESULT CALLBACK OLEMenu_GetMsgProc(INT code, WPARAM wParam, LPARAM lPara * If the window has an OLEMenu property we may need to dispatch * the menu message to its active objects window instead. */ - hOleMenu = GetPropA( pMsg->hwnd, "PROP_OLEMenuDescriptor" ); + hOleMenu = GetPropW( pMsg->hwnd, prop_olemenuW ); if ( !hOleMenu ) goto NEXTHOOK; @@ -1671,7 +1679,7 @@ HRESULT WINAPI OleSetMenuDescriptor( pOleMenuDescriptor = NULL; /* Add a menu descriptor windows property to the frame window */ - SetPropA( hwndFrame, "PROP_OLEMenuDescriptor", hOleMenu ); + SetPropW( hwndFrame, prop_olemenuW, hOleMenu ); /* Install thread scope message hooks for WH_GETMESSAGE and WH_CALLWNDPROC */ if ( !OLEMenu_InstallHooks( GetCurrentThreadId() ) ) @@ -1684,7 +1692,7 @@ HRESULT WINAPI OleSetMenuDescriptor( return E_FAIL; /* Remove the menu descriptor property from the frame window */ - RemovePropA( hwndFrame, "PROP_OLEMenuDescriptor" ); + RemovePropW( hwndFrame, prop_olemenuW ); } return S_OK; @@ -1870,9 +1878,9 @@ void WINAPI ReleaseStgMedium( */ static void OLEDD_Initialize(void) { - WNDCLASSA wndClass; + WNDCLASSW wndClass; - ZeroMemory (&wndClass, sizeof(WNDCLASSA)); + ZeroMemory (&wndClass, sizeof(WNDCLASSW)); wndClass.style = CS_GLOBALCLASS; wndClass.lpfnWndProc = OLEDD_DragTrackerWindowProc; wndClass.cbClsExtra = 0; @@ -1881,7 +1889,7 @@ static void OLEDD_Initialize(void) wndClass.hbrBackground = 0; wndClass.lpszClassName = OLEDD_DRAGTRACKERCLASS; - RegisterClassA (&wndClass); + RegisterClassW (&wndClass); } /*** @@ -1958,7 +1966,7 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( { LPCREATESTRUCTA createStruct = (LPCREATESTRUCTA)lParam; - SetWindowLongPtrA(hwnd, 0, (LONG_PTR)createStruct->lpCreateParams); + SetWindowLongPtrW(hwnd, 0, (LONG_PTR)createStruct->lpCreateParams); SetTimer(hwnd, DRAG_TIMER_ID, 50, NULL); break; @@ -1989,7 +1997,7 @@ static LRESULT WINAPI OLEDD_DragTrackerWindowProc( /* * This is a window proc after all. Let's call the default. */ - return DefWindowProcA (hwnd, uMsg, wParam, lParam); + return DefWindowProcW (hwnd, uMsg, wParam, lParam); } /*** @@ -2257,8 +2265,8 @@ static void OLEUTL_ReadRegistryDWORDValue( DWORD* pdwValue) { char buffer[20]; + DWORD cbData = sizeof(buffer); DWORD dwKeyType; - DWORD cbData = 20; LONG lres; lres = RegQueryValueExA(regKey,

1 0

Ing. Simone. Giustetti : Slackware download description line updated to latest package binary format
by Jeremy Newman April 28, 2010

April 28, 2010

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 April 27, 2010

April 27, 2010

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 : windowscodecs: Implement IWICBitmapFlipRotator_GetSize.
by Alexandre Julliard April 27, 2010

April 27, 2010

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 : include: Add definitions for IWICBitmapFlipRotator.
by Alexandre Julliard April 27, 2010

April 27, 2010

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 April 27, 2010

April 27, 2010

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: Partially implement IWICBitmapFlipRotator_CopyPixels.
by Alexandre Julliard April 27, 2010

April 27, 2010

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

Vincent Povirk : windowscodecs: Implement IWICBitmapFlipRotator_Initialize.
by Alexandre Julliard April 27, 2010

April 27, 2010

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 IWICImagingFactory_CreateDecoderFromFilename.
by Alexandre Julliard April 27, 2010

April 27, 2010

Module: wine Branch: master Commit: b468c29de10d29d9b3a7717bbc8b8dc631a4ca83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b468c29de10d29d9b3a7717bb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 10:40:40 2010 -0500 windowscodecs: Implement IWICImagingFactory_CreateDecoderFromFilename. --- dlls/windowscodecs/imgfactory.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index a98aeb8..e3dcca0 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winreg.h" #include "objbase.h" +#include "shellapi.h" #include "wincodec.h" #include "wincodecs_private.h" @@ -89,9 +90,27 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename( DWORD dwDesiredAccess, WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder) { - FIXME("(%p,%s,%s,%u,%u,%p): stub\n", iface, debugstr_w(wzFilename), + IWICStream *stream; + HRESULT hr; + + TRACE("(%p,%s,%s,%u,%u,%p)\n", iface, debugstr_w(wzFilename), debugstr_guid(pguidVendor), dwDesiredAccess, metadataOptions, ppIDecoder); - return E_NOTIMPL; + + hr = StreamImpl_Create(&stream); + if (SUCCEEDED(hr)) + { + hr = IWICStream_InitializeFromFilename(stream, wzFilename, dwDesiredAccess); + + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreateDecoderFromStream(iface, (IStream*)stream, + pguidVendor, metadataOptions, ppIDecoder); + } + + IWICStream_Release(stream); + } + + return hr; } static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream(

1 0

Vincent Povirk : windowscodecs: Implement IWICImagingFactory_CreateFormatConverter.
by Alexandre Julliard April 27, 2010

April 27, 2010

Module: wine Branch: master Commit: 83f32fc7d8f6ba709884bfb2214f862dae1420ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f32fc7d8f6ba709884bfb22… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 27 10:46:53 2010 -0500 windowscodecs: Implement IWICImagingFactory_CreateFormatConverter. --- dlls/windowscodecs/imgfactory.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index e3dcca0..3f51493 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -247,8 +247,7 @@ static HRESULT WINAPI ImagingFactory_CreatePalette(IWICImagingFactory *iface, static HRESULT WINAPI ImagingFactory_CreateFormatConverter(IWICImagingFactory *iface, IWICFormatConverter **ppIFormatConverter) { - FIXME("(%p,%p): stub\n", iface, ppIFormatConverter); - return E_NOTIMPL; + return FormatConverter_CreateInstance(NULL, &IID_IWICFormatConverter, (void**)ppIFormatConverter); } static HRESULT WINAPI ImagingFactory_CreateBitmapScaler(IWICImagingFactory *iface,

1 0