June 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9: Get rid of IDirect3DPixelShader9Impl.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 2f2995de753d09d21c2ed33ac65fb2f777f1d4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2995de753d09d21c2ed33ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 12 17:03:47 2012 +0200 d3d9: Get rid of IDirect3DPixelShader9Impl. --- dlls/d3d9/d3d9_private.h | 20 +++++++------------- dlls/d3d9/device.c | 6 +++--- dlls/d3d9/shader.c | 46 ++++++++++++++++++++++------------------------ 3 files changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index d1d177d..6925272 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -287,23 +287,17 @@ struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVerte #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D9_MAX_SIMULTANEOUS_RENDERTARGETS 4 -/* --------------------- */ -/* IDirect3DPixelShader9 */ -/* --------------------- */ - -/***************************************************************************** - * IDirect3DPixelShader implementation structure - */ -typedef struct IDirect3DPixelShader9Impl { +struct d3d9_pixelshader +{ IDirect3DPixelShader9 IDirect3DPixelShader9_iface; - LONG ref; + LONG refcount; struct wined3d_shader *wined3d_shader; - IDirect3DDevice9Ex *parentDevice; -} IDirect3DPixelShader9Impl; + IDirect3DDevice9Ex *parent_device; +}; -HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, +HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *device, const DWORD *byte_code) DECLSPEC_HIDDEN; -IDirect3DPixelShader9Impl *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) DECLSPEC_HIDDEN; +struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) DECLSPEC_HIDDEN; /* --------------- */ /* IDirect3DQuery9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2e5eb3d..1cfeace 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2547,7 +2547,7 @@ static HRESULT WINAPI d3d9_device_CreatePixelShader(IDirect3DDevice9Ex *iface, const DWORD *byte_code, IDirect3DPixelShader9 **shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DPixelShader9Impl *object; + struct d3d9_pixelshader *object; HRESULT hr; TRACE("iface %p, byte_code %p, shader %p.\n", iface, byte_code, shader); @@ -2576,7 +2576,7 @@ static HRESULT WINAPI d3d9_device_CreatePixelShader(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_SetPixelShader(IDirect3DDevice9Ex *iface, IDirect3DPixelShader9 *shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DPixelShader9Impl *shader_obj = unsafe_impl_from_IDirect3DPixelShader9(shader); + struct d3d9_pixelshader *shader_obj = unsafe_impl_from_IDirect3DPixelShader9(shader); HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); @@ -2592,7 +2592,7 @@ static HRESULT WINAPI d3d9_device_SetPixelShader(IDirect3DDevice9Ex *iface, IDir static HRESULT WINAPI d3d9_device_GetPixelShader(IDirect3DDevice9Ex *iface, IDirect3DPixelShader9 **shader) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DPixelShader9Impl *shader_impl; + struct d3d9_pixelshader *shader_impl; struct wined3d_shader *wined3d_shader; TRACE("iface %p, shader %p.\n", iface, shader); diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 7020d15..e65f485 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -166,39 +166,39 @@ struct d3d9_vertexshader *unsafe_impl_from_IDirect3DVertexShader9(IDirect3DVerte return impl_from_IDirect3DVertexShader9(iface); } -static inline IDirect3DPixelShader9Impl *impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) +static inline struct d3d9_pixelshader *impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DPixelShader9Impl, IDirect3DPixelShader9_iface); + return CONTAINING_RECORD(iface, struct d3d9_pixelshader, IDirect3DPixelShader9_iface); } -static HRESULT WINAPI d3d9_pixelshader_QueryInterface(IDirect3DPixelShader9 *iface, REFIID riid, void **object) +static HRESULT WINAPI d3d9_pixelshader_QueryInterface(IDirect3DPixelShader9 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DPixelShader9) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DPixelShader9_AddRef(iface); - *object = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *object = NULL; + *out = NULL; return E_NOINTERFACE; } static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface) { - IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); - ULONG refcount = InterlockedIncrement(&shader->ref); + struct d3d9_pixelshader *shader = impl_from_IDirect3DPixelShader9(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); if (refcount == 1) { - IDirect3DDevice9Ex_AddRef(shader->parentDevice); + IDirect3DDevice9Ex_AddRef(shader->parent_device); wined3d_mutex_lock(); wined3d_shader_incref(shader->wined3d_shader); wined3d_mutex_unlock(); @@ -209,14 +209,14 @@ static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface) static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface) { - IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); - ULONG refcount = InterlockedDecrement(&shader->ref); + struct d3d9_pixelshader *shader = impl_from_IDirect3DPixelShader9(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) { - IDirect3DDevice9Ex *device = shader->parentDevice; + IDirect3DDevice9Ex *device = shader->parent_device; wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); @@ -229,14 +229,13 @@ static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface) return refcount; } -static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, - IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, IDirect3DDevice9 **device) { - IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); + struct d3d9_pixelshader *shader = impl_from_IDirect3DPixelShader9(iface); TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)shader->parentDevice; + *device = (IDirect3DDevice9 *)shader->parent_device; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -244,10 +243,9 @@ static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, return D3D_OK; } -static HRESULT WINAPI d3d9_pixelshader_GetFunction(IDirect3DPixelShader9 *iface, void *data, - UINT *data_size) +static HRESULT WINAPI d3d9_pixelshader_GetFunction(IDirect3DPixelShader9 *iface, void *data, UINT *data_size) { - IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); + struct d3d9_pixelshader *shader = impl_from_IDirect3DPixelShader9(iface); HRESULT hr; TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); @@ -280,11 +278,11 @@ static const struct wined3d_parent_ops d3d9_pixelshader_wined3d_parent_ops = d3d9_pixelshader_wined3d_object_destroyed, }; -HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, struct d3d9_device *device, const DWORD *byte_code) +HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *device, const DWORD *byte_code) { HRESULT hr; - shader->ref = 1; + shader->refcount = 1; shader->IDirect3DPixelShader9_iface.lpVtbl = &d3d9_pixelshader_vtbl; wined3d_mutex_lock(); @@ -297,13 +295,13 @@ HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, struct d3d9_device * return hr; } - shader->parentDevice = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(shader->parentDevice); + shader->parent_device = &device->IDirect3DDevice9Ex_iface; + IDirect3DDevice9Ex_AddRef(shader->parent_device); return D3D_OK; } -IDirect3DPixelShader9Impl *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) +struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) { if (!iface) return NULL;

1 0

Henri Verbeet : d3d9: Get rid of IDirect3DQuery9Impl.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 56fffd06597c056655bf270fb0f8fe1134466f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56fffd06597c056655bf270fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 12 17:03:48 2012 +0200 d3d9: Get rid of IDirect3DQuery9Impl. --- dlls/d3d9/d3d9_private.h | 26 +++-------- dlls/d3d9/device.c | 2 +- dlls/d3d9/query.c | 108 ++++++++++++++++++++++----------------------- 3 files changed, 62 insertions(+), 74 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6925272..60bcc72 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -299,24 +299,14 @@ HRESULT pixelshader_init(struct d3d9_pixelshader *shader, struct d3d9_device *device, const DWORD *byte_code) DECLSPEC_HIDDEN; struct d3d9_pixelshader *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) DECLSPEC_HIDDEN; -/* --------------- */ -/* IDirect3DQuery9 */ -/* --------------- */ - -/***************************************************************************** - * IDirect3DPixelShader implementation structure - */ -typedef struct IDirect3DQuery9Impl { - IDirect3DQuery9 IDirect3DQuery9_iface; - LONG ref; - - /* IDirect3DQuery9 fields */ - struct wined3d_query *wineD3DQuery; - - /* Parent reference */ - IDirect3DDevice9Ex *parentDevice; -} IDirect3DQuery9Impl; +struct d3d9_query +{ + IDirect3DQuery9 IDirect3DQuery9_iface; + LONG refcount; + struct wined3d_query *wined3d_query; + IDirect3DDevice9Ex *parent_device; +}; -HRESULT query_init(IDirect3DQuery9Impl *query, struct d3d9_device *device, D3DQUERYTYPE type) DECLSPEC_HIDDEN; +HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUERYTYPE type) DECLSPEC_HIDDEN; #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1cfeace..1014c27 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2760,7 +2760,7 @@ static HRESULT WINAPI d3d9_device_DeletePatch(IDirect3DDevice9Ex *iface, UINT ha static HRESULT WINAPI d3d9_device_CreateQuery(IDirect3DDevice9Ex *iface, D3DQUERYTYPE type, IDirect3DQuery9 **query) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DQuery9Impl *object; + struct d3d9_query *object; HRESULT hr; TRACE("iface %p, type %#x, query %p.\n", iface, type, query); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 20dcfc4..d363413 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -25,66 +25,65 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); -static inline IDirect3DQuery9Impl *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface) +static inline struct d3d9_query *impl_from_IDirect3DQuery9(IDirect3DQuery9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DQuery9Impl, IDirect3DQuery9_iface); + return CONTAINING_RECORD(iface, struct d3d9_query, IDirect3DQuery9_iface); } -static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(IDirect3DQuery9 *iface, REFIID riid, - void **ppobj) +static HRESULT WINAPI d3d9_query_QueryInterface(IDirect3DQuery9 *iface, REFIID riid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DQuery9) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DQuery9_AddRef(iface); - *ppobj = iface; + *out = iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - *ppobj = NULL; + *out = NULL; return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DQuery9Impl_AddRef(IDirect3DQuery9 *iface) +static ULONG WINAPI d3d9_query_AddRef(IDirect3DQuery9 *iface) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); + ULONG refcount = InterlockedIncrement(&query->refcount); - TRACE("%p increasing refcount to %u.\n", iface, ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirect3DQuery9Impl_Release(IDirect3DQuery9 *iface) +static ULONG WINAPI d3d9_query_Release(IDirect3DQuery9 *iface) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); + ULONG refcount = InterlockedDecrement(&query->refcount); - TRACE("%p decreasing refcount to %u.\n", iface, ref); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (ref == 0) { + if (!refcount) + { wined3d_mutex_lock(); - wined3d_query_decref(This->wineD3DQuery); + wined3d_query_decref(query->wined3d_query); wined3d_mutex_unlock(); - IDirect3DDevice9Ex_Release(This->parentDevice); - HeapFree(GetProcessHeap(), 0, This); + IDirect3DDevice9Ex_Release(query->parent_device); + HeapFree(GetProcessHeap(), 0, query); } - return ref; + return refcount; } -static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, - IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_query_GetDevice(IDirect3DQuery9 *iface, IDirect3DDevice9 **device) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)This->parentDevice; + *device = (IDirect3DDevice9 *)query->parent_device; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -92,86 +91,85 @@ static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(IDirect3DQuery9 *iface, return D3D_OK; } -static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(IDirect3DQuery9 *iface) +static D3DQUERYTYPE WINAPI d3d9_query_GetType(IDirect3DQuery9 *iface) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); D3DQUERYTYPE type; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - type = wined3d_query_get_type(This->wineD3DQuery); + type = wined3d_query_get_type(query->wined3d_query); wined3d_mutex_unlock(); return type; } -static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(IDirect3DQuery9 *iface) +static DWORD WINAPI d3d9_query_GetDataSize(IDirect3DQuery9 *iface) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); DWORD ret; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - ret = wined3d_query_get_data_size(This->wineD3DQuery); + ret = wined3d_query_get_data_size(query->wined3d_query); wined3d_mutex_unlock(); return ret; } -static HRESULT WINAPI IDirect3DQuery9Impl_Issue(IDirect3DQuery9 *iface, DWORD dwIssueFlags) +static HRESULT WINAPI d3d9_query_Issue(IDirect3DQuery9 *iface, DWORD flags) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); HRESULT hr; - TRACE("iface %p, flags %#x.\n", iface, dwIssueFlags); + TRACE("iface %p, flags %#x.\n", iface, flags); wined3d_mutex_lock(); - hr = wined3d_query_issue(This->wineD3DQuery, dwIssueFlags); + hr = wined3d_query_issue(query->wined3d_query, flags); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DQuery9Impl_GetData(IDirect3DQuery9 *iface, void *pData, - DWORD dwSize, DWORD dwGetDataFlags) +static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWORD size, DWORD flags) { - IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface); + struct d3d9_query *query = impl_from_IDirect3DQuery9(iface); HRESULT hr; TRACE("iface %p, data %p, size %u, flags %#x.\n", - iface, pData, dwSize, dwGetDataFlags); + iface, data, size, flags); wined3d_mutex_lock(); - hr = wined3d_query_get_data(This->wineD3DQuery, pData, dwSize, dwGetDataFlags); + hr = wined3d_query_get_data(query->wined3d_query, data, size, flags); wined3d_mutex_unlock(); return hr; } -static const IDirect3DQuery9Vtbl Direct3DQuery9_Vtbl = +static const struct IDirect3DQuery9Vtbl d3d9_query_vtbl = { - IDirect3DQuery9Impl_QueryInterface, - IDirect3DQuery9Impl_AddRef, - IDirect3DQuery9Impl_Release, - IDirect3DQuery9Impl_GetDevice, - IDirect3DQuery9Impl_GetType, - IDirect3DQuery9Impl_GetDataSize, - IDirect3DQuery9Impl_Issue, - IDirect3DQuery9Impl_GetData + d3d9_query_QueryInterface, + d3d9_query_AddRef, + d3d9_query_Release, + d3d9_query_GetDevice, + d3d9_query_GetType, + d3d9_query_GetDataSize, + d3d9_query_Issue, + d3d9_query_GetData, }; -HRESULT query_init(IDirect3DQuery9Impl *query, struct d3d9_device *device, D3DQUERYTYPE type) +HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUERYTYPE type) { HRESULT hr; - query->IDirect3DQuery9_iface.lpVtbl = &Direct3DQuery9_Vtbl; - query->ref = 1; + query->IDirect3DQuery9_iface.lpVtbl = &d3d9_query_vtbl; + query->refcount = 1; wined3d_mutex_lock(); - hr = wined3d_query_create(device->wined3d_device, type, &query->wineD3DQuery); + hr = wined3d_query_create(device->wined3d_device, type, &query->wined3d_query); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -179,8 +177,8 @@ HRESULT query_init(IDirect3DQuery9Impl *query, struct d3d9_device *device, D3DQU return hr; } - query->parentDevice = &device->IDirect3DDevice9Ex_iface; - IDirect3DDevice9Ex_AddRef(query->parentDevice); + query->parent_device = &device->IDirect3DDevice9Ex_iface; + IDirect3DDevice9Ex_AddRef(query->parent_device); return D3D_OK; }

1 0

Henri Verbeet : wined3d: Set undefined vertex attributes to 0.0.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 611b541f292761e459eac4eb1cf88d765b939ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=611b541f292761e459eac4eb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 12 17:03:49 2012 +0200 wined3d: Set undefined vertex attributes to 0.0. --- dlls/wined3d/state.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f2da77c..35e1736 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4082,7 +4082,10 @@ static void load_numbered_arrays(struct wined3d_context *context, if (!(stream_info->use_map & (1 << i))) { - if (context->numbered_array_mask & (1 << i)) unload_numbered_array(context, i); + if (context->numbered_array_mask & (1 << i)) + unload_numbered_array(context, i); + if (state->vertex_shader->reg_maps.input_registers & (1 << i)) + GL_EXTCALL(glVertexAttrib4fARB(i, 0.0f, 0.0f, 0.0f, 0.0f)); continue; }

1 0

Henri Verbeet : wined3d: Invalidate the entire buffer on maps with WINED3DLOCK_DISCARD.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 0610d1eec9a287e22831a40427e6a9a38f3f745f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0610d1eec9a287e22831a4042… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 12 17:03:50 2012 +0200 wined3d: Invalidate the entire buffer on maps with WINED3DLOCK_DISCARD. --- dlls/wined3d/buffer.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f11edf4..4735595 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1011,7 +1011,20 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN flags = buffer_sanitize_flags(buffer, flags); if (!(flags & WINED3DLOCK_READONLY)) { - if (!buffer_add_dirty_area(buffer, offset, size)) return E_OUTOFMEMORY; + if (flags & WINED3DLOCK_DISCARD) + { + /* DISCARD invalidates the entire buffer, regardless of the + * specified offset and size. Some applications also depend on the + * entire buffer being uploaded in that case. Two such + * applications are Port Royale and Darkstar One. */ + if (!buffer_add_dirty_area(buffer, 0, 0)) + return E_OUTOFMEMORY; + } + else + { + if (!buffer_add_dirty_area(buffer, offset, size)) + return E_OUTOFMEMORY; + } } count = ++buffer->resource.map_count;

1 0

Piotr Caban : msvcp90: Fixed default locale constructor implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 1d0b072d0f1d5adf3229eca282ce42de11a231d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0b072d0f1d5adf3229eca28… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:12:12 2012 +0200 msvcp90: Fixed default locale constructor implementation. --- dlls/msvcp90/locale.c | 78 +++++++++++++++++++++++++++++++------------ dlls/msvcp90/msvcp90.h | 1 + dlls/msvcp90/msvcp90_main.c | 1 + 3 files changed, 58 insertions(+), 22 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 54c2eaf..49d864a 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -163,6 +163,9 @@ typedef struct _istreambuf_iterator_wchar /* ?_Id_cnt(a)id@locale(a)std@@0HA */ int locale_id__Id_cnt = 0; +static locale__Locimp *global_locale; +static locale classic_locale; + /* ?_Clocptr(a)_Locimp@locale(a)std@@0PAV123(a)A */ /* ?_Clocptr(a)_Locimp@locale(a)std@@0PEAV123(a)EA */ locale__Locimp *locale__Locimp__Clocptr = NULL; @@ -2606,7 +2609,6 @@ codecvt_char* __thiscall codecvt_char_ctor(codecvt_char *this) return codecvt_char_ctor_locinfo(this, NULL, 0); } -/* ?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ??1?$codecvt(a)DDH@std@@MAE(a)XZ */ /* ??1?$codecvt(a)DDH@std@@MEAA(a)XZ */ DEFINE_THISCALL_WRAPPER(codecvt_char_dtor, 4) @@ -2636,6 +2638,7 @@ codecvt_char* __thiscall MSVCP_codecvt_char_vector_dtor(codecvt_char *this, unsi return this; } +/* ?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl codecvt_char__Getcat(const locale_facet **facet, const locale *loc) { @@ -4338,6 +4341,41 @@ locale* __thiscall locale_ctor_locimp(locale *this, locale__Locimp *locimp) return this; } +/* ?_Init(a)locale@std@@CAPAV_Locimp(a)12@XZ */ +/* ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@XZ */ +locale__Locimp* __cdecl locale__Init(void) +{ + _Lockit lock; + + TRACE("\n"); + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + if(global_locale) { + _Lockit_dtor(&lock); + return global_locale; + } + + global_locale = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!global_locale) { + _Lockit_dtor(&lock); + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return NULL; + } + + locale__Locimp_ctor(global_locale); + global_locale->catmask = (1<<(LC_MAX+1))-1; + MSVCP_basic_string_char_dtor(&global_locale->name); + MSVCP_basic_string_char_ctor_cstr(&global_locale->name, "C"); + + locale__Locimp__Clocptr = global_locale; + global_locale->facet.refs++; + locale_ctor_locimp(&classic_locale, locale__Locimp__Clocptr); + _Lockit_dtor(&lock); + + return global_locale; +} + /* ??0locale(a)std@@QAE(a)ABV01@0H(a)Z */ /* ??0locale(a)std@@QEAA(a)AEBV01@0H(a)Z */ DEFINE_THISCALL_WRAPPER(locale_ctor_locale_locale, 16) @@ -4392,14 +4430,8 @@ DEFINE_THISCALL_WRAPPER(locale_ctor, 4) locale* __thiscall locale_ctor(locale *this) { TRACE("(%p)\n", this); - this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); - if(!this->ptr) { - ERR("Out of memory\n"); - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - return NULL; - } - - locale__Locimp_ctor(this->ptr); + this->ptr = locale__Init(); + locale_facet__Incref(&this->ptr->facet); return this; } @@ -4497,35 +4529,29 @@ const locale_facet* __thiscall locale__Getfacet(const locale *this, MSVCP_size_t return NULL; } -/* ?_Init(a)locale@std@@CAPAV_Locimp(a)12@XZ */ -/* ?_Init(a)locale@std@@CAPEAV_Locimp(a)12@XZ */ -locale__Locimp* __cdecl locale__Init(void) -{ - FIXME("stub\n"); - return NULL; -} - /* ?_Getgloballocale(a)locale@std@@CAPAV_Locimp(a)12@XZ */ /* ?_Getgloballocale(a)locale@std@@CAPEAV_Locimp(a)12@XZ */ locale__Locimp* __cdecl locale__Getgloballocale(void) { - FIXME("stub\n"); - return NULL; + TRACE("\n"); + return global_locale; } /* ?_Setgloballocale(a)locale@std@@CAXPAX(a)Z */ /* ?_Setgloballocale(a)locale@std@@CAXPEAX(a)Z */ void __cdecl locale__Setgloballocale(void *locimp) { - FIXME("(%p) stub\n", locimp); + TRACE("(%p)\n", locimp); + global_locale = locimp; } /* ?classic(a)locale@std@@SAABV12(a)XZ */ /* ?classic(a)locale@std@@SAAEBV12(a)XZ */ const locale* __cdecl locale_classic(void) { - FIXME("stub\n"); - return NULL; + TRACE("\n"); + locale__Init(); + return &classic_locale; } /* ?name(a)locale@std@@QBE?AV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2(a)XZ */ @@ -4682,3 +4708,11 @@ void __asm_dummy_vtables(void) { #ifndef __GNUC__ } #endif + +void free_locale(void) +{ + if(global_locale) { + locale__Locimp_dtor(global_locale); + locale_dtor(&classic_locale); + } +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index f15e832..47bcc26 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -267,6 +267,7 @@ locale* __thiscall locale_ctor(locale*); locale* __thiscall locale_copy_ctor(locale*, const locale*); locale* __thiscall locale_operator_assign(locale*, const locale*); void __thiscall locale_dtor(locale*); +void free_locale(void); /* class _Lockit */ typedef struct { diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 6a1d4d2..de036e5 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -92,6 +92,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_lockit(); break; case DLL_PROCESS_DETACH: + free_locale(); free_lockit(); break; }

1 0

Piotr Caban : msvcp90: Added use_facet< codecvt<char> > implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 9c83b6ee42574857d035f1a379cf766003686761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c83b6ee42574857d035f1a37… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:12:32 2012 +0200 msvcp90: Added use_facet< codecvt<char> > implementation. --- dlls/msvcp90/locale.c | 73 +++++++++++++++++++++++++++++++++++++++++++---- dlls/msvcp90/msvcp90.h | 6 ++++ 2 files changed, 72 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 49d864a..f5fec45 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -25,6 +25,8 @@ #include "errno.h" #include "limits.h" +#include "wine/list.h" + #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -37,6 +39,7 @@ char* __cdecl _Getmonths(void); void* __cdecl _Gettnames(void); unsigned int __cdecl ___lc_codepage_func(void); LCID* __cdecl ___lc_handle_func(void); +const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t); typedef int category; @@ -44,11 +47,6 @@ typedef struct { MSVCP_size_t id; } locale_id; -typedef struct { - const vtable_ptr *vtable; - MSVCP_size_t refs; -} locale_facet; - typedef struct _locale__Locimp { locale_facet facet; locale_facet **facetvec; @@ -200,6 +198,25 @@ locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsi return this; } +typedef struct +{ + locale_facet *fac; + struct list entry; +} facets_elem; +static struct list lazy_facets = LIST_INIT(lazy_facets); + +static void locale_facet_register(locale_facet *add) +{ + facets_elem *head = MSVCRT_operator_new(sizeof(*head)); + if(!head) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + + head->fac = add; + list_add_head(&lazy_facets, &head->entry); +} + extern const vtable_ptr MSVCP_locale_facet_vtable; /* ??0id(a)locale@std@@QAE(a)I@Z */ @@ -2657,6 +2674,32 @@ MSVCP_size_t __cdecl codecvt_char__Getcat(const locale_facet **facet, const loca return LC_CTYPE; } +codecvt_char* codecvt_char_use_facet(locale *loc) +{ + static codecvt_char *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, codecvt_char_id.id); + if(fac) { + _Lockit_dtor(&lock); + return (codecvt_char*)fac; + } + + if(obj) + return obj; + + codecvt_char__Getcat(&fac, loc); + obj = (codecvt_char*)fac; + locale_facet__Incref(&obj->base.facet); + locale_facet_register(&obj->base.facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?do_in@?$codecvt(a)DDH@std@@MBEHAAHPBD1AAPBDPAD3AAPAD(a)Z */ /* ?do_in@?$codecvt(a)DDH@std@@MEBAHAEAHPEBD1AEAPEBDPEAD3AEAPEAD(a)Z */ #define call_codecvt_char_do_in(this, state, from, from_end, from_next, to, to_end, to_next) \ @@ -4525,8 +4568,15 @@ locale* __thiscall locale__Addfac(locale *this, locale_facet *facet, MSVCP_size_ DEFINE_THISCALL_WRAPPER(locale__Getfacet, 8) const locale_facet* __thiscall locale__Getfacet(const locale *this, MSVCP_size_t id) { - FIXME("(%p %lu) stub\n", this, id); - return NULL; + locale_facet *fac; + + TRACE("(%p %lu)\n", this, id); + + fac = id < this->ptr->facet_cnt ? this->ptr->facetvec[id] : NULL; + if(fac || !this->ptr->transparent) + return fac; + + return id < global_locale->facet_cnt ? global_locale->facetvec[id] : NULL; } /* ?_Getgloballocale(a)locale@std@@CAPAV_Locimp(a)12@XZ */ @@ -4711,8 +4761,17 @@ void __asm_dummy_vtables(void) { void free_locale(void) { + facets_elem *iter, *safe; + if(global_locale) { locale__Locimp_dtor(global_locale); locale_dtor(&classic_locale); } + + LIST_FOR_EACH_ENTRY_SAFE(iter, safe, &lazy_facets, facets_elem, entry) { + list_remove(&iter->entry); + if(locale_facet__Decref(iter->fac)) + call_locale_facet_vector_dtor(iter->fac, 1); + MSVCRT_operator_delete(iter); + } } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 47bcc26..aebd034 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -257,6 +257,12 @@ wchar_t* __stdcall MSVCP_allocator_wchar_allocate(void*, MSVCP_size_t); void __stdcall MSVCP_allocator_wchar_deallocate(void*, wchar_t*, MSVCP_size_t); MSVCP_size_t __stdcall MSVCP_allocator_wchar_max_size(void*); +/* class locale::facet */ +typedef struct { + const vtable_ptr *vtable; + MSVCP_size_t refs; +} locale_facet; + /* class locale */ typedef struct {

1 0

Piotr Caban : msvcp90: Added locale::global implementation.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 65db238da0bd62bd830d4867abef6c921f3e04f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65db238da0bd62bd830d4867a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 12 18:12:51 2012 +0200 msvcp90: Added locale::global implementation. --- dlls/msvcp90/locale.c | 27 +++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f5fec45..ca8001b 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4614,6 +4614,33 @@ basic_string_char* __thiscall locale_name(const locale *this, basic_string_char return ret; } +/* ?global(a)locale@std@@SA?AV12(a)ABV12@@Z */ +/* ?global(a)locale@std@@SA?AV12(a)AEBV12@@Z */ +locale* __cdecl locale_global(locale *ret, const locale *loc) +{ + _Lockit lock; + int i; + + TRACE("(%p %p)\n", loc, ret); + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + locale_ctor(ret); + + if(loc->ptr != global_locale) { + locale_facet__Decref(&global_locale->facet); + global_locale = loc->ptr; + locale_facet__Incref(&global_locale->facet); + + for(i=LC_ALL+1; i<=LC_MAX; i++) { + if((global_locale->catmask & (1<<(i-1))) == 0) + continue; + setlocale(i, MSVCP_basic_string_char_c_str(&global_locale->name)); + } + } + _Lockit_dtor(&lock); + return ret; +} + DEFINE_RTTI_DATA(locale_facet, 0, 0, NULL, NULL, NULL, ".?AVfacet(a)locale@std@@"); DEFINE_RTTI_DATA(collate_char, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$collate(a)D@std@@"); DEFINE_RTTI_DATA(collate_wchar, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$collate(a)_W@std@@"); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 880e84d..a823f3f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -4155,8 +4155,8 @@ @ cdecl -arch=win64 ?getloc@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEBA?AVlocale(a)2@XZ(ptr ptr) basic_streambuf_wchar_getloc @ thiscall -arch=win32 ?getloc(a)ios_base@std@@QBE?AVlocale(a)2@XZ(ptr ptr) ios_base_getloc @ cdecl -arch=win64 ?getloc(a)ios_base@std@@QEBA?AVlocale(a)2@XZ(ptr ptr) ios_base_getloc -@ stub -arch=win32 ?global(a)locale@std@@SA?AV12(a)ABV12@@Z -@ stub -arch=win64 ?global(a)locale@std@@SA?AV12(a)AEBV12@@Z +@ cdecl -arch=win32 ?global(a)locale@std@@SA?AV12(a)ABV12@@Z(ptr ptr) locale_global +@ cdecl -arch=win64 ?global(a)locale@std@@SA?AV12(a)AEBV12@@Z(ptr ptr) locale_global @ thiscall -arch=win32 ?good(a)ios_base@std@@QBE_NXZ(ptr) ios_base_good @ cdecl -arch=win64 ?good(a)ios_base@std@@QEBA_NXZ(ptr) ios_base_good @ thiscall -arch=win32 ?gptr@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@IBEPADXZ(ptr) basic_streambuf_char_gptr

1 0

Hans Leidekker : msi: Don't fail if no .NET runtime is available.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 458f6b7ccd0c25753ffbc071673d034dc02fe9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458f6b7ccd0c25753ffbc0716… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 12 09:24:45 2012 +0200 msi: Don't fail if no .NET runtime is available. --- dlls/msi/assembly.c | 98 ++++++++++++++++---------------------------------- 1 files changed, 32 insertions(+), 66 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index d384003..bfa5142 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -49,13 +49,21 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; - if (pCreateAssemblyCacheNet10 || pCreateAssemblyCacheNet11 || pCreateAssemblyCacheNet20 || - pCreateAssemblyCacheNet40 ) return TRUE; - - if (!(hmscoree = LoadLibraryA( "mscoree.dll" ))) return FALSE; + if (!hsxs && !(hsxs = LoadLibraryA( "sxs.dll" ))) return FALSE; + if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) + { + FreeLibrary( hsxs ); + hsxs = NULL; + return FALSE; + } + if (hmscoree || !(hmscoree = LoadLibraryA( "mscoree.dll" ))) return TRUE; pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ - if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) goto error; - + if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) + { + FreeLibrary( hmscoree ); + hmscoree = NULL; + return TRUE; + } if (!pLoadLibraryShim( szFusion, szVersion10, NULL, &hfusion10 )) pCreateAssemblyCacheNet10 = (void *)GetProcAddress( hfusion10, "CreateAssemblyCache" ); @@ -68,76 +76,27 @@ static BOOL init_function_pointers( void ) if (!pLoadLibraryShim( szFusion, szVersion40, NULL, &hfusion40 )) pCreateAssemblyCacheNet40 = (void *)GetProcAddress( hfusion40, "CreateAssemblyCache" ); - if (!pCreateAssemblyCacheNet10 && !pCreateAssemblyCacheNet11 && !pCreateAssemblyCacheNet20 - && !pCreateAssemblyCacheNet40) goto error; - - if (!(hsxs = LoadLibraryA( "sxs.dll" ))) goto error; - if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) goto error; return TRUE; - -error: - pCreateAssemblyCacheNet10 = NULL; - pCreateAssemblyCacheNet11 = NULL; - pCreateAssemblyCacheNet20 = NULL; - pCreateAssemblyCacheNet40 = NULL; - FreeLibrary( hfusion10 ); - FreeLibrary( hfusion11 ); - FreeLibrary( hfusion20 ); - FreeLibrary( hfusion40 ); - FreeLibrary( hmscoree ); - return FALSE; } BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { if (!init_function_pointers()) return FALSE; - if (package->cache_net[CLR_VERSION_V10] || - package->cache_net[CLR_VERSION_V11] || - package->cache_net[CLR_VERSION_V20] || - package->cache_net[CLR_VERSION_V40]) return TRUE; if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; - if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet10( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); if (pCreateAssemblyCacheNet40) pCreateAssemblyCacheNet40( &package->cache_net[CLR_VERSION_V40], 0 ); - - if (package->cache_net[CLR_VERSION_V10] || - package->cache_net[CLR_VERSION_V11] || - package->cache_net[CLR_VERSION_V20] || - package->cache_net[CLR_VERSION_V40]) - { - return TRUE; - } - if (package->cache_net[CLR_VERSION_V10]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V10] ); - package->cache_net[CLR_VERSION_V10] = NULL; - } - if (package->cache_net[CLR_VERSION_V11]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V11] ); - package->cache_net[CLR_VERSION_V11] = NULL; - } - if (package->cache_net[CLR_VERSION_V20]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V20] ); - package->cache_net[CLR_VERSION_V20] = NULL; - } - if (package->cache_net[CLR_VERSION_V40]) - { - IAssemblyCache_Release( package->cache_net[CLR_VERSION_V40] ); - package->cache_net[CLR_VERSION_V40] = NULL; - } - IAssemblyCache_Release( package->cache_sxs ); - package->cache_sxs = NULL; - return FALSE; + return TRUE; } void msi_destroy_assembly_caches( MSIPACKAGE *package ) { UINT i; + IAssemblyCache_Release( package->cache_sxs ); + package->cache_sxs = NULL; + for (i = 0; i < CLR_VERSION_MAX; i++) { if (package->cache_net[i]) @@ -146,11 +105,6 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) package->cache_net[i] = NULL; } } - if (package->cache_sxs) - { - IAssemblyCache_Release( package->cache_sxs ); - package->cache_sxs = NULL; - } pCreateAssemblyCacheNet10 = NULL; pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; @@ -161,6 +115,12 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) FreeLibrary( hfusion40 ); FreeLibrary( hmscoree ); FreeLibrary( hsxs ); + hfusion10 = NULL; + hfusion11 = NULL; + hfusion20 = NULL; + hfusion40 = NULL; + hmscoree = NULL; + hsxs = NULL; } static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) @@ -279,6 +239,8 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n HRESULT hr; ASSEMBLY_INFO info; + if (!cache) return FALSE; + memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); @@ -433,6 +395,7 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { manifest = msi_get_loaded_file( package, comp->KeyPath )->TargetPath; cache = package->cache_net[get_clr_version( manifest )]; + if (!cache) return ERROR_SUCCESS; } TRACE("installing assembly %s\n", debugstr_w(manifest)); @@ -477,8 +440,11 @@ UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { if (!assembly->clr_version[i]) continue; cache = package->cache_net[i]; - hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); - if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + if (cache) + { + hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); + if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + } } } if (feature) feature->Action = INSTALLSTATE_ABSENT;

1 0

Hans Leidekker : msi: Always load mscoree.dll from the system directory.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: 3480ccbbb4d7ac9ec365595b57a9e938834d1efd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3480ccbbb4d7ac9ec365595b5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 12 09:24:58 2012 +0200 msi: Always load mscoree.dll from the system directory. --- dlls/msi/assembly.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index bfa5142..e7660bd 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -43,20 +43,25 @@ static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; static BOOL init_function_pointers( void ) { - static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; + static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; + static const WCHAR szMscoree[] = {'\\','m','s','c','o','r','e','e','.','d','l','l',0}; + static const WCHAR szSxs[] = {'s','x','s','.','d','l','l',0}; static const WCHAR szVersion10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; + WCHAR path[MAX_PATH]; + DWORD len = GetSystemDirectoryW( path, MAX_PATH ); - if (!hsxs && !(hsxs = LoadLibraryA( "sxs.dll" ))) return FALSE; + if (!hsxs && !(hsxs = LoadLibraryW( szSxs ))) return FALSE; if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) { FreeLibrary( hsxs ); hsxs = NULL; return FALSE; } - if (hmscoree || !(hmscoree = LoadLibraryA( "mscoree.dll" ))) return TRUE; + strcpyW( path + len, szMscoree ); + if (hmscoree || !(hmscoree = LoadLibraryW( path ))) return TRUE; pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) {

1 0

Hans Leidekker : msi: Keep assembly caches loaded until the package is destroyed.
by Alexandre Julliard 12 Jun '12

12 Jun '12

Module: wine Branch: master Commit: a17ca164952526815e98a345a6f7513842baa535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17ca164952526815e98a345a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 12 09:25:09 2012 +0200 msi: Keep assembly caches loaded until the package is destroyed. --- dlls/msi/action.c | 1 - dlls/msi/assembly.c | 8 +++++--- dlls/msi/files.c | 4 ---- dlls/msi/package.c | 7 ++----- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b256439..d452c92 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1017,7 +1017,6 @@ UINT msi_load_all_components( MSIPACKAGE *package ) r = MSI_IterateRecords(view, NULL, load_component, package); msiobj_release(&view->hdr); - msi_destroy_assembly_caches( package ); return r; } diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index e7660bd..2f321db 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -99,9 +99,11 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) { UINT i; - IAssemblyCache_Release( package->cache_sxs ); - package->cache_sxs = NULL; - + if (package->cache_sxs) + { + IAssemblyCache_Release( package->cache_sxs ); + package->cache_sxs = NULL; + } for (i = 0; i < CLR_VERSION_MAX; i++) { if (package->cache_net[i]) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index fe72c24..11913ef 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -399,7 +399,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) goto done; } } - msi_init_assembly_caches( package ); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { comp->Action = msi_get_component_action( package, comp ); @@ -414,7 +413,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) } } } - msi_destroy_assembly_caches( package ); done: msi_free_media_info(mi); @@ -1309,7 +1307,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) msiobj_release( &uirow->hdr ); } - msi_init_assembly_caches( package ); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { comp->Action = msi_get_component_action( package, comp ); @@ -1328,6 +1325,5 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) remove_folder( folder ); } } - msi_destroy_assembly_caches( package ); return ERROR_SUCCESS; } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 7c8b1b4..4944065 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -344,9 +344,10 @@ static void free_package_structures( MSIPACKAGE *package ) static void MSI_FreePackage( MSIOBJECTHDR *arg) { - UINT i; MSIPACKAGE *package = (MSIPACKAGE *)arg; + msi_destroy_assembly_caches( package ); + if( package->dialog ) msi_dialog_destroy( package->dialog ); @@ -354,10 +355,6 @@ static void MSI_FreePackage( MSIOBJECTHDR *arg) free_package_structures(package); CloseHandle( package->log_file ); - for (i = 0; i < CLR_VERSION_MAX; i++) - if (package->cache_net[i]) IAssemblyCache_Release( package->cache_net[i] ); - if (package->cache_sxs) IAssemblyCache_Release( package->cache_sxs ); - if (package->delete_on_close) DeleteFileW( package->localfile ); msi_free( package->localfile ); }

1 0