January 2014 - Wine-commits

Alexandre Julliard : makedep: Expand tool names into the generated rules.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 7d1d9b40f105a4eb26421a254f19302484d7d37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1d9b40f105a4eb26421a254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 15:04:30 2014 +0100 makedep: Expand tool names into the generated rules. --- Make.vars.in | 5 ---- tools/makedep.c | 77 +++++++++++++++++++++++++++++++++---------------------- 2 files changed, 47 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d1d9b40f105a4eb26421…

1 0

Akihiro Sagawa : gdi32: Use the vertAdvance value for cellIncX if vertical metrics are available.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: d33602564b36fda5302a2d9bb57889aeacb78258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33602564b36fda5302a2d9bb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:51 2014 +0900 gdi32: Use the vertAdvance value for cellIncX if vertical metrics are available. --- dlls/gdi32/freetype.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4be2978..1c3e6fc 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6504,7 +6504,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); - vec.x = metrics.horiAdvance; + if (vertical_metrics) + vec.x = metrics.vertAdvance; + else + vec.x = metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); gm.gmCellIncY = -((vec.y+63) >> 6);

1 0

Akihiro Sagawa : gdi32: Fix sub-pixel shift calculations for vertical writing.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: e9188970a78336358c7f160d78c5705ab230c974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9188970a78336358c7f160d7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 10 20:29:54 2014 +0900 gdi32: Fix sub-pixel shift calculations for vertical writing. --- dlls/gdi32/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1c3e6fc..f8b365b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6790,7 +6790,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vmul = 3; } - x_shift = ft_face->glyph->bitmap_left - gm.gmptGlyphOrigin.x; + x_shift = ft_face->glyph->bitmap_left - (left >> 6); if ( x_shift < 0 ) { src += hmul * -x_shift; @@ -6802,7 +6802,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, width -= x_shift; } - y_shift = gm.gmptGlyphOrigin.y - ft_face->glyph->bitmap_top; + y_shift = (top >> 6) - ft_face->glyph->bitmap_top; if ( y_shift < 0 ) { src += src_pitch * vmul * -y_shift;

1 0

Michael Stefaniuc : dmscript: Don' t use the method implementations directly.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: f7dc10d2ce36ad84d8ce7f0fc3bb9d77d7d88a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7dc10d2ce36ad84d8ce7f0fc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 21:59:30 2014 +0100 dmscript: Don't use the method implementations directly. --- dlls/dmscript/script.c | 13 ++++--------- dlls/dmscript/scripttrack.c | 9 +++------ 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 090e0ce..80959cf 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -31,11 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); WINE_DECLARE_DEBUG_CHANNEL(dmfile); -static ULONG WINAPI IDirectMusicScriptImpl_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicScript_AddRef (LPDIRECTMUSICSCRIPT iface); -static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface); -static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicScriptImpl implementation */ @@ -46,19 +41,19 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN if (IsEqualIID (riid, &IID_IUnknown)) { *ppobj = &This->UnknownVtbl; - IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicScript)) { *ppobj = &This->ScriptVtbl; - IDirectMusicScriptImpl_IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl); + IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; - IDirectMusicScriptImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); + IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { *ppobj = &This->PersistStreamVtbl; - IDirectMusicScriptImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); + IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; } diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 7ff8ef8..d17b7e1 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -24,9 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); /***************************************************************************** * IDirectMusicScriptTrack implementation */ -static ULONG WINAPI IDirectMusicScriptTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface); -static ULONG WINAPI IDirectMusicScriptTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); /* IDirectMusicScriptTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { @@ -35,16 +32,16 @@ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { *ppobj = &This->UnknownVtbl; - IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { *ppobj = (LPDIRECTMUSICTRACK8)&This->TrackVtbl; - IDirectMusicScriptTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); + IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { *ppobj = &This->PersistStreamVtbl; - IDirectMusicScriptTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); + IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; }

1 0

Michael Stefaniuc : dmscript: Remove duplicate "IDirectMusicScript" from method names.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 75b2ce7716a81181040a3066c1e9331602276e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75b2ce7716a81181040a3066c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:01:03 2014 +0100 dmscript: Remove duplicate "IDirectMusicScript" from method names. --- dlls/dmscript/script.c | 76 +++++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 80959cf..149b7b7 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -98,29 +98,37 @@ static const IUnknownVtbl DirectMusicScript_Unknown_Vtbl = { }; /* IDirectMusicScriptImpl IDirectMusicScript part: */ -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_QueryInterface (LPDIRECTMUSICSCRIPT iface, REFIID riid, LPVOID *ppobj) { +static HRESULT WINAPI IDirectMusicScriptImpl_QueryInterface(IDirectMusicScript *iface, REFIID riid, + void **ppobj) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } -static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicScript_AddRef (LPDIRECTMUSICSCRIPT iface) { +static ULONG WINAPI IDirectMusicScriptImpl_AddRef(IDirectMusicScript *iface) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } -static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicScript_Release (LPDIRECTMUSICSCRIPT iface) { +static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_Init (LPDIRECTMUSICSCRIPT iface, IDirectMusicPerformance* pPerformance, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_Init(IDirectMusicScript *iface, + IDirectMusicPerformance *pPerformance, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %p, %p): stub\n", This, pPerformance, pErrorInfo); This->pPerformance = pPerformance; return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_CallRoutine (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszRoutineName, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_CallRoutine(IDirectMusicScript *iface, + WCHAR *pwszRoutineName, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszRoutineName), pErrorInfo); /*return E_NOTIMPL;*/ @@ -128,68 +136,84 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_CallRoutine (LPD /*return E_FAIL;*/ } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_SetVariableVariant (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, VARIANT varValue, BOOL fSetRef, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableVariant(IDirectMusicScript *iface, + WCHAR *pwszVariableName, VARIANT varValue, BOOL fSetRef, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, FIXME, %d, %p): stub\n", This, debugstr_w(pwszVariableName),/* varValue,*/ fSetRef, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_GetVariableVariant (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, VARIANT* pvarValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableVariant(IDirectMusicScript *iface, + WCHAR *pwszVariableName, VARIANT *pvarValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), pvarValue, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_SetVariableNumber (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, LONG lValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableNumber(IDirectMusicScript *iface, + WCHAR *pwszVariableName, LONG lValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %i, %p): stub\n", This, debugstr_w(pwszVariableName), lValue, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_GetVariableNumber (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, LONG* plValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableNumber(IDirectMusicScript *iface, + WCHAR *pwszVariableName, LONG *plValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), plValue, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_SetVariableObject (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, IUnknown* punkValue, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableObject(IDirectMusicScript *iface, + WCHAR *pwszVariableName, IUnknown *punkValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), punkValue, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_GetVariableObject (LPDIRECTMUSICSCRIPT iface, WCHAR* pwszVariableName, REFIID riid, LPVOID* ppv, DMUS_SCRIPT_ERRORINFO* pErrorInfo) { +static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableObject(IDirectMusicScript *iface, + WCHAR *pwszVariableName, REFIID riid, void **ppv, DMUS_SCRIPT_ERRORINFO *pErrorInfo) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %s, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), debugstr_dmguid(riid), ppv, pErrorInfo); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_EnumRoutine (LPDIRECTMUSICSCRIPT iface, DWORD dwIndex, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicScriptImpl_EnumRoutine(IDirectMusicScript *iface, DWORD dwIndex, + WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } -static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_EnumVariable (LPDIRECTMUSICSCRIPT iface, DWORD dwIndex, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicScriptImpl_EnumVariable(IDirectMusicScript *iface, DWORD dwIndex, + WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } static const IDirectMusicScriptVtbl DirectMusicScript_Script_Vtbl = { - IDirectMusicScriptImpl_IDirectMusicScript_QueryInterface, - IDirectMusicScriptImpl_IDirectMusicScript_AddRef, - IDirectMusicScriptImpl_IDirectMusicScript_Release, - IDirectMusicScriptImpl_IDirectMusicScript_Init, - IDirectMusicScriptImpl_IDirectMusicScript_CallRoutine, - IDirectMusicScriptImpl_IDirectMusicScript_SetVariableVariant, - IDirectMusicScriptImpl_IDirectMusicScript_GetVariableVariant, - IDirectMusicScriptImpl_IDirectMusicScript_SetVariableNumber, - IDirectMusicScriptImpl_IDirectMusicScript_GetVariableNumber, - IDirectMusicScriptImpl_IDirectMusicScript_SetVariableObject, - IDirectMusicScriptImpl_IDirectMusicScript_GetVariableObject, - IDirectMusicScriptImpl_IDirectMusicScript_EnumRoutine, - IDirectMusicScriptImpl_IDirectMusicScript_EnumVariable + IDirectMusicScriptImpl_QueryInterface, + IDirectMusicScriptImpl_AddRef, + IDirectMusicScriptImpl_Release, + IDirectMusicScriptImpl_Init, + IDirectMusicScriptImpl_CallRoutine, + IDirectMusicScriptImpl_SetVariableVariant, + IDirectMusicScriptImpl_GetVariableVariant, + IDirectMusicScriptImpl_SetVariableNumber, + IDirectMusicScriptImpl_GetVariableNumber, + IDirectMusicScriptImpl_SetVariableObject, + IDirectMusicScriptImpl_GetVariableObject, + IDirectMusicScriptImpl_EnumRoutine, + IDirectMusicScriptImpl_EnumVariable }; /* IDirectMusicScriptImpl IDirectMusicObject part: */

1 0

Michael Stefaniuc : dmscript: COM cleanup for IDirectMusicScript.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: aaecaf517427191977c0a37c057596c6a9bdfc85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaecaf517427191977c0a37c0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:03:06 2014 +0100 dmscript: COM cleanup for IDirectMusicScript. --- dlls/dmscript/dmscript_private.h | 2 +- dlls/dmscript/script.c | 57 ++++++++++++++++++++++---------------- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index c31164f..a7f2ba9 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -62,7 +62,7 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVO struct IDirectMusicScriptImpl { /* IUnknown fields */ const IUnknownVtbl *UnknownVtbl; - const IDirectMusicScriptVtbl *ScriptVtbl; + IDirectMusicScript IDirectMusicScript_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 149b7b7..3f25638 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -44,8 +44,8 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicScript)) { - *ppobj = &This->ScriptVtbl; - IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl); + *ppobj = &This->IDirectMusicScript_iface; + IDirectMusicScript_AddRef(&This->IDirectMusicScript_iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; @@ -97,30 +97,34 @@ static const IUnknownVtbl DirectMusicScript_Unknown_Vtbl = { IDirectMusicScriptImpl_IUnknown_Release }; -/* IDirectMusicScriptImpl IDirectMusicScript part: */ +static inline IDirectMusicScriptImpl *impl_from_IDirectMusicScript(IDirectMusicScript *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, IDirectMusicScript_iface); +} + static HRESULT WINAPI IDirectMusicScriptImpl_QueryInterface(IDirectMusicScript *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicScriptImpl_AddRef(IDirectMusicScript *iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } static HRESULT WINAPI IDirectMusicScriptImpl_Init(IDirectMusicScript *iface, IDirectMusicPerformance *pPerformance, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %p, %p): stub\n", This, pPerformance, pErrorInfo); This->pPerformance = pPerformance; return S_OK; @@ -129,7 +133,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_Init(IDirectMusicScript *iface, static HRESULT WINAPI IDirectMusicScriptImpl_CallRoutine(IDirectMusicScript *iface, WCHAR *pwszRoutineName, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszRoutineName), pErrorInfo); /*return E_NOTIMPL;*/ return S_OK; @@ -139,7 +143,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_CallRoutine(IDirectMusicScript *ifa static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableVariant(IDirectMusicScript *iface, WCHAR *pwszVariableName, VARIANT varValue, BOOL fSetRef, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, FIXME, %d, %p): stub\n", This, debugstr_w(pwszVariableName),/* varValue,*/ fSetRef, pErrorInfo); return S_OK; } @@ -147,7 +151,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableVariant(IDirectMusicScri static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableVariant(IDirectMusicScript *iface, WCHAR *pwszVariableName, VARIANT *pvarValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), pvarValue, pErrorInfo); return S_OK; } @@ -155,7 +159,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableVariant(IDirectMusicScri static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableNumber(IDirectMusicScript *iface, WCHAR *pwszVariableName, LONG lValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %i, %p): stub\n", This, debugstr_w(pwszVariableName), lValue, pErrorInfo); return S_OK; } @@ -163,7 +167,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableNumber(IDirectMusicScrip static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableNumber(IDirectMusicScript *iface, WCHAR *pwszVariableName, LONG *plValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), plValue, pErrorInfo); return S_OK; } @@ -171,7 +175,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableNumber(IDirectMusicScrip static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableObject(IDirectMusicScript *iface, WCHAR *pwszVariableName, IUnknown *punkValue, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), punkValue, pErrorInfo); return S_OK; } @@ -179,7 +183,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_SetVariableObject(IDirectMusicScrip static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableObject(IDirectMusicScript *iface, WCHAR *pwszVariableName, REFIID riid, void **ppv, DMUS_SCRIPT_ERRORINFO *pErrorInfo) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %s, %s, %p, %p): stub\n", This, debugstr_w(pwszVariableName), debugstr_dmguid(riid), ppv, pErrorInfo); return S_OK; } @@ -187,7 +191,7 @@ static HRESULT WINAPI IDirectMusicScriptImpl_GetVariableObject(IDirectMusicScrip static HRESULT WINAPI IDirectMusicScriptImpl_EnumRoutine(IDirectMusicScript *iface, DWORD dwIndex, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } @@ -195,12 +199,12 @@ static HRESULT WINAPI IDirectMusicScriptImpl_EnumRoutine(IDirectMusicScript *ifa static HRESULT WINAPI IDirectMusicScriptImpl_EnumVariable(IDirectMusicScript *iface, DWORD dwIndex, WCHAR *pwszName) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, ScriptVtbl, iface); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } -static const IDirectMusicScriptVtbl DirectMusicScript_Script_Vtbl = { +static const IDirectMusicScriptVtbl dmscript_vtbl = { IDirectMusicScriptImpl_QueryInterface, IDirectMusicScriptImpl_AddRef, IDirectMusicScriptImpl_Release, @@ -708,16 +712,21 @@ static const IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { - IDirectMusicScriptImpl* obj; - +HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) +{ + IDirectMusicScriptImpl *obj; + + *ppobj = NULL; + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicScriptImpl)); - if (NULL == obj) { - *ppobj = NULL; + if (!obj) return E_OUTOFMEMORY; - } + obj->UnknownVtbl = &DirectMusicScript_Unknown_Vtbl; - obj->ScriptVtbl = &DirectMusicScript_Script_Vtbl; + obj->IDirectMusicScript_iface.lpVtbl = &dmscript_vtbl; obj->ObjectVtbl = &DirectMusicScript_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicScript_PersistStream_Vtbl; obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));

1 0

Michael Stefaniuc : dmscript: Remove the extraneous IUnknown from DirectMusicScript.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: d3ba2a9fe31ac7e19fb80c703626ee32acd32dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3ba2a9fe31ac7e19fb80c703… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:04:51 2014 +0100 dmscript: Remove the extraneous IUnknown from DirectMusicScript. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmscript/dmscript_private.h | 2 - dlls/dmscript/script.c | 134 ++++++++++++++++---------------------- 2 files changed, 55 insertions(+), 81 deletions(-) diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index a7f2ba9..97557bc 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -60,8 +60,6 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVO * IDirectMusicScriptImpl implementation structure */ struct IDirectMusicScriptImpl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; IDirectMusicScript IDirectMusicScript_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 3f25638..a7f26a6 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -34,91 +34,63 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicScriptImpl implementation */ -/* IDirectMusicScriptImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicScript)) { - *ppobj = &This->IDirectMusicScript_iface; - IDirectMusicScript_AddRef(&This->IDirectMusicScript_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicScriptImpl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMSCRIPT_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicScriptImpl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicScriptImpl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This->pHeader); - HeapFree(GetProcessHeap(), 0, This->pVersion); - HeapFree(GetProcessHeap(), 0, This->pwzLanguage); - HeapFree(GetProcessHeap(), 0, This->pwzSource); - HeapFree(GetProcessHeap(), 0, This); - } - - DMSCRIPT_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicScript_Unknown_Vtbl = { - IDirectMusicScriptImpl_IUnknown_QueryInterface, - IDirectMusicScriptImpl_IUnknown_AddRef, - IDirectMusicScriptImpl_IUnknown_Release -}; - static inline IDirectMusicScriptImpl *impl_from_IDirectMusicScript(IDirectMusicScript *iface) { return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, IDirectMusicScript_iface); } static HRESULT WINAPI IDirectMusicScriptImpl_QueryInterface(IDirectMusicScript *iface, REFIID riid, - void **ppobj) + void **ret_iface) { - IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); - return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicScript)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicScriptImpl_AddRef(IDirectMusicScript *iface) { - IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); - return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicScriptImpl_Release(IDirectMusicScript *iface) { - IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); - return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + IDirectMusicScriptImpl *This = impl_from_IDirectMusicScript(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This->pHeader); + HeapFree(GetProcessHeap(), 0, This->pVersion); + HeapFree(GetProcessHeap(), 0, This->pwzLanguage); + HeapFree(GetProcessHeap(), 0, This->pwzSource); + HeapFree(GetProcessHeap(), 0, This->pDesc); + HeapFree(GetProcessHeap(), 0, This); + DMSCRIPT_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicScriptImpl_Init(IDirectMusicScript *iface, @@ -223,17 +195,17 @@ static const IDirectMusicScriptVtbl dmscript_vtbl = { /* IDirectMusicScriptImpl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicScript_QueryInterface(&This->IDirectMusicScript_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicScript_AddRef (&This->IDirectMusicScript_iface); } static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicScript_Release (&This->IDirectMusicScript_iface); } static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -438,17 +410,17 @@ static const IDirectMusicObjectVtbl DirectMusicScript_Object_Vtbl = { /* IDirectMusicScriptImpl IPersistStream part: */ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicScript_QueryInterface(&This->IDirectMusicScript_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicScript_AddRef(&This->IDirectMusicScript_iface); } static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); - return IDirectMusicScriptImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicScript_Release(&This->IDirectMusicScript_iface); } static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -715,6 +687,7 @@ static const IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl = { HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, IUnknown *pUnkOuter) { IDirectMusicScriptImpl *obj; + HRESULT hr; *ppobj = NULL; @@ -725,7 +698,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, if (!obj) return E_OUTOFMEMORY; - obj->UnknownVtbl = &DirectMusicScript_Unknown_Vtbl; obj->IDirectMusicScript_iface.lpVtbl = &dmscript_vtbl; obj->ObjectVtbl = &DirectMusicScript_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicScript_PersistStream_Vtbl; @@ -733,7 +705,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj, DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicScript; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; + + DMSCRIPT_LockModule(); + hr = IDirectMusicScript_QueryInterface(&obj->IDirectMusicScript_iface, lpcGUID, ppobj); + IDirectMusicScript_Release(&obj->IDirectMusicScript_iface); - return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Dmitry Timoshkov : wuapi: Fix object constructors to match the changed prototype.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 1f99a11f5709ba769d425307a5bf6328a591b830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f99a11f5709ba769d425307a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Jan 11 13:07:19 2014 +0900 wuapi: Fix object constructors to match the changed prototype. --- dlls/wuapi/downloader.c | 5 +++-- dlls/wuapi/installer.c | 5 +++-- dlls/wuapi/searcher.c | 5 +++-- dlls/wuapi/systeminfo.c | 5 +++-- dlls/wuapi/updates.c | 5 +++-- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/wuapi/downloader.c b/dlls/wuapi/downloader.c index 6bed32e..e17e155 100644 --- a/dlls/wuapi/downloader.c +++ b/dlls/wuapi/downloader.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "initguid.h" #include "wuapi.h" +#include "wuapi_private.h" #include "wine/debug.h" @@ -248,11 +249,11 @@ static const struct IUpdateDownloaderVtbl update_downloader_vtbl = update_downloader_EndDownload }; -HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateDownloader_create( LPVOID *ppObj ) { update_downloader *downloader; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); downloader = HeapAlloc( GetProcessHeap(), 0, sizeof(*downloader) ); if (!downloader) return E_OUTOFMEMORY; diff --git a/dlls/wuapi/installer.c b/dlls/wuapi/installer.c index f60d618..46c8699 100644 --- a/dlls/wuapi/installer.c +++ b/dlls/wuapi/installer.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "ole2.h" #include "wuapi.h" +#include "wuapi_private.h" #include "wine/debug.h" @@ -342,11 +343,11 @@ static const struct IUpdateInstallerVtbl update_installer_vtbl = update_installer_get_RebootRequiredBeforeInstallation }; -HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateInstaller_create( LPVOID *ppObj ) { update_installer *installer; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); installer = HeapAlloc( GetProcessHeap(), 0, sizeof(*installer) ); if (!installer) return E_OUTOFMEMORY; diff --git a/dlls/wuapi/searcher.c b/dlls/wuapi/searcher.c index 522f99a..1ca8020 100644 --- a/dlls/wuapi/searcher.c +++ b/dlls/wuapi/searcher.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "ole2.h" #include "wuapi.h" +#include "wuapi_private.h" #include "wine/debug.h" @@ -314,11 +315,11 @@ static const struct IUpdateSearcherVtbl update_searcher_vtbl = update_searcher_put_ServiceID }; -HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateSearcher_create( LPVOID *ppObj ) { update_searcher *searcher; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); searcher = HeapAlloc( GetProcessHeap(), 0, sizeof(*searcher) ); if (!searcher) return E_OUTOFMEMORY; diff --git a/dlls/wuapi/systeminfo.c b/dlls/wuapi/systeminfo.c index f3f635f..7c62bed 100644 --- a/dlls/wuapi/systeminfo.c +++ b/dlls/wuapi/systeminfo.c @@ -29,6 +29,7 @@ #include "winuser.h" #include "ole2.h" #include "wuapi.h" +#include "wuapi_private.h" #include "wine/debug.h" @@ -143,11 +144,11 @@ static const struct ISystemInformationVtbl systeminfo_vtbl = systeminfo_get_RebootRequired }; -HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT SystemInformation_create(LPVOID *ppObj) { systeminfo *info; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); info = HeapAlloc(GetProcessHeap(), 0, sizeof(*info)); if (!info) diff --git a/dlls/wuapi/updates.c b/dlls/wuapi/updates.c index d099fb4..4f6648c 100644 --- a/dlls/wuapi/updates.c +++ b/dlls/wuapi/updates.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "ole2.h" #include "wuapi.h" +#include "wuapi_private.h" #include "wine/debug.h" @@ -202,11 +203,11 @@ static const struct IAutomaticUpdatesVtbl automatic_updates_vtbl = automatic_updates_EnableService }; -HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT AutomaticUpdates_create( LPVOID *ppObj ) { automatic_updates *updates; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); updates = HeapAlloc( GetProcessHeap(), 0, sizeof(*updates) ); if (!updates) return E_OUTOFMEMORY;

1 0

Frédéric Delanoy : dbghelp: Remove an "#if 1" preprocessor directive.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 74b0f6b4adf1155b5459266c6920efbb83740c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b0f6b4adf1155b5459266c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 11 13:53:24 2014 +0100 dbghelp: Remove an "#if 1" preprocessor directive. --- dlls/dbghelp/storage.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 3f00b07..3c2aea6 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -358,7 +358,7 @@ void hash_table_destroy(struct hash_table* ht) variance = (double)sq / ht->num_buckets - mean * mean; FIXME("STATS: elts[num:%-4u size:%u mean:%f] buckets[min:%-4u variance:%+f max:%-4u]\n", ht->num_elts, ht->num_buckets, mean, min, variance, max); -#if 1 + for (i = 0; i < ht->num_buckets; i++) { for (len = 0, elt = ht->buckets[i]; elt; elt = elt->next) len++; @@ -372,7 +372,6 @@ void hash_table_destroy(struct hash_table* ht) } #endif -#endif } void hash_table_add(struct hash_table* ht, struct hash_table_elt* elt)

1 0

Frédéric Delanoy : dplayx: Remove "#if 1" preprocessor directives.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: eecc2f8b72bbc2d3cee8d290b09bef2f0e43600d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eecc2f8b72bbc2d3cee8d290b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 11 13:53:25 2014 +0100 dplayx: Remove "#if 1" preprocessor directives. --- dlls/dplayx/dplay.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 20899d5..0d448a6 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -324,28 +324,17 @@ HRESULT DP_HandleMessage( IDirectPlayImpl *This, const void *lpcMessageBody, case DPMSGCMD_GETNAMETABLEREPLY: case DPMSGCMD_NEWPLAYERIDREPLY: -#if 0 - if( wCommandId == DPMSGCMD_NEWPLAYERIDREPLY ) - DebugBreak(); -#endif DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); break; -#if 1 case DPMSGCMD_JUSTENVELOPE: TRACE( "GOT THE SELF MESSAGE: %p -> 0x%08x\n", lpcMessageHeader, ((const DWORD *)lpcMessageHeader)[1] ); NS_SetLocalAddr( This->dp2->lpNameServerData, lpcMessageHeader, 20 ); DP_MSG_ReplyReceived( This, wCommandId, lpcMessageBody, dwMessageBodySize ); -#endif case DPMSGCMD_FORWARDADDPLAYER: -#if 0 - DebugBreak(); -#endif -#if 1 TRACE( "Sending message to self to get my addr\n" ); DP_MSG_ToSelf( This, 1 ); /* This is a hack right now */ -#endif break; case DPMSGCMD_FORWARDADDPLAYERNACK:

1 0