wine-commits February 2015

wine-commits@winehq.org

2 participants
411 discussions

Henri Verbeet : d3d10core: Implement d3d10_geometry_shader_SetPrivateDataInterface().
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: e0e909ec48418c106ce35232a6c8bba68802ef62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e909ec48418c106ce35232a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:35 2015 +0100 d3d10core: Implement d3d10_geometry_shader_SetPrivateDataInterface(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index d1d67bd..ee47001 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -388,9 +388,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10Geom static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(ID3D10GeometryShader *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&shader->private_store, guid, data); } static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl =

1 0

Henri Verbeet : d3d10core: Implement d3d10_geometry_shader_SetPrivateData( ).
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 450a3fbfc20e4cca99e75425d1d4cd0dd48a927b URL: http://source.winehq.org/git/wine.git/?a=commit;h=450a3fbfc20e4cca99e75425d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:34 2015 +0100 d3d10core: Implement d3d10_geometry_shader_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index dfd6149..8526cf2 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -215,6 +215,7 @@ struct d3d10_geometry_shader ID3D10GeometryShader ID3D10GeometryShader_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 8010828..d1d67bd 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -377,10 +377,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10Geom static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10GeometryShader *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(ID3D10GeometryShader *iface, @@ -406,6 +408,9 @@ static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = static void STDMETHODCALLTYPE d3d10_geometry_shader_wined3d_object_destroyed(void *parent) { + struct d3d10_geometry_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -425,12 +430,14 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct shader->ID3D10GeometryShader_iface.lpVtbl = &d3d10_geometry_shader_vtbl; shader->refcount = 1; + wined3d_private_store_init(&shader->private_store); shader_info.input_signature = &input_signature; shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { ERR("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return hr; } @@ -446,6 +453,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct if (FAILED(hr)) { WARN("Failed to create wined3d geometry shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return E_INVALIDARG; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_vertex_shader_GetPrivateData().
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 43452192745f49961eef998b51dbc96c465b0b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43452192745f49961eef998b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:33 2015 +0100 d3d10core: Implement d3d10_vertex_shader_GetPrivateData(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index bb0e596..8010828 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -200,10 +200,12 @@ static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader * static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10VertexShader *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10VertexShader *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_vertex_shader_SetPrivateDataInterface().
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: e8dc68a8e4674713139030592f9849dde9d34a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8dc68a8e4674713139030592… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:32 2015 +0100 d3d10core: Implement d3d10_vertex_shader_SetPrivateDataInterface(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 31896e3..bb0e596 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -220,9 +220,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10Vertex static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3D10VertexShader *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&shader->private_store, guid, data); } static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl =

1 0

Henri Verbeet : d3d10core: Implement d3d10_vertex_shader_SetPrivateData().
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: fe06bb149261ab4e4693c72e024dba447ec6c5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe06bb149261ab4e4693c72e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:31 2015 +0100 d3d10core: Implement d3d10_vertex_shader_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index e03a5cb..dfd6149 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -200,6 +200,7 @@ struct d3d10_vertex_shader ID3D10VertexShader ID3D10VertexShader_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; ID3D10Device1 *device; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 1000054..31896e3 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -209,10 +209,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10Vertex static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10VertexShader *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateDataInterface(ID3D10VertexShader *iface, @@ -238,6 +240,9 @@ static const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = static void STDMETHODCALLTYPE d3d10_vertex_shader_wined3d_object_destroyed(void *parent) { + struct d3d10_vertex_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -257,12 +262,14 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 shader->ID3D10VertexShader_iface.lpVtbl = &d3d10_vertex_shader_vtbl; shader->refcount = 1; + wined3d_private_store_init(&shader->private_store); shader_info.input_signature = &input_signature; shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { ERR("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return hr; } @@ -278,6 +285,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 if (FAILED(hr)) { WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return E_INVALIDARG; }

1 0

Jacek Caban : urlmon: Added IInternetBindInfo implementation to BindStatusCallback object.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 168e915c918a38f29c4323fb24e84de56c81d5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=168e915c918a38f29c4323fb2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 26 11:00:27 2015 +0100 urlmon: Added IInternetBindInfo implementation to BindStatusCallback object. --- dlls/urlmon/bindctx.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/tests/url.c | 11 +++++++++ 2 files changed, 73 insertions(+) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index b2d2776..d8bba1b 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -29,6 +29,7 @@ extern IID IID_IBindStatusCallbackHolder; typedef struct { IBindStatusCallbackEx IBindStatusCallbackEx_iface; + IInternetBindInfo IInternetBindInfo_iface; IServiceProvider IServiceProvider_iface; IHttpNegotiate2 IHttpNegotiate2_iface; IAuthenticate IAuthenticate_iface; @@ -126,6 +127,9 @@ static HRESULT WINAPI BindStatusCallback_QueryInterface(IBindStatusCallbackEx *i }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { TRACE("(%p)->(IID_IAuthenticate, %p)\n", This, ppv); *ppv = &This->IAuthenticate_iface; + }else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { + TRACE("(%p)->(IID_IInternetBindInfo, %p)\n", This, ppv); + *ppv = &This->IInternetBindInfo_iface; } if(*ppv) { @@ -497,6 +501,63 @@ static const IAuthenticateVtbl BSCAuthenticateVtbl = { BSCAuthenticate_Authenticate }; +static inline BindStatusCallback *impl_from_IInternetBindInfo(IInternetBindInfo *iface) +{ + return CONTAINING_RECORD(iface, BindStatusCallback, IInternetBindInfo_iface); +} + +static HRESULT WINAPI BSCInternetBindInfo_QueryInterface(IInternetBindInfo *iface, REFIID riid, void **ppv) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + return IBindStatusCallbackEx_QueryInterface(&This->IBindStatusCallbackEx_iface, riid, ppv); +} + +static ULONG WINAPI BSCInternetBindInfo_AddRef(IInternetBindInfo *iface) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + return IBindStatusCallbackEx_AddRef(&This->IBindStatusCallbackEx_iface); +} + +static ULONG WINAPI BSCInternetBindInfo_Release(IInternetBindInfo *iface) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + return IBindStatusCallbackEx_Release(&This->IBindStatusCallbackEx_iface); +} + +static HRESULT WINAPI BSCInternetBindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *bindf, BINDINFO *bindinfo) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + FIXME("(%p)->(%p %p)\n", This, bindf, bindinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI BSCInternetBindInfo_GetBindString(IInternetBindInfo *iface, ULONG string_type, + WCHAR **strs, ULONG cnt, ULONG *fetched) +{ + BindStatusCallback *This = impl_from_IInternetBindInfo(iface); + IInternetBindInfo *bind_info; + HRESULT hres; + + TRACE("(%p)->(%d %p %d %p)\n", This, string_type, strs, cnt, fetched); + + hres = IBindStatusCallback_QueryInterface(This->callback, &IID_IInternetBindInfo, (void**)&bind_info); + if(FAILED(hres)) + return hres; + + hres = IInternetBindInfo_GetBindString(bind_info, string_type, strs, cnt, fetched); + + IInternetBindInfo_Release(bind_info); + return hres; +} + +static IInternetBindInfoVtbl BSCInternetBindInfoVtbl = { + BSCInternetBindInfo_QueryInterface, + BSCInternetBindInfo_AddRef, + BSCInternetBindInfo_Release, + BSCInternetBindInfo_GetBindInfo, + BSCInternetBindInfo_GetBindString +}; + static void set_callback(BindStatusCallback *This, IBindStatusCallback *bsc) { IServiceProvider *serv_prov; @@ -523,6 +584,7 @@ HRESULT wrap_callback(IBindStatusCallback *bsc, IBindStatusCallback **ret_iface) return E_OUTOFMEMORY; ret->IBindStatusCallbackEx_iface.lpVtbl = &BindStatusCallbackExVtbl; + ret->IInternetBindInfo_iface.lpVtbl = &BSCInternetBindInfoVtbl; ret->IServiceProvider_iface.lpVtbl = &BSCServiceProviderVtbl; ret->IHttpNegotiate2_iface.lpVtbl = &BSCHttpNegotiateVtbl; ret->IAuthenticate_iface.lpVtbl = &BSCAuthenticateVtbl; diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ab564f7..dd3a52d 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2564,6 +2564,7 @@ static BOOL test_bscholder(IBindStatusCallback *holder) IHttpNegotiate *http_negotiate, *http_negotiate_serv; IHttpNegotiate2 *http_negotiate2, *http_negotiate2_serv; IAuthenticate *authenticate, *authenticate_serv; + IInternetBindInfo *bind_info; IInternetProtocol *protocol; BINDINFO bindinfo = {sizeof(bindinfo)}; BOOL ret = TRUE; @@ -2678,6 +2679,16 @@ static BOOL test_bscholder(IBindStatusCallback *holder) IAuthenticate_Release(authenticate); IAuthenticate_Release(authenticate_serv); + hres = IBindStatusCallback_QueryInterface(holder, &IID_IInternetBindInfo, (void**)&bind_info); + ok(hres == S_OK || broken(hres == E_NOINTERFACE /* win2k */), "Could not get IInternetBindInfo interface: %08x\n", hres); + + if(SUCCEEDED(hres)) { + hres = IInternetBindInfo_GetBindString(bind_info, BINDSTRING_USER_AGENT, &wstr, 1, &dw); + ok(hres == E_NOINTERFACE, "GetBindString(BINDSTRING_USER_AGENT) failed: %08x\n", hres); + + IInternetBindInfo_Release(bind_info); + } + SET_EXPECT(OnStopBinding); hres = IBindStatusCallback_OnStopBinding(holder, S_OK, NULL); ok(hres == S_OK, "OnStopBinding failed: %08x\n", hres);

1 0

Matteo Bruni : wined3d: Remove ARB_/EXT_TEXTURE_ENV_ADD.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 67d2b52c27841228897c738a7417f7ad22a44830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d2b52c27841228897c738a7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 24 13:38:18 2015 +0100 wined3d: Remove ARB_/EXT_TEXTURE_ENV_ADD. --- dlls/wined3d/directx.c | 2 -- dlls/wined3d/wined3d_gl.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5fa9355..4ca13f4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -145,7 +145,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_compression", ARB_TEXTURE_COMPRESSION }, {"GL_ARB_texture_compression_rgtc", ARB_TEXTURE_COMPRESSION_RGTC }, {"GL_ARB_texture_cube_map", ARB_TEXTURE_CUBE_MAP }, - {"GL_ARB_texture_env_add", ARB_TEXTURE_ENV_ADD }, {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE }, {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, @@ -192,7 +191,6 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture3D", EXT_TEXTURE3D }, {"GL_EXT_texture_compression_rgtc", EXT_TEXTURE_COMPRESSION_RGTC }, {"GL_EXT_texture_compression_s3tc", EXT_TEXTURE_COMPRESSION_S3TC }, - {"GL_EXT_texture_env_add", EXT_TEXTURE_ENV_ADD }, {"GL_EXT_texture_env_combine", EXT_TEXTURE_ENV_COMBINE }, {"GL_EXT_texture_env_dot3", EXT_TEXTURE_ENV_DOT3 }, {"GL_EXT_texture_filter_anisotropic", EXT_TEXTURE_FILTER_ANISOTROPIC}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3f06601..48d25b0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -81,7 +81,6 @@ enum wined3d_gl_extension ARB_TEXTURE_COMPRESSION, ARB_TEXTURE_COMPRESSION_RGTC, ARB_TEXTURE_CUBE_MAP, - ARB_TEXTURE_ENV_ADD, ARB_TEXTURE_ENV_COMBINE, ARB_TEXTURE_ENV_DOT3, ARB_TEXTURE_FLOAT, @@ -126,7 +125,6 @@ enum wined3d_gl_extension EXT_TEXTURE3D, EXT_TEXTURE_COMPRESSION_RGTC, EXT_TEXTURE_COMPRESSION_S3TC, - EXT_TEXTURE_ENV_ADD, EXT_TEXTURE_ENV_COMBINE, EXT_TEXTURE_ENV_DOT3, EXT_TEXTURE_FILTER_ANISOTROPIC,

1 0

Andrew Eikum : advapi32: Stub EventActivityIdControl.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 8140bdc752125249c1a5adae618f964941c177f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8140bdc752125249c1a5adae6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 25 14:27:15 2015 -0600 advapi32: Stub EventActivityIdControl. Used by the Office 2013 live installer. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-eventing-provider-l1-1-0.spec | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 40ae014..322360d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -269,7 +269,7 @@ # @ stub EventAccessControl # @ stub EventAccessQuery # @ stub EventAccessRemove -# @ stub EventActivityIdControl +@ stdcall EventActivityIdControl(long ptr) @ stdcall EventEnabled(int64 ptr) @ stdcall EventProviderEnabled(int64 long int64) @ stdcall EventRegister(ptr ptr ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 988060f..bebb08b 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -908,6 +908,16 @@ BOOLEAN WINAPI EventProviderEnabled( REGHANDLE handle, UCHAR level, ULONGLONG ke } /****************************************************************************** + * EventActivityIdControl [ADVAPI32.@] + * + */ +ULONG WINAPI EventActivityIdControl(ULONG code, GUID *guid) +{ + FIXME("0x%x, %p: stub\n", code, guid); + return ERROR_SUCCESS; +} + +/****************************************************************************** * EventWrite [ADVAPI32.@] */ ULONG WINAPI EventWrite( REGHANDLE handle, PCEVENT_DESCRIPTOR descriptor, ULONG count, diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 5b0b069..130f285 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -38,7 +38,7 @@ @ stub EqualDomainSid @ stdcall EqualPrefixSid(ptr ptr) advapi32.EqualPrefixSid @ stdcall EqualSid(ptr ptr) advapi32.EqualSid -@ stub EventActivityIdControl +@ stdcall EventActivityIdControl(long ptr) advapi32.EventActivityIdControl @ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled @ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister diff --git a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec index 901f74c..a498097 100644 --- a/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-provider-l1-1-0/api-ms-win-eventing-provider-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub EventActivityIdControl +@ stdcall EventActivityIdControl(long ptr) advapi32.EventActivityIdControl @ stdcall EventEnabled(int64 ptr) advapi32.EventEnabled @ stdcall EventProviderEnabled(int64 long int64) advapi32.EventProviderEnabled @ stdcall EventRegister(ptr ptr ptr ptr) advapi32.EventRegister

1 0

Jacek Caban : appwiz.cpl: Use custom user agent string for addon downloader.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 66514fd7135cd672b832f78eda54e994bbb1bdc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66514fd7135cd672b832f78ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 25 19:35:12 2015 +0100 appwiz.cpl: Use custom user agent string for addon downloader. --- dlls/appwiz.cpl/Makefile.in | 2 +- dlls/appwiz.cpl/addons.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 1cf7b0e..a8341fa 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -1,5 +1,5 @@ MODULE = appwiz.cpl -IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 user32 comdlg32 +IMPORTS = uuid urlmon advpack comctl32 advapi32 shell32 ole32 user32 comdlg32 DELAYIMPORTS = msi C_SRCS = \ diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 7fce9cb..9fbb386 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -415,6 +415,8 @@ static enum install_res install_from_cache(void) return res; } +static IInternetBindInfo InstallCallbackBindInfo; + static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface, REFIID riid, void **ppv) { @@ -423,6 +425,12 @@ static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface, return S_OK; } + if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { + TRACE("IID_IInternetBindInfo\n"); + *ppv = &InstallCallbackBindInfo; + return S_OK; + } + return E_INVALIDARG; } @@ -564,6 +572,59 @@ static const IBindStatusCallbackVtbl InstallCallbackVtbl = { static IBindStatusCallback InstallCallback = { &InstallCallbackVtbl }; +static HRESULT WINAPI InstallCallbackBindInfo_QueryInterface(IInternetBindInfo *iface, REFIID riid, void **ppv) +{ + return IBindStatusCallback_QueryInterface(&InstallCallback, riid, ppv); +} + +static ULONG WINAPI InstallCallbackBindInfo_AddRef(IInternetBindInfo *iface) +{ + return 2; +} + +static ULONG WINAPI InstallCallbackBindInfo_Release(IInternetBindInfo *iface) +{ + return 1; +} + +static HRESULT WINAPI InstallCallbackBindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *bindf, BINDINFO *bindinfo) +{ + ERR("\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallCallbackBindInfo_GetBindString(IInternetBindInfo *iface, ULONG string_type, + WCHAR **strs, ULONG cnt, ULONG *fetched) +{ + static const WCHAR wine_addon_downloaderW[] = + {'W','i','n','e',' ','A','d','d','o','n',' ','D','o','w','n','l','o','a','d','e','r',0}; + + switch(string_type) { + case BINDSTRING_USER_AGENT: + TRACE("BINDSTRING_USER_AGENT\n"); + + *strs = CoTaskMemAlloc(sizeof(wine_addon_downloaderW)); + if(!*strs) + return E_OUTOFMEMORY; + + memcpy(*strs, wine_addon_downloaderW, sizeof(wine_addon_downloaderW)); + *fetched = 1; + return S_OK; + } + + return E_NOTIMPL; +} + +static const IInternetBindInfoVtbl InstallCallbackBindInfoVtbl = { + InstallCallbackBindInfo_QueryInterface, + InstallCallbackBindInfo_AddRef, + InstallCallbackBindInfo_Release, + InstallCallbackBindInfo_GetBindInfo, + InstallCallbackBindInfo_GetBindString +}; + +static IInternetBindInfo InstallCallbackBindInfo = { &InstallCallbackBindInfoVtbl }; + static void append_url_params( WCHAR *url ) { static const WCHAR arch_formatW[] = {'?','a','r','c','h','='};

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 25 Feb '15

25 Feb '15

Module: wine Branch: master Commit: 1fdd692ebd237dd45f5f7dbb383f90cb61318c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdd692ebd237dd45f5f7dbb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 25 15:34:16 2015 +0100 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 88 ++++++++++++++++++------------------- dlls/msvcp110/msvcp110.spec | 84 +++++++++++++++++------------------ dlls/msvcp120/msvcp120.spec | 84 +++++++++++++++++------------------ dlls/msvcp120_app/msvcp120_app.spec | 84 +++++++++++++++++------------------ dlls/msvcp70/msvcp70.spec | 76 ++++++++++++++++---------------- dlls/msvcp71/msvcp71.spec | 80 ++++++++++++++++----------------- dlls/msvcp80/msvcp80.spec | 84 +++++++++++++++++------------------ 7 files changed, 290 insertions(+), 290 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fdd692ebd237dd45f5f7…

1 0

← Newer
1
2
3
4
5
6
7
8
...
42
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 February 2015