January 2010 - Wine-Commits

Rico Schüller : d3d10: Implement ID3D10EffectType:: IsValid().
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: f811cd3e0dfa6ba7adff07ae0c060f5221231d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f811cd3e0dfa6ba7adff07ae0… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 24 14:26:39 2010 +0100 d3d10: Implement ID3D10EffectType::IsValid(). --- dlls/d3d10/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7c38c57..8a16dbc 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6017,9 +6017,9 @@ static const struct ID3D10EffectSamplerVariableVtbl d3d10_effect_sampler_variabl static BOOL STDMETHODCALLTYPE d3d10_effect_type_IsValid(ID3D10EffectType *iface) { - FIXME("iface %p stub!\n", iface); + TRACE("iface %p\n", iface); - return FALSE; + return (struct d3d10_effect_type *)iface != &null_type; } static HRESULT STDMETHODCALLTYPE d3d10_effect_type_GetDesc(ID3D10EffectType *iface, D3D10_EFFECT_TYPE_DESC *desc)

1 0

Rico Schüller : d3d10: Add D3D10_EOO_PARSED_OBJECT_INDEX in parse_fx10_object().
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 37b7de2bfd936146df11b68aad2899b98185a1bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b7de2bfd936146df11b68aa… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 24 14:26:54 2010 +0100 d3d10: Add D3D10_EOO_PARSED_OBJECT_INDEX in parse_fx10_object(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 4d80241..e2ad432 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -49,6 +49,7 @@ enum d3d10_effect_object_operation { D3D10_EOO_VALUE = 1, D3D10_EOO_PARSED_OBJECT = 2, + D3D10_EOO_PARSED_OBJECT_INDEX = 3, D3D10_EOO_ANONYMOUS_SHADER = 7, }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e5240e6..9249c11 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -965,6 +965,17 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr hr = S_OK; break; + case D3D10_EOO_PARSED_OBJECT_INDEX: + /* This is a local object, we've parsed in parse_fx10_local_object, which has an array index. */ + data_ptr = data + offset; + read_dword(&data_ptr, &offset); + read_dword(&data_ptr, &o->index); + TRACE("Shader = %s[%u].\n", data + offset, o->index); + + o->data = e->lpVtbl->GetVariableByName(e, data + offset); + hr = S_OK; + break; + case D3D10_EOO_ANONYMOUS_SHADER: TRACE("Anonymous shader\n");

1 0

Rico Schüller : d3d10: Implement ID3D10EffectPass:: GetGeometryShaderDesc().
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 3961b7b881c3911985fc1fa93d8927a28340f1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3961b7b881c3911985fc1fa93… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 24 14:26:13 2010 +0100 d3d10: Implement ID3D10EffectPass::GetGeometryShaderDesc(). --- dlls/d3d10/effect.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8a3cb56..c814bed 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2418,9 +2418,40 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10Eff static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, desc %p\n", iface, desc); + + if (This == &null_pass) + { + WARN("Null pass specified\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + for (i = 0; i < This->object_count; ++i) + { + struct d3d10_effect_object *o = &This->objects[i]; + + if (o->type == D3D10_EOT_GEOMETRYSHADER) + { + desc->pShaderVariable = o->data; + desc->ShaderIndex = o->index; + return S_OK; + } + } + + TRACE("Returning null_shader_variable\n"); + desc->pShaderVariable = (ID3D10EffectShaderVariable *)&null_shader_variable; + desc->ShaderIndex = 0; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetPixelShaderDesc(ID3D10EffectPass *iface,

1 0

Rico Schüller : d3d10: Implement ID3D10EffectPass:: GetVertexShaderDesc().
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 07b96240f1f4ee339f24f0fd2397095da9653d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b96240f1f4ee339f24f0fd2… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 24 14:25:52 2010 +0100 d3d10: Implement ID3D10EffectPass::GetVertexShaderDesc(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 41 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 06f435f..a782419 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -56,6 +56,7 @@ struct d3d10_effect_object struct d3d10_effect_pass *pass; enum d3d10_effect_object_type type; DWORD idx_offset; + DWORD index; void *data; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3e7f21d..8a3cb56 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -906,7 +906,7 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr, const char *data) { const char *data_ptr = NULL; - DWORD offset, index; + DWORD offset; enum d3d10_effect_object_operation operation; HRESULT hr; struct d3d10_effect *effect = o->pass->technique->effect; @@ -914,8 +914,8 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr read_dword(ptr, &o->type); TRACE("Effect object is of type %#x.\n", o->type); - read_dword(ptr, &index); - TRACE("Effect object index %#x.\n", index); + read_dword(ptr, &o->index); + TRACE("Effect object index %#x.\n", o->index); read_dword(ptr, &operation); TRACE("Effect object operation %#x.\n", operation); @@ -2379,9 +2379,40 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, desc %p\n", iface, desc); + + if (This == &null_pass) + { + WARN("Null pass specified\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + for (i = 0; i < This->object_count; ++i) + { + struct d3d10_effect_object *o = &This->objects[i]; + + if (o->type == D3D10_EOT_VERTEXSHADER) + { + desc->pShaderVariable = o->data; + desc->ShaderIndex = o->index; + return S_OK; + } + } + + TRACE("Returning null_shader_variable\n"); + desc->pShaderVariable = (ID3D10EffectShaderVariable *)&null_shader_variable; + desc->ShaderIndex = 0; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10EffectPass *iface,

1 0

Rico Schüller : d3d10: Implement ID3D10EffectPass:: GetPixelShaderDesc().
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 104e422b0cce987c529e0b2fb0d59c6f6a2367ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=104e422b0cce987c529e0b2fb… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 24 14:26:21 2010 +0100 d3d10: Implement ID3D10EffectPass::GetPixelShaderDesc(). --- dlls/d3d10/effect.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c814bed..7c38c57 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2457,9 +2457,40 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10E static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetPixelShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_effect_pass *This = (struct d3d10_effect_pass *)iface; + unsigned int i; - return E_NOTIMPL; + TRACE("iface %p, desc %p\n", iface, desc); + + if (This == &null_pass) + { + WARN("Null pass specified\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified\n"); + return E_INVALIDARG; + } + + for (i = 0; i < This->object_count; ++i) + { + struct d3d10_effect_object *o = &This->objects[i]; + + if (o->type == D3D10_EOT_PIXELSHADER) + { + desc->pShaderVariable = o->data; + desc->ShaderIndex = o->index; + return S_OK; + } + } + + TRACE("Returning null_shader_variable\n"); + desc->pShaderVariable = (ID3D10EffectShaderVariable *)&null_shader_variable; + desc->ShaderIndex = 0; + + return S_OK; } static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByIndex(ID3D10EffectPass *iface,

1 0

Rico Schüller : d3d10: Parse shaders in parse_fx10_local_variable().
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: ef47f8d336684da93119c0b06cf1167b752ea8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef47f8d336684da93119c0b06… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 24 14:25:42 2010 +0100 d3d10: Parse shaders in parse_fx10_local_variable(). --- dlls/d3d10/effect.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 20eccb5..3e7f21d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -306,6 +306,9 @@ static HRESULT parse_shader(struct d3d10_effect_variable *v, const char *data) read_dword(&ptr, &dxbc_size); TRACE("dxbc size: %#x\n", dxbc_size); + /* We got a shader VertexShader vs = NULL, so it is fine to skip this. */ + if (!dxbc_size) return S_OK; + switch (v->type->basetype) { case D3D10_SVT_VERTEXSHADER: @@ -1208,16 +1211,26 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const case D3D10_SVT_VERTEXSHADER: case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: - TRACE("SVT is a shader.\n"); + TRACE("Shader type is %s\n", debug_d3d10_shader_variable_type(v->type->basetype)); for (i = 0; i < max(v->type->element_count, 1); ++i) { DWORD shader_offset; + struct d3d10_effect_variable *var; + + if (!v->type->element_count) + { + var = v; + } + else + { + var = &v->elements[i]; + } - /* - * TODO: Parse the shader - */ read_dword(ptr, &shader_offset); - FIXME("Shader offset: %#x.\n", shader_offset); + TRACE("Shader offset: %#x.\n", shader_offset); + + hr = parse_shader(var, data + shader_offset); + if (FAILED(hr)) return hr; } break;

1 0

Rico Schüller : d3d10: Add anonymous shaders.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 3b56f259ce77860b0f56e38b5f50da534e69f696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b56f259ce77860b0f56e38b5… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Jan 24 14:25:19 2010 +0100 d3d10: Add anonymous shaders. --- dlls/d3d10/d3d10_private.h | 9 ++++--- dlls/d3d10/effect.c | 54 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 85618f5..06f435f 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -76,11 +76,14 @@ struct d3d10_effect_type { const struct ID3D10EffectTypeVtbl *vtbl; + char *name; + D3D10_SHADER_VARIABLE_TYPE basetype; + D3D10_SHADER_VARIABLE_CLASS type_class; + DWORD id; struct wine_rb_entry entry; struct d3d10_effect *effect; - char *name; DWORD element_count; DWORD size_unpacked; DWORD stride; @@ -88,8 +91,6 @@ struct d3d10_effect_type DWORD member_count; DWORD column_count; DWORD row_count; - D3D10_SHADER_VARIABLE_TYPE basetype; - D3D10_SHADER_VARIABLE_CLASS type_class; struct d3d10_effect_type *elementtype; struct d3d10_effect_type_member *members; }; @@ -109,7 +110,6 @@ struct d3d10_effect_variable struct d3d10_effect_variable *buffer; struct d3d10_effect_type *type; - struct d3d10_effect *effect; void *data; char *name; @@ -118,6 +118,7 @@ struct d3d10_effect_variable DWORD annotation_count; DWORD flag; DWORD data_size; + struct d3d10_effect *effect; struct d3d10_effect_variable *elements; struct d3d10_effect_variable *members; struct d3d10_effect_variable *annotations; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index f31bddd..20eccb5 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -97,6 +97,24 @@ static struct d3d10_effect_variable null_rasterizer_variable = {(ID3D10EffectVar static struct d3d10_effect_variable null_sampler_variable = {(ID3D10EffectVariableVtbl *)&d3d10_effect_sampler_variable_vtbl, &null_local_buffer, &null_type}; +/* anonymous_shader_type and anonymous_shader */ +static char anonymous_name[] = "$Anonymous"; +static char anonymous_vertexshader_name[] = "vertexshader"; +static char anonymous_pixelshader_name[] = "pixelshader"; +static char anonymous_geometryshader_name[] = "geometryshader"; +static struct d3d10_effect_type anonymous_vs_type = {&d3d10_effect_type_vtbl, anonymous_vertexshader_name, + D3D10_SVT_VERTEXSHADER, D3D10_SVC_OBJECT}; +static struct d3d10_effect_type anonymous_ps_type = {&d3d10_effect_type_vtbl, anonymous_pixelshader_name, + D3D10_SVT_PIXELSHADER, D3D10_SVC_OBJECT}; +static struct d3d10_effect_type anonymous_gs_type = {&d3d10_effect_type_vtbl, anonymous_geometryshader_name, + D3D10_SVT_GEOMETRYSHADER, D3D10_SVC_OBJECT}; +static struct d3d10_effect_variable anonymous_vs = {(ID3D10EffectVariableVtbl *)&d3d10_effect_shader_variable_vtbl, + &null_local_buffer, &anonymous_vs_type, &null_shader_variable, anonymous_name}; +static struct d3d10_effect_variable anonymous_ps = {(ID3D10EffectVariableVtbl *)&d3d10_effect_shader_variable_vtbl, + &null_local_buffer, &anonymous_ps_type, &null_shader_variable, anonymous_name}; +static struct d3d10_effect_variable anonymous_gs = {(ID3D10EffectVariableVtbl *)&d3d10_effect_shader_variable_vtbl, + &null_local_buffer, &anonymous_gs_type, &null_shader_variable, anonymous_name}; + static struct d3d10_effect_type *get_fx10_type(struct d3d10_effect *effect, const char *data, DWORD offset); static inline void read_dword(const char **ptr, DWORD *d) @@ -904,10 +922,35 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr switch(operation) { - /* FIXME: This probably isn't completely correct. */ case D3D10_EOO_VALUE: - FIXME("Copy variable value\n"); + TRACE("Copy variable values\n"); hr = E_FAIL; + + switch (o->type) + { + case D3D10_EOT_VERTEXSHADER: + TRACE("Vertex shader\n"); + o->data = &anonymous_vs; + hr = S_OK; + break; + + case D3D10_EOT_PIXELSHADER: + TRACE("Pixel shader\n"); + o->data = &anonymous_ps; + hr = S_OK; + break; + + case D3D10_EOT_GEOMETRYSHADER: + TRACE("Geometry shader\n"); + o->data = &anonymous_gs; + hr = S_OK; + break; + + default: + FIXME("Unhandled object type %#x\n", o->type); + hr = E_FAIL; + break; + } break; case D3D10_EOO_ANONYMOUS_SHADER: @@ -2454,18 +2497,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVaria TRACE("iface %p, desc %p\n", iface, desc); - if(This == &null_variable) + if (!iface->lpVtbl->IsValid(iface)) { WARN("Null variable specified\n"); return E_FAIL; } - if(!desc) + if (!desc) { WARN("Invalid argument specified\n"); return E_INVALIDARG; } + /* FIXME: This isn't correct. Anonymous shaders let desc->ExplicitBindPoint untouched, but normal shaders set it! */ memset(desc, 0, sizeof(*desc)); desc->Name = This->name; desc->Semantic = This->semantic; @@ -2473,7 +2517,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVaria desc->Annotations = This->annotation_count; desc->BufferOffset = This->buffer_offset; - if( This->flag == D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) + if (This->flag & D3D10_EFFECT_VARIABLE_EXPLICIT_BIND_POINT) { desc->ExplicitBindPoint = This->buffer_offset; }

1 0

Hans Leidekker : winhttp: Adjust connect timeout to the value observed on Windows.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 4b5f14f5f45242699a3ec41f3b986550ea98b452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b5f14f5f45242699a3ec41f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 25 12:26:58 2010 +0100 winhttp: Adjust connect timeout to the value observed on Windows. --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 9992e5b..a4a4ec6 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -#define DEFAULT_CONNECT_TIMEOUT 60000 +#define DEFAULT_CONNECT_TIMEOUT 20000 #define DEFAULT_SEND_TIMEOUT 30000 #define DEFAULT_RECEIVE_TIMEOUT 30000

1 0

Hans Leidekker : include: Add some missing prototypes.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 9e769f2faee68ea0a7e9df859828309e04efa1fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e769f2faee68ea0a7e9df859… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 25 12:26:24 2010 +0100 include: Add some missing prototypes. --- include/msi.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msi.h b/include/msi.h index 2c0a37f..5c2f38c 100644 --- a/include/msi.h +++ b/include/msi.h @@ -597,6 +597,10 @@ UINT WINAPI MsiSourceListEnumSourcesA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, UINT WINAPI MsiSourceListEnumSourcesW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, DWORD, LPWSTR, LPDWORD); #define MsiSourceListEnumSources WINELIB_NAME_AW(MsiSourceListEnumSources) +UINT WINAPI MsiSourceListClearSourceA(LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR); +UINT WINAPI MsiSourceListClearSourceW(LPCWSTR, LPCWSTR, MSIINSTALLCONTEXT, DWORD, LPCWSTR); +#define MsiSourceListClearSource WINELIB_NAME_AW(MsiSourceListClearSource) + UINT WINAPI MsiSourceListClearAllA(LPCSTR, LPCSTR, DWORD); UINT WINAPI MsiSourceListClearAllW(LPCWSTR, LPCWSTR, DWORD); #define MsiSourceListClearAll WINELIB_NAME_AW(MsiSourceListClearAll)

1 0

Hans Leidekker : pdh: Add a stub implementation of PdhSetDefaultRealTimeDataSource.
by Alexandre Julliard Jan. 25, 2010

Jan. 25, 2010

Module: wine Branch: master Commit: 960c2088d7c40d0ac3cd05f4d071f3ad5436b712 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960c2088d7c40d0ac3cd05f4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 25 12:25:47 2010 +0100 pdh: Add a stub implementation of PdhSetDefaultRealTimeDataSource. --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 9 +++++++++ include/pdh.h | 5 +++++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 7486606..3d75bb1 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -127,7 +127,7 @@ @ stub PdhSelectDataSourceA @ stub PdhSelectDataSourceW @ stdcall PdhSetCounterScaleFactor(ptr long) -@ stub PdhSetDefaultRealTimeDataSource +@ stdcall PdhSetDefaultRealTimeDataSource(long) @ stub PdhSetLogSetRunID @ stub PdhSetQueryTimeRange @ stub PdhTranslate009CounterA diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 7f08c92..fd6deba 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1211,3 +1211,12 @@ PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineNam return PDH_NOT_IMPLEMENTED; } + +/*********************************************************************** + * PdhSetDefaultRealTimeDataSource (PDH.@) + */ +PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source ) +{ + FIXME("%u\n", source); + return ERROR_SUCCESS; +} diff --git a/include/pdh.h b/include/pdh.h index d79241b..f4764af 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -49,6 +49,10 @@ typedef HANDLE PDH_HLOG; #define PDH_FMT_1000 0x00002000 #define PDH_FMT_NOCAP100 0x00008000 +#define DATA_SOURCE_REGISTRY 0x00000001 +#define DATA_SOURCE_LOGFILE 0x00000002 +#define DATA_SOURCE_WBEM 0x00000004 + typedef struct _PDH_FMT_COUNTERVALUE { DWORD CStatus; @@ -198,6 +202,7 @@ PDH_STATUS WINAPI PdhOpenQueryW(LPCWSTR, DWORD_PTR, PDH_HQUERY *); #define PdhOpenQuery WINELIB_NAME_AW(PdhOpenQuery) PDH_STATUS WINAPI PdhRemoveCounter(PDH_HCOUNTER); PDH_STATUS WINAPI PdhSetCounterScaleFactor(PDH_HCOUNTER, LONG); +PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource(DWORD); PDH_STATUS WINAPI PdhValidatePathA(LPCSTR); PDH_STATUS WINAPI PdhValidatePathW(LPCWSTR); #define PdhValidatePath WINELIB_NAME_AW(PdhValidatePath)

1 0