January 2011 - Wine-commits

Greg Geldorp : shell32/tests: Use long file name.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 90df19f05a33b9f2e2737e8aef912b561fae609b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90df19f05a33b9f2e2737e8ae… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Thu Jan 27 11:39:45 2011 +0100 shell32/tests: Use long file name. Test is about the extension, so let's un-complicate it by using long path names. --- dlls/shell32/tests/shelllink.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 29b0dda..bdcffde 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -682,13 +682,13 @@ static void test_load_save(void) check_lnk(lnkfile, &desc, 0x0); /* Test omitting .exe from an absolute path */ - p=strrchr(mypath, '.'); + p=strrchr(realpath, '.'); if (p) *p='\0'; desc.description="absolute path without .exe"; desc.workdir=mydir; - desc.path=mypath; + desc.path=realpath; desc.pidl=NULL; desc.arguments="/option1 /option2 \"Some string\""; desc.showcmd=SW_SHOWNORMAL; @@ -696,7 +696,7 @@ static void test_load_save(void) desc.icon_id=0; desc.hotkey=0x1234; create_lnk(lnkfile, &desc, 0); - desc.path = realpath; + strcat(realpath, ".exe"); check_lnk(lnkfile, &desc, 0x4); /* Overwrite the existing lnk file and test link to a command on the path */

1 0

Hwang YunSong : po: Update Korean resource.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: c6193f91c8679737b7ae2b0ee121aa2e77c0afa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6193f91c8679737b7ae2b0ee… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Jan 26 20:00:46 2011 +0900 po: Update Korean resource. --- po/ko.po | 332 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 166 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6193f91c8679737b7ae2…

1 0

Alexandre Julliard : configure: Automatically remove obsolete entries in po files.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 945ccf52e9baa9daaf88fd63016a977982ffca19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=945ccf52e9baa9daaf88fd630… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 15:09:55 2011 +0100 configure: Automatically remove obsolete entries in po files. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index a3b5ad9..013dc0b 100755 --- a/configure +++ b/configure @@ -15491,7 +15491,7 @@ then ALL_POT_FILES =$ALL_POT_FILES all: \$(ALL_PO_FILES) \$(ALL_PO_FILES): \$(srcdir)/po/wine.pot - msgmerge -U -q --backup=none \$@ \$(srcdir)/po/wine.pot && touch \$@ + msgmerge -q \$@ \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$@.new && mv \$@.new \$@ \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) msgcat -o \$@ \$(ALL_POT_FILES)" fi diff --git a/configure.ac b/configure.ac index a7a1339..277bd8e 100644 --- a/configure.ac +++ b/configure.ac @@ -3009,7 +3009,7 @@ then ALL_POT_FILES =$ALL_POT_FILES all: \$(ALL_PO_FILES) \$(ALL_PO_FILES): \$(srcdir)/po/wine.pot - msgmerge -U -q --backup=none \$[@] \$(srcdir)/po/wine.pot && touch \$[@] + msgmerge -q \$[@] \$(srcdir)/po/wine.pot | msgattrib --no-obsolete -o \$[(a)].new && mv \$[(a)].new \$[@] \$(srcdir)/po/wine.pot: \$(ALL_POT_FILES) msgcat -o \$[@] \$(ALL_POT_FILES)]) fi

1 0

Michael Stefaniuc : d3dx9_36: COM cleanup for the ID3DXMesh iface.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 697a9a1ac563d49967f37f5f2d83dad6a6939b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697a9a1ac563d49967f37f5f2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 27 00:34:55 2011 +0100 d3dx9_36: COM cleanup for the ID3DXMesh iface. --- dlls/d3dx9_36/d3dx9_36_private.h | 18 -------- dlls/d3dx9_36/mesh.c | 83 +++++++++++++++++++++++-------------- 2 files changed, 51 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=697a9a1ac563d49967f37…

1 0

Michael Stefaniuc : d3dx9_36: COM cleanup for the ID3DXSprite iface.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: c2bf9a6b7998217f8456e1b1d0f4fcb1da256452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2bf9a6b7998217f8456e1b1d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 27 00:44:50 2011 +0100 d3dx9_36: COM cleanup for the ID3DXSprite iface. --- dlls/d3dx9_36/d3dx9_36_private.h | 36 ------------- dlls/d3dx9_36/sprite.c | 104 ++++++++++++++++++++++++++------------ 2 files changed, 72 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2bf9a6b7998217f8456e…

1 0

Vincent Povirk : include: Add declaration of GdipRecordMetafile.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 8fa86b598033cbf0f436807338e27efdc25bced0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa86b598033cbf0f43680733… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 26 16:23:42 2011 -0600 include: Add declaration of GdipRecordMetafile. --- include/gdiplusflat.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b12909c..7cf2729 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -524,6 +524,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST Wm GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); +GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); /* MetafileHeader */ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromEmf(HENHMETAFILE,MetafileHeader*);

1 0

Vincent Povirk : gdiplus: Stub GdipGetHemfFromMetafile.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: e029d71c4b7930260924b088340bf370d5988776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e029d71c4b7930260924b0883… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 26 16:28:03 2011 -0600 gdiplus: Stub GdipGetHemfFromMetafile. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 12 ++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 6721c01..80a6aae 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -278,7 +278,7 @@ @ stdcall GdipGetHatchBackgroundColor(ptr ptr) @ stdcall GdipGetHatchForegroundColor(ptr ptr) @ stdcall GdipGetHatchStyle(ptr ptr) -@ stub GdipGetHemfFromMetafile +@ stdcall GdipGetHemfFromMetafile(ptr ptr) @ stub GdipGetImageAttributesAdjustedPalette @ stdcall GdipGetImageBounds(ptr ptr ptr) @ stdcall GdipGetImageDecoders(long long ptr) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index de1e28f..026b9a2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5382,3 +5382,15 @@ cleanup: GdipDeleteRegion(rgn); return stat; } + +GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile *metafile, HENHMETAFILE *hEmf) +{ + FIXME("(%p,%p): stub\n", metafile, hEmf); + + if (!metafile || !hEmf) + return InvalidParameter; + + *hEmf = NULL; + + return NotImplemented; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 7cf2729..b35048f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -523,6 +523,7 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR*, GDIPCONST Wm GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateMetafileFromStream(IStream*,GpMetafile**); +GpStatus WINGDIPAPI GdipGetHemfFromMetafile(GpMetafile*,HENHMETAFILE*); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); GpStatus WINGDIPAPI GdipRecordMetafile(HDC,EmfType,GDIPCONST GpRectF*,MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**);

1 0

Vincent Povirk : gdiplus: Test for EMF+ recording.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: a06b4bc59b9da73505b18d55e5dcc2f272f3702a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06b4bc59b9da73505b18d55e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 26 17:23:44 2011 -0600 gdiplus: Test for EMF+ recording. --- dlls/gdiplus/tests/Makefile.in | 1 + dlls/gdiplus/tests/metafile.c | 89 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 6a04778..1538eb0 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ graphicspath.c \ image.c \ matrix.c \ + metafile.c \ pathiterator.c \ pen.c \ region.c \ diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c new file mode 100644 index 0000000..8d0adc9 --- /dev/null +++ b/dlls/gdiplus/tests/metafile.c @@ -0,0 +1,89 @@ +/* + * Unit test suite for metafiles + * + * Copyright (C) 2011 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 "windows.h" +#include <stdio.h> +#include "gdiplus.h" +#include "wine/test.h" + +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + +static void test_empty(void) +{ + GpStatus stat; + GpMetafile *metafile; + GpGraphics *graphics; + HDC hdc; + HENHMETAFILE hemf, dummy; + BOOL ret; + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &metafile); + todo_wine expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(InvalidParameter, stat); + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(InvalidParameter, stat); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipGetHemfFromMetafile(metafile, &hemf); + expect(Ok, stat); + + stat = GdipGetHemfFromMetafile(metafile, &dummy); + expect(InvalidParameter, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + ret = DeleteEnhMetaFile(hemf); + ok(ret != 0, "Failed to delete enhmetafile %p\n", hemf); +} + +START_TEST(metafile) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_empty(); + + GdiplusShutdown(gdiplusToken); +}

1 0

Vincent Povirk : gdiplus: Test the types of records in an empty EMF+.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 757012cd3c7f1769302bc532df15cfb4bbfaf12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=757012cd3c7f1769302bc532d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jan 26 18:50:10 2011 -0600 gdiplus: Test the types of records in an empty EMF+. --- dlls/gdiplus/tests/metafile.c | 125 ++++++++++++++++++ include/gdiplusenums.h | 277 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 402 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=757012cd3c7f1769302bc…

1 0

Michael Stefaniuc : shell32: Use ifaces instead of vtbl pointers in RecycleBin.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 421b6527f272862f69653d94bc98437b599febcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=421b6527f272862f69653d94b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 27 10:46:37 2011 +0100 shell32: Use ifaces instead of vtbl pointers in RecycleBin. --- dlls/shell32/recyclebin.c | 66 ++++++++++++++++++++++++++------------------ 1 files changed, 39 insertions(+), 27 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index a538b3c..47d2775 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -99,8 +99,8 @@ static HRESULT FormatDateTime(LPWSTR buffer, int size, FILETIME ft) typedef struct tagRecycleBin { - const IShellFolder2Vtbl *lpVtbl; - const IPersistFolder2Vtbl *lpPersistFolderVtbl; + IShellFolder2 IShellFolder2_iface; + IPersistFolder2 IPersistFolder2_iface; LONG refCount; LPITEMIDLIST pidl; @@ -109,9 +109,14 @@ typedef struct tagRecycleBin static const IShellFolder2Vtbl recycleBinVtbl; static const IPersistFolder2Vtbl recycleBinPersistVtbl; -static RecycleBin *impl_from_IPersistFolder(IPersistFolder2 *iface) +static inline RecycleBin *impl_from_IShellFolder2(IShellFolder2 *iface) { - return (RecycleBin *)((char *)iface - FIELD_OFFSET(RecycleBin, lpPersistFolderVtbl)); + return CONTAINING_RECORD(iface, RecycleBin, IShellFolder2_iface); +} + +static RecycleBin *impl_from_IPersistFolder2(IPersistFolder2 *iface) +{ + return CONTAINING_RECORD(iface, RecycleBin, IPersistFolder2_iface); } static void RecycleBin_Destructor(RecycleBin *This); @@ -127,9 +132,9 @@ HRESULT WINAPI RecycleBin_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID * if (obj == NULL) return E_OUTOFMEMORY; ZeroMemory(obj, sizeof(RecycleBin)); - obj->lpVtbl = &recycleBinVtbl; - obj->lpPersistFolderVtbl = &recycleBinPersistVtbl; - if (FAILED(ret = IUnknown_QueryInterface((IUnknown *)obj, riid, ppOutput))) + obj->IShellFolder2_iface.lpVtbl = &recycleBinVtbl; + obj->IPersistFolder2_iface.lpVtbl = &recycleBinPersistVtbl; + if (FAILED(ret = IPersistFolder2_QueryInterface(&obj->IPersistFolder2_iface, riid, ppOutput))) { RecycleBin_Destructor(obj); return ret; @@ -147,7 +152,7 @@ static void RecycleBin_Destructor(RecycleBin *This) static HRESULT WINAPI RecycleBin_QueryInterface(IShellFolder2 *iface, REFIID riid, void **ppvObject) { - RecycleBin *This = (RecycleBin *)iface; + RecycleBin *This = impl_from_IShellFolder2(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppvObject); *ppvObject = NULL; @@ -157,7 +162,7 @@ static HRESULT WINAPI RecycleBin_QueryInterface(IShellFolder2 *iface, REFIID rii if (IsEqualGUID(riid, &IID_IPersist) || IsEqualGUID(riid, &IID_IPersistFolder) || IsEqualGUID(riid, &IID_IPersistFolder2)) - *ppvObject = &This->lpPersistFolderVtbl; + *ppvObject = &This->IPersistFolder2_iface; if (*ppvObject != NULL) { @@ -170,14 +175,14 @@ static HRESULT WINAPI RecycleBin_QueryInterface(IShellFolder2 *iface, REFIID rii static ULONG WINAPI RecycleBin_AddRef(IShellFolder2 *iface) { - RecycleBin *This = (RecycleBin *)iface; + RecycleBin *This = impl_from_IShellFolder2(iface); TRACE("(%p)\n", This); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI RecycleBin_Release(IShellFolder2 *iface) { - RecycleBin *This = (RecycleBin *)iface; + RecycleBin *This = impl_from_IShellFolder2(iface); LONG result; TRACE("(%p)\n", This); @@ -200,7 +205,7 @@ static HRESULT WINAPI RecycleBin_ParseDisplayName(IShellFolder2 *This, HWND hwnd static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SHCONTF grfFlags, IEnumIDList **ppenumIDList) { - RecycleBin *This = (RecycleBin *)iface; + RecycleBin *This = impl_from_IShellFolder2(iface); IEnumIDList *list; LPITEMIDLIST *pidls; HRESULT ret; @@ -255,7 +260,7 @@ static HRESULT WINAPI RecycleBin_BindToStorage(IShellFolder2 *This, LPCITEMIDLIS static HRESULT WINAPI RecycleBin_CompareIDs(IShellFolder2 *iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { - RecycleBin *This = (RecycleBin *)iface; + RecycleBin *This = impl_from_IShellFolder2(iface); /* TODO */ TRACE("(%p, %p, %p, %p)\n", This, (void *)lParam, pidl1, pidl2); @@ -266,7 +271,7 @@ static HRESULT WINAPI RecycleBin_CompareIDs(IShellFolder2 *iface, LPARAM lParam, static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwndOwner, REFIID riid, void **ppv) { - RecycleBin *This = (RecycleBin *)iface; + RecycleBin *This = impl_from_IShellFolder2(iface); HRESULT ret; TRACE("(%p, %p, %s, %p)\n", This, hwndOwner, debugstr_guid(riid), ppv); @@ -338,9 +343,9 @@ static HRESULT WINAPI RecycleBin_GetClassID(IPersistFolder2 *This, CLSID *pClass static HRESULT WINAPI RecycleBin_Initialize(IPersistFolder2 *iface, LPCITEMIDLIST pidl) { - RecycleBin *This = impl_from_IPersistFolder(iface); + RecycleBin *This = impl_from_IPersistFolder2(iface); TRACE("(%p, %p)\n", This, pidl); - + This->pidl = ILClone(pidl); if (This->pidl == NULL) return E_OUTOFMEMORY; @@ -349,7 +354,7 @@ static HRESULT WINAPI RecycleBin_Initialize(IPersistFolder2 *iface, LPCITEMIDLIS static HRESULT WINAPI RecycleBin_GetCurFolder(IPersistFolder2 *iface, LPITEMIDLIST *ppidl) { - RecycleBin *This = impl_from_IPersistFolder(iface); + RecycleBin *This = impl_from_IPersistFolder2(iface); TRACE("\n"); *ppidl = ILClone(This->pidl); return S_OK; @@ -370,7 +375,7 @@ static HRESULT WINAPI RecycleBin_EnumSearches(IShellFolder2 *iface, IEnumExtraSe static HRESULT WINAPI RecycleBin_GetDefaultColumn(IShellFolder2 *iface, DWORD dwReserved, ULONG *pSort, ULONG *pDisplay) { - RecycleBin *This = (RecycleBin *)iface; + RecycleBin *This = impl_from_IShellFolder2(iface); TRACE("(%p, %x, %p, %p)\n", This, dwReserved, pSort, pDisplay); *pSort = 0; *pDisplay = 0; @@ -379,7 +384,7 @@ static HRESULT WINAPI RecycleBin_GetDefaultColumn(IShellFolder2 *iface, DWORD dw static HRESULT WINAPI RecycleBin_GetDefaultColumnState(IShellFolder2 *iface, UINT iColumn, SHCOLSTATEF *pcsFlags) { - RecycleBin *This = (RecycleBin *)iface; + RecycleBin *This = impl_from_IShellFolder2(iface); TRACE("(%p, %d, %p)\n", This, iColumn, pcsFlags); if (iColumn >= COLUMNS_COUNT) return E_INVALIDARG; @@ -395,7 +400,7 @@ static HRESULT WINAPI RecycleBin_GetDetailsEx(IShellFolder2 *iface, LPCITEMIDLIS static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIST pidl, UINT iColumn, LPSHELLDETAILS pDetails) { - RecycleBin *This = (RecycleBin *)iface; + RecycleBin *This = impl_from_IShellFolder2(iface); WIN32_FIND_DATAW data; WCHAR buffer[MAX_PATH]; @@ -444,7 +449,7 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIS static HRESULT WINAPI RecycleBin_MapColumnToSCID(IShellFolder2 *iface, UINT iColumn, SHCOLUMNID *pscid) { - RecycleBin *This = (RecycleBin *)iface; + RecycleBin *This = impl_from_IShellFolder2(iface); TRACE("(%p, %d, %p)\n", This, iColumn, pscid); if (iColumn>=COLUMNS_COUNT) return E_INVALIDARG; @@ -482,19 +487,26 @@ static const IShellFolder2Vtbl recycleBinVtbl = RecycleBin_MapColumnToSCID }; -static HRESULT WINAPI RecycleBin_IPersistFolder2_QueryInterface(IPersistFolder2 *This, REFIID riid, void **ppvObject) +static HRESULT WINAPI RecycleBin_IPersistFolder2_QueryInterface(IPersistFolder2 *iface, REFIID riid, + void **ppvObject) { - return RecycleBin_QueryInterface((IShellFolder2 *)impl_from_IPersistFolder(This), riid, ppvObject); + RecycleBin *This = impl_from_IPersistFolder2(iface); + + return RecycleBin_QueryInterface(&This->IShellFolder2_iface, riid, ppvObject); } -static ULONG WINAPI RecycleBin_IPersistFolder2_AddRef(IPersistFolder2 *This) +static ULONG WINAPI RecycleBin_IPersistFolder2_AddRef(IPersistFolder2 *iface) { - return RecycleBin_AddRef((IShellFolder2 *)impl_from_IPersistFolder(This)); + RecycleBin *This = impl_from_IPersistFolder2(iface); + + return RecycleBin_AddRef(&This->IShellFolder2_iface); } -static ULONG WINAPI RecycleBin_IPersistFolder2_Release(IPersistFolder2 *This) +static ULONG WINAPI RecycleBin_IPersistFolder2_Release(IPersistFolder2 *iface) { - return RecycleBin_Release((IShellFolder2 *)impl_from_IPersistFolder(This)); + RecycleBin *This = impl_from_IPersistFolder2(iface); + + return RecycleBin_Release(&This->IShellFolder2_iface); } static const IPersistFolder2Vtbl recycleBinPersistVtbl =

1 0