Module: wine Branch: master Commit: fc6d667ac000659ad2ac12151476f8712174b48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6d667ac000659ad2ac121514...
Author: Hans Leidekker hans@codeweavers.com Date: Wed Jun 27 11:34:23 2012 +0200
wbemprox: Add support for 64-bit integer types.
---
dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/query.c | 69 +++++++++++++++++++++++++++++++------------- 2 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index bc82945..837a47e 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 +IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 user32
C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 35b6a0c..0f41d44 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -56,6 +56,9 @@ static UINT get_column_size( const struct table *table, UINT column ) case CIM_SINT32: case CIM_UINT32: return sizeof(INT32); + case CIM_SINT64: + case CIM_UINT64: + return sizeof(INT64); case CIM_DATETIME: case CIM_STRING: return sizeof(WCHAR *); @@ -78,7 +81,7 @@ static UINT get_row_size( const struct table *table ) return get_column_offset( table, table->num_cols - 1 ) + get_column_size( table, table->num_cols - 1 ); }
-static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_PTR *val ) +static HRESULT get_value( const struct table *table, UINT row, UINT column, LONGLONG *val ) { UINT col_offset, row_size; const BYTE *ptr; @@ -89,14 +92,14 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_
if (table->columns[column].type & CIM_FLAG_ARRAY) { - *val = (INT_PTR)*(const void **)ptr; + *val = (LONGLONG)(INT_PTR)*(const void **)ptr; return S_OK; } switch (table->columns[column].type & COL_TYPE_MASK) { case CIM_DATETIME: case CIM_STRING: - *val = (INT_PTR)*(const WCHAR **)ptr; + *val = (LONGLONG)(INT_PTR)*(const WCHAR **)ptr; break; case CIM_SINT16: *val = *(const INT16 *)ptr; @@ -110,6 +113,12 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_ case CIM_UINT32: *val = *(const UINT32 *)ptr; break; + case CIM_SINT64: + *val = *(const INT64 *)ptr; + break; + case CIM_UINT64: + *val = *(const UINT64 *)ptr; + break; default: ERR("invalid column type %u\n", table->columns[column].type & COL_TYPE_MASK); *val = 0; @@ -122,10 +131,12 @@ static BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) { static const WCHAR fmt_signedW[] = {'%','d',0}; static const WCHAR fmt_unsignedW[] = {'%','u',0}; + static const WCHAR fmt_signed64W[] = {'%','I','6','4','d',0}; + static const WCHAR fmt_unsigned64W[] = {'%','I','6','4','u',0}; static const WCHAR fmt_strW[] = {'"','%','s','"',0}; - INT_PTR val; + LONGLONG val; BSTR ret; - WCHAR number[12]; + WCHAR number[22]; UINT len;
if (table->columns[column].type & CIM_FLAG_ARRAY) @@ -139,9 +150,9 @@ static BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) { case CIM_DATETIME: case CIM_STRING: - len = strlenW( (const WCHAR *)val ) + 2; + len = strlenW( (const WCHAR *)(INT_PTR)val ) + 2; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - sprintfW( ret, fmt_strW, (const WCHAR *)val ); + sprintfW( ret, fmt_strW, (const WCHAR *)(INT_PTR)val ); return ret;
case CIM_SINT16: @@ -154,6 +165,14 @@ static BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) sprintfW( number, fmt_unsignedW, val ); return SysAllocString( number );
+ case CIM_SINT64: + wsprintfW( number, fmt_signed64W, val ); + return SysAllocString( number ); + + case CIM_UINT64: + wsprintfW( number, fmt_unsigned64W, val ); + return SysAllocString( number ); + default: FIXME("unhandled column type %u\n", table->columns[column].type & COL_TYPE_MASK); break; @@ -192,7 +211,7 @@ static void clear_table( struct table *table ) if (type == CIM_STRING || type == CIM_DATETIME || (type & CIM_FLAG_ARRAY)) { void *ptr; - if (get_value( table, i, j, (INT_PTR *)&ptr ) == S_OK) heap_free( ptr ); + if (get_value( table, i, j, (LONGLONG *)&ptr ) == S_OK) heap_free( ptr ); } } } @@ -207,9 +226,9 @@ void destroy_view( struct view *view ) heap_free( view ); }
-static BOOL eval_like( INT_PTR lval, INT_PTR rval ) +static BOOL eval_like( LONGLONG lval, LONGLONG rval ) { - const WCHAR *p = (const WCHAR *)lval, *q = (const WCHAR *)rval; + const WCHAR *p = (const WCHAR *)(INT_PTR)lval, *q = (const WCHAR *)(INT_PTR)rval;
while (*p && *q) { @@ -225,13 +244,13 @@ static BOOL eval_like( INT_PTR lval, INT_PTR rval ) return TRUE; }
-static HRESULT eval_cond( const struct table *, UINT, const struct expr *, INT_PTR * ); +static HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG * );
static BOOL eval_binary( const struct table *table, UINT row, const struct complex_expr *expr, - INT_PTR *val ) + LONGLONG *val ) { HRESULT lret, rret; - INT_PTR lval, rval; + LONGLONG lval, rval;
lret = eval_cond( table, row, expr->left, &lval ); rret = eval_cond( table, row, expr->right, &rval ); @@ -274,12 +293,12 @@ static BOOL eval_binary( const struct table *table, UINT row, const struct compl }
static HRESULT eval_unary( const struct table *table, UINT row, const struct complex_expr *expr, - INT_PTR *val ) + LONGLONG *val )
{ HRESULT hr; UINT column; - INT_PTR lval; + LONGLONG lval;
hr = get_column_index( table, expr->left->u.propval->name, &column ); if (hr != S_OK) @@ -305,7 +324,7 @@ static HRESULT eval_unary( const struct table *table, UINT row, const struct com }
static HRESULT eval_propval( const struct table *table, UINT row, const struct property *propval, - INT_PTR *val ) + LONGLONG *val )
{ HRESULT hr; @@ -319,7 +338,7 @@ static HRESULT eval_propval( const struct table *table, UINT row, const struct p }
static HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, - INT_PTR *val ) + LONGLONG *val ) { if (!cond) { @@ -335,7 +354,7 @@ static HRESULT eval_cond( const struct table *table, UINT row, const struct expr case EXPR_PROPVAL: return eval_propval( table, row, cond->u.propval, val ); case EXPR_SVAL: - *val = (INT_PTR)cond->u.sval; + *val = (LONGLONG)(INT_PTR)cond->u.sval; return S_OK; case EXPR_IVAL: case EXPR_BVAL: @@ -360,7 +379,7 @@ static HRESULT execute_view( struct view *view ) for (i = 0; i < view->table->num_rows; i++) { HRESULT hr; - INT_PTR val = 0; + LONGLONG val = 0;
if (j >= len) { @@ -634,7 +653,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR { HRESULT hr; UINT column, row = view->result[index]; - INT_PTR val; + LONGLONG val;
if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type ); if (!is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; @@ -650,7 +669,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR case CIM_STRING: case CIM_DATETIME: V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = SysAllocString( (const WCHAR *)val ); + V_BSTR( ret ) = SysAllocString( (const WCHAR *)(INT_PTR)val ); break; case CIM_SINT16: V_VT( ret ) = VT_I2; @@ -668,6 +687,14 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR V_VT( ret ) = VT_UI4; V_UI4( ret ) = val; break; + case CIM_SINT64: + V_VT( ret ) = VT_I8; + V_I8( ret ) = val; + break; + case CIM_UINT64: + V_VT( ret ) = VT_UI8; + V_UI8( ret ) = val; + break; default: ERR("unhandled column type %u\n", view->table->columns[column].type); return WBEM_E_FAILED;
-
Alexandre Julliard