January 2011 - Wine-Commits

Michael Stefaniuc : jscript: COM cleanup for the IDispatchEx iface.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 3cb9886ea748926d8982a6ef7ff91f6c4a15f384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cb9886ea748926d8982a6ef7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 16 21:27:20 2011 +0100 jscript: COM cleanup for the IDispatchEx iface. --- dlls/jscript/dispex.c | 49 ++++++++++++++++++++++++----------------------- dlls/jscript/jscript.h | 10 +++----- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 99fad56..653857c 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -420,21 +420,24 @@ static HRESULT fill_protrefs(jsdisp_t *This) return S_OK; } -#define DISPATCHEX_THIS(iface) DEFINE_THIS(jsdisp_t, IDispatchEx, iface) +static inline jsdisp_t *impl_from_IDispatchEx(IDispatchEx *iface) +{ + return CONTAINING_RECORD(iface, jsdisp_t, IDispatchEx_iface); +} static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = _IDispatchEx_(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = _IDispatchEx_(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IDispatchEx, riid)) { TRACE("(%p)->(IID_IDispatchEx %p)\n", This, ppv); - *ppv = _IDispatchEx_(This); + *ppv = &This->IDispatchEx_iface; }else if(IsEqualGUID(&IID_IDispatchJS, riid)) { TRACE("(%p)->(IID_IDispatchJS %p)\n", This, ppv); jsdisp_addref(This); @@ -452,7 +455,7 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -462,7 +465,7 @@ static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -491,7 +494,7 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); TRACE("(%p)->(%p)\n", This, pctinfo); @@ -502,7 +505,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -511,7 +514,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); UINT i; HRESULT hres; @@ -519,7 +522,7 @@ static HRESULT WINAPI DispatchEx_GetIDsOfNames(IDispatchEx *iface, REFIID riid, lcid, rgDispId); for(i=0; i < cNames; i++) { - hres = IDispatchEx_GetDispID(_IDispatchEx_(This), rgszNames[i], 0, rgDispId+i); + hres = IDispatchEx_GetDispID(&This->IDispatchEx_iface, rgszNames[i], 0, rgDispId+i); if(FAILED(hres)) return hres; } @@ -531,18 +534,18 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return IDispatchEx_InvokeEx(_IDispatchEx_(This), dispIdMember, lcid, wFlags, + return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); } static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -557,7 +560,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; jsexcept_t jsexcept; HRESULT hres; @@ -623,7 +626,7 @@ static HRESULT delete_prop(dispex_prop_t *prop) static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; HRESULT hres; @@ -645,7 +648,7 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bst static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; TRACE("(%p)->(%x)\n", This, id); @@ -661,14 +664,14 @@ static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *prop; TRACE("(%p)->(%x %p)\n", This, id, pbstrName); @@ -686,7 +689,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); dispex_prop_t *iter; HRESULT hres; @@ -718,13 +721,11 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) { - jsdisp_t *This = DISPATCHEX_THIS(iface); + jsdisp_t *This = impl_from_IDispatchEx(iface); FIXME("(%p)->(%p)\n", This, ppunk); return E_NOTIMPL; } -#undef DISPATCHEX_THIS - static IDispatchExVtbl DispatchExVtbl = { DispatchEx_QueryInterface, DispatchEx_AddRef, @@ -747,7 +748,7 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b { TRACE("%p (%p)\n", dispex, prototype); - dispex->lpIDispatchExVtbl = &DispatchExVtbl; + dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; dispex->ref = 1; dispex->builtin_info = builtin_info; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 429fcd3..06258d3 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -170,7 +170,7 @@ typedef struct { } builtin_info_t; struct jsdisp_t { - const IDispatchExVtbl *lpIDispatchExVtbl; + IDispatchEx IDispatchEx_iface; LONG ref; @@ -184,21 +184,19 @@ struct jsdisp_t { const builtin_info_t *builtin_info; }; -#define _IDispatchEx_(x) ((IDispatchEx*) &(x)->lpIDispatchExVtbl) - static inline IDispatch *to_disp(jsdisp_t *jsdisp) { - return (IDispatch*)&jsdisp->lpIDispatchExVtbl; + return (IDispatch*)&jsdisp->IDispatchEx_iface; } static inline void jsdisp_addref(jsdisp_t *jsdisp) { - IDispatchEx_AddRef(_IDispatchEx_(jsdisp)); + IDispatchEx_AddRef(&jsdisp->IDispatchEx_iface); } static inline void jsdisp_release(jsdisp_t *jsdisp) { - IDispatchEx_Release(_IDispatchEx_(jsdisp)); + IDispatchEx_Release(&jsdisp->IDispatchEx_iface); } HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**);

1 0

Michael Stefaniuc : jscript: Use ifaces instead of vtbl pointers in JScript .
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 3b1d9d43de90f522534c07eb5e536289c51bb291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b1d9d43de90f522534c07eb5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 16 21:30:46 2011 +0100 jscript: Use ifaces instead of vtbl pointers in JScript. --- dlls/jscript/jscript.c | 177 ++++++++++++++++++++++++------------------------ 1 files changed, 88 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b1d9d43de90f522534c0…

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to context_resource_released().
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: c28d6f38afbdec959eed763e0408758896de4766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28d6f38afbdec959eed763e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 16 23:36:47 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to context_resource_released(). --- dlls/wined3d/context.c | 3 ++- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8edcf66..c001577 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -689,7 +689,8 @@ static void context_queue_fbo_entry_destruction(struct wined3d_context *context, list_add_head(&context->fbo_destroy_list, &entry->entry); } -void context_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *resource, WINED3DRESOURCETYPE type) +void context_resource_released(struct IWineD3DDeviceImpl *device, + struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type) { if (!device->d3d_initialized) return; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2008aee..a225e53 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6609,7 +6609,7 @@ void device_resource_released(struct IWineD3DDeviceImpl *device, struct IWineD3D TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); - context_resource_released(device, (IWineD3DResource *)resource, type); + context_resource_released(device, resource, type); switch (type) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bed2aa9..8dcb461 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1228,8 +1228,8 @@ void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPE struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; -void context_resource_released(IWineD3DDeviceImpl *device, - IWineD3DResource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; +void context_resource_released(struct IWineD3DDeviceImpl *device, + struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; void context_resource_unloaded(IWineD3DDeviceImpl *device, IWineD3DResource *resource, WINED3DRESOURCETYPE type) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to device_resource_released().
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 834b599e19df6ba775dfc3dd441e842db75ea393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=834b599e19df6ba775dfc3dd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 16 23:36:46 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to device_resource_released(). --- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b1769e8..2008aee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6602,14 +6602,14 @@ static void device_resource_remove(struct IWineD3DDeviceImpl *device, struct IWi list_remove(&resource->resource.resource_list_entry); } -void device_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *resource) +void device_resource_released(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) { - WINED3DRESOURCETYPE type = IWineD3DResource_GetType(resource); + WINED3DRESOURCETYPE type = IWineD3DResource_GetType((IWineD3DResource *)resource); unsigned int i; TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); - context_resource_released(device, resource, type); + context_resource_released(device, (IWineD3DResource *)resource, type); switch (type) { @@ -6696,7 +6696,7 @@ void device_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *reso } /* Remove the resource from the resourceStore */ - device_resource_remove(device, (IWineD3DResourceImpl *)resource); + device_resource_remove(device, resource); TRACE("Resource released.\n"); } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6e90ee1..370861e 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -120,7 +120,7 @@ void resource_cleanup(struct IWineD3DResourceImpl *resource) resource->resource.heapMemory = 0; if (resource->resource.device) - device_resource_released(resource->resource.device, (IWineD3DResource *)resource); + device_resource_released(resource->resource.device, resource); } void resource_unload(IWineD3DResourceImpl *resource) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1ee0b9c..bed2aa9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1784,7 +1784,7 @@ void device_preload_textures(IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; -void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN; +void device_resource_released(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN; void device_switch_onscreen_ds(IWineD3DDeviceImpl *device, struct wined3d_context *context,

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to device_resource_add().
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 852ac57db6cbaee6337d195d1954206a1d26e47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=852ac57db6cbaee6337d195d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 16 23:36:45 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to device_resource_add(). --- dlls/wined3d/device.c | 15 +++------------ dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6920420..b1769e8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6588,20 +6588,11 @@ static void WINAPI IWineD3DDeviceImpl_GetGammaRamp(IWineD3DDevice *iface, UINT i } } - -/** ******************************************************** -* Notification functions -** ********************************************************/ -/** This function must be called in the release of a resource when ref == 0, -* the contents of resource must still be correct, -* any handles to other resource held by the caller must be closed -* (e.g. a texture should release all held surfaces because telling the device that it's been released.) - *****************************************************/ -void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) +void device_resource_add(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) { - TRACE("(%p) : Adding resource %p\n", This, resource); + TRACE("device %p, resource %p.\n", device, resource); - list_add_head(&This->resources, &((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); + list_add_head(&device->resources, &resource->resource.resource_list_entry); } static void device_resource_remove(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 73b9943..6e90ee1 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -88,7 +88,7 @@ HRESULT resource_init(struct IWineD3DResourceImpl *resource, WINED3DRESOURCETYPE WineD3DAdapterChangeGLRam(device, size); } - device_resource_add(device, (IWineD3DResource *)resource); + device_resource_add(device, resource); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c752726..1ee0b9c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -59,6 +59,7 @@ typedef struct IWineD3DDeviceImpl IWineD3DDeviceImpl; typedef struct IWineD3DSwapChainImpl IWineD3DSwapChainImpl; struct IWineD3DBaseShaderImpl; struct IWineD3DBaseTextureImpl; +struct IWineD3DResourceImpl; /* Texture format fixups */ @@ -1782,7 +1783,7 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, void device_preload_textures(IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; LRESULT device_process_message(IWineD3DDeviceImpl *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; -void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN; +void device_resource_add(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) DECLSPEC_HIDDEN; void device_resource_released(IWineD3DDeviceImpl *This, IWineD3DResource *resource) DECLSPEC_HIDDEN; void device_stream_info_from_declaration(IWineD3DDeviceImpl *This, BOOL use_vshader, struct wined3d_stream_info *stream_info, BOOL *fixup) DECLSPEC_HIDDEN;

1 0

Juan Lang : rsaenh: Only set key length on successful retrieval of hash value.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 786c57d323179712bffaecd7da27a528e940048e URL: http://source.winehq.org/git/wine.git/?a=commit;h=786c57d323179712bffaecd7d… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Jan 16 12:01:47 2011 -0800 rsaenh: Only set key length on successful retrieval of hash value. --- dlls/rsaenh/rsaenh.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 50954c5..df83f5a 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -4216,6 +4216,7 @@ BOOL WINAPI RSAENH_CPSetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa if (pCryptKey->aiAlgid == CALG_HMAC && !pCryptKey->dwKeyLen) { HCRYPTHASH hKeyHash; + DWORD keyLen; if (!RSAENH_CPCreateHash(hProv, ((PHMAC_INFO)pbData)->HashAlgid, 0, 0, &hKeyHash)) @@ -4226,13 +4227,14 @@ BOOL WINAPI RSAENH_CPSetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa RSAENH_CPDestroyHash(hProv, hKeyHash); return FALSE; } - pCryptKey->dwKeyLen = sizeof(pCryptKey->abKeyValue); + keyLen = sizeof(pCryptKey->abKeyValue); if (!RSAENH_CPGetHashParam(hProv, hKeyHash, HP_HASHVAL, pCryptKey->abKeyValue, - &pCryptKey->dwKeyLen, 0)) + &keyLen, 0)) { RSAENH_CPDestroyHash(hProv, hKeyHash); return FALSE; } + pCryptKey->dwKeyLen = keyLen; RSAENH_CPDestroyHash(hProv, hKeyHash); } for (i=0; i<RSAENH_MIN(pCryptKey->dwKeyLen,pCryptHash->pHMACInfo->cbInnerString); i++) {

1 0

Juan Lang : crypt32: Add stub for CertRegisterPhysicalStore.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 7f0db794917631f749b07ab19fb76638c62ed243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0db794917631f749b07ab19… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Jan 16 11:43:56 2011 -0800 crypt32: Add stub for CertRegisterPhysicalStore. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/store.c | 12 ++++++++++++ include/wincrypt.h | 3 +++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index dedcb4f..45ec666 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -77,6 +77,7 @@ @ stdcall CertOpenSystemStoreW(long wstr) @ stdcall CertRDNValueToStrA(long ptr ptr long) @ stdcall CertRDNValueToStrW(long ptr ptr long) +@ stdcall CertRegisterPhysicalStore(ptr long wstr ptr ptr) @ stdcall CertRemoveEnhancedKeyUsageIdentifier(ptr str) @ stdcall CertRemoveStoreFromCollection(ptr ptr) @ stdcall CertSaveStore(ptr long long long ptr long) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index df12e3e..b540e61 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1465,3 +1465,15 @@ BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, pfnEnum); return FALSE; } + +BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, + LPCWSTR pwszStoreName, PCERT_PHYSICAL_STORE_INFO pStoreInfo, void *pvReserved) +{ + if (dwFlags & CERT_SYSTEM_STORE_RELOCATE_FLAG) + FIXME("(%p, %08x, %s, %p, %p): stub\n", pvSystemStore, dwFlags, + debugstr_w(pwszStoreName), pStoreInfo, pvReserved); + else + FIXME("(%s, %08x, %s, %p, %p): stub\n", debugstr_w(pvSystemStore), + dwFlags, debugstr_w(pwszStoreName), pStoreInfo, pvReserved); + return FALSE; +} diff --git a/include/wincrypt.h b/include/wincrypt.h index 8834561..7a2e5b3 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3999,6 +3999,9 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum); +BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, + LPCWSTR pwszStoreName, PCERT_PHYSICAL_STORE_INFO pStoreInfo, void *pvReserved); + BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, DWORD dwSaveAs, DWORD dwSaveTo, void* pvSaveToPara, DWORD dwFlags);

1 0

Juan Lang : rsaenh: Be more careful about when to hash HMAC key material.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 9f8d00889f5a03b0a4b7585893a374600212eb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8d00889f5a03b0a4b758589… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Jan 16 12:06:30 2011 -0800 rsaenh: Be more careful about when to hash HMAC key material. --- dlls/rsaenh/rsaenh.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index df83f5a..afd06e1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -139,6 +139,7 @@ typedef struct tagKEYCONTAINER #define RSAENH_HMAC_DEF_IPAD_CHAR 0x36 #define RSAENH_HMAC_DEF_OPAD_CHAR 0x5c #define RSAENH_HMAC_DEF_PAD_LEN 64 +#define RSAENH_HMAC_BLOCK_LEN 64 #define RSAENH_DES_EFFECTIVE_KEYLEN 56 #define RSAENH_DES_STORAGE_KEYLEN 64 #define RSAENH_3DES112_EFFECTIVE_KEYLEN 112 @@ -2956,7 +2957,7 @@ static BOOL import_plaintext_key(HCRYPTPROV hProv, CONST BYTE *pbData, *phKey = new_key(hProv, CALG_HMAC, 0, &pCryptKey); if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; - if (*pKeyLen <= sizeof(pCryptKey->abKeyValue)) + if (*pKeyLen <= RSAENH_MIN(sizeof(pCryptKey->abKeyValue), RSAENH_HMAC_BLOCK_LEN)) { memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); pCryptKey->dwKeyLen = *pKeyLen;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DResourceImpl pointer to device_resource_remove().
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: 2ad540cea5a17abade5935d3bfa1b600d9fa065e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad540cea5a17abade5935d3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 16 23:36:44 2011 +0100 wined3d: Pass an IWineD3DResourceImpl pointer to device_resource_remove(). --- dlls/wined3d/device.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 45b64d7..6920420 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6604,11 +6604,11 @@ void device_resource_add(IWineD3DDeviceImpl *This, IWineD3DResource *resource) list_add_head(&This->resources, &((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); } -static void device_resource_remove(IWineD3DDeviceImpl *This, IWineD3DResource *resource) +static void device_resource_remove(struct IWineD3DDeviceImpl *device, struct IWineD3DResourceImpl *resource) { - TRACE("(%p) : Removing resource %p\n", This, resource); + TRACE("device %p, resource %p.\n", device, resource); - list_remove(&((IWineD3DResourceImpl *) resource)->resource.resource_list_entry); + list_remove(&resource->resource.resource_list_entry); } void device_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *resource) @@ -6705,7 +6705,7 @@ void device_resource_released(IWineD3DDeviceImpl *device, IWineD3DResource *reso } /* Remove the resource from the resourceStore */ - device_resource_remove(device, resource); + device_resource_remove(device, (IWineD3DResourceImpl *)resource); TRACE("Resource released.\n"); }

1 0

Greg Geldorp : user32/tests: Fix DDE test failures on DBCS machines.
by Alexandre Julliard Jan. 17, 2011

Jan. 17, 2011

Module: wine Branch: master Commit: f61c8c68b6e48f3bfef7c1273145024754f682df URL: http://source.winehq.org/git/wine.git/?a=commit;h=f61c8c68b6e48f3bfef7c1273… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Sun Jan 16 15:14:32 2011 +0100 user32/tests: Fix DDE test failures on DBCS machines. --- dlls/user32/tests/dde.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index b382240..ea010e6 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1295,7 +1295,7 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP if (!conv_unicode) ok( !lstrcmpA(cmd, exec_cmdA), "server A got wrong command '%s'\n", cmd ); else /* we get garbage as the A command was mapped W->A */ - ok( cmd[0] == '?', "server A got wrong command '%s'\n", cmd ); + ok( cmd[0] != exec_cmdA[0], "server A got wrong command '%s'\n", cmd ); break; case 2: /* ANSI command in Unicode format */ @@ -1316,7 +1316,7 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP if (!conv_unicode) ok( !lstrcmpA(cmd, exec_cmdWA), "server A got wrong command '%s'\n", cmd ); else /* we get garbage as the A command was mapped W->A */ - ok( cmd[0] == '?', "server A got wrong command '%s'\n", cmd ); + ok( cmd[0] != exec_cmdWA[0], "server A got wrong command '%s'\n", cmd ); break; } GlobalUnlock((HGLOBAL)hi); @@ -1430,7 +1430,7 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP case 1: /* ANSI command */ if (conv_unicode && !client_unicode) /* W->A mapping -> garbage */ - ok( cmd[0] == '?', "server W got wrong command '%s'\n", cmd ); + ok( cmd[0] != exec_cmdA[0], "server W got wrong command '%s'\n", cmd ); else if (!conv_unicode && client_unicode) /* A->W mapping */ ok( !lstrcmpW((LPCWSTR)cmd, exec_cmdAW), "server W got wrong command '%s'\n", cmd ); else @@ -1457,7 +1457,7 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP case 4: /* Unicode command in ANSI format */ if (conv_unicode && !client_unicode) /* W->A mapping -> garbage */ - ok( cmd[0] == '?', "server W got wrong command '%s'\n", cmd ); + ok( cmd[0] != exec_cmdWA[0], "server W got wrong command '%s'\n", cmd ); else if (!conv_unicode && client_unicode) /* A->W mapping */ ok( !lstrcmpW((LPCWSTR)cmd, exec_cmdW), "server W got wrong command '%s'\n", cmd ); else @@ -2487,8 +2487,6 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV else if (unicode_client) { /* ASCII string mapped W->A -> garbage */ - ok(size == size_a / sizeof(WCHAR) || size == size_a / sizeof(WCHAR) + 1, - "Wrong size %d, msg_index=%d\n", size, msg_index); } else { @@ -2530,7 +2528,8 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV DWORD nt_size = MultiByteToWideChar( CP_ACP, 0, (char *)cmd_w, size_w, test_cmd_a_to_w, sizeof(test_cmd_a_to_w)/sizeof(WCHAR) ) * sizeof(WCHAR); DWORD xp_size = MultiByteToWideChar( CP_ACP, 0, (char *)cmd_w, -1, NULL, 0 ) * sizeof(WCHAR); - ok(size == xp_size || broken(size == nt_size), + ok(size == xp_size || broken(size == nt_size) || + broken(str_index == 4 && IsDBCSLeadByte(cmd_w[0])) /* East Asian */, "Wrong size %d/%d, msg_index=%d\n", size, size_a_to_w, msg_index); ok(!lstrcmpW((WCHAR*)buffer, test_cmd_a_to_w), "Expected %s, msg_index=%d\n", wine_dbgstr_w(test_cmd_a_to_w), msg_index);

1 0