September 2012 - Wine-commits

Hans Leidekker : wbemprox: Adapt to the new behavior of NtPowerInformation.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 66d39fba285128702fbe59b26063b4d9f69f5eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d39fba285128702fbe59b26… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:18:46 2012 +0200 wbemprox: Adapt to the new behavior of NtPowerInformation. --- dlls/wbemprox/builtin.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c2271c0..30dfd4c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -782,9 +782,17 @@ static void get_processor_name( WCHAR *name ) } static UINT get_processor_maxclockspeed( void ) { - PROCESSOR_POWER_INFORMATION info; - if (!NtPowerInformation( ProcessorInformation, NULL, 0, &info, sizeof(info) )) return info.MaxMhz; - return 1000000; + PROCESSOR_POWER_INFORMATION *info; + UINT ret = 1000000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); + NTSTATUS status; + + if ((info = heap_alloc( size ))) + { + status = NtPowerInformation( ProcessorInformation, NULL, 0, info, size ); + if (!status) ret = info[0].MaxMhz; + heap_free( info ); + } + return ret; } static void fill_processor( struct table *table )

1 0

Hans Leidekker : wbemprox: Override variant conversion for Win32_Processor. MaxClockSpeed.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 8e5350041863300a4fc70d718dea253b1fe4be4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5350041863300a4fc70d718… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:18:58 2012 +0200 wbemprox: Override variant conversion for Win32_Processor.MaxClockSpeed. --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 30dfd4c..7e416a5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -259,7 +259,7 @@ static const struct column col_processor[] = { prop_cpustatusW, CIM_UINT16 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_maxclockspeedW, CIM_UINT32 }, + { prop_maxclockspeedW, CIM_UINT32, VT_I4 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }

1 0

Hans Leidekker : wbemprox: Win32_Processor. MaxClockSpeed is expressed in Mhz.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: c60fe4751874905ce5b763916a93de7588073c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60fe4751874905ce5b763916… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:19:13 2012 +0200 wbemprox: Win32_Processor.MaxClockSpeed is expressed in Mhz. --- dlls/wbemprox/builtin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7e416a5..41a31f3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -783,7 +783,7 @@ static void get_processor_name( WCHAR *name ) static UINT get_processor_maxclockspeed( void ) { PROCESSOR_POWER_INFORMATION *info; - UINT ret = 1000000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); + UINT ret = 1000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); NTSTATUS status; if ((info = heap_alloc( size )))

1 0

Hans Leidekker : wbemprox: Implement Win32_VideoController.Description.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 2760a70aeecb79551931b49ba5512f068fbd8919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2760a70aeecb79551931b49ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 17 12:19:30 2012 +0200 wbemprox: Implement Win32_VideoController.Description. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 41a31f3..5434fc5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -287,6 +287,7 @@ static const struct column col_videocontroller[] = { prop_currentbitsperpixelW, CIM_UINT32 }, { prop_currenthorizontalresW, CIM_UINT32 }, { prop_currentverticalresW, CIM_UINT32 }, + { prop_descriptionW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_deviceidW, CIM_STRING|COL_FLAG_KEY }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC } }; @@ -428,6 +429,7 @@ struct record_videocontroller UINT32 current_bitsperpixel; UINT32 current_horizontalres; UINT32 current_verticalres; + const WCHAR *description; const WCHAR *device_id; const WCHAR *name; }; @@ -1050,6 +1052,7 @@ done: rec->current_bitsperpixel = get_bits_per_pixel( &hres, &vres ); rec->current_horizontalres = hres; rec->current_verticalres = vres; + rec->description = heap_strdupW( name ); rec->device_id = videocontroller_deviceidW; rec->name = heap_strdupW( name );

1 0

Henri Verbeet : wined3d: Introduce a union for declaration shader instruction arguments.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 0a17173bc247381cb63bfdda1a5f1311f44556a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a17173bc247381cb63bfdda1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 12:22:22 2012 +0200 wined3d: Introduce a union for declaration shader instruction arguments. --- dlls/wined3d/shader.c | 24 +++++++++++++----------- dlls/wined3d/shader_sm1.c | 2 +- dlls/wined3d/wined3d_private.h | 5 ++++- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 6bb3b5b..3799e04 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -501,29 +501,31 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st /* Handle declarations. */ if (ins.handler_idx == WINED3DSIH_DCL) { - switch (ins.semantic.reg.reg.type) + struct wined3d_shader_semantic *semantic = &ins.declaration.semantic; + + switch (semantic->reg.reg.type) { /* Mark input registers used. */ case WINED3DSPR_INPUT: - reg_maps->input_registers |= 1 << ins.semantic.reg.reg.idx; - shader_signature_from_semantic(&input_signature[ins.semantic.reg.reg.idx], &ins.semantic); + reg_maps->input_registers |= 1 << semantic->reg.reg.idx; + shader_signature_from_semantic(&input_signature[semantic->reg.reg.idx], semantic); break; /* Vertex shader: mark 3.0 output registers used, save token. */ case WINED3DSPR_OUTPUT: - reg_maps->output_registers |= 1 << ins.semantic.reg.reg.idx; - shader_signature_from_semantic(&output_signature[ins.semantic.reg.reg.idx], &ins.semantic); - if (ins.semantic.usage == WINED3D_DECL_USAGE_FOG) + reg_maps->output_registers |= 1 << semantic->reg.reg.idx; + shader_signature_from_semantic(&output_signature[semantic->reg.reg.idx], semantic); + if (semantic->usage == WINED3D_DECL_USAGE_FOG) reg_maps->fog = 1; break; /* Save sampler usage token. */ case WINED3DSPR_SAMPLER: - reg_maps->sampler_type[ins.semantic.reg.reg.idx] = ins.semantic.sampler_type; + reg_maps->sampler_type[semantic->reg.reg.idx] = semantic->sampler_type; break; default: - TRACE("Not recording DCL register type %#x.\n", ins.semantic.reg.reg.type); + TRACE("Not recording DCL register type %#x.\n", semantic->reg.reg.type); break; } } @@ -1314,10 +1316,10 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe if (ins.handler_idx == WINED3DSIH_DCL) { - shader_dump_decl_usage(&ins.semantic, &shader_version); - shader_dump_ins_modifiers(&ins.semantic.reg); + shader_dump_decl_usage(&ins.declaration.semantic, &shader_version); + shader_dump_ins_modifiers(&ins.declaration.semantic.reg); TRACE(" "); - shader_dump_dst_param(&ins.semantic.reg, &shader_version); + shader_dump_dst_param(&ins.declaration.semantic.reg, &shader_version); } else if (ins.handler_idx == WINED3DSIH_DEF) { diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 8721d7e..b8b96dd 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -670,7 +670,7 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi if (ins->handler_idx == WINED3DSIH_DCL) { - shader_sm1_read_semantic(&p, &ins->semantic); + shader_sm1_read_semantic(&p, &ins->declaration.semantic); } else if (ins->handler_idx == WINED3DSIH_DEF) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bd5c5e2..8f1b168 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -663,7 +663,10 @@ struct wined3d_shader_instruction const struct wined3d_shader_dst_param *dst; UINT src_count; const struct wined3d_shader_src_param *src; - struct wined3d_shader_semantic semantic; + union + { + struct wined3d_shader_semantic semantic; + } declaration; }; struct wined3d_shader_attribute

1 0

Henri Verbeet : wined3d: Recognize the SM4 dcl_maxOutputVertexCount opcode.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: d574d639a42e9b57a0a51a77bad4a277d0dc5080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d574d639a42e9b57a0a51a77b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 12:22:23 2012 +0200 wined3d: Recognize the SM4 dcl_maxOutputVertexCount opcode. --- dlls/wined3d/arb_program_shader.c | 215 ++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 215 ++++++++++++++++++------------------ dlls/wined3d/shader.c | 219 +++++++++++++++++++------------------ dlls/wined3d/shader_sm4.c | 207 ++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 438 insertions(+), 420 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d574d639a42e9b57a0a51…

1 0

Michael Stefaniuc : mshtml: Fix a memory leak on an error path (Smatch).
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: d8d58b238c2abb84f21cd662c558e9105c295498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8d58b238c2abb84f21cd662c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Sep 16 15:22:29 2012 +0200 mshtml: Fix a memory leak on an error path (Smatch). --- dlls/mshtml/navigate.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index a15be0e..15c9e85 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -769,8 +769,10 @@ static void query_http_info(nsChannelBSC *This, IWinInetHttpInfo *wininet_info) return; IWinInetHttpInfo_QueryInfo(wininet_info, HTTP_QUERY_RAW_HEADERS_CRLF, buf, &len, NULL, NULL); - if(!len) + if(!len) { + heap_free(buf); return; + } ptr = strchrW(buf, '\r'); if(ptr && ptr[1] == '\n') {

1 0

Christian Costa : d3dxof: Checkout output pointer and set returned interface to NULL at the beginning .
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 87d7fe68e2ea6a8435238b4ce17dc27c1eaeb67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=87d7fe68e2ea6a8435238b4ce… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 16 20:23:33 2012 +0200 d3dxof: Checkout output pointer and set returned interface to NULL at the beginning. --- dlls/d3dxof/d3dxof.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 02ed593..d8aaf62 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -987,27 +987,25 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE IDirectXFileDataImpl* object; HRESULT hr; + if (!ppDataObj) + return E_POINTER; + + *ppDataObj = NULL; + TRACE("(%p/%p)->(%p)\n", This, iface, ppDataObj); if (This->nb_xobjects >= MAX_OBJECTS) { ERR("Too many objects\n"); - *ppDataObj = NULL; return DXFILEERR_NOMOREOBJECTS; } /* Check if there are templates defined before the object */ if (!parse_templates(&This->buf)) - { - *ppDataObj = NULL; return DXFILEERR_BADVALUE; - } if (!This->buf.rem_bytes) - { - *ppDataObj = NULL; return DXFILEERR_NOMOREOBJECTS; - } hr = IDirectXFileDataImpl_Create(&object); if (FAILED(hr)) @@ -1064,7 +1062,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE error: IDirectXFileData_Release(&object->IDirectXFileData_iface); - *ppDataObj = NULL; return hr; }

1 0

Christian Costa : dmusic: Rename params in CreateMusicBuffer.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 8c07215f3a33a80701ebe754da6dd4bb2464473d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c07215f3a33a80701ebe754d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 16 20:23:54 2012 +0200 dmusic: Rename params in CreateMusicBuffer. --- dlls/dmusic/dmusic.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 3e0f9aa..8f3218d 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -168,19 +168,19 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind return S_FALSE; } -static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer(LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC pBufferDesc, LPDIRECTMUSICBUFFER* ppBuffer, LPUNKNOWN pUnkOuter) +static HRESULT WINAPI IDirectMusic8Impl_CreateMusicBuffer(LPDIRECTMUSIC8 iface, LPDMUS_BUFFERDESC buffer_desc, LPDIRECTMUSICBUFFER* buffer, LPUNKNOWN unkouter) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - TRACE("(%p, %p, %p, %p)\n", This, pBufferDesc, ppBuffer, pUnkOuter); + TRACE("(%p)->(%p, %p, %p)\n", This, buffer_desc, buffer, unkouter); - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; + if (unkouter) + return CLASS_E_NOAGGREGATION; - if (!pBufferDesc || !ppBuffer) - return E_POINTER; + if (!buffer_desc || !buffer) + return E_POINTER; - return DMUSIC_CreateDirectMusicBufferImpl(pBufferDesc, (LPVOID)ppBuffer); + return DMUSIC_CreateDirectMusicBufferImpl(buffer_desc, (LPVOID)buffer); } static HRESULT WINAPI IDirectMusic8Impl_CreatePort(LPDIRECTMUSIC8 iface, REFCLSID rclsidPort, LPDMUS_PORTPARAMS pPortParams, LPDIRECTMUSICPORT* ppPort, LPUNKNOWN pUnkOuter)

1 0

Christian Costa : dmusic: Rename params in GetMasterClock.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 649a1770074771a3768c2aaaa6a3ccf0a88dad19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=649a1770074771a3768c2aaaa… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Sep 16 20:24:02 2012 +0200 dmusic: Rename params in GetMasterClock. --- dlls/dmusic/dmusic.c | 43 ++++++++++++++++++++++--------------------- 1 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 8f3218d..3bc4901 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -270,17 +270,18 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumMasterClock(LPDIRECTMUSIC8 iface, DW return S_OK; } -static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPGUID pguidClock, IReferenceClock** ppReferenceClock) +static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPGUID guid_clock, IReferenceClock** reference_clock) { - IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); + IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface); - TRACE("(%p, %p, %p)\n", This, pguidClock, ppReferenceClock); - if (pguidClock) - *pguidClock = This->pMasterClock->pClockInfo.guidClock; - if(ppReferenceClock) - *ppReferenceClock = (IReferenceClock *)This->pMasterClock; + TRACE("(%p)->(%p, %p)\n", This, guid_clock, reference_clock); - return S_OK; + if (guid_clock) + *guid_clock = This->pMasterClock->pClockInfo.guidClock; + if (reference_clock) + *reference_clock = (IReferenceClock*)This->pMasterClock; + + return S_OK; } static HRESULT WINAPI IDirectMusic8Impl_SetMasterClock(LPDIRECTMUSIC8 iface, REFGUID rguidClock) @@ -354,19 +355,19 @@ static HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock(LPDIRECTMUSIC8 if } static const IDirectMusic8Vtbl DirectMusic8_Vtbl = { - IDirectMusic8Impl_QueryInterface, - IDirectMusic8Impl_AddRef, - IDirectMusic8Impl_Release, - IDirectMusic8Impl_EnumPort, - IDirectMusic8Impl_CreateMusicBuffer, - IDirectMusic8Impl_CreatePort, - IDirectMusic8Impl_EnumMasterClock, - IDirectMusic8Impl_GetMasterClock, - IDirectMusic8Impl_SetMasterClock, - IDirectMusic8Impl_Activate, - IDirectMusic8Impl_GetDefaultPort, - IDirectMusic8Impl_SetDirectSound, - IDirectMusic8Impl_SetExternalMasterClock + IDirectMusic8Impl_QueryInterface, + IDirectMusic8Impl_AddRef, + IDirectMusic8Impl_Release, + IDirectMusic8Impl_EnumPort, + IDirectMusic8Impl_CreateMusicBuffer, + IDirectMusic8Impl_CreatePort, + IDirectMusic8Impl_EnumMasterClock, + IDirectMusic8Impl_GetMasterClock, + IDirectMusic8Impl_SetMasterClock, + IDirectMusic8Impl_Activate, + IDirectMusic8Impl_GetDefaultPort, + IDirectMusic8Impl_SetDirectSound, + IDirectMusic8Impl_SetExternalMasterClock }; /* For ClassFactory */

1 0