wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Henri Verbeet : wined3d: Use the proper texture target in ffp_blit_p8_upload_palette().
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: f0fb19992580cc66a3fed9f9e0f5ca1c78d73dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0fb19992580cc66a3fed9f9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 17 11:40:37 2012 +0200 wined3d: Use the proper texture target in ffp_blit_p8_upload_palette(). --- 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 c0b27ba..13c88f9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6333,12 +6333,18 @@ static void ffp_blit_p8_upload_palette(const struct wined3d_surface *surface, co { BYTE table[256][4]; BOOL colorkey_active = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) ? TRUE : FALSE; + GLenum target; + + if (surface->container.type == WINED3D_CONTAINER_TEXTURE) + target = surface->container.u.texture->target; + else + target = surface->texture_target; d3dfmt_p8_init_palette(surface, table, colorkey_active); TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n"); ENTER_GL(); - GL_EXTCALL(glColorTableEXT(surface->texture_target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, table)); + GL_EXTCALL(glColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, table)); LEAVE_GL(); }

1 0

Henri Verbeet : wined3d: Use the proper texture target in fb_copy_to_texture_direct().
by Alexandre Julliard 17 Jul '12

17 Jul '12

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

Henri Verbeet : wined3d: Use the proper texture target in ffp_blit_set().
by Alexandre Julliard 17 Jul '12

17 Jul '12

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

Henri Verbeet : wined3d: Use the proper texture target in arbfp_blit_set().
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 86db5b601f77e41d2fedbdf81759b87dc9250f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86db5b601f77e41d2fedbdf81… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 17 11:40:34 2012 +0200 wined3d: Use the proper texture target in arbfp_blit_set(). For cube maps, texture->target is GL_TEXTURE_CUBE_MAP and would be used for calls that apply to the entire texture, like glTexParameter(). surface->texture_target refers to individual faces like GL_TEXTURE_CUBE_MAP_POSITIVE_X, etc., and would be used for calls like glTexImage2D(). What makes this a bit ugly is the fact that surfaces don't always have an associated texture. --- dlls/wined3d/arb_program_shader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index db1d812..a85e6fd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7196,8 +7196,13 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; - GLenum textype = surface->texture_target; const struct wined3d_gl_info *gl_info = context->gl_info; + GLenum textype; + + if (surface->container.type == WINED3D_CONTAINER_TEXTURE) + textype = surface->container.u.texture->target; + else + textype = surface->texture_target; if (surface->flags & SFLAG_CONVERTED) {

1 0

Jacek Caban : d3drmdef.h: Replace unsigned long by ULONG.
by Alexandre Julliard 17 Jul '12

17 Jul '12

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

Nikolay Sivov : ole32: Fix QueryInterface for IErrorInfo to return IUnknown pointer.
by Alexandre Julliard 17 Jul '12

17 Jul '12

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

Nikolay Sivov : ole32: COM cleanup for IErrorInfo.
by Alexandre Julliard 17 Jul '12

17 Jul '12

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

Nikolay Sivov : ole32: COM cleanup of HGLOBAL ILockBytes implementation.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 897d4d4e4aa148e9f8a978d27e409d59f1af81f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=897d4d4e4aa148e9f8a978d27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 10:53:14 2012 +0400 ole32: COM cleanup of HGLOBAL ILockBytes implementation. --- dlls/ole32/memlockbytes.c | 210 +++++++++++++-------------------------------- 1 files changed, 61 insertions(+), 149 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=897d4d4e4aa148e9f8a97…

1 0

Nikolay Sivov : ole32: Make ole stream creation helper capable of handling flags data.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 52ce30d242154530a0a46bae4d5bc332f7906c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ce30d242154530a0a46bae4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 10:31:08 2012 +0400 ole32: Make ole stream creation helper capable of handling flags data. --- dlls/ole32/clipboard.c | 2 +- dlls/ole32/storage32.c | 73 +++++++++++++++++++---------------------------- dlls/ole32/storage32.h | 2 +- 3 files changed, 32 insertions(+), 45 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b98404f..57b0c46 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -662,7 +662,7 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt) ProgIDFromCLSID(&clsID, &strProgID); WideCharToMultiByte( CP_ACP, 0, strProgID, -1, strOleTypeName, sizeof(strOleTypeName), NULL, NULL ); - OLECONVERT_CreateOleStream(std.u.pstg); + STORAGE_CreateOleStream(std.u.pstg, 0); OLECONVERT_CreateCompObjStream(std.u.pstg, strOleTypeName); } } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 30d380b..f4f2d88 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -8520,18 +8520,18 @@ static DWORD OLECONVERT_WriteOLE20ToBuffer(LPSTORAGE pStorage, BYTE **pData) } /************************************************************************* - * OLECONVERT_CreateOleStream [Internal] + * STORAGE_CreateOleStream [Internal] * * Creates the "\001OLE" stream in the IStorage if necessary. * * PARAMS - * pStorage [I] Dest storage to create the stream in + * storage [I] Dest storage to create the stream in + * flags [I] flags to be set for newly created stream * * RETURNS - * Nothing + * HRESULT return value * * NOTES - * This function is used by OleConvertOLESTREAMToIStorage only. * * This stream is still unknown, MS Word seems to have extra data * but since the data is stored in the OLESTREAM there should be @@ -8539,28 +8539,32 @@ static DWORD OLECONVERT_WriteOLE20ToBuffer(LPSTORAGE pStorage, BYTE **pData) * deleted it will create it with this default data. * */ -void OLECONVERT_CreateOleStream(LPSTORAGE pStorage) +HRESULT STORAGE_CreateOleStream(IStorage *storage, DWORD flags) { - HRESULT hRes; - IStream *pStream; - static const WCHAR wstrStreamName[] = {1,'O', 'l', 'e', 0}; - BYTE pOleStreamHeader [] = + static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; + static const DWORD version_magic = 0x02000001; + IStream *stream; + HRESULT hr; + + hr = IStorage_CreateStream(storage, stream_1oleW, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); + if (hr == S_OK) { - 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00 - }; + struct empty_1ole_stream { + DWORD version_magic; + DWORD flags; + BYTE padding[12]; + }; + struct empty_1ole_stream stream_data; - /* Create stream if not present */ - hRes = IStorage_CreateStream(pStorage, wstrStreamName, - STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &pStream ); + stream_data.version_magic = version_magic; + stream_data.flags = flags; + memset(stream_data.padding, 0, sizeof(stream_data.padding)); - if(hRes == S_OK) - { - /* Write default Data */ - hRes = IStream_Write(pStream, pOleStreamHeader, sizeof(pOleStreamHeader), NULL); - IStream_Release(pStream); + hr = IStream_Write(stream, &stream_data, sizeof(stream_data), NULL); + IStream_Release(stream); } + + return hr; } /* write a string to a stream, preceded by its length */ @@ -9291,7 +9295,7 @@ HRESULT WINAPI OleConvertOLESTREAMToIStorage ( if(hRes == S_OK) { /*Create the Ole Stream if necessary */ - OLECONVERT_CreateOleStream(pstg); + STORAGE_CreateOleStream(pstg, 0); } } @@ -9418,33 +9422,16 @@ HRESULT WINAPI GetConvertStg(IStorage *stg) */ HRESULT WINAPI SetConvertStg(IStorage *storage, BOOL convert) { - static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; - static const DWORD version_magic = 0x02000001; DWORD flags = convert ? OleStream_Convert : 0; - IStream *stream; HRESULT hr; TRACE("(%p, %d)\n", storage, convert); - hr = IStorage_CreateStream(storage, stream_1oleW, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stream); - if (hr == S_OK) - { - struct empty_1ole_stream { - DWORD version_magic; - DWORD flags; - BYTE padding[12]; - }; - struct empty_1ole_stream stream_data; - - stream_data.version_magic = version_magic; - stream_data.flags = flags; - memset(stream_data.padding, 0, sizeof(stream_data.padding)); - - hr = IStream_Write(stream, &stream_data, sizeof(stream_data), NULL); - IStream_Release(stream); - } - else if (hr == STG_E_FILEALREADYEXISTS) + hr = STORAGE_CreateOleStream(storage, flags); + if (hr == STG_E_FILEALREADYEXISTS) { + static const WCHAR stream_1oleW[] = {1,'O','l','e',0}; + IStream *stream; DWORD header[2]; hr = IStorage_OpenStream(storage, stream_1oleW, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stream); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 80fe01b..f2061f3 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -160,7 +160,7 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN * Ole Convert support */ -void OLECONVERT_CreateOleStream(LPSTORAGE pStorage) DECLSPEC_HIDDEN; +HRESULT STORAGE_CreateOleStream(IStorage*, DWORD) DECLSPEC_HIDDEN; HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : ole32: Use interface macros to call methods.
by Alexandre Julliard 17 Jul '12

17 Jul '12

Module: wine Branch: master Commit: 88e6c8175b36ec4b2e06c003bf8e7da7e053b57c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e6c8175b36ec4b2e06c003b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 10:15:25 2012 +0400 ole32: Use interface macros to call methods. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 6a39b94..1471162 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -657,7 +657,7 @@ static HRESULT WINAPI StgStreamImpl_Clone( seek_pos.QuadPart = This->currentPosition.QuadPart; - hres=StgStreamImpl_Seek (*ppstm, seek_pos, STREAM_SEEK_SET, NULL); + hres = IStream_Seek(*ppstm, seek_pos, STREAM_SEEK_SET, NULL); assert (SUCCEEDED(hres)); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a1c925f..30d380b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2152,7 +2152,7 @@ static HRESULT deleteStreamContents( size.u.HighPart = 0; size.u.LowPart = 0; - hr = StorageBaseImpl_OpenStream(&parentStorage->IStorage_iface, + hr = IStorage_OpenStream(&parentStorage->IStorage_iface, entryDataToDelete.name, NULL, STGM_WRITE | STGM_SHARE_EXCLUSIVE, 0, &pis); if (hr!=S_OK) @@ -4798,14 +4798,10 @@ static void TransactedSnapshotImpl_Destroy( StorageBaseImpl *iface) { TransactedSnapshotImpl* This = (TransactedSnapshotImpl*) iface; - TransactedSnapshotImpl_Revert(&This->base.IStorage_iface); - + IStorage_Revert(&This->base.IStorage_iface); IStorage_Release(&This->transactedParent->IStorage_iface); - IStorage_Release(&This->scratch->IStorage_iface); - HeapFree(GetProcessHeap(), 0, This->entries); - HeapFree(GetProcessHeap(), 0, This); }

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012