July 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use the proper texture target in fb_copy_to_texture_direct().
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: 092ba1e1bf7edfaa7321ac003f8efed76bd9a638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=092ba1e1bf7edfaa7321ac003… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 17 11:40:36 2012 +0200 wined3d: Use the proper texture target in fb_copy_to_texture_direct(). --- dlls/wined3d/surface.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3fa10d1..c0b27ba 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4888,6 +4888,12 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; + GLenum dst_target; + + if (dst_surface->container.type == WINED3D_CONTAINER_TEXTURE) + dst_target = dst_surface->container.u.texture->target; + else + dst_target = dst_surface->texture_target; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it @@ -4905,7 +4911,7 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc ENTER_GL(); /* Bind the target texture */ - context_bind_texture(context, dst_surface->texture_target, dst_surface->texture_name); + context_bind_texture(context, dst_target, dst_surface->texture_name); if (surface_is_offscreen(src_surface)) { TRACE("Reading from an offscreen target\n");

1 0

Dmitry Timoshkov : gdiplus: Add some tests for GdipBitmapLockBits/ GdipBitmapUnlockBits.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: 85d3d760d7472db4d8486ee62e6cb8af767c8dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d3d760d7472db4d8486ee62… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 14:58:47 2012 +0900 gdiplus: Add some tests for GdipBitmapLockBits/GdipBitmapUnlockBits. --- dlls/gdiplus/tests/image.c | 221 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 221 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85d3d760d7472db4d8486…

1 0

Dmitry Timoshkov : gdiplus: Use public ColorPalette structure to store image palette.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: a46c1f780a971ab3a2355451a2e09cf4770d4d27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46c1f780a971ab3a2355451a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 14:59:43 2012 +0900 gdiplus: Use public ColorPalette structure to store image palette. --- dlls/gdiplus/gdiplus_private.h | 5 +-- dlls/gdiplus/graphics.c | 8 +-- dlls/gdiplus/image.c | 97 ++++++++++++++++++++-------------------- dlls/gdiplus/metafile.c | 5 +-- 4 files changed, 53 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a46c1f780a971ab3a2355…

1 0

Henri Verbeet : wined3d: Use the proper texture target in ffp_blit_set().
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: f5e289c6e00197af268d6a96c584dc6478a2d010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e289c6e00197af268d6a96c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 17 11:40:35 2012 +0200 wined3d: Use the proper texture target in ffp_blit_set(). --- dlls/wined3d/surface.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 21028ba..3fa10d1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6340,6 +6340,12 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { enum complex_fixup fixup = get_complex_fixup(surface->resource.format->color_fixup); + GLenum target; + + if (surface->container.type == WINED3D_CONTAINER_TEXTURE) + target = surface->container.u.texture->target; + else + target = surface->texture_target; /* When EXT_PALETTED_TEXTURE is around, palette conversion is done by the GPU * else the surface is converted in software at upload time in LoadLocation. @@ -6349,8 +6355,8 @@ static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, co ffp_blit_p8_upload_palette(surface, context->gl_info); ENTER_GL(); - glEnable(surface->texture_target); - checkGLcall("glEnable(surface->texture_target)"); + glEnable(target); + checkGLcall("glEnable(target)"); LEAVE_GL(); return WINED3D_OK; }

1 0

Alexandre Julliard : server: Subtract the current update region from the valid rect when a window client area is changed .
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: 0816a04d92ba5a08f01ae80db2fecacb9ea71122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0816a04d92ba5a08f01ae80db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 18 17:11:55 2012 +0200 server: Subtract the current update region from the valid rect when a window client area is changed. --- server/window.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/server/window.c b/server/window.c index 3456e1a..cc4b07b 100644 --- a/server/window.c +++ b/server/window.c @@ -1645,6 +1645,13 @@ static void set_window_pos( struct window *win, struct window *previous, if (tmp) { set_region_rect( tmp, &valid_rects[0] ); + /* subtract update region since invalid parts of the valid rect won't be copied */ + if (win->update_region) + { + offset_region( tmp, -window_rect->left, -window_rect->top ); + subtract_region( tmp, tmp, win->update_region ); + offset_region( tmp, window_rect->left, window_rect->top ); + } if (subtract_region( tmp, win_rgn, tmp )) win_rgn = tmp; else free_region( tmp ); }

1 0

Nikolay Sivov : ole32: Fix QueryInterface for IErrorInfo to return IUnknown pointer.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: 959814a3bdb8bb7337840e7cb93cea9f2fbd00fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=959814a3bdb8bb7337840e7cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 11:22:59 2012 +0400 ole32: Fix QueryInterface for IErrorInfo to return IUnknown pointer. --- dlls/ole32/errorinfo.c | 2 +- dlls/ole32/tests/errorinfo.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 6a499fc..055d6a5 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -160,7 +160,7 @@ static HRESULT WINAPI IErrorInfoImpl_QueryInterface( *ppvoid = NULL; - if(IsEqualIID(riid, &IID_IErrorInfo)) + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IErrorInfo)) { *ppvoid = &This->IErrorInfo_iface; } diff --git a/dlls/ole32/tests/errorinfo.c b/dlls/ole32/tests/errorinfo.c index f55d480..bb350ae 100644 --- a/dlls/ole32/tests/errorinfo.c +++ b/dlls/ole32/tests/errorinfo.c @@ -47,10 +47,15 @@ static void test_error_info(void) static WCHAR wszDescription[] = {'F','a','i','l','e','d',' ','S','p','r','o','c','k','e','t',0}; static WCHAR wszHelpFile[] = {'s','p','r','o','c','k','e','t','.','h','l','p',0}; static WCHAR wszSource[] = {'s','p','r','o','c','k','e','t',0}; + IUnknown *unk; hr = CreateErrorInfo(&pCreateErrorInfo); ok_ole_success(hr, "CreateErrorInfo"); + hr = ICreateErrorInfo_QueryInterface(pCreateErrorInfo, &IID_IUnknown, (void**)&unk); + ok_ole_success(hr, "QI"); + IUnknown_Release(unk); + hr = ICreateErrorInfo_SetDescription(pCreateErrorInfo, NULL); ok_ole_success(hr, "ICreateErrorInfo_SetDescription"); @@ -78,6 +83,10 @@ static void test_error_info(void) hr = ICreateErrorInfo_QueryInterface(pCreateErrorInfo, &IID_IErrorInfo, (void **)&pErrorInfo); ok_ole_success(hr, "ICreateErrorInfo_QueryInterface"); + hr = IErrorInfo_QueryInterface(pErrorInfo, &IID_IUnknown, (void**)&unk); + ok_ole_success(hr, "QI"); + IUnknown_Release(unk); + ICreateErrorInfo_Release(pCreateErrorInfo); hr = SetErrorInfo(0, pErrorInfo);

1 0

Jacek Caban : d3drmdef.h: Replace unsigned long by ULONG.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: 80ebe35aa7e9249fea86ec165163d5bdaa04318d URL: http://source.winehq.org/git/wine.git/?a=commit;h=80ebe35aa7e9249fea86ec165… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 17 10:37:58 2012 +0200 d3drmdef.h: Replace unsigned long by ULONG. --- include/d3drmdef.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/d3drmdef.h b/include/d3drmdef.h index e83869f..ab9f02d 100644 --- a/include/d3drmdef.h +++ b/include/d3drmdef.h @@ -154,10 +154,10 @@ typedef struct _D3DRMIMAGE { int bytes_per_line; void* buffer1; void* buffer2; - unsigned long red_mask; - unsigned long green_mask; - unsigned long blue_mask; - unsigned long alpha_mask; + ULONG red_mask; + ULONG green_mask; + ULONG blue_mask; + ULONG alpha_mask; int palette_size; D3DRMPALETTEENTRY* palette; } D3DRMIMAGE, *LPD3DRMIMAGE;

1 0

Dmitry Timoshkov : gdiplus: Pass palette instead of bitmap to setpixel helpers.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: d9f4df06196bc28ae4938ee8e1ac179d057be6e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f4df06196bc28ae4938ee8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 15:01:16 2012 +0900 gdiplus: Pass palette instead of bitmap to setpixel helpers. --- dlls/gdiplus/image.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f9781ef..d14fca0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -297,11 +297,14 @@ GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, return Ok; } -static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, GpBitmap* bitmap) { +static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, ColorPalette *palette) +{ BYTE index = 0; int best_distance = 0x7fff; int distance; int i; + + if (!palette) return 0; /* This algorithm scans entire palette, computes difference from desired color (all color components have equal weight) and returns the index of color with least difference. @@ -311,8 +314,8 @@ static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, GpBitmap* b tables and thus may actually be slower if this method is called only few times per every image. */ - for(i=0;i<bitmap->image.palette->Count;i++) { - ARGB color=bitmap->image.palette->Entries[i]; + for(i=0;i<palette->Count;i++) { + ARGB color=palette->Entries[i]; distance=abs(b-(color & 0xff)) + abs(g-(color>>8 & 0xff)) + abs(r-(color>>16 & 0xff)) + abs(a-(color>>24 & 0xff)); if (distance<best_distance) { best_distance=distance; @@ -323,25 +326,25 @@ static inline UINT get_palette_index(BYTE r, BYTE g, BYTE b, BYTE a, GpBitmap* b } static inline void setpixel_8bppIndexed(BYTE r, BYTE g, BYTE b, BYTE a, - BYTE *row, UINT x, GpBitmap* bitmap) + BYTE *row, UINT x, ColorPalette *palette) { - BYTE index = get_palette_index(r,g,b,a,bitmap); + BYTE index = get_palette_index(r,g,b,a,palette); row[x]=index; } static inline void setpixel_1bppIndexed(BYTE r, BYTE g, BYTE b, BYTE a, - BYTE *row, UINT x, GpBitmap* bitmap) + BYTE *row, UINT x, ColorPalette *palette) { - row[x/8] = (row[x/8] & ~(1<<(7-x%8))) | (get_palette_index(r,g,b,a,bitmap)<<(7-x%8)); + row[x/8] = (row[x/8] & ~(1<<(7-x%8))) | (get_palette_index(r,g,b,a,palette)<<(7-x%8)); } static inline void setpixel_4bppIndexed(BYTE r, BYTE g, BYTE b, BYTE a, - BYTE *row, UINT x, GpBitmap* bitmap) + BYTE *row, UINT x, ColorPalette *palette) { if (x & 1) - row[x/2] = (row[x/2] & 0xf0) | get_palette_index(r,g,b,a,bitmap); + row[x/2] = (row[x/2] & 0xf0) | get_palette_index(r,g,b,a,palette); else - row[x/2] = (row[x/2] & 0x0f) | get_palette_index(r,g,b,a,bitmap)<<4; + row[x/2] = (row[x/2] & 0x0f) | get_palette_index(r,g,b,a,palette)<<4; } static inline void setpixel_16bppGrayScale(BYTE r, BYTE g, BYTE b, BYTE a, @@ -483,13 +486,13 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, setpixel_64bppPARGB(r,g,b,a,row,x); break; case PixelFormat8bppIndexed: - setpixel_8bppIndexed(r,g,b,a,row,x,bitmap); + setpixel_8bppIndexed(r,g,b,a,row,x,bitmap->image.palette); break; case PixelFormat4bppIndexed: - setpixel_4bppIndexed(r,g,b,a,row,x,bitmap); + setpixel_4bppIndexed(r,g,b,a,row,x,bitmap->image.palette); break; case PixelFormat1bppIndexed: - setpixel_1bppIndexed(r,g,b,a,row,x,bitmap); + setpixel_1bppIndexed(r,g,b,a,row,x,bitmap->image.palette); break; default: FIXME("not implemented for format 0x%x\n", bitmap->format);

1 0

Dmitry Timoshkov : gdiplus: Make sure that GdipBitmapLockBits stores valid lockmode.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: c108fd6bf91f6cf4058905161e36e18bccc44ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c108fd6bf91f6cf4058905161… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 17 14:57:40 2012 +0900 gdiplus: Make sure that GdipBitmapLockBits stores valid lockmode. --- dlls/gdiplus/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f7bfd1a..cdbf7bf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -953,7 +953,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, lockeddata->Scan0 = bitmap->bits + (bitspp / 8) * act_rect.X + bitmap->stride * act_rect.Y; - bitmap->lockmode = flags; + bitmap->lockmode = flags | ImageLockModeRead; bitmap->numlocks++; return Ok; @@ -1022,7 +1022,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } } - bitmap->lockmode = flags; + bitmap->lockmode = flags | ImageLockModeRead; bitmap->numlocks++; bitmap->lockx = act_rect.X; bitmap->locky = act_rect.Y;

1 0

Nikolay Sivov : ole32: COM cleanup for IErrorInfo.
by Alexandre Julliard July 17, 2012

July 17, 2012

Module: wine Branch: master Commit: fa4db6d9ef11b9725e84346f50be486b4687dd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4db6d9ef11b9725e84346f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 11:14:12 2012 +0400 ole32: COM cleanup for IErrorInfo. --- dlls/ole32/errorinfo.c | 137 ++++++++++++++++++----------------------------- 1 files changed, 53 insertions(+), 84 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 39751ab..6a499fc 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -121,91 +121,56 @@ static VOID ERRORINFO_SysFreeString(BSTR in) HeapFree(GetProcessHeap(), 0, bufferPointer); } - typedef struct ErrorInfoImpl { - const IErrorInfoVtbl *lpvtei; - const ICreateErrorInfoVtbl *lpvtcei; - const ISupportErrorInfoVtbl *lpvtsei; - LONG ref; + IErrorInfo IErrorInfo_iface; + ICreateErrorInfo ICreateErrorInfo_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG ref; - GUID m_Guid; - BSTR bstrSource; - BSTR bstrDescription; - BSTR bstrHelpFile; - DWORD m_dwHelpContext; + GUID m_Guid; + BSTR bstrSource; + BSTR bstrDescription; + BSTR bstrHelpFile; + DWORD m_dwHelpContext; } ErrorInfoImpl; -static const IErrorInfoVtbl IErrorInfoImpl_VTable; -static const ICreateErrorInfoVtbl ICreateErrorInfoImpl_VTable; -static const ISupportErrorInfoVtbl ISupportErrorInfoImpl_VTable; - -/* - converts an object pointer to This - */ - static inline ErrorInfoImpl *impl_from_IErrorInfo( IErrorInfo *iface ) { - return (ErrorInfoImpl *)((char*)iface - FIELD_OFFSET(ErrorInfoImpl, lpvtei)); + return CONTAINING_RECORD(iface, ErrorInfoImpl, IErrorInfo_iface); } static inline ErrorInfoImpl *impl_from_ICreateErrorInfo( ICreateErrorInfo *iface ) { - return (ErrorInfoImpl *)((char*)iface - FIELD_OFFSET(ErrorInfoImpl, lpvtcei)); + return CONTAINING_RECORD(iface, ErrorInfoImpl, ICreateErrorInfo_iface); } static inline ErrorInfoImpl *impl_from_ISupportErrorInfo( ISupportErrorInfo *iface ) { - return (ErrorInfoImpl *)((char*)iface - FIELD_OFFSET(ErrorInfoImpl, lpvtsei)); + return CONTAINING_RECORD(iface, ErrorInfoImpl, ISupportErrorInfo_iface); } - -/* - converts This to an object pointer - */ -#define _IErrorInfo_(This) ((IErrorInfo*)&(This)->lpvtei) -#define _ICreateErrorInfo_(This) (&(This)->lpvtcei) -#define _ISupportErrorInfo_(This) (&(This)->lpvtsei) - -static IErrorInfo * IErrorInfoImpl_Constructor(void) -{ - ErrorInfoImpl * ei = HeapAlloc(GetProcessHeap(), 0, sizeof(ErrorInfoImpl)); - if (ei) - { - ei->lpvtei = &IErrorInfoImpl_VTable; - ei->lpvtcei = &ICreateErrorInfoImpl_VTable; - ei->lpvtsei = &ISupportErrorInfoImpl_VTable; - ei->ref = 1; - ei->bstrSource = NULL; - ei->bstrDescription = NULL; - ei->bstrHelpFile = NULL; - ei->m_dwHelpContext = 0; - } - return (IErrorInfo *)ei; -} - - static HRESULT WINAPI IErrorInfoImpl_QueryInterface( IErrorInfo* iface, REFIID riid, - VOID** ppvoid) + void** ppvoid) { ErrorInfoImpl *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvoid); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid),ppvoid); *ppvoid = NULL; if(IsEqualIID(riid, &IID_IErrorInfo)) { - *ppvoid = _IErrorInfo_(This); + *ppvoid = &This->IErrorInfo_iface; } else if(IsEqualIID(riid, &IID_ICreateErrorInfo)) { - *ppvoid = _ICreateErrorInfo_(This); + *ppvoid = &This->ICreateErrorInfo_iface; } else if(IsEqualIID(riid, &IID_ISupportErrorInfo)) { - *ppvoid = _ISupportErrorInfo_(This); + *ppvoid = &This->ISupportErrorInfo_iface; } if(*ppvoid) @@ -311,12 +276,11 @@ static HRESULT WINAPI IErrorInfoImpl_GetHelpContext( return S_OK; } -static const IErrorInfoVtbl IErrorInfoImpl_VTable = +static const IErrorInfoVtbl ErrorInfoVtbl = { IErrorInfoImpl_QueryInterface, IErrorInfoImpl_AddRef, IErrorInfoImpl_Release, - IErrorInfoImpl_GetGUID, IErrorInfoImpl_GetSource, IErrorInfoImpl_GetDescription, @@ -330,25 +294,22 @@ static HRESULT WINAPI ICreateErrorInfoImpl_QueryInterface( REFIID riid, VOID** ppvoid) { - ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); - TRACE("(%p)\n", This); - return IErrorInfo_QueryInterface(_IErrorInfo_(This), riid, ppvoid); + ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); + return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, riid, ppvoid); } static ULONG WINAPI ICreateErrorInfoImpl_AddRef( ICreateErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); - TRACE("(%p)\n", This); - return IErrorInfo_AddRef(_IErrorInfo_(This)); + ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); + return IErrorInfo_AddRef(&This->IErrorInfo_iface); } static ULONG WINAPI ICreateErrorInfoImpl_Release( ICreateErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); - TRACE("(%p)\n", This); - return IErrorInfo_Release(_IErrorInfo_(This)); + ErrorInfoImpl *This = impl_from_ICreateErrorInfo(iface); + return IErrorInfo_Release(&This->IErrorInfo_iface); } @@ -410,12 +371,11 @@ static HRESULT WINAPI ICreateErrorInfoImpl_SetHelpContext( return S_OK; } -static const ICreateErrorInfoVtbl ICreateErrorInfoImpl_VTable = +static const ICreateErrorInfoVtbl CreateErrorInfoVtbl = { ICreateErrorInfoImpl_QueryInterface, ICreateErrorInfoImpl_AddRef, ICreateErrorInfoImpl_Release, - ICreateErrorInfoImpl_SetGUID, ICreateErrorInfoImpl_SetSource, ICreateErrorInfoImpl_SetDescription, @@ -428,29 +388,22 @@ static HRESULT WINAPI ISupportErrorInfoImpl_QueryInterface( REFIID riid, VOID** ppvoid) { - ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); - TRACE("(%p)\n", This); - - return IErrorInfo_QueryInterface(_IErrorInfo_(This), riid, ppvoid); + ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); + return IErrorInfo_QueryInterface(&This->IErrorInfo_iface, riid, ppvoid); } -static ULONG WINAPI ISupportErrorInfoImpl_AddRef( - ISupportErrorInfo* iface) +static ULONG WINAPI ISupportErrorInfoImpl_AddRef(ISupportErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); - TRACE("(%p)\n", This); - return IErrorInfo_AddRef(_IErrorInfo_(This)); + ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); + return IErrorInfo_AddRef(&This->IErrorInfo_iface); } -static ULONG WINAPI ISupportErrorInfoImpl_Release( - ISupportErrorInfo* iface) +static ULONG WINAPI ISupportErrorInfoImpl_Release(ISupportErrorInfo* iface) { - ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); - TRACE("(%p)\n", This); - return IErrorInfo_Release(_IErrorInfo_(This)); + ErrorInfoImpl *This = impl_from_ISupportErrorInfo(iface); + return IErrorInfo_Release(&This->IErrorInfo_iface); } - static HRESULT WINAPI ISupportErrorInfoImpl_InterfaceSupportsErrorInfo( ISupportErrorInfo* iface, REFIID riid) @@ -460,16 +413,32 @@ static HRESULT WINAPI ISupportErrorInfoImpl_InterfaceSupportsErrorInfo( return (IsEqualIID(riid, &This->m_Guid)) ? S_OK : S_FALSE; } -static const ISupportErrorInfoVtbl ISupportErrorInfoImpl_VTable = +static const ISupportErrorInfoVtbl SupportErrorInfoVtbl = { ISupportErrorInfoImpl_QueryInterface, ISupportErrorInfoImpl_AddRef, ISupportErrorInfoImpl_Release, - - ISupportErrorInfoImpl_InterfaceSupportsErrorInfo }; +static IErrorInfo* IErrorInfoImpl_Constructor(void) +{ + ErrorInfoImpl *This = HeapAlloc(GetProcessHeap(), 0, sizeof(ErrorInfoImpl)); + + if (!This) return NULL; + + This->IErrorInfo_iface.lpVtbl = &ErrorInfoVtbl; + This->ICreateErrorInfo_iface.lpVtbl = &CreateErrorInfoVtbl; + This->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; + This->ref = 1; + This->bstrSource = NULL; + This->bstrDescription = NULL; + This->bstrHelpFile = NULL; + This->m_dwHelpContext = 0; + + return &This->IErrorInfo_iface; +} + /*********************************************************************** * CreateErrorInfo (OLE32.@) *

1 0