June 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Get rid of forward declarations for custom action handlers.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: b4c20e7fef73b65dd3511ed27cbc27e954deea03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c20e7fef73b65dd3511ed27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:35:20 2011 +0200 msi: Get rid of forward declarations for custom action handlers. --- dlls/msi/custom.c | 383 +++++++++++++++++++++++++---------------------------- 1 files changed, 179 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4c20e7fef73b65dd3511…

1 0

Hans Leidekker : msi: Get rid of some more forward declarations.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: 1ae309f98194f56b3734943cd63d8a798319fb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae309f98194f56b3734943cd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:35:58 2011 +0200 msi: Get rid of some more forward declarations. --- dlls/msi/dialog.c | 38 +++--- dlls/msi/table.c | 443 +++++++++++++++++++++++++---------------------------- 2 files changed, 228 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ae309f98194f56b37349…

1 0

Henri Verbeet : wined3d: cfg can never be NULL in wined3d_check_pixel_format_depth().
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: be180bed7cdde56cb8d4d7517f9e699546b6af55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be180bed7cdde56cb8d4d7517… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:28 2011 +0200 wined3d: cfg can never be NULL in wined3d_check_pixel_format_depth(). --- dlls/wined3d/directx.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4b77d5e..02cb33c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2974,9 +2974,6 @@ static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_in BYTE depthSize, stencilSize; BOOL lockable = FALSE; - if(!cfg) - return FALSE; - if (!getDepthStencilBits(format, &depthSize, &stencilSize)) { ERR("Unable to check compatibility for format %s.\n", debug_d3dformat(format->id));

1 0

Hans Leidekker : msi: Handle disabled components properly in the ProcessComponents action.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: 597e16643384e689272c4fdaf352fb5ca16929ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=597e16643384e689272c4fdaf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:35:05 2011 +0200 msi: Handle disabled components properly in the ProcessComponents action. --- dlls/msi/action.c | 64 +++++++++++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5f42d7c..e460465 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3188,10 +3188,27 @@ static void ACTION_RefCountComponent( MSIPACKAGE* package, MSICOMPONENT *comp ) ACTION_WriteSharedDLLsCount( comp->FullKeypath, comp->RefCount ); } +static WCHAR *build_full_keypath( MSIPACKAGE *package, MSICOMPONENT *comp ) +{ + if (comp->assembly) + { + const WCHAR prefixW[] = {'<','\\',0}; + DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); + WCHAR *keypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); + + if (keypath) + { + strcpyW( keypath, prefixW ); + strcatW( keypath, comp->assembly->display_name ); + } + return keypath; + } + return resolve_keypath( package, comp ); +} + static UINT ACTION_ProcessComponents(MSIPACKAGE *package) { - WCHAR squished_pc[GUID_SIZE]; - WCHAR squished_cc[GUID_SIZE]; + WCHAR squished_pc[GUID_SIZE], squished_cc[GUID_SIZE]; UINT rc; MSICOMPONENT *comp; HKEY hkey; @@ -3205,41 +3222,27 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - MSIRECORD * uirow; + MSIRECORD *uirow; + INSTALLSTATE action; msi_ui_progress( package, 2, 0, 0, 0 ); if (!comp->ComponentId) continue; - squash_guid(comp->ComponentId,squished_cc); - - msi_free(comp->FullKeypath); - if (comp->assembly) - { - const WCHAR prefixW[] = {'<','\\',0}; - DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); - - comp->FullKeypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); - if (comp->FullKeypath) - { - strcpyW( comp->FullKeypath, prefixW ); - strcatW( comp->FullKeypath, comp->assembly->display_name ); - } - } - else comp->FullKeypath = resolve_keypath( package, comp ); + squash_guid( comp->ComponentId, squished_cc ); + msi_free( comp->FullKeypath ); + comp->FullKeypath = build_full_keypath( package, comp ); ACTION_RefCountComponent( package, comp ); - comp->Action = msi_get_component_action( package, comp ); + if (package->need_rollback) action = comp->Installed; + else action = comp->ActionRequest; + TRACE("Component %s (%s), Keypath=%s, RefCount=%u Action=%u\n", - debugstr_w(comp->Component), - debugstr_w(squished_cc), - debugstr_w(comp->FullKeypath), - comp->RefCount, - comp->Action); - - if (comp->Action == INSTALLSTATE_LOCAL || - comp->Action == INSTALLSTATE_SOURCE) + debugstr_w(comp->Component), debugstr_w(squished_cc), + debugstr_w(comp->FullKeypath), comp->RefCount, action); + + if (action == INSTALLSTATE_LOCAL || action == INSTALLSTATE_SOURCE) { if (package->Context == MSIINSTALLCONTEXT_MACHINE) rc = MSIREG_OpenUserDataComponentKey(comp->ComponentId, szLocalSid, &hkey, TRUE); @@ -3258,8 +3261,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) msi_reg_set_val_str(hkey, szPermKey, comp->FullKeypath); } - - if (comp->Action == INSTALLSTATE_LOCAL) + if (action == INSTALLSTATE_LOCAL) msi_reg_set_val_str(hkey, squished_pc, comp->FullKeypath); else { @@ -3299,7 +3301,7 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) } RegCloseKey(hkey); } - else if (comp->Action == INSTALLSTATE_ABSENT) + else if (action == INSTALLSTATE_ABSENT) { if (package->Context == MSIINSTALLCONTEXT_MACHINE) MSIREG_DeleteUserDataComponentKey(comp->ComponentId, szLocalSid);

1 0

Henri Verbeet : wined3d: Get rid of wined3d_texture_get_type().
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: 1fbdfd625aab1799f24c1c1f4ec1a85e14f29dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fbdfd625aab1799f24c1c1f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:24 2011 +0200 wined3d: Get rid of wined3d_texture_get_type(). --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/texture.c | 7 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cb60719..c7bade0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4337,8 +4337,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, } /* Verify that the source and destination textures are the same type. */ - type = wined3d_texture_get_type(src_texture); - if (wined3d_texture_get_type(dst_texture) != type) + type = src_texture->resource.resourceType; + if (dst_texture->resource.resourceType != type) { WARN("Source and destination have different types, returning WINED3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7abf18a..c138d01 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -483,13 +483,6 @@ void CDECL wined3d_texture_preload(struct wined3d_texture *texture) texture->texture_ops->texture_preload(texture, SRGB_ANY); } -WINED3DRESOURCETYPE CDECL wined3d_texture_get_type(const struct wined3d_texture *texture) -{ - TRACE("texture %p.\n", texture); - - return texture->resource.resourceType; -} - void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture) { TRACE("texture %p.\n", texture); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 45c9aaf..cfdd236 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -268,7 +268,6 @@ @ cdecl wined3d_texture_get_priority(ptr) @ cdecl wined3d_texture_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_texture_get_sub_resource(ptr long) -@ cdecl wined3d_texture_get_type(ptr) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_preload(ptr) @ cdecl wined3d_texture_set_autogen_filter_type(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ed269f0..aadd5fd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2504,7 +2504,6 @@ HRESULT __cdecl wined3d_texture_get_private_data(const struct wined3d_texture *t REFGUID guid, void *data, DWORD *data_size); struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(struct wined3d_texture *texture, UINT sub_resource_idx); -WINED3DRESOURCETYPE __cdecl wined3d_texture_get_type(const struct wined3d_texture *texture); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); void __cdecl wined3d_texture_preload(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_set_autogen_filter_type(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Use GL_DEPTH_COMPONENT as internal format for depth_blt_texture.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: 01e668b00747be4a359e7a74f17bb40e2490d006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e668b00747be4a359e7a74f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:26 2011 +0200 wined3d: Use GL_DEPTH_COMPONENT as internal format for depth_blt_texture. This also changes the texture level to always be zero while we're at it. In practice depth/stencil textures should rarely have multiple levels, if ever, but only 0 makes sense here. --- dlls/wined3d/surface.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c5c526b..ad217fc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5707,7 +5707,14 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co bind_target = GL_TEXTURE_2D; } glBindTexture(bind_target, device->depth_blt_texture); - glCopyTexImage2D(bind_target, surface->texture_level, surface->resource.format->glInternal, 0, 0, w, h, 0); + /* We use GL_DEPTH_COMPONENT instead of the surface's specific + * internal format, because the internal format might include stencil + * data. In principle we should copy stencil data as well, but unless + * the driver supports stencil export it's hard to do, and doesn't + * seem to be needed in practice. If the hardware doesn't support + * writing stencil data, the glCopyTexImage2D() call might trigger + * software fallbacks. */ + glCopyTexImage2D(bind_target, 0, GL_DEPTH_COMPONENT, 0, 0, w, h, 0); glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);

1 0

Hans Leidekker : msi: Add support for returning validation errors.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: ab13c00fc9ae394779ba05c1e19031fa6883dd06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab13c00fc9ae394779ba05c1e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:34:49 2011 +0200 msi: Add support for returning validation errors. --- dlls/msi/msipriv.h | 2 + dlls/msi/msiquery.c | 58 +++++++++++++++++++++++++------------------------- dlls/msi/table.c | 49 ++++++++++++++++++++++++++---------------- dlls/msi/tests/db.c | 34 +++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab13c00fc9ae394779ba0…

1 0

Hans Leidekker : msi: Print a warning instead of an error if we' re going to remove an installed file.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: c869192c92f644396af49eb655c94d471df50a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c869192c92f644396af49eb65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 7 10:34:35 2011 +0200 msi: Print a warning instead of an error if we're going to remove an installed file. Removing an installed file is normal as part of a rollback. --- dlls/msi/files.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 2ea119e..af84e9b 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1271,9 +1271,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) VS_FIXEDFILEINFO *ver; MSICOMPONENT *comp = file->Component; - if ( file->state == msifs_installed ) - ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); - comp->Action = msi_get_component_action( package, comp ); if (comp->Action != INSTALLSTATE_ABSENT || comp->Installed == INSTALLSTATE_SOURCE) continue; @@ -1299,6 +1296,9 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) msi_free( ver ); } + if (file->state == msifs_installed) + WARN("removing installed file %s\n", debugstr_w(file->TargetPath)); + TRACE("removing %s\n", debugstr_w(file->File) ); SetFileAttributesW( file->TargetPath, FILE_ATTRIBUTE_NORMAL );

1 0

Henri Verbeet : wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt to wined3d_check_pixel_format_depth ().
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: fec6137de27e2c90eb9b6f808ba0458e36e81913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec6137de27e2c90eb9b6f808… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:27 2011 +0200 wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt to wined3d_check_pixel_format_depth(). --- dlls/wined3d/directx.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a29533e..4b77d5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2968,7 +2968,7 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const struct wined return FALSE; } -static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const struct wined3d_gl_info *gl_info, +static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { BYTE depthSize, stencilSize; @@ -3043,7 +3043,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, { if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, &cfgs[i], rt_format)) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, &cfgs[i], ds_format)) + if (wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) { TRACE_(d3d_caps)("Formats match.\n"); return WINED3D_OK; @@ -3104,7 +3104,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 if(cfgs[i].numSamples != multisample_type) continue; - if (!IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, &cfgs[i], format)) + if (!wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], format)) continue; TRACE("Found pixel format %u to support multisample_type %#x for format %s.\n", @@ -3190,10 +3190,8 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, const struct wined3d_pixel_format *cfg = &adapter->cfgs[it]; if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, cfg, display_format)) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, cfg, ds_format)) - { + if (wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) return TRUE; - } } } }

1 0

Michael Stefaniuc : dxgi: COM cleanup for the IWineDXGIFactory iface.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: a26925d38fc067b7d8e398f3bfb94744e4d8275c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a26925d38fc067b7d8e398f3b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 09:56:55 2011 +0200 dxgi: COM cleanup for the IWineDXGIFactory iface. --- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/factory.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 98fdea8..5af04b4 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -77,7 +77,7 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSP /* IDXGIFactory */ struct dxgi_factory { - const struct IWineDXGIFactoryVtbl *vtbl; + IWineDXGIFactory IWineDXGIFactory_iface; LONG refcount; struct wined3d *wined3d; UINT adapter_count; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 71e9fe1..dd1ec5e 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline struct dxgi_factory *impl_from_IWineDXGIFactory(IWineDXGIFactory *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_factory, IWineDXGIFactory_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *iface, REFIID riid, void **object) @@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_QueryInterface(IWineDXGIFactory *i static ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IWineDXGIFactory *iface) { - struct dxgi_factory *This = (struct dxgi_factory *)iface; + struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -58,7 +63,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_AddRef(IWineDXGIFactory *iface) static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IWineDXGIFactory *iface) { - struct dxgi_factory *This = (struct dxgi_factory *)iface; + struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -122,7 +127,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetParent(IWineDXGIFactory *iface, static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *iface, UINT adapter_idx, IDXGIAdapter **adapter) { - struct dxgi_factory *This = (struct dxgi_factory *)iface; + struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); TRACE("iface %p, adapter_idx %u, adapter %p\n", iface, adapter_idx, adapter); @@ -258,7 +263,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IWineDXGIFac static struct wined3d * STDMETHODCALLTYPE dxgi_factory_get_wined3d(IWineDXGIFactory *iface) { - struct dxgi_factory *This = (struct dxgi_factory *)iface; + struct dxgi_factory *This = impl_from_IWineDXGIFactory(iface); TRACE("iface %p\n", iface); @@ -294,7 +299,7 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) HRESULT hr; UINT i; - factory->vtbl = &dxgi_factory_vtbl; + factory->IWineDXGIFactory_iface.lpVtbl = &dxgi_factory_vtbl; factory->refcount = 1; EnterCriticalSection(&dxgi_cs); @@ -332,7 +337,7 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) goto fail; } - hr = dxgi_adapter_init(adapter, (IWineDXGIFactory *)factory, i); + hr = dxgi_adapter_init(adapter, &factory->IWineDXGIFactory_iface, i); if (FAILED(hr)) { UINT j;

1 0