April 2011 - Wine-commits - list.winehq.org

André Hentschel : winegcc: Forward -mcpu to winebuild.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: bddc08db752dcc1ec7f6f57efbe53c221f0cc77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddc08db752dcc1ec7f6f57ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 27 19:45:49 2011 +0200 winegcc: Forward -mcpu to winebuild. --- tools/winegcc/winegcc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index f135e71..9e75509 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1391,6 +1391,8 @@ int main(int argc, char **argv) opts.force_pointer_size = 8; raw_linker_arg = 1; } + else if (strncmp("-mcpu=", argv[i], 6) == 0) + strarray_add(opts.winebuild_args, argv[i]); break; case 'n': if (strcmp("-nostdinc", argv[i]) == 0)

1 0

Matteo Bruni : wined3d: Add missing temporary variable declaration to ARB shader backend.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 0210a8384ae2972be2b48b058a8617ca34d47496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0210a8384ae2972be2b48b058… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 22 21:59:31 2011 +0200 wined3d: Add missing temporary variable declaration to ARB shader backend. --- dlls/wined3d/arb_program_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 227f262..2b5b4a0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4140,6 +4140,7 @@ static GLuint shader_arb_generate_vshader(struct wined3d_shader *shader, } shader_addline(buffer, "TEMP TA;\n"); + shader_addline(buffer, "TEMP TB;\n"); /* Base Declarations */ next_local = shader_generate_arb_declarations(shader, reg_maps, buffer,

1 0

Matteo Bruni : wined3d: Remove rcp special handling of 0 from the ARB shader backend.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: db8d681a5b088b3b0dd58c6952086891f6bbb4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8d681a5b088b3b0dd58c695… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 21 18:51:31 2011 +0200 wined3d: Remove rcp special handling of 0 from the ARB shader backend. --- dlls/wined3d/arb_program_shader.c | 21 +-------------------- dlls/wined3d/shader.c | 1 - dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2b5b4a0..7d1a3f7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -340,7 +340,6 @@ static BOOL need_helper_const(const struct arb_vshader_private *shader_data, if (gl_info->quirks & WINED3D_QUIRK_SET_TEXCOORD_W) return TRUE; /* Have to init texcoords. */ if (!use_nv_clip(gl_info)) return TRUE; /* Init the clip texcoord */ if (reg_maps->usesnrm) return TRUE; /* 0.0 */ - if (reg_maps->usesrcp) return TRUE; /* EPS */ return FALSE; } @@ -2424,8 +2423,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) static void shader_hw_rcp(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; - const char *flt_eps = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_EPS); char dst[50]; char src[50]; @@ -2440,23 +2437,7 @@ static void shader_hw_rcp(const struct wined3d_shader_instruction *ins) strcat(src, ".w"); } - /* TODO: If the destination is readable, and not the same as the source, the destination - * can be used instead of TA - */ - if (priv->target_version >= NV2) - { - shader_addline(buffer, "MOVC TA.x, %s;\n", src); - shader_addline(buffer, "MOV TA.x (EQ.x), %s;\n", flt_eps); - shader_addline(buffer, "RCP%s %s, TA.x;\n", shader_arb_get_modifier(ins), dst); - } - else - { - const char *zero = arb_get_helper_value(ins->ctx->reg_maps->shader_version.type, ARB_ZERO); - shader_addline(buffer, "ABS TA.x, %s;\n", src); - shader_addline(buffer, "SGE TA.y, -TA.x, %s;\n", zero); - shader_addline(buffer, "MAD TA.x, TA.y, %s, %s;\n", flt_eps, src); - shader_addline(buffer, "RCP%s %s, TA.x;\n", shader_arb_get_modifier(ins), dst); - } + shader_addline(buffer, "RCP%s %s, %s;\n", shader_arb_get_modifier(ins), dst, src); } static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e2c2dce..464fa9a 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -788,7 +788,6 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else if (ins.handler_idx == WINED3DSIH_MOVA) reg_maps->usesmova = 1; else if (ins.handler_idx == WINED3DSIH_IFC) reg_maps->usesifc = 1; else if (ins.handler_idx == WINED3DSIH_CALL) reg_maps->usescall = 1; - else if (ins.handler_idx == WINED3DSIH_RCP) reg_maps->usesrcp = 1; limit = ins.src_count + (ins.predicate ? 1 : 0); for (i = 0; i < limit; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c4509f0..288c2db 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -559,8 +559,7 @@ struct wined3d_shader_reg_maps WORD usestexldl : 1; WORD usesifc : 1; WORD usescall : 1; - WORD usesrcp : 1; - WORD padding : 3; + WORD padding : 4; /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth;

1 0

Matteo Bruni : wined3d: Split pow instruction handling in the ARB backend.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 9da924039f2905bbc2328b3c3cba0648ddc3416d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da924039f2905bbc2328b3c3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 22 21:59:56 2011 +0200 wined3d: Split pow instruction handling in the ARB backend. --- dlls/wined3d/arb_program_shader.c | 51 ++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7d1a3f7..fd97c96 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2733,51 +2733,62 @@ static DWORD abs_modifier(DWORD mod, BOOL *need_abs) return mod; } -static void shader_hw_log_pow(const struct wined3d_shader_instruction *ins) +static void shader_hw_log(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - char src0[50], src1[50], dst[50]; + char src0[50], dst[50]; struct wined3d_shader_src_param src0_copy = ins->src[0]; BOOL need_abs = FALSE; const char *instr; - BOOL arg2 = FALSE; switch(ins->handler_idx) { case WINED3DSIH_LOG: instr = "LG2"; break; case WINED3DSIH_LOGP: instr = "LOG"; break; - case WINED3DSIH_POW: instr = "POW"; arg2 = TRUE; break; default: ERR("Unexpected instruction %d\n", ins->handler_idx); return; } - /* LOG, LOGP and POW operate on the absolute value of the input */ + /* LOG and LOGP operate on the absolute value of the input */ src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); shader_arb_get_dst_param(ins, &ins->dst[0], dst); shader_arb_get_src_param(ins, &src0_copy, 0, src0); - if(arg2) shader_arb_get_src_param(ins, &ins->src[1], 1, src1); if(need_abs) { shader_addline(buffer, "ABS TA, %s;\n", src0); - if(arg2) - { - shader_addline(buffer, "%s%s %s, TA, %s;\n", instr, shader_arb_get_modifier(ins), dst, src1); - } - else - { - shader_addline(buffer, "%s%s %s, TA;\n", instr, shader_arb_get_modifier(ins), dst); - } + shader_addline(buffer, "%s%s %s, TA;\n", instr, shader_arb_get_modifier(ins), dst); } - else if(arg2) + else + { + shader_addline(buffer, "%s%s %s, %s;\n", instr, shader_arb_get_modifier(ins), dst, src0); + } +} + +static void shader_hw_pow(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + char src0[50], src1[50], dst[50]; + struct wined3d_shader_src_param src0_copy = ins->src[0]; + BOOL need_abs = FALSE; + + /* POW operates on the absolute value of the input */ + src0_copy.modifiers = abs_modifier(src0_copy.modifiers, &need_abs); + + shader_arb_get_dst_param(ins, &ins->dst[0], dst); + shader_arb_get_src_param(ins, &src0_copy, 0, src0); + shader_arb_get_src_param(ins, &ins->src[1], 1, src1); + + if (need_abs) { - shader_addline(buffer, "%s%s %s, %s, %s;\n", instr, shader_arb_get_modifier(ins), dst, src0, src1); + shader_addline(buffer, "ABS TA.x, %s;\n", src0); + shader_addline(buffer, "POW%s %s, TA.x, %s;\n", shader_arb_get_modifier(ins), dst, src1); } else { - shader_addline(buffer, "%s%s %s, %s;\n", instr, shader_arb_get_modifier(ins), dst, src0); + shader_addline(buffer, "POW%s %s, %s, %s;\n", shader_arb_get_modifier(ins), dst, src0, src1); } } @@ -5007,8 +5018,8 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, - /* WINED3DSIH_LOG */ shader_hw_log_pow, - /* WINED3DSIH_LOGP */ shader_hw_log_pow, + /* WINED3DSIH_LOG */ shader_hw_log, + /* WINED3DSIH_LOGP */ shader_hw_log, /* WINED3DSIH_LOOP */ shader_hw_loop, /* WINED3DSIH_LRP */ shader_hw_lrp, /* WINED3DSIH_LT */ NULL, @@ -5027,7 +5038,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ NULL, - /* WINED3DSIH_POW */ shader_hw_log_pow, + /* WINED3DSIH_POW */ shader_hw_pow, /* WINED3DSIH_RCP */ shader_hw_rcp, /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RET */ shader_hw_ret,

1 0

Matteo Bruni : wined3d: Remove an unused field.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: eba8fd0b77e0c2428afe6dd634a5ecbba428f743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eba8fd0b77e0c2428afe6dd63… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 27 22:53:55 2011 +0200 wined3d: Remove an unused field. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 288c2db..e3c025c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -760,7 +760,6 @@ typedef struct { BOOL (*shader_dirtifyable_constants)(void); void (*shader_get_caps)(const struct wined3d_gl_info *gl_info, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup); - void (*shader_add_instruction_modifiers)(const struct wined3d_shader_instruction *ins); } shader_backend_t; extern const shader_backend_t glsl_shader_backend DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : shdocvw: COM cleanup in shlinstobj.c.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 1c8bad803770ff0df36bcae71183fe19a77088f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8bad803770ff0df36bcae71… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 28 00:48:47 2011 +0200 shdocvw: COM cleanup in shlinstobj.c. --- dlls/shdocvw/shlinstobj.c | 66 ++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 28 deletions(-) diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 63bf0e6..921a909 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); -#define ADJUST_THIS(c,m,p) ((c*)(((long)p)-(long)&(((c*)0)->lp##m##Vtbl))) -#define STATIC_CAST(i,p) ((i*)&p->lp##i##Vtbl) #define CHARS_IN_GUID 39 /****************************************************************************** @@ -50,11 +48,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); * Gives access to a registry key's values via the IPropertyBag interface. */ typedef struct _RegistryPropertyBag { - const IPropertyBagVtbl *lpIPropertyBagVtbl; + IPropertyBag IPropertyBag_iface; LONG m_cRef; HKEY m_hInitPropertyBagKey; } RegistryPropertyBag; +static inline RegistryPropertyBag *impl_from_IPropertyBag(IPropertyBag *iface) +{ + return CONTAINING_RECORD(iface, RegistryPropertyBag, IPropertyBag_iface); +} + static void RegistryPropertyBag_Destroy(RegistryPropertyBag *This) { TRACE("This=%p)\n", This); @@ -65,7 +68,7 @@ static void RegistryPropertyBag_Destroy(RegistryPropertyBag *This) { static HRESULT WINAPI RegistryPropertyBag_IPropertyBag_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv) { - RegistryPropertyBag *This = ADJUST_THIS(RegistryPropertyBag, IPropertyBag, iface); + RegistryPropertyBag *This = impl_from_IPropertyBag(iface); TRACE("(iface=%p, riid=%s, ppv=%p)\n", iface, debugstr_guid(riid), ppv); @@ -73,7 +76,7 @@ static HRESULT WINAPI RegistryPropertyBag_IPropertyBag_QueryInterface(IPropertyB return E_INVALIDARG; if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPropertyBag, riid)) { - *ppv = STATIC_CAST(IPropertyBag, This); + *ppv = &This->IPropertyBag_iface; } else { *ppv = NULL; return E_NOINTERFACE; @@ -83,8 +86,9 @@ static HRESULT WINAPI RegistryPropertyBag_IPropertyBag_QueryInterface(IPropertyB return S_OK; } -static ULONG WINAPI RegistryPropertyBag_IPropertyBag_AddRef(IPropertyBag *iface) { - RegistryPropertyBag *This = ADJUST_THIS(RegistryPropertyBag, IPropertyBag, iface); +static ULONG WINAPI RegistryPropertyBag_IPropertyBag_AddRef(IPropertyBag *iface) +{ + RegistryPropertyBag *This = impl_from_IPropertyBag(iface); ULONG cRef; TRACE("(iface=%p)\n", iface); @@ -97,8 +101,9 @@ static ULONG WINAPI RegistryPropertyBag_IPropertyBag_AddRef(IPropertyBag *iface) return cRef; } -static ULONG WINAPI RegistryPropertyBag_IPropertyBag_Release(IPropertyBag *iface) { - RegistryPropertyBag *This = ADJUST_THIS(RegistryPropertyBag, IPropertyBag, iface); +static ULONG WINAPI RegistryPropertyBag_IPropertyBag_Release(IPropertyBag *iface) +{ + RegistryPropertyBag *This = impl_from_IPropertyBag(iface); ULONG cRef; TRACE("(iface=%p)\n", iface); @@ -116,7 +121,7 @@ static ULONG WINAPI RegistryPropertyBag_IPropertyBag_Release(IPropertyBag *iface static HRESULT WINAPI RegistryPropertyBag_IPropertyBag_Read(IPropertyBag *iface, LPCOLESTR pwszPropName, VARIANT *pVar, IErrorLog *pErrorLog) { - RegistryPropertyBag *This = ADJUST_THIS(RegistryPropertyBag, IPropertyBag, iface); + RegistryPropertyBag *This = impl_from_IPropertyBag(iface); WCHAR *pwszValue; DWORD dwType, cbData; LONG res; @@ -178,15 +183,15 @@ static HRESULT RegistryPropertyBag_Constructor(HKEY hInitPropertyBagKey, REFIID pRegistryPropertyBag = heap_alloc(sizeof(RegistryPropertyBag)); if (pRegistryPropertyBag) { - pRegistryPropertyBag->lpIPropertyBagVtbl = &RegistryPropertyBag_IPropertyBagVtbl; + pRegistryPropertyBag->IPropertyBag_iface.lpVtbl = &RegistryPropertyBag_IPropertyBagVtbl; pRegistryPropertyBag->m_cRef = 0; pRegistryPropertyBag->m_hInitPropertyBagKey = hInitPropertyBagKey; /* The clasping AddRef/Release is for the case that QueryInterface fails, which will result * in a reference count of 0 in the Release call, which will result in object destruction.*/ - IPropertyBag_AddRef(STATIC_CAST(IPropertyBag, pRegistryPropertyBag)); - hr = IPropertyBag_QueryInterface(STATIC_CAST(IPropertyBag, pRegistryPropertyBag), riid, ppvObject); - IPropertyBag_Release(STATIC_CAST(IPropertyBag, pRegistryPropertyBag)); + IPropertyBag_AddRef(&pRegistryPropertyBag->IPropertyBag_iface); + hr = IPropertyBag_QueryInterface(&pRegistryPropertyBag->IPropertyBag_iface, riid, ppvObject); + IPropertyBag_Release(&pRegistryPropertyBag->IPropertyBag_iface); } return hr; @@ -198,21 +203,26 @@ static HRESULT RegistryPropertyBag_Constructor(HKEY hInitPropertyBagKey, REFIID * values of a PropertyBag. */ typedef struct _InstanceObjectFactory { - const IClassFactoryVtbl *lpIClassFactoryVtbl; + IClassFactory IClassFactory_iface; LONG m_cRef; CLSID m_clsidInstance; /* CLSID of the objects to create. */ IPropertyBag *m_pPropertyBag; /* PropertyBag to initialize those objects. */ } InstanceObjectFactory; +static inline InstanceObjectFactory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, InstanceObjectFactory, IClassFactory_iface); +} + static void InstanceObjectFactory_Destroy(InstanceObjectFactory *This) { IPropertyBag_Release(This->m_pPropertyBag); heap_free(This); } -static HRESULT WINAPI InstanceObjectFactory_IClassFactory_QueryInterface(IClassFactory *iface, - REFIID riid, LPVOID* ppv) +static HRESULT WINAPI InstanceObjectFactory_IClassFactory_QueryInterface(IClassFactory *iface, + REFIID riid, void **ppv) { - InstanceObjectFactory *This = ADJUST_THIS(InstanceObjectFactory, IClassFactory, iface); + InstanceObjectFactory *This = impl_from_IClassFactory(iface); TRACE("iface=%p, riid=%s, ppv=%p)\n", iface, debugstr_guid(riid), ppv); @@ -220,7 +230,7 @@ static HRESULT WINAPI InstanceObjectFactory_IClassFactory_QueryInterface(IClassF return E_INVALIDARG; if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IClassFactory, riid)) { - *ppv = STATIC_CAST(IClassFactory, This); + *ppv = &This->IClassFactory_iface; } else { *ppv = NULL; return E_NOINTERFACE; @@ -232,7 +242,7 @@ static HRESULT WINAPI InstanceObjectFactory_IClassFactory_QueryInterface(IClassF static ULONG WINAPI InstanceObjectFactory_IClassFactory_AddRef(IClassFactory *iface) { - InstanceObjectFactory *This = ADJUST_THIS(InstanceObjectFactory, IClassFactory, iface); + InstanceObjectFactory *This = impl_from_IClassFactory(iface); ULONG cRef; TRACE("(iface=%p)\n", iface); @@ -247,7 +257,7 @@ static ULONG WINAPI InstanceObjectFactory_IClassFactory_AddRef(IClassFactory *if static ULONG WINAPI InstanceObjectFactory_IClassFactory_Release(IClassFactory *iface) { - InstanceObjectFactory *This = ADJUST_THIS(InstanceObjectFactory, IClassFactory, iface); + InstanceObjectFactory *This = impl_from_IClassFactory(iface); ULONG cRef; TRACE("(iface=%p)\n", iface); @@ -265,12 +275,12 @@ static ULONG WINAPI InstanceObjectFactory_IClassFactory_Release(IClassFactory *i static HRESULT WINAPI InstanceObjectFactory_IClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, LPVOID *ppvObj) { - InstanceObjectFactory *This = ADJUST_THIS(InstanceObjectFactory, IClassFactory, iface); + InstanceObjectFactory *This = impl_from_IClassFactory(iface); IPersistPropertyBag *pPersistPropertyBag; HRESULT hr; - + TRACE("(pUnkOuter=%p, riid=%s, ppvObj=%p)\n", pUnkOuter, debugstr_guid(riid), ppvObj); - + hr = CoCreateInstance(&This->m_clsidInstance, NULL, CLSCTX_INPROC_SERVER, &IID_IPersistPropertyBag, (LPVOID*)&pPersistPropertyBag); if (FAILED(hr)) { @@ -324,16 +334,16 @@ static HRESULT InstanceObjectFactory_Constructor(REFCLSID rclsid, IPropertyBag * pInstanceObjectFactory = heap_alloc(sizeof(InstanceObjectFactory)); if (pInstanceObjectFactory) { - pInstanceObjectFactory->lpIClassFactoryVtbl = &InstanceObjectFactory_IClassFactoryVtbl; + pInstanceObjectFactory->IClassFactory_iface.lpVtbl = &InstanceObjectFactory_IClassFactoryVtbl; pInstanceObjectFactory->m_cRef = 0; pInstanceObjectFactory->m_clsidInstance = *rclsid; pInstanceObjectFactory->m_pPropertyBag = pPropertyBag; IPropertyBag_AddRef(pPropertyBag); - IClassFactory_AddRef(STATIC_CAST(IClassFactory, pInstanceObjectFactory)); - hr = IClassFactory_QueryInterface(STATIC_CAST(IClassFactory, pInstanceObjectFactory), + IClassFactory_AddRef(&pInstanceObjectFactory->IClassFactory_iface); + hr = IClassFactory_QueryInterface(&pInstanceObjectFactory->IClassFactory_iface, riid, ppvObject); - IClassFactory_Release(STATIC_CAST(IClassFactory, pInstanceObjectFactory)); + IClassFactory_Release(&pInstanceObjectFactory->IClassFactory_iface); } return hr;

1 0

Michael Stefaniuc : shdocvw: Merge the Destroy functions into the coresponding Release functions.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: e58b0dd079bdfd3106e955a118a6f3290aabc6e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58b0dd079bdfd3106e955a11… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 28 00:51:19 2011 +0200 shdocvw: Merge the Destroy functions into the coresponding Release functions. --- dlls/shdocvw/shlinstobj.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 921a909..9a5bee8 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -58,13 +58,6 @@ static inline RegistryPropertyBag *impl_from_IPropertyBag(IPropertyBag *iface) return CONTAINING_RECORD(iface, RegistryPropertyBag, IPropertyBag_iface); } -static void RegistryPropertyBag_Destroy(RegistryPropertyBag *This) { - TRACE("This=%p)\n", This); - - RegCloseKey(This->m_hInitPropertyBagKey); - heap_free(This); -} - static HRESULT WINAPI RegistryPropertyBag_IPropertyBag_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv) { @@ -110,8 +103,10 @@ static ULONG WINAPI RegistryPropertyBag_IPropertyBag_Release(IPropertyBag *iface cRef = InterlockedDecrement(&This->m_cRef); - if (cRef == 0) { - RegistryPropertyBag_Destroy(This); + if (cRef == 0) { + TRACE("Destroying This=%p)\n", This); + RegCloseKey(This->m_hInitPropertyBagKey); + heap_free(This); SHDOCVW_UnlockModule(); } @@ -214,11 +209,6 @@ static inline InstanceObjectFactory *impl_from_IClassFactory(IClassFactory *ifac return CONTAINING_RECORD(iface, InstanceObjectFactory, IClassFactory_iface); } -static void InstanceObjectFactory_Destroy(InstanceObjectFactory *This) { - IPropertyBag_Release(This->m_pPropertyBag); - heap_free(This); -} - static HRESULT WINAPI InstanceObjectFactory_IClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { @@ -264,9 +254,10 @@ static ULONG WINAPI InstanceObjectFactory_IClassFactory_Release(IClassFactory *i cRef = InterlockedDecrement(&This->m_cRef); - if (cRef == 0) { + if (cRef == 0) { IClassFactory_LockServer(iface, FALSE); - InstanceObjectFactory_Destroy(This); + IPropertyBag_Release(This->m_pPropertyBag); + heap_free(This); } return cRef;

1 0

Ken Thomases : winecoreaudio.drv: Link against ole32 for CoTaskMemAlloc/ Free.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 518675fbb55d4ba7b813d8b045d9e7a62593ce63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518675fbb55d4ba7b813d8b04… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 27 18:02:47 2011 -0500 winecoreaudio.drv: Link against ole32 for CoTaskMemAlloc/Free. --- dlls/winecoreaudio.drv/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index 1db95ab..544e109 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winecoreaudio.drv -IMPORTS = uuid winmm user32 +IMPORTS = uuid winmm ole32 user32 EXTRALIBS = @COREAUDIO@ C_SRCS = \

1 0

André Hentschel : dbghelp: Implement rudimentary stack walk for ARM.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 7af9179eb92e17d67ca5634b45d0144d67b7593b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af9179eb92e17d67ca5634b4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 27 21:08:49 2011 +0200 dbghelp: Implement rudimentary stack walk for ARM. --- dlls/dbghelp/cpu_arm.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 108 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/cpu_arm.c b/dlls/dbghelp/cpu_arm.c index 4f54ef4..5bec525 100644 --- a/dlls/dbghelp/cpu_arm.c +++ b/dlls/dbghelp/cpu_arm.c @@ -1,8 +1,8 @@ /* * File cpu_arm.c * - * Copyright (C) 2009-2009, Eric Pouech - * Copyright (C) 2010, André Hentschel + * Copyright (C) 2009 Eric Pouech + * Copyright (C) 2010, 2011 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,11 +46,116 @@ static unsigned arm_get_addr(HANDLE hThread, const CONTEXT* ctx, } } +#ifdef __arm__ +enum st_mode {stm_start, stm_arm, stm_done}; + +/* indexes in Reserved array */ +#define __CurrentModeCount 0 + +#define curr_mode (frame->Reserved[__CurrentModeCount] & 0x0F) +#define curr_count (frame->Reserved[__CurrentModeCount] >> 4) + +#define set_curr_mode(m) {frame->Reserved[__CurrentModeCount] &= ~0x0F; frame->Reserved[__CurrentModeCount] |= (m & 0x0F);} +#define inc_curr_count() (frame->Reserved[__CurrentModeCount] += 0x10) + +/* fetch_next_frame() + * + * modify (at least) context.Pc using unwind information + * either out of debug info (dwarf), or simple Lr trace + */ +static BOOL fetch_next_frame(struct cpu_stack_walk* csw, + CONTEXT* context, DWORD_PTR curr_pc) +{ + DWORD_PTR xframe; + DWORD oldReturn = context->Lr; + + if (dwarf2_virtual_unwind(csw, curr_pc, context, &xframe)) + { + context->Sp = xframe; + context->Pc = oldReturn; + return TRUE; + } + + if (context->Pc == context->Lr) return FALSE; + context->Pc = oldReturn; + + return TRUE; +} + +static BOOL arm_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) +{ + unsigned deltapc = curr_count <= 1 ? 0 : 4; + + /* sanity check */ + if (curr_mode >= stm_done) return FALSE; + + TRACE("Enter: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s\n", + wine_dbgstr_addr(&frame->AddrPC), + wine_dbgstr_addr(&frame->AddrFrame), + wine_dbgstr_addr(&frame->AddrReturn), + wine_dbgstr_addr(&frame->AddrStack), + curr_mode == stm_start ? "start" : "ARM", + wine_dbgstr_longlong(curr_count)); + + if (curr_mode == stm_start) + { + if ((frame->AddrPC.Mode == AddrModeFlat) && + (frame->AddrFrame.Mode != AddrModeFlat)) + { + WARN("Bad AddrPC.Mode / AddrFrame.Mode combination\n"); + goto done_err; + } + + /* Init done */ + set_curr_mode(stm_arm); + frame->AddrReturn.Mode = frame->AddrStack.Mode = AddrModeFlat; + /* don't set up AddrStack on first call. Either the caller has set it up, or + * we will get it in the next frame + */ + memset(&frame->AddrBStore, 0, sizeof(frame->AddrBStore)); + } + else + { + if (context->Sp != frame->AddrStack.Offset) FIXME("inconsistent Stack Pointer\n"); + if (context->Pc != frame->AddrPC.Offset) FIXME("inconsistent Program Counter\n"); + + if (frame->AddrReturn.Offset == 0) goto done_err; + if (!fetch_next_frame(csw, context, frame->AddrPC.Offset - deltapc)) + goto done_err; + } + + memset(&frame->Params, 0, sizeof(frame->Params)); + + /* set frame information */ + frame->AddrStack.Offset = context->Sp; + frame->AddrReturn.Offset = context->Lr; + frame->AddrFrame.Offset = context->Fp; + frame->AddrPC.Offset = context->Pc; + + frame->Far = TRUE; + frame->Virtual = TRUE; + inc_curr_count(); + + TRACE("Leave: PC=%s Frame=%s Return=%s Stack=%s Mode=%s Count=%s FuncTable=%p\n", + wine_dbgstr_addr(&frame->AddrPC), + wine_dbgstr_addr(&frame->AddrFrame), + wine_dbgstr_addr(&frame->AddrReturn), + wine_dbgstr_addr(&frame->AddrStack), + curr_mode == stm_start ? "start" : "ARM", + wine_dbgstr_longlong(curr_count), + frame->FuncTableEntry); + + return TRUE; +done_err: + set_curr_mode(stm_done); + return FALSE; +} +#else static BOOL arm_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) { - FIXME("not done for ARM\n"); return FALSE; } +#endif static unsigned arm_map_dwarf_register(unsigned regno) {

1 0

Dylan Smith : d3dx9: Implement GetNumBytesPerVertex using the vertex declaration.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: b2dac1df27a773ab4d63f92aa3248b97e1e56076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2dac1df27a773ab4d63f92aa… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Apr 27 18:11:58 2011 -0400 d3dx9: Implement GetNumBytesPerVertex using the vertex declaration. If a declaration without a corresponding FVF is used to create the mesh, then its declaration must be used to get the vertex size. --- dlls/d3dx9_36/mesh.c | 7 ++++++- dlls/d3dx9_36/tests/mesh.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 432db1d..404f447 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -157,10 +157,15 @@ static HRESULT WINAPI ID3DXMeshImpl_GetDeclaration(ID3DXMesh *iface, D3DVERTEXEL static DWORD WINAPI ID3DXMeshImpl_GetNumBytesPerVertex(ID3DXMesh *iface) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); + UINT numelements; + D3DVERTEXELEMENT9 declaration[MAX_FVF_DECL_SIZE] = { D3DDECL_END() }; TRACE("iface (%p)\n", This); - return D3DXGetFVFVertexSize(This->fvf); + IDirect3DVertexDeclaration9_GetDeclaration(This->vertex_declaration, + declaration, + &numelements); + return D3DXGetDeclVertexSize(declaration, 0); } static DWORD WINAPI ID3DXMeshImpl_GetOptions(ID3DXMesh *iface) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 88ac59c..bde8595 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1216,6 +1216,9 @@ static void D3DXCreateMeshTest(void) free_mesh(&mesh); } + mesh.vertex_size = d3dxmesh->lpVtbl->GetNumBytesPerVertex(d3dxmesh); + ok(mesh.vertex_size == 60, "Got vertex size %u, expected %u\n", mesh.vertex_size, 60); + d3dxmesh->lpVtbl->Release(d3dxmesh); }

1 0