June 2012 - Wine-Commits - list.winehq.org

Piotr Caban : msvcp90: Added basic_stringbuf<wchar> and basic_stringbuf< short> implementation.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 2fdc5e28442802954a5e82a55f3f7db03e9841f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fdc5e28442802954a5e82a55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 29 12:03:55 2012 +0200 msvcp90: Added basic_stringbuf<wchar> and basic_stringbuf<short> implementation. --- dlls/msvcp90/ios.c | 469 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.h | 4 +- dlls/msvcp90/msvcp90.spec | 116 ++++++------ 3 files changed, 529 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2fdc5e28442802954a5e8…

1 0

Piotr Caban : msvcp90: Added basic_ostringstream<wchar> implementation.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: d4bb283ff9540e35065227c29b2bf685fcfb0d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4bb283ff9540e35065227c29… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 29 12:04:09 2012 +0200 msvcp90: Added basic_ostringstream<wchar> implementation. --- dlls/msvcp90/ios.c | 147 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++------ 2 files changed, 165 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4bb283ff9540e3506522…

1 0

Piotr Caban : msvcp90: Added basic_istringstream<wchar> implementation.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 1aff1c48818a62ce658ef522698210a18e0ddc00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aff1c48818a62ce658ef5226… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 29 12:04:21 2012 +0200 msvcp90: Added basic_istringstream<wchar> implementation. --- dlls/msvcp90/ios.c | 147 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++------ 2 files changed, 165 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1aff1c48818a62ce658ef…

1 0

Piotr Caban : msvcp90: Added basic_stringstream<wchar> implementation.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: f5ea4bab536847123c80d315518f56d88afaf5e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ea4bab536847123c80d3155… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 29 12:04:49 2012 +0200 msvcp90: Added basic_stringstream<wchar> implementation. --- dlls/msvcp90/ios.c | 154 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 38 ++++++------ 2 files changed, 173 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5ea4bab536847123c80d…

1 0

Piotr Caban : msvcp90: Sync spec files.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 20a2f23b2a075eb1bc5826aa5305e50e11b39b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a2f23b2a075eb1bc5826aa5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 29 12:05:06 2012 +0200 msvcp90: Sync spec files. --- dlls/msvcp70/msvcp70.spec | 336 ++++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 336 ++++++++++++++++++++++---------------------- dlls/msvcp80/msvcp80.spec | 336 ++++++++++++++++++++++---------------------- 3 files changed, 504 insertions(+), 504 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20a2f23b2a075eb1bc582…

1 0

Hans Leidekker : wbemprox: Implement Win32_Processor.ProcessorId.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 1b0d5cb10fbb8037477f102961cc1a87bdff27a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b0d5cb10fbb8037477f10296… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 29 13:39:19 2012 +0200 wbemprox: Implement Win32_Processor.ProcessorId. --- dlls/wbemprox/builtin.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 62d089a..800b034 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -97,6 +97,8 @@ static const WCHAR prop_pprocessidW[] = {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_processidW[] = {'P','r','o','c','e','s','s','I','D',0}; +static const WCHAR prop_processoridW[] = + {'P','r','o','c','e','s','s','o','r','I','d',0}; static const WCHAR prop_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = @@ -156,7 +158,8 @@ static const struct column col_processor[] = { { prop_cpustatusW, CIM_UINT16 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_manufacturerW, CIM_STRING } + { prop_manufacturerW, CIM_STRING }, + { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_videocontroller[] = { @@ -243,6 +246,7 @@ struct record_processor UINT16 cpu_status; const WCHAR *device_id; const WCHAR *manufacturer; + const WCHAR *processor_id; }; struct record_videocontroller { @@ -401,15 +405,31 @@ done: CloseHandle( snap ); } +static inline void do_cpuid( unsigned int ax, unsigned int *p ) +{ +#ifdef __i386__ + __asm__("pushl %%ebx\n\t" + "cpuid\n\t" + "movl %%ebx, %%esi\n\t" + "popl %%ebx" + : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) + : "0" (ax)); +#endif +} + static void fill_processor( struct table *table ) { static const WCHAR fmtW[] = {'C','P','U','%','u',0}; - WCHAR device_id[14]; + static const WCHAR fmt_cpuidW[] = {'%','0','8','X','%','0','8','X',0}; + WCHAR device_id[14], cpu_id[17]; struct record_processor *rec; UINT i, offset = 0, count = get_processor_count(); + unsigned int regs[4] = {0, 0, 0, 0}; if (!(table->data = heap_alloc( sizeof(*rec) * count ))) return; + do_cpuid( 1, regs ); + sprintfW( cpu_id, fmt_cpuidW, regs[3], regs[0] ); for (i = 0; i < count; i++) { rec = (struct record_processor *)(table->data + offset); @@ -417,6 +437,7 @@ static void fill_processor( struct table *table ) rec->manufacturer = processor_manufacturerW; sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); + rec->processor_id = heap_strdupW( cpu_id ); offset += sizeof(*rec); }

1 0

Piotr Caban : msvcp90: Added basic_ostringstream<char> implementation.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 8108e0a97e504fce7b69d5982234d3982e401fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=8108e0a97e504fce7b69d5982… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 29 12:03:05 2012 +0200 msvcp90: Added basic_ostringstream<char> implementation. --- dlls/msvcp90/ios.c | 154 +++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 36 +++++----- 2 files changed, 168 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8108e0a97e504fce7b69d…

1 0

Hans Leidekker : wbemprox: Fix returned variant type and flavor for system properties.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: fe79fea731bd31a5e07f6151ff165ac58f64a51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe79fea731bd31a5e07f6151f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 29 13:39:34 2012 +0200 wbemprox: Fix returned variant type and flavor for system properties. --- dlls/wbemprox/class.c | 7 +------ dlls/wbemprox/query.c | 18 +++++++++++------- dlls/wbemprox/wbemprox_private.h | 2 +- include/wbemcli.idl | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index d60f726..ff729f2 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -290,12 +290,7 @@ static HRESULT WINAPI class_object_Get( TRACE("%p, %s, %08x, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor); - if (plFlavor) - { - FIXME("flavor parameter not supported\n"); - *plFlavor = 0; - } - return get_propval( view, co->index, wszName, pVal, pType ); + return get_propval( view, co->index, wszName, pVal, pType, plFlavor ); } static HRESULT WINAPI class_object_Put( diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7e5872a..0ac5a3e 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -597,7 +597,7 @@ static UINT count_selected_props( const struct view *view ) } static HRESULT get_system_propval( const struct view *view, UINT index, const WCHAR *name, - VARIANT *ret, CIMTYPE *type ) + VARIANT *ret, CIMTYPE *type, LONG *flavor ) { static const WCHAR classW[] = {'_','_','C','L','A','S','S',0}; static const WCHAR genusW[] = {'_','_','G','E','N','U','S',0}; @@ -607,6 +607,8 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC static const WCHAR relpathW[] = {'_','_','R','E','L','P','A','T','H',0}; static const WCHAR serverW[] = {'_','_','S','E','R','V','E','R',0}; + if (flavor) *flavor = WBEM_FLAVOR_ORIGIN_SYSTEM; + if (!strcmpiW( name, classW )) { V_VT( ret ) = VT_BSTR; @@ -616,8 +618,8 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC } if (!strcmpiW( name, genusW )) { - V_VT( ret ) = VT_INT; - V_INT( ret ) = WBEM_GENUS_INSTANCE; /* FIXME */ + V_VT( ret ) = VT_I4; + V_I4( ret ) = WBEM_GENUS_INSTANCE; /* FIXME */ if (type) *type = CIM_SINT32; return S_OK; } @@ -637,8 +639,8 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC } if (!strcmpiW( name, propcountW )) { - V_VT( ret ) = VT_INT; - V_INT( ret ) = count_selected_props( view ); + V_VT( ret ) = VT_I4; + V_I4( ret ) = count_selected_props( view ); if (type) *type = CIM_SINT32; return S_OK; } @@ -660,13 +662,14 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC return WBEM_E_NOT_FOUND; } -HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, CIMTYPE *type ) +HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, + CIMTYPE *type, LONG *flavor ) { HRESULT hr; UINT column, row = view->result[index]; LONGLONG val; - if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type ); + if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type, flavor ); if (!is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; hr = get_column_index( view->table, name, &column ); @@ -711,6 +714,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR return WBEM_E_FAILED; } if (type) *type = view->table->columns[column].type & COL_TYPE_MASK; + if (flavor) *flavor = 0; return S_OK; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index e2ffce1..437da28 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -120,7 +120,7 @@ HRESULT create_view( const struct property *, const WCHAR *, const struct expr * void destroy_view( struct view * ) DECLSPEC_HIDDEN; struct table *get_table( const WCHAR * ) DECLSPEC_HIDDEN; HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, - CIMTYPE * ) DECLSPEC_HIDDEN; + CIMTYPE *, LONG * ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 1cd76eb..c76d465 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -201,6 +201,24 @@ typedef [v1_enum] enum tag_WBEM_CONDITION_FLAG_TYPE WBEM_MASK_CLASS_CONDITION = 0x300 } WBEM_CONDITION_FLAG_TYPE; +typedef [v1_enum] enum tag_WBEM_FLAVOR_TYPE +{ + WBEM_FLAVOR_DONT_PROPAGATE = 0, + WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE = 0x1, + WBEM_FLAVOR_FLAG_PROPAGATE_TO_DERIVED_CLASS = 0x2, + WBEM_FLAVOR_MASK_PROPAGATION = 0xf, + WBEM_FLAVOR_OVERRIDABLE = 0, + WBEM_FLAVOR_NOT_OVERRIDABLE = 0x10, + WBEM_FLAVOR_MASK_PERMISSIONS = 0x10, + WBEM_FLAVOR_ORIGIN_LOCAL = 0, + WBEM_FLAVOR_ORIGIN_PROPAGATED = 0x20, + WBEM_FLAVOR_ORIGIN_SYSTEM = 0x40, + WBEM_FLAVOR_MASK_ORIGIN = 0x60, + WBEM_FLAVOR_NOT_AMENDED = 0, + WBEM_FLAVOR_AMENDED = 0x80, + WBEM_FLAVOR_MASK_AMENDED = 0x80 +} WBEM_FLAVOR_TYPE; + typedef [v1_enum] enum tag_WBEM_GENUS_TYPE { WBEM_GENUS_CLASS = 1,

1 0

Piotr Caban : msvcp90: Added basic_istringstream<char> implementation.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 5b32999337af657190add9311feedb3dd9223ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b32999337af657190add9311… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 29 12:03:19 2012 +0200 msvcp90: Added basic_istringstream<char> implementation. --- dlls/msvcp90/ios.c | 147 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++------ 2 files changed, 165 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b32999337af657190add…

1 0

Alexandre Julliard : opengl32: Make the WGL driver context-specific.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 83be88953bc5a4fa6d3cd53f81c09f493e2dd86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=83be88953bc5a4fa6d3cd53f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 29 15:53:37 2012 +0200 opengl32: Make the WGL driver context-specific. --- dlls/gdi32/driver.c | 2 +- dlls/opengl32/wgl.c | 83 +++++++++++++++++++++++++++----------------- dlls/winex11.drv/opengl.c | 5 +-- include/wine/gdi_driver.h | 4 +- 4 files changed, 55 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83be88953bc5a4fa6d3cd…

1 0