wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Henri Verbeet : d3d10: Properly handle arrays of state objects.
by Alexandre Julliard 26 Sep '12

26 Sep '12

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 : httpapi: Add a stub implementation of HttpAddUrl.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 7e22fc09434a6773caac6ab86199677ad71a72d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e22fc09434a6773caac6ab86… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 26 09:37:55 2012 +0200 httpapi: Add a stub implementation of HttpAddUrl. --- dlls/httpapi/httpapi.spec | 2 +- dlls/httpapi/httpapi_main.c | 9 +++++++++ include/http.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index 7e5eede..4d35c84 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -1,5 +1,5 @@ @ stub HttpAddFragmentToCache -@ stub HttpAddUrl +@ stdcall HttpAddUrl(ptr wstr ptr) @ stub HttpAddUrlToConfigGroup @ stub HttpCancelHttpRequest @ stub HttpCreateAppPool diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 3375cb6..e71048f 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -176,3 +176,12 @@ ULONG WINAPI HttpCreateHttpHandle( PHANDLE handle, ULONG reserved ) FIXME( "(%p, %d): stub!\n", handle, reserved); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * HttpAddUrl (HTTPAPI.@) + */ +ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved ) +{ + FIXME( "(%p, %s, %p): stub!\n", handle, debugstr_w(url), reserved ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/http.h b/include/http.h index b42cbca..8c2f21e 100644 --- a/include/http.h +++ b/include/http.h @@ -53,6 +53,7 @@ typedef enum _HTTP_SERVICE_CONFIG_ID ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); ULONG WINAPI HttpTerminate(ULONG,PVOID); +ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED);

1 0

Hans Leidekker : hnetcfg: Return success from INetFwAuthorizedApplication:: put_Scope.
by Alexandre Julliard 26 Sep '12

26 Sep '12

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 INetFwMgr, INetFwPolicy and INetFwProfile.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 4619b529cf26ac923bca7b2a88a4548bd9f50d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4619b529cf26ac923bca7b2a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 26 09:37:23 2012 +0200 hnetcfg: Add IDispatch support for INetFwMgr, INetFwPolicy and INetFwProfile. --- dlls/hnetcfg/apps.c | 5 ++++- dlls/hnetcfg/hnetcfg_private.h | 3 +++ dlls/hnetcfg/manager.c | 36 ++++++++++++++++++++++++++++-------- dlls/hnetcfg/policy.c | 36 ++++++++++++++++++++++++++++-------- dlls/hnetcfg/profile.c | 36 ++++++++++++++++++++++++++++-------- 5 files changed, 91 insertions(+), 25 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 0418865..38c0d00 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -106,7 +106,10 @@ static ITypeInfo *typeinfo[last_tid]; static REFIID tid_id[] = { &IID_INetFwAuthorizedApplication, - &IID_INetFwAuthorizedApplications + &IID_INetFwAuthorizedApplications, + &IID_INetFwMgr, + &IID_INetFwPolicy, + &IID_INetFwProfile }; HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index bd92392..05b0aee 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -20,6 +20,9 @@ enum type_id { INetFwAuthorizedApplication_tid, INetFwAuthorizedApplications_tid, + INetFwMgr_tid, + INetFwPolicy_tid, + INetFwProfile_tid, last_tid }; diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index 6192c2d..1d548b4 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -96,8 +96,9 @@ static HRESULT WINAPI fw_manager_GetTypeInfoCount( { fw_manager *This = impl_from_INetFwMgr( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_manager_GetTypeInfo( @@ -108,8 +109,8 @@ static HRESULT WINAPI fw_manager_GetTypeInfo( { fw_manager *This = impl_from_INetFwMgr( 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( INetFwMgr_tid, ppTInfo ); } static HRESULT WINAPI fw_manager_GetIDsOfNames( @@ -121,9 +122,18 @@ static HRESULT WINAPI fw_manager_GetIDsOfNames( DISPID *rgDispId ) { fw_manager *This = impl_from_INetFwMgr( 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( INetFwMgr_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_manager_Invoke( @@ -138,10 +148,20 @@ static HRESULT WINAPI fw_manager_Invoke( UINT *puArgErr ) { fw_manager *This = impl_from_INetFwMgr( 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( INetFwMgr_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwMgr_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_manager_get_LocalPolicy( diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index dd5a1fe..e340ffb 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -95,8 +95,9 @@ static HRESULT WINAPI fw_policy_GetTypeInfoCount( { fw_policy *This = impl_from_INetFwPolicy( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_policy_GetTypeInfo( @@ -107,8 +108,8 @@ static HRESULT WINAPI fw_policy_GetTypeInfo( { fw_policy *This = impl_from_INetFwPolicy( 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( INetFwPolicy_tid, ppTInfo ); } static HRESULT WINAPI fw_policy_GetIDsOfNames( @@ -120,9 +121,18 @@ static HRESULT WINAPI fw_policy_GetIDsOfNames( DISPID *rgDispId ) { fw_policy *This = impl_from_INetFwPolicy( 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( INetFwPolicy_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_policy_Invoke( @@ -137,10 +147,20 @@ static HRESULT WINAPI fw_policy_Invoke( UINT *puArgErr ) { fw_policy *This = impl_from_INetFwPolicy( 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( INetFwPolicy_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwPolicy_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_policy_get_CurrentProfile( diff --git a/dlls/hnetcfg/profile.c b/dlls/hnetcfg/profile.c index f1d724d..835e82e 100644 --- a/dlls/hnetcfg/profile.c +++ b/dlls/hnetcfg/profile.c @@ -95,8 +95,9 @@ static HRESULT WINAPI fw_profile_GetTypeInfoCount( { fw_profile *This = impl_from_INetFwProfile( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_profile_GetTypeInfo( @@ -107,8 +108,8 @@ static HRESULT WINAPI fw_profile_GetTypeInfo( { fw_profile *This = impl_from_INetFwProfile( 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( INetFwProfile_tid, ppTInfo ); } static HRESULT WINAPI fw_profile_GetIDsOfNames( @@ -120,9 +121,18 @@ static HRESULT WINAPI fw_profile_GetIDsOfNames( DISPID *rgDispId ) { fw_profile *This = impl_from_INetFwProfile( 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( INetFwProfile_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_profile_Invoke( @@ -137,10 +147,20 @@ static HRESULT WINAPI fw_profile_Invoke( UINT *puArgErr ) { fw_profile *This = impl_from_INetFwProfile( 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( INetFwProfile_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwProfile_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_profile_get_Type(

1 0

Hans Leidekker : hnetcfg: Add IDispatch support for INetFwAuthorizedApplication and INetFwAuthorizedApplications .
by Alexandre Julliard 26 Sep '12

26 Sep '12

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

Hans Leidekker : hnetcfg: Add a typelib.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 3edae31d7a25fe58da987a2fe985646af51297d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3edae31d7a25fe58da987a2fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 26 09:36:52 2012 +0200 hnetcfg: Add a typelib. --- dlls/hnetcfg/Makefile.in | 1 + dlls/hnetcfg/hnetcfg_tlb.idl | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 63f3150..198a6bb 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -11,5 +11,6 @@ C_SRCS = \ service.c IDL_R_SRCS = hnetcfg.idl +IDL_TLB_SRCS = hnetcfg_tlb.idl @MAKE_DLL_RULES@ diff --git a/dlls/hnetcfg/hnetcfg_tlb.idl b/dlls/hnetcfg/hnetcfg_tlb.idl new file mode 100644 index 0000000..6a202b2 --- /dev/null +++ b/dlls/hnetcfg/hnetcfg_tlb.idl @@ -0,0 +1,21 @@ +/* + * Typelib for hnetcfg + * + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "netfw.idl"

1 0

Gerald Pfeifer : d3dx9_36: Fix initialization of header in save_dds_surface_to_memory. save_dds_surface_to_memory.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: f807666d2b38e39d4df8ad2725c3ce6ecf15f6f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f807666d2b38e39d4df8ad272… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 25 19:38:32 2012 -0400 d3dx9_36: Fix initialization of header in save_dds_surface_to_memory. save_dds_surface_to_memory. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ab6a9f6..daa6cfe 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -473,7 +473,7 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur header = ID3DXBuffer_GetBufferPointer(buffer); pixels = (BYTE *)(header + 1); - memset(header, 0, sizeof(header)); + memset(header, 0, sizeof(*header)); header->signature = MAKEFOURCC('D','D','S',' '); header->size = sizeof(*header); header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PITCH | DDS_PIXELFORMAT | DDS_MIPMAPCOUNT;

1 0

Francois Gouget : shlwapi: Fix the PathCreateFromUrlW() implementation.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: fad0bea304ee1908ad021df22f1483800cd55eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad0bea304ee1908ad021df22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 26 04:22:00 2012 +0200 shlwapi: Fix the PathCreateFromUrlW() implementation. --- dlls/shlwapi/path.c | 139 ++++++++++++++++++++++++++++++++++---------- dlls/shlwapi/tests/path.c | 66 +++++++++++----------- 2 files changed, 140 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fad0bea304ee1908ad021…

1 0

Francois Gouget : shlwapi: UrlIs()'s check for the 'file:' protocol is case insensitive.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 7c42bfe107cb79418e6540825eb9176b7d78021c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c42bfe107cb79418e6540825… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 26 04:20:00 2012 +0200 shlwapi: UrlIs()'s check for the 'file:' protocol is case insensitive. --- dlls/shlwapi/tests/url.c | 3 ++- dlls/shlwapi/url.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index b24a277..6cef9d6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -450,7 +450,8 @@ static const struct { { "file://e:/b/c", FALSE, TRUE }, { "http:partial", FALSE, FALSE }, { "mailto://www.winehq.org/test.html", TRUE, FALSE }, - { "file:partial", FALSE, TRUE } + { "file:partial", FALSE, TRUE }, + { "File:partial", FALSE, TRUE }, }; /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index f483db3..70a0b87 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1864,7 +1864,8 @@ BOOL WINAPI UrlIsA(LPCSTR pszUrl, URLIS Urlis) return FALSE; case URLIS_FILEURL: - return !StrCmpNA("file:", pszUrl, 5); + return (CompareStringA(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, + "file:", 5) == CSTR_EQUAL); case URLIS_DIRECTORY: last = pszUrl + strlen(pszUrl) - 1; @@ -1889,7 +1890,7 @@ BOOL WINAPI UrlIsA(LPCSTR pszUrl, URLIS Urlis) */ BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis) { - static const WCHAR stemp[] = { 'f','i','l','e',':',0 }; + static const WCHAR file_colon[] = { 'f','i','l','e',':',0 }; PARSEDURLW base; DWORD res1; LPCWSTR last; @@ -1917,7 +1918,8 @@ BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis) return FALSE; case URLIS_FILEURL: - return !strncmpW(stemp, pszUrl, 5); + return (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5, + file_colon, 5) == CSTR_EQUAL); case URLIS_DIRECTORY: last = pszUrl + strlenW(pszUrl) - 1;

1 0

Dmitry Timoshkov : windowscodecs: Use appropriate helper to release GIF decoder.
by Alexandre Julliard 26 Sep '12

26 Sep '12

Module: wine Branch: master Commit: 7fcf7e831cf2927e130ce2683b3c298f43ab5cf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fcf7e831cf2927e130ce2683… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 26 10:56:56 2012 +0900 windowscodecs: Use appropriate helper to release GIF decoder. --- dlls/windowscodecs/gifformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 78371b0..4fa10e0 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -661,7 +661,7 @@ static ULONG WINAPI GifFrameDecode_Release(IWICBitmapFrameDecode *iface) if (ref == 0) { - IUnknown_Release((IUnknown*)This->parent); + IWICBitmapDecoder_Release(&This->parent->IWICBitmapDecoder_iface); HeapFree(GetProcessHeap(), 0, This); }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012