September 2012 - Wine-Commits

Francois Gouget : wininet: Add a trailing '\n' to a couple of Wine traces.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 83af29fb03c3d00be7bd490b0203a6f71df9118a URL: http://source.winehq.org/git/wine.git/?a=commit;h=83af29fb03c3d00be7bd490b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 26 11:12:46 2012 +0200 wininet: Add a trailing '\n' to a couple of Wine traces. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 3be3b15..13633ac 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1772,7 +1772,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExA( return FALSE; } if (dwFlags & ~GET_INSTALLED_ENTRY) - FIXME("ignorring unsupported flags: %x", dwFlags); + FIXME("ignoring unsupported flags: %x\n", dwFlags); error = URLCacheContainers_FindContainerA(lpszUrl, &pContainer); if (error != ERROR_SUCCESS) @@ -1913,7 +1913,7 @@ BOOL WINAPI GetUrlCacheEntryInfoExW( return FALSE; } if (dwFlags) - FIXME("ignorring unsupported flags: %x", dwFlags); + FIXME("ignoring unsupported flags: %x\n", dwFlags); error = URLCacheContainers_FindContainerW(lpszUrl, &pContainer); if (error != ERROR_SUCCESS)

1 0

Rico Schüller : d3dx9: Improve RegisterCount calculation for D3DXRS_INT4/BOOL.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 82a800c128be2681633e6d4c9e62a1d2e0984b57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a800c128be2681633e6d4c9… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 12:22:02 2012 +0200 d3dx9: Improve RegisterCount calculation for D3DXRS_INT4/BOOL. --- dlls/d3dx9_36/shader.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index dfa0488..3147d40 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1644,6 +1644,27 @@ static HRESULT parse_ctab_constant_type(const char *ctab, DWORD typeoffset, stru /* offset in bytes => offsetdiff * components(4) * sizeof(DWORD) */ if (offset) *offset += offsetdiff * 4 * 4; + + /* int and bool registerset have different sizes */ + if (regset == D3DXRS_INT4 || regset == D3DXRS_BOOL) + { + switch (type->Class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + size = type->Columns; + break; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_MATRIX_COLUMNS: + size = 4 * type->Columns; + break; + + default: + FIXME("Unhandled type class %s\n", debug_d3dxparameter_class(type->Class)); + break; + } + } } constant->desc.RegisterCount = max(0, min(max - index, size));

1 0

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionRotationYawPitchRoll().
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 7d75ad8230e182fe4c6724aed20b6a9302d7fa54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d75ad8230e182fe4c6724aed… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:05 2012 +0200 d3dx9: Use float functions in D3DXQuaternionRotationYawPitchRoll(). --- dlls/d3dx9_36/math.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 7599a0a..3f0e8e4 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1424,15 +1424,25 @@ D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *pout, FLOAT yaw, FLOAT pitch, FLOAT roll) +D3DXQUATERNION * WINAPI D3DXQuaternionRotationYawPitchRoll(D3DXQUATERNION *out, FLOAT yaw, FLOAT pitch, FLOAT roll) { - TRACE("(%p, %f, %f, %f)\n", pout, yaw, pitch, roll); + FLOAT syaw, cyaw, spitch, cpitch, sroll, croll; - pout->x = sin( yaw / 2.0f) * cos(pitch / 2.0f) * sin(roll / 2.0f) + cos(yaw / 2.0f) * sin(pitch / 2.0f) * cos(roll / 2.0f); - pout->y = sin( yaw / 2.0f) * cos(pitch / 2.0f) * cos(roll / 2.0f) - cos(yaw / 2.0f) * sin(pitch / 2.0f) * sin(roll / 2.0f); - pout->z = cos(yaw / 2.0f) * cos(pitch / 2.0f) * sin(roll / 2.0f) - sin( yaw / 2.0f) * sin(pitch / 2.0f) * cos(roll / 2.0f); - pout->w = cos( yaw / 2.0f) * cos(pitch / 2.0f) * cos(roll / 2.0f) + sin(yaw / 2.0f) * sin(pitch / 2.0f) * sin(roll / 2.0f); - return pout; + TRACE("out %p, yaw %f, pitch %f, roll %f\n", out, yaw, pitch, roll); + + syaw = sinf(yaw / 2.0f); + cyaw = cosf(yaw / 2.0f); + spitch = sinf(pitch / 2.0f); + cpitch = cosf(pitch / 2.0f); + sroll = sinf(roll / 2.0f); + croll = cosf(roll / 2.0f); + + out->x = syaw * cpitch * sroll + cyaw * spitch * croll; + out->y = syaw * cpitch * croll - cyaw * spitch * sroll; + out->z = cyaw * cpitch * sroll - syaw * spitch * croll; + out->w = cyaw * cpitch * croll + syaw * spitch * sroll; + + return out; } D3DXQUATERNION * WINAPI D3DXQuaternionSlerp(D3DXQUATERNION *out, const D3DXQUATERNION *q1,

1 0

Rico Schüller : d3dx9: Use float functions in D3DXQuaternionRotationAxis().
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: db8df8bc7c5e03427f07a596125dec4c52d638be URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8df8bc7c5e03427f07a5961… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 26 13:57:11 2012 +0200 d3dx9: Use float functions in D3DXQuaternionRotationAxis(). --- dlls/d3dx9_36/math.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 3f0e8e4..c6fa19a 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1357,18 +1357,20 @@ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQ return pout; } -D3DXQUATERNION* WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *pout, CONST D3DXVECTOR3 *pv, FLOAT angle) +D3DXQUATERNION * WINAPI D3DXQuaternionRotationAxis(D3DXQUATERNION *out, const D3DXVECTOR3 *v, FLOAT angle) { D3DXVECTOR3 temp; - TRACE("(%p, %p, %f)\n", pout, pv, angle); + TRACE("out %p, v %p, angle %f\n", out, v, angle); - D3DXVec3Normalize(&temp, pv); - pout->x = sin( angle / 2.0f ) * temp.x; - pout->y = sin( angle / 2.0f ) * temp.y; - pout->z = sin( angle / 2.0f ) * temp.z; - pout->w = cos( angle / 2.0f ); - return pout; + D3DXVec3Normalize(&temp, v); + + out->x = sinf(angle / 2.0f) * temp.x; + out->y = sinf(angle / 2.0f) * temp.y; + out->z = sinf(angle / 2.0f) * temp.z; + out->w = cosf(angle / 2.0f); + + return out; } D3DXQUATERNION* WINAPI D3DXQuaternionRotationMatrix(D3DXQUATERNION *pout, CONST D3DXMATRIX *pm)

1 0

Alexandre Julliard : winex11: Add a workaround for XInput support with mouse drivers that don' t provide labels.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 0a9398421ce3d5a57419d1c8582d66ec31a31f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a9398421ce3d5a57419d1c85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 25 19:25:02 2012 +0200 winex11: Add a workaround for XInput support with mouse drivers that don't provide labels. --- dlls/winex11.drv/mouse.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5808420..2f9831c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -286,6 +286,8 @@ static void enable_xinput2(void) class->number, class->min, class->max, class->resolution, class->mode, XGetAtomName( data->display, class->label )); if (class->label == x11drv_atom( Rel_X ) || class->label == x11drv_atom( Rel_Y )) count++; + /* workaround for drivers that don't provide labels */ + if (!class->label && class->number <= 1 && class->mode == XIModeRelative) count++; } if (count < 2) continue; TRACE( "Using %u (%s) as core pointer\n", @@ -1526,14 +1528,16 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) if (XIMaskIsSet( event->valuators.mask, class->number )) { double val = *values++; - if (class->label == x11drv_atom( Rel_X )) + if (class->label == x11drv_atom( Rel_X ) || + (!class->label && class->number == 0 && class->mode == XIModeRelative)) { input.u.mi.dx = dx = val; if (class->min < class->max) input.u.mi.dx = val * (virtual_screen_rect.right - virtual_screen_rect.left) / (class->max - class->min); } - else if (class->label == x11drv_atom( Rel_Y )) + else if (class->label == x11drv_atom( Rel_Y ) || + (!class->label && class->number == 1 && class->mode == XIModeRelative)) { input.u.mi.dy = dy = val; if (class->min < class->max)

1 0

Henri Verbeet : wined3d: Add some basic SM4 bytecode dumping code.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 8168e184431d87f26e9f8cd681172d6c3794c2c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8168e184431d87f26e9f8cd68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 10:12:15 2012 +0200 wined3d: Add some basic SM4 bytecode dumping code. --- dlls/wined3d/shader_sm4.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 007b9b1..f50fd76 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -22,6 +22,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (1 << 31) @@ -555,6 +556,16 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi opcode = opcode_token & WINED3D_SM4_OPCODE_MASK; len = ((opcode_token & WINED3D_SM4_INSTRUCTION_LENGTH_MASK) >> WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) - 1; + if (TRACE_ON(d3d_bytecode)) + { + TRACE_(d3d_bytecode)("[ %08x ", opcode_token); + for (i = 0; i < len; ++i) + { + TRACE_(d3d_bytecode)("%08x ", (*ptr)[i]); + } + TRACE_(d3d_bytecode)("]\n"); + } + if (!(opcode_info = get_opcode_info(opcode))) { FIXME("Unrecognized opcode %#x, opcode_token 0x%08x.\n", opcode, opcode_token);

1 0

Henri Verbeet : d3d10: Properly handle arrays of state objects.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 7d7d1836f6402a30042ca04b7af1ff80b2eef8cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7d1836f6402a30042ca04b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 10:12:11 2012 +0200 d3d10: Properly handle arrays of state objects. --- dlls/d3d10/effect.c | 64 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 23 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0aca9b3..8354ac0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1641,7 +1641,6 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const { const struct d3d10_effect_state_storage_info *storage_info; unsigned int count = max(v->type->element_count, 1); - unsigned char *desc; if (!(storage_info = get_storage_info(v->type->basetype))) { @@ -1650,25 +1649,32 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const return E_FAIL; } - if (!(desc = HeapAlloc(GetProcessHeap(), 0, count * storage_info->size))) - { - ERR("Failed to allocate backing store memory.\n"); - return E_OUTOFMEMORY; - } - for (i = 0; i < count; ++i) { - memcpy(&desc[i * storage_info->size], storage_info->default_state, storage_info->size); + struct d3d10_effect_variable *var; + unsigned char *desc; + + if (v->type->element_count) + var = &v->elements[i]; + else + var = v; - if (!parse_fx10_state_group(ptr, data, v->type->basetype, &desc[i * storage_info->size])) + if (!(desc = HeapAlloc(GetProcessHeap(), 0, storage_info->size))) + { + ERR("Failed to allocate backing store memory.\n"); + return E_OUTOFMEMORY; + } + + memcpy(desc, storage_info->default_state, storage_info->size); + if (!parse_fx10_state_group(ptr, data, var->type->basetype, desc)) { ERR("Failed to read property list.\n"); HeapFree(GetProcessHeap(), 0, desc); return E_FAIL; } - } - v->data = desc; + var->data = desc; + } } break; @@ -6016,13 +6022,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBackingStore(ID3 TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (index >= max(v->type->element_count, 1)) + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + + if (v->type->basetype != D3D10_SVT_BLEND) { - WARN("Invalid index %u.\n", index); + WARN("Variable is not a blend state.\n"); return E_FAIL; } - *desc = ((D3D10_BLEND_DESC *)v->data)[index]; + *desc = *(D3D10_BLEND_DESC *)v->data; return S_OK; } @@ -6231,13 +6240,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingS TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (index >= max(v->type->element_count, 1)) + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + + if (v->type->basetype != D3D10_SVT_DEPTHSTENCIL) { - WARN("Invalid index %u.\n", index); + WARN("Variable is not a depth stencil state.\n"); return E_FAIL; } - *desc = ((D3D10_DEPTH_STENCIL_DESC *)v->data)[index]; + *desc = *(D3D10_DEPTH_STENCIL_DESC *)v->data; return S_OK; } @@ -6446,13 +6458,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetBackingStor TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (index >= max(v->type->element_count, 1)) + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + + if (v->type->basetype != D3D10_SVT_RASTERIZER) { - WARN("Invalid index %u.\n", index); + WARN("Variable is not a rasterizer state.\n"); return E_FAIL; } - *desc = ((D3D10_RASTERIZER_DESC *)v->data)[index]; + *desc = *(D3D10_RASTERIZER_DESC *)v->data; return S_OK; } @@ -6661,13 +6676,16 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetBackingStore(I TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (index >= max(v->type->element_count, 1)) + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + + if (v->type->basetype != D3D10_SVT_SAMPLER) { - WARN("Invalid index %u.\n", index); + WARN("Variable is not a sampler state.\n"); return E_FAIL; } - *desc = ((D3D10_SAMPLER_DESC *)v->data)[index]; + *desc = *(D3D10_SAMPLER_DESC *)v->data; return S_OK; }

1 0

Hans Leidekker : hnetcfg: Return success from INetFwAuthorizedApplication:: put_Scope.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: c82e1eaf669f12775e73e544e643797f72b0e724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82e1eaf669f12775e73e544e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 26 09:37:40 2012 +0200 hnetcfg: Return success from INetFwAuthorizedApplication::put_Scope. --- dlls/hnetcfg/apps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 38c0d00..7fd6b55 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -286,7 +286,7 @@ static HRESULT WINAPI fw_app_put_Scope( fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); FIXME("%p, %u\n", This, scope); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI fw_app_get_RemoteAddresses(

1 0

Hans Leidekker : hnetcfg: Add IDispatch support for INetFwAuthorizedApplication and INetFwAuthorizedApplications .
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 9ff1b4c8b2770a7ab233d27f2029e79b50d016d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ff1b4c8b2770a7ab233d27f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 26 09:37:08 2012 +0200 hnetcfg: Add IDispatch support for INetFwAuthorizedApplication and INetFwAuthorizedApplications. --- dlls/hnetcfg/Makefile.in | 2 +- dlls/hnetcfg/apps.c | 110 ++++++++++++++++++++++++++++++++++----- dlls/hnetcfg/hnetcfg_private.h | 9 +++ 3 files changed, 106 insertions(+), 15 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 198a6bb..165152d 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,5 +1,5 @@ MODULE = hnetcfg.dll -IMPORTS = ole32 advapi32 +IMPORTS = oleaut32 ole32 advapi32 C_SRCS = \ apps.c \ diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 90a1807..0418865 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -95,8 +95,52 @@ static HRESULT WINAPI fw_app_GetTypeInfoCount( { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; +} + +static ITypeLib *typelib; +static ITypeInfo *typeinfo[last_tid]; + +static REFIID tid_id[] = +{ + &IID_INetFwAuthorizedApplication, + &IID_INetFwAuthorizedApplications +}; + +HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) +{ + HRESULT hr; + + if (!typelib) + { + ITypeLib *lib; + + hr = LoadRegTypeLib( &LIBID_NetFwPublicTypeLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &lib ); + if (FAILED(hr)) + { + ERR("LoadRegTypeLib failed: %08x\n", hr); + return hr; + } + if (InterlockedCompareExchangePointer( (void **)&typelib, lib, NULL )) + ITypeLib_Release( lib ); + } + if (!typeinfo[tid]) + { + ITypeInfo *info; + + hr = ITypeLib_GetTypeInfoOfGuid( typelib, tid_id[tid], &info ); + if (FAILED(hr)) + { + ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_id[tid]), hr); + return hr; + } + if (InterlockedCompareExchangePointer( (void **)(typeinfo + tid), info, NULL )) + ITypeInfo_Release( info ); + } + *ret = typeinfo[tid]; + return S_OK; } static HRESULT WINAPI fw_app_GetTypeInfo( @@ -107,8 +151,8 @@ static HRESULT WINAPI fw_app_GetTypeInfo( { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwAuthorizedApplication_tid, ppTInfo ); } static HRESULT WINAPI fw_app_GetIDsOfNames( @@ -120,9 +164,18 @@ static HRESULT WINAPI fw_app_GetIDsOfNames( DISPID *rgDispId ) { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwAuthorizedApplication_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_app_Invoke( @@ -137,10 +190,20 @@ static HRESULT WINAPI fw_app_Invoke( UINT *puArgErr ) { fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwAuthorizedApplication_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwAuthorizedApplication_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_app_get_Name( @@ -378,8 +441,8 @@ static HRESULT WINAPI fw_apps_GetTypeInfo( { fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwAuthorizedApplications_tid, ppTInfo ); } static HRESULT WINAPI fw_apps_GetIDsOfNames( @@ -391,9 +454,18 @@ static HRESULT WINAPI fw_apps_GetIDsOfNames( DISPID *rgDispId ) { fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwAuthorizedApplications_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_apps_Invoke( @@ -408,10 +480,20 @@ static HRESULT WINAPI fw_apps_Invoke( UINT *puArgErr ) { fw_apps *This = impl_from_INetFwAuthorizedApplications( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwAuthorizedApplications_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwAuthorizedApplications_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_apps_get_Count( diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index cc7519b..bd92392 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -16,6 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +enum type_id +{ + INetFwAuthorizedApplication_tid, + INetFwAuthorizedApplications_tid, + last_tid +}; + +HRESULT get_typeinfo(enum type_id, ITypeInfo **) DECLSPEC_HIDDEN; + HRESULT NetFwMgr_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwPolicy_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT NetFwProfile_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Vincent Povirk : windowscodecs: Use WINCODEC_ERR_UNSUPPORTEDOPERATION in GetColorContexts stubs.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 6f4dba586aae7a9fea7359732bd7e9c4b0e82b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4dba586aae7a9fea7359732… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Sep 25 16:34:59 2012 -0500 windowscodecs: Use WINCODEC_ERR_UNSUPPORTEDOPERATION in GetColorContexts stubs. --- dlls/windowscodecs/pngformat.c | 4 ++-- dlls/windowscodecs/tiffformat.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index d0977b4..686f9c6 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -625,7 +625,7 @@ static HRESULT WINAPI PngDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_GetThumbnail(IWICBitmapDecoder *iface, @@ -845,7 +845,7 @@ static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *i UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 05b6aba..cf93540 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -649,7 +649,7 @@ static HRESULT WINAPI TiffDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffDecoder_GetThumbnail(IWICBitmapDecoder *iface, @@ -1099,7 +1099,7 @@ static HRESULT WINAPI TiffFrameDecode_GetColorContexts(IWICBitmapFrameDecode *if UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return E_NOTIMPL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface,

1 0