December 2010 - Wine-commits

Huw Davies : include: Add GLYPHSET flag define.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 78687532e4cc01e30946a22688e5e5c384b5bfa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78687532e4cc01e30946a2268… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 16 13:56:08 2010 +0000 include: Add GLYPHSET flag define. --- include/wingdi.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/wingdi.h b/include/wingdi.h index e10bbe9..12e28dc 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3331,6 +3331,8 @@ typedef struct tagGLYPHSET { WCRANGE ranges[1]; } GLYPHSET, *PGLYPHSET, *LPGLYPHSET; +#define GS_8BIT_INDICES 0x00000001 + WINGDIAPI INT WINAPI AbortDoc(HDC); WINGDIAPI BOOL WINAPI AbortPath(HDC); WINGDIAPI INT WINAPI AddFontResourceA(LPCSTR);

1 0

Huw Davies : gdi32: Clear the accel flags.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: aec376dcef20823b81d6c70926e02d5c27c40b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec376dcef20823b81d6c7092… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 7 11:37:14 2010 +0000 gdi32: Clear the accel flags. --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e2db1aa..81c8e46 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6230,6 +6230,7 @@ DWORD WineEngGetFontUnicodeRanges(GdiFont *font, LPGLYPHSET glyphset) { glyphset->cbThis = size; glyphset->cRanges = num_ranges; + glyphset->flAccel = 0; } return size; }

1 0

Jacek Caban : mshtml: IHTMLDocument2 iface handling clean up.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: c63a5fa8fd99e131fbfb8e4886734147ad877a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c63a5fa8fd99e131fbfb8e488… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 16 14:59:51 2010 +0100 mshtml: IHTMLDocument2 iface handling clean up. --- dlls/mshtml/hlink.c | 6 +- dlls/mshtml/htmldoc.c | 279 +++++++++++++++++++++--------------------- dlls/mshtml/htmldoc3.c | 14 +- dlls/mshtml/htmldoc5.c | 12 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/htmlframebase.c | 2 +- dlls/mshtml/htmliframe.c | 2 +- dlls/mshtml/htmlnode.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/olecmd.c | 6 +- dlls/mshtml/oleobj.c | 36 +++--- dlls/mshtml/olewnd.c | 16 ++-- dlls/mshtml/persist.c | 39 +++--- dlls/mshtml/service.c | 6 +- dlls/mshtml/view.c | 18 ++-- 18 files changed, 224 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c63a5fa8fd99e131fbfb8…

1 0

Jacek Caban : winetest: Make win9x unsupported.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: a3217c89236d40d288e7c765cd400ace78a7fa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3217c89236d40d288e7c765c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 16 15:29:59 2010 +0100 winetest: Make win9x unsupported. It's still possible to run tests with this patch, but results won't be submitted. --- programs/winetest/main.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 7caf9f9..5a7109a 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1162,8 +1162,13 @@ int main( int argc, char *argv[] ) } } if (!submit && !extract) { + int is_win9x = (GetVersion() & 0x80000000) != 0; + report (R_STATUS, "Starting up"); + if (is_win9x) + report (R_WARNING, "Running on win9x is not supported. You won't be able to submit results."); + if (!running_on_visible_desktop ()) report (R_FATAL, "Tests must be run on a visible desktop"); @@ -1208,7 +1213,7 @@ int main( int argc, char *argv[] ) DeleteFileA(logname); exit (0); } - if (build_id[0] && nr_of_skips <= SKIP_LIMIT && !nr_native_dlls && + if (build_id[0] && nr_of_skips <= SKIP_LIMIT && !nr_native_dlls && !is_win9x && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) if (!send_file (logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError());

1 0

Hwang YunSong : clock: Update Korean resource.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 7f9dfeb939a4c0d23759ba71d216829cb1af62c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9dfeb939a4c0d23759ba71d… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Dec 16 17:07:55 2010 +0900 clock: Update Korean resource. --- programs/clock/Ko.rc | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/programs/clock/Ko.rc b/programs/clock/Ko.rc index 75084a9..f61b9d7 100644 --- a/programs/clock/Ko.rc +++ b/programs/clock/Ko.rc @@ -4,6 +4,7 @@ * Copyright 1998 Marcel Baur <mbaur(a)g26.ethz.ch> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Copyright 2004 Mike McCormack + * Copyright 2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,29 +23,31 @@ #include "clock_res.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT MAIN_MENU MENU { - POPUP "�� (&P)" { - MENUITEM "�Ƴ��α�(&L)", IDM_ANALOG - MENUITEM "��(&T)", IDM_DIGITAL + POPUP "등록 정보(&P)" { + MENUITEM "아날로그(&L)", IDM_ANALOG + MENUITEM "디지털(&T)", IDM_DIGITAL MENUITEM SEPARATOR - MENUITEM "�۲�(&F)...", IDM_FONT + MENUITEM "글꼴(&F)...", IDM_FONT MENUITEM SEPARATOR - MENUITEM "�� ǥ�� (&W)", IDM_NOTITLE + MENUITEM "제목 표시 안함 (&W)", IDM_NOTITLE MENUITEM SEPARATOR - MENUITEM "��(&S)", IDM_SECONDS - MENUITEM "��¥(&D)", IDM_DATE + MENUITEM "초(&S)", IDM_SECONDS + MENUITEM "날짜(&D)", IDM_DATE MENUITEM SEPARATOR - MENUITEM "�׻� �տ� (&A)", IDM_ONTOP + MENUITEM "항상 앞에 (&A)", IDM_ONTOP } - POPUP "��(&O)" { - MENUITEM "�ð� ��(&A)...", IDM_ABOUT + POPUP "정보(&O)" { + MENUITEM "시계 정보(&A)...", IDM_ABOUT } } STRINGTABLE { -IDS_CLOCK, "�ð�" +IDS_CLOCK, "시계" }

1 0

Hwang YunSong : cmdlgtst: Update Korean resource.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: b43947761216ce0e6ec94584ed275c3298b8d097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b43947761216ce0e6ec94584e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Dec 16 17:08:45 2010 +0900 cmdlgtst: Update Korean resource. --- programs/cmdlgtst/Ko.rc | 128 ++++++++++++++++++++++++----------------------- 1 files changed, 65 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b43947761216ce0e6ec94…

1 0

Michael Stefaniuc : windowscodecs: Use ifaces instead of vtbl pointers in PngEncoder.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 53af9f2b1ec93df8713eedc841637f26efdf7100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53af9f2b1ec93df8713eedc84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:24 2010 +0100 windowscodecs: Use ifaces instead of vtbl pointers in PngEncoder. --- dlls/windowscodecs/pngformat.c | 53 ++++++++++++++++++++++------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 9923097..f1c0e3c 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -803,8 +803,8 @@ static const struct png_pixelformat formats[] = { }; typedef struct PngEncoder { - const IWICBitmapEncoderVtbl *lpVtbl; - const IWICBitmapFrameEncodeVtbl *lpFrameVtbl; + IWICBitmapEncoder IWICBitmapEncoder_iface; + IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; LONG ref; IStream *stream; png_structp png_ptr; @@ -821,15 +821,20 @@ typedef struct PngEncoder { CRITICAL_SECTION lock; } PngEncoder; -static inline PngEncoder *encoder_from_frame(IWICBitmapFrameEncode *iface) +static inline PngEncoder *impl_from_IWICBitmapEncoder(IWICBitmapEncoder *iface) { - return CONTAINING_RECORD(iface, PngEncoder, lpFrameVtbl); + return CONTAINING_RECORD(iface, PngEncoder, IWICBitmapEncoder_iface); +} + +static inline PngEncoder *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) +{ + return CONTAINING_RECORD(iface, PngEncoder, IWICBitmapFrameEncode_iface); } static HRESULT WINAPI PngFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, void **ppv) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -837,7 +842,7 @@ static HRESULT WINAPI PngFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) { - *ppv = &This->lpFrameVtbl; + *ppv = &This->IWICBitmapFrameEncode_iface; } else { @@ -851,20 +856,20 @@ static HRESULT WINAPI PngFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface static ULONG WINAPI PngFrameEncode_AddRef(IWICBitmapFrameEncode *iface) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); return IUnknown_AddRef((IUnknown*)This); } static ULONG WINAPI PngFrameEncode_Release(IWICBitmapFrameEncode *iface) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); return IUnknown_Release((IUnknown*)This); } static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, IPropertyBag2 *pIEncoderOptions) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%p)\n", iface, pIEncoderOptions); EnterCriticalSection(&This->lock); @@ -885,7 +890,7 @@ static HRESULT WINAPI PngFrameEncode_Initialize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); EnterCriticalSection(&This->lock); @@ -907,7 +912,7 @@ static HRESULT WINAPI PngFrameEncode_SetSize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); EnterCriticalSection(&This->lock); @@ -929,7 +934,7 @@ static HRESULT WINAPI PngFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); int i; TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); @@ -981,7 +986,7 @@ static HRESULT WINAPI PngFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); png_byte **row_pointers=NULL; UINT i; jmp_buf jmpbuf; @@ -1056,7 +1061,7 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); HRESULT hr; WICRect rc; WICPixelFormatGUID guid; @@ -1128,7 +1133,7 @@ static HRESULT WINAPI PngFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, static HRESULT WINAPI PngFrameEncode_Commit(IWICBitmapFrameEncode *iface) { - PngEncoder *This = encoder_from_frame(iface); + PngEncoder *This = impl_from_IWICBitmapFrameEncode(iface); jmp_buf jmpbuf; TRACE("(%p)\n", iface); @@ -1184,7 +1189,7 @@ static const IWICBitmapFrameEncodeVtbl PngEncoder_FrameVtbl = { static HRESULT WINAPI PngEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); if (!ppv) return E_INVALIDARG; @@ -1206,7 +1211,7 @@ static HRESULT WINAPI PngEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID static ULONG WINAPI PngEncoder_AddRef(IWICBitmapEncoder *iface) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -1216,7 +1221,7 @@ static ULONG WINAPI PngEncoder_AddRef(IWICBitmapEncoder *iface) static ULONG WINAPI PngEncoder_Release(IWICBitmapEncoder *iface) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -1255,7 +1260,7 @@ static void user_flush(png_structp png_ptr) static HRESULT WINAPI PngEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); jmp_buf jmpbuf; TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); @@ -1350,7 +1355,7 @@ static HRESULT WINAPI PngEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitmap static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); HRESULT hr; TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); @@ -1380,14 +1385,14 @@ static HRESULT WINAPI PngEncoder_CreateNewFrame(IWICBitmapEncoder *iface, LeaveCriticalSection(&This->lock); IWICBitmapEncoder_AddRef(iface); - *ppIFrameEncode = (IWICBitmapFrameEncode*)&This->lpFrameVtbl; + *ppIFrameEncode = &This->IWICBitmapFrameEncode_iface; return S_OK; } static HRESULT WINAPI PngEncoder_Commit(IWICBitmapEncoder *iface) { - PngEncoder *This = (PngEncoder*)iface; + PngEncoder *This = impl_from_IWICBitmapEncoder(iface); TRACE("(%p)\n", iface); EnterCriticalSection(&This->lock); @@ -1448,8 +1453,8 @@ HRESULT PngEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This = HeapAlloc(GetProcessHeap(), 0, sizeof(PngEncoder)); if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &PngEncoder_Vtbl; - This->lpFrameVtbl = &PngEncoder_FrameVtbl; + This->IWICBitmapEncoder_iface.lpVtbl = &PngEncoder_Vtbl; + This->IWICBitmapFrameEncode_iface.lpVtbl = &PngEncoder_FrameVtbl; This->ref = 1; This->png_ptr = NULL; This->info_ptr = NULL;

1 0

Michael Stefaniuc : oleaut32: Use ifaces instead of vtbl pointers in OLEFontImpl.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 1fdece9b823a3755003a681f1cd279410bd1c461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdece9b823a3755003a681f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:22 2010 +0100 oleaut32: Use ifaces instead of vtbl pointers in OLEFontImpl. --- dlls/oleaut32/olefont.c | 189 ++++++++++++++++++++++++----------------------- 1 files changed, 97 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fdece9b823a3755003a6…

1 0

Michael Stefaniuc : ole32: Standardize the COM usage in clipboard.c.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 0207e413c1d58b36b8c78edd637304f70b105c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0207e413c1d58b36b8c78edd6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:21 2010 +0100 ole32: Standardize the COM usage in clipboard.c. --- dlls/ole32/clipboard.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 3064bb0..67b4350 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -138,7 +138,7 @@ static inline DWORD_PTR td_get_offs(ole_priv_data *data, DWORD idx) */ typedef struct snapshot { - const IDataObjectVtbl* lpVtbl; + IDataObject IDataObject_iface; LONG ref; DWORD seq_no; /* Clipboard sequence number corresponding to this snapshot */ @@ -161,7 +161,7 @@ typedef struct ole_clipbrd static inline snapshot *impl_from_IDataObject(IDataObject *iface) { - return (snapshot*)((char*)iface - FIELD_OFFSET(snapshot, lpVtbl)); + return CONTAINING_RECORD(iface, snapshot, IDataObject_iface); } typedef struct PresentationDataHeader @@ -226,7 +226,7 @@ static inline char *dump_fmtetc(FORMATETC *fmt) typedef struct enum_fmtetc { - const IEnumFORMATETCVtbl *lpVtbl; + IEnumFORMATETC IEnumFORMATETC_iface; LONG ref; UINT pos; /* current enumerator position */ @@ -235,7 +235,7 @@ typedef struct enum_fmtetc static inline enum_fmtetc *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) { - return (enum_fmtetc*)((char*)iface - FIELD_OFFSET(enum_fmtetc, lpVtbl)); + return CONTAINING_RECORD(iface, enum_fmtetc, IEnumFORMATETC_iface); } /************************************************************************ @@ -440,12 +440,12 @@ static HRESULT enum_fmtetc_construct(ole_priv_data *data, UINT pos, IEnumFORMATE if (!ef) return E_OUTOFMEMORY; ef->ref = 1; - ef->lpVtbl = &efvt; + ef->IEnumFORMATETC_iface.lpVtbl = &efvt; ef->data = data; ef->pos = pos; TRACE("(%p)->()\n", ef); - *obj = (IEnumFORMATETC *)ef; + *obj = &ef->IEnumFORMATETC_iface; return S_OK; } @@ -1501,7 +1501,7 @@ static snapshot *snapshot_construct(DWORD seq_no) This = HeapAlloc( GetProcessHeap(), 0, sizeof(*This) ); if (!This) return NULL; - This->lpVtbl = &snapshot_vtable; + This->IDataObject_iface.lpVtbl = &snapshot_vtable; This->ref = 0; This->seq_no = seq_no; This->data = NULL; @@ -2016,7 +2016,7 @@ HRESULT WINAPI OleGetClipboard(IDataObject **obj) if(!clipbrd->latest_snapshot) return E_OUTOFMEMORY; } - *obj = (IDataObject*)&clipbrd->latest_snapshot->lpVtbl; + *obj = &clipbrd->latest_snapshot->IDataObject_iface; IDataObject_AddRef(*obj); return S_OK;

1 0

Michael Stefaniuc : shell32: Use an iface instead of a vtbl pointer in ShellItem.
by Alexandre Julliard 17 Dec '10

17 Dec '10

Module: wine Branch: master Commit: 3f213cb798e73f9447bd4e0ea73ba12692977c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f213cb798e73f9447bd4e0ea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 16 01:04:28 2010 +0100 shell32: Use an iface instead of a vtbl pointer in ShellItem. --- dlls/shell32/shellitem.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 805731f..d694503 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -39,23 +39,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct _ShellItem { - const IShellItemVtbl *lpIShellItemVtbl; + IShellItem IShellItem_iface; LONG ref; LPITEMIDLIST pidl; - const IPersistIDListVtbl *lpIPersistIDListVtbl; + IPersistIDList IPersistIDList_iface; } ShellItem; +static inline ShellItem *impl_from_IShellItem(IShellItem *iface) +{ + return CONTAINING_RECORD(iface, ShellItem, IShellItem_iface); +} + static inline ShellItem *impl_from_IPersistIDList( IPersistIDList *iface ) { - return (ShellItem*)((char*)iface - FIELD_OFFSET(ShellItem, lpIPersistIDListVtbl)); + return CONTAINING_RECORD(iface, ShellItem, IPersistIDList_iface); } static HRESULT WINAPI ShellItem_QueryInterface(IShellItem *iface, REFIID riid, void **ppv) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); TRACE("(%p,%p,%p)\n", iface, riid, ppv); @@ -67,7 +72,7 @@ static HRESULT WINAPI ShellItem_QueryInterface(IShellItem *iface, REFIID riid, } else if (IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistIDList, riid)) { - *ppv = &(This->lpIPersistIDListVtbl); + *ppv = &This->IPersistIDList_iface; } else { FIXME("not implemented for %s\n", shdebugstr_guid(riid)); @@ -81,7 +86,7 @@ static HRESULT WINAPI ShellItem_QueryInterface(IShellItem *iface, REFIID riid, static ULONG WINAPI ShellItem_AddRef(IShellItem *iface) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p), new refcount=%i\n", iface, ref); @@ -91,7 +96,7 @@ static ULONG WINAPI ShellItem_AddRef(IShellItem *iface) static ULONG WINAPI ShellItem_Release(IShellItem *iface) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p), new refcount=%i\n", iface, ref); @@ -174,7 +179,7 @@ static HRESULT ShellItem_get_shellfolder(ShellItem *This, IBindCtx *pbc, IShellF static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, REFGUID rbhid, REFIID riid, void **ppvOut) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); HRESULT ret; TRACE("(%p,%p,%s,%p,%p)\n", iface, pbc, shdebugstr_guid(rbhid), riid, ppvOut); @@ -208,7 +213,8 @@ static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, } else if (IsEqualGUID(rbhid, &BHID_DataObject)) { - return ShellItem_BindToHandler((IShellItem*)This, pbc, &BHID_SFUIObject, &IID_IDataObject, ppvOut); + return ShellItem_BindToHandler(&This->IShellItem_iface, pbc, &BHID_SFUIObject, + &IID_IDataObject, ppvOut); } FIXME("Unsupported BHID %s.\n", debugstr_guid(rbhid)); @@ -218,7 +224,7 @@ static HRESULT WINAPI ShellItem_BindToHandler(IShellItem *iface, IBindCtx *pbc, static HRESULT WINAPI ShellItem_GetParent(IShellItem *iface, IShellItem **ppsi) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); LPITEMIDLIST parent_pidl; HRESULT ret; @@ -237,7 +243,7 @@ static HRESULT WINAPI ShellItem_GetParent(IShellItem *iface, IShellItem **ppsi) static HRESULT WINAPI ShellItem_GetDisplayName(IShellItem *iface, SIGDN sigdnName, LPWSTR *ppszName) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); TRACE("(%p,%x,%p)\n", iface, sigdnName, ppszName); return SHGetNameFromIDList(This->pidl, sigdnName, ppszName); @@ -246,7 +252,7 @@ static HRESULT WINAPI ShellItem_GetDisplayName(IShellItem *iface, SIGDN sigdnNam static HRESULT WINAPI ShellItem_GetAttributes(IShellItem *iface, SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs) { - ShellItem *This = (ShellItem*)iface; + ShellItem *This = impl_from_IShellItem(iface); IShellFolder *parent_folder; LPITEMIDLIST child_pidl; HRESULT ret; @@ -340,19 +346,19 @@ static HRESULT WINAPI ShellItem_IPersistIDList_QueryInterface(IPersistIDList *if REFIID riid, void **ppv) { ShellItem *This = impl_from_IPersistIDList(iface); - return ShellItem_QueryInterface((IShellItem*)This, riid, ppv); + return ShellItem_QueryInterface(&This->IShellItem_iface, riid, ppv); } static ULONG WINAPI ShellItem_IPersistIDList_AddRef(IPersistIDList *iface) { ShellItem *This = impl_from_IPersistIDList(iface); - return ShellItem_AddRef((IShellItem*)This); + return ShellItem_AddRef(&This->IShellItem_iface); } static ULONG WINAPI ShellItem_IPersistIDList_Release(IPersistIDList *iface) { ShellItem *This = impl_from_IPersistIDList(iface); - return ShellItem_Release((IShellItem*)This); + return ShellItem_Release(&This->IShellItem_iface); } static HRESULT WINAPI ShellItem_IPersistIDList_GetClassID(IPersistIDList* iface, @@ -419,13 +425,13 @@ HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **p if (pUnkOuter) return CLASS_E_NOAGGREGATION; This = HeapAlloc(GetProcessHeap(), 0, sizeof(ShellItem)); - This->lpIShellItemVtbl = &ShellItem_Vtbl; + This->IShellItem_iface.lpVtbl = &ShellItem_Vtbl; This->ref = 1; This->pidl = NULL; - This->lpIPersistIDListVtbl = &ShellItem_IPersistIDList_Vtbl; + This->IPersistIDList_iface.lpVtbl = &ShellItem_IPersistIDList_Vtbl; - ret = ShellItem_QueryInterface((IShellItem*)This, riid, ppv); - ShellItem_Release((IShellItem*)This); + ret = ShellItem_QueryInterface(&This->IShellItem_iface, riid, ppv); + ShellItem_Release(&This->IShellItem_iface); return ret; } @@ -483,7 +489,7 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent, ret = IShellItem_Constructor(NULL, &IID_IShellItem, (void**)&This); if (This) { - *ppsi = (IShellItem*)This; + *ppsi = &This->IShellItem_iface; This->pidl = new_pidl; } else

1 0